diff --git a/erpnext/translations/af.csv b/erpnext/translations/af.csv
index 55293fd..78a3993 100644
--- a/erpnext/translations/af.csv
+++ b/erpnext/translations/af.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Periode Naam
 DocType: Employee,Salary Mode,Salaris af
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,registreer
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,registreer
 DocType: Patient,Divorced,geskei
 DocType: Support Settings,Post Route Key,Pos roete sleutel
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Laat item toe om verskeie kere in &#39;n transaksie te voeg
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Nuwe wisselkoers
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Geldeenheid word vereis vir Pryslys {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sal in die transaksie bereken word.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Verskaffer&gt; Verskaffer Tipe
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Kliëntkontak
 DocType: Patient Appointment,Check availability,Gaan beskikbaarheid
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Wys oop
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Reeks suksesvol opgedateer
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Uitteken
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} in ry {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} in ry {1}
 DocType: Asset Finance Book,Depreciation Start Date,Waardevermindering Aanvangsdatum
 DocType: Pricing Rule,Apply On,Pas aan
 DocType: Item Price,Multiple Item prices.,Meervoudige Item pryse.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Lab Voorskrif
 ,Delay Days,Vertragingsdae
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Diensuitgawes
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} is reeds in verkoopsfaktuur verwys: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} is reeds in verkoopsfaktuur verwys: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,faktuur
 DocType: Purchase Invoice Item,Item Weight Details,Item Gewig Besonderhede
 DocType: Asset Maintenance Log,Periodicity,periodisiteit
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,rekenmeester
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Verkooppryslys
 DocType: Patient,Tobacco Current Use,Tabak huidige gebruik
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Begindatum en einddatum oorvleuel met die poskaart <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Verkoopprys
 DocType: Cost Center,Stock User,Voorraad gebruiker
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Verwante
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Bywoningsdatum kan nie minder wees as werknemer se toetredingsdatum nie
 DocType: Grading Scale,Grading Scale Name,Gradering Skaal Naam
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Voeg gebruikers by die Marktplaats
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Voeg gebruikers by die Marktplaats
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Dit is &#39;n wortelrekening en kan nie geredigeer word nie.
 DocType: Sales Invoice,Company Address,Maatskappyadres
 DocType: BOM,Operations,bedrywighede
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Hoeveelheid
 DocType: Production Plan,Material Request Detail,Materiaal Versoek Detail
 DocType: Selling Settings,Default Quotation Validity Days,Standaard Kwotasie Geldigheidsdae
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om belasting in ry {0} in Item-tarief in te sluit, moet belasting in rye {1} ook ingesluit word"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om belasting in ry {0} in Item-tarief in te sluit, moet belasting in rye {1} ook ingesluit word"
 DocType: SMS Center,SMS Center,Sms sentrum
 DocType: Payroll Entry,Validate Attendance,Bevestig Bywoning
 DocType: Sales Invoice,Change Amount,Verander bedrag
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Lyn spasiëring vir hoeveelheid in woorde
 DocType: Vehicle,Additional Details,Bykomende besonderhede
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Geen beskrywing gegee nie
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Verskaffer&gt; Verskaffersgroep
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Versoek om aankoop.
 DocType: POS Closing Voucher Details,Collected Amount,Versamel bedrag
 DocType: Lab Test,Submitted Date,Datum gestuur
@@ -540,6 +539,7 @@
 DocType: Accounts Settings,Settings for Accounts,Instellings vir rekeninge
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Verskafferfaktuur Geen bestaan in Aankoopfaktuur {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Bestuur verkopersboom.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Kan roete nie verwerk nie, aangesien Google Maps-instellings gedeaktiveer is."
 DocType: Job Applicant,Cover Letter,Dekbrief
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Uitstaande tjeks en deposito&#39;s om skoon te maak
 DocType: Item,Synced With Hub,Gesinkroniseer met hub
@@ -598,7 +598,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Nuwe batewaarde
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Koers waarop die kliënt geldeenheid omgeskakel word na die kliënt se basiese geldeenheid
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kursusskeduleringsinstrument
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ry # {0}: Aankoopfaktuur kan nie teen &#39;n bestaande bate gemaak word nie {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ry # {0}: Aankoopfaktuur kan nie teen &#39;n bestaande bate gemaak word nie {1}
 DocType: Crop Cycle,LInked Analysis,Ingelyfde Analise
 DocType: POS Closing Voucher,POS Closing Voucher,POS sluitingsbewys
 DocType: Contract,Lapsed,verval
@@ -633,6 +633,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} is nie in die Kursus ingeskryf nie {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Studente naam:
 DocType: POS Closing Voucher Details,Difference,verskil
+DocType: Delivery Settings,Delay between Delivery Stops,Vertraag tussen afleweringstoppies
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Daar is &#39;n probleem met die GoCardless-konfigurasie van die bediener. Moenie bekommerd wees nie, in geval van versuim, sal die bedrag terugbetaal word na u rekening."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Voeg items by
@@ -690,7 +691,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Hoeveelheid en Tarief
 DocType: Delivery Note,% Installed,% Geïnstalleer
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,Klaskamers / Laboratoriums ens. Waar lesings geskeduleer kan word.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Maatskappy-geldeenhede van albei die maatskappye moet ooreenstem met Inter Company Transactions.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Maatskappy-geldeenhede van albei die maatskappye moet ooreenstem met Inter Company Transactions.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Voer asseblief die maatskappy se naam eerste in
 DocType: Travel Itinerary,Non-Vegetarian,Nie-Vegetaries
 DocType: Purchase Invoice,Supplier Name,Verskaffernaam
@@ -773,7 +774,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Huur vanaf datum
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Genoeg Onderdele om te Bou
 DocType: POS Profile User,POS Profile User,POS Profiel gebruiker
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Ry {0}: Waardevermindering Aanvangsdatum is nodig
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Ry {0}: Waardevermindering Aanvangsdatum is nodig
 DocType: Purchase Invoice Item,Service Start Date,Diens begin datum
 DocType: Subscription Invoice,Subscription Invoice,Inskrywing Invoice
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Direkte inkomste
@@ -840,7 +841,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Afkorting is reeds vir &#39;n ander maatskappy gebruik
 DocType: Selling Settings,Default Customer Group,Verstek kliënt groep
 DocType: Employee,IFSC Code,IFSC-kode
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Begindatum en einddatum oorvleuel met die poskaart <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","As afskakel, sal die veld &#39;Afgeronde Totaal&#39; nie sigbaar wees in enige transaksie nie"
 DocType: BOM,Operating Cost,Bedryfskoste
 DocType: Crop,Produced Items,Geproduseerde Items
@@ -891,7 +891,7 @@
 DocType: Supplier,Prevent RFQs,Voorkom RFQs
 DocType: Hub User,Hub User,Hub gebruiker
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Maak verkoopbestelling
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Salarisstrokie ingedien vir tydperk vanaf {0} tot {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Salarisstrokie ingedien vir tydperk vanaf {0} tot {1}
 DocType: Project Task,Project Task,Projektaak
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Verlore punte
 ,Lead Id,Lei Id
@@ -1073,7 +1073,7 @@
 DocType: Vehicle Log,Service Details,Diensbesonderhede
 DocType: Lab Test Template,Grouped,gegroepeer
 DocType: Selling Settings,Delivery Note Required,Afleweringsnota benodig
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Inhandiging van salarisstrokies ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Inhandiging van salarisstrokies ...
 DocType: Bank Guarantee,Bank Guarantee Number,Bank waarborg nommer
 DocType: Assessment Criteria,Assessment Criteria,Assesseringskriteria
 DocType: BOM Item,Basic Rate (Company Currency),Basiese Koers (Maatskappy Geld)
@@ -1098,13 +1098,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Betalinginskrywing is reeds geskep
 DocType: Request for Quotation,Get Suppliers,Kry Verskaffers
 DocType: Purchase Receipt Item Supplied,Current Stock,Huidige voorraad
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Ry # {0}: Bate {1} word nie gekoppel aan Item {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Ry # {0}: Bate {1} word nie gekoppel aan Item {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Preview Salary Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Rekening {0} is verskeie kere ingevoer
 DocType: Account,Expenses Included In Valuation,Uitgawes Ingesluit in Waardasie
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,U kan net hernu indien u lidmaatskap binne 30 dae verstryk
 DocType: Shopping Cart Settings,Show Stock Availability,Toon voorraad beskikbaarheid
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Stel {0} in batekategorie {1} of maatskappy {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Stel {0} in batekategorie {1} of maatskappy {2}
 DocType: Location,Longitude,Longitude
 ,Absent Student Report,Afwesige Studenteverslag
 DocType: Crop,Crop Spacing UOM,Crop Spacing UOM
@@ -1176,7 +1176,7 @@
 DocType: Soil Texture,Sand,sand
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,energie
 DocType: Opportunity,Opportunity From,Geleentheid Van
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ry {0}: {1} Serial nommers benodig vir item {2}. U het {3} verskaf.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ry {0}: {1} Serial nommers benodig vir item {2}. U het {3} verskaf.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Kies asseblief &#39;n tabel
 DocType: BOM,Website Specifications,Webwerf spesifikasies
 DocType: Special Test Items,Particulars,Besonderhede
@@ -1266,7 +1266,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Items met &#39;n hoër gewig sal hoër vertoon word
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Lab toetse en Vital Signs
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bankversoening Detail
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Ry # {0}: Bate {1} moet ingedien word
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Ry # {0}: Bate {1} moet ingedien word
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Geen werknemer gevind nie
 DocType: Item,If subcontracted to a vendor,As onderaannemer aan &#39;n ondernemer
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentegroep is reeds opgedateer.
@@ -1320,7 +1320,6 @@
 DocType: Loyalty Program Collection,Tier Name,Tier Naam
 DocType: HR Settings,Enter retirement age in years,Gee aftree-ouderdom in jare
 DocType: Crop,Target Warehouse,Teiken Warehouse
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series vir {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Payroll Employee Detail,Payroll Employee Detail,Betaalstaat Werknemer Detail
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Kies asseblief &#39;n pakhuis
 DocType: Cheque Print Template,Starting location from left edge,Begin plek vanaf linkerkant
@@ -1410,7 +1409,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Beplan materiaal vir sub-gemeentes
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Verkope Vennote en Territory
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} moet aktief wees
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Geen items beskikbaar vir oordrag nie
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Geen items beskikbaar vir oordrag nie
 DocType: Employee Boarding Activity,Activity Name,Aktiwiteit Naam
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Verander Release Date
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Voltooide produk hoeveelheid <b>{0}</b> en vir Hoeveelheid <b>{1}</b> kan nie anders wees nie
@@ -1634,6 +1633,7 @@
 DocType: Project,First Email,Eerste e-pos
 DocType: Company,Exception Budget Approver Role,Uitsondering Begroting Goedkeuringsrol
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Sodra dit ingestel is, sal hierdie faktuur aan die houer bly tot die vasgestelde datum"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Gereserveerde pakhuis in verkoopsbestelling / voltooide goedere pakhuis
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Verkoopbedrag
 DocType: Repayment Schedule,Interest Amount,Rente Bedrag
@@ -1645,7 +1645,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,rekords
 DocType: Asset,Scrapped,geskrap
 DocType: Item,Item Defaults,Item Standaard
-DocType: Purchase Invoice,Returns,opbrengste
+DocType: Cashier Closing,Returns,opbrengste
 DocType: Job Card,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Rekeningnommer {0} is onder onderhoudskontrak tot {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,werwing
@@ -1659,7 +1659,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Oordrag Tipe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Verkoopsuitgawes
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kliënt&gt; Kliëntegroep&gt; Territorium
 DocType: Diagnosis,Diagnosis,diagnose
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standaard koop
 DocType: Attendance Request,Explanation,verduideliking
@@ -1672,7 +1671,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Aankooporders Items agterstallig
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Poskode
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Verkoopsbestelling {0} is {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Kies rentekoersrekening in lening {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Kies rentekoersrekening in lening {0}
 DocType: Opportunity,Contact Info,Kontakbesonderhede
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Maak voorraadinskrywings
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Kan nie werknemer bevorder met status links nie
@@ -1684,7 +1683,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Faktuur kan nie vir nul faktuuruur gemaak word nie
 DocType: Company,Date of Commencement,Aanvangsdatum
 DocType: Sales Person,Select company name first.,Kies die maatskappy se naam eerste.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},E-pos gestuur na {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},E-pos gestuur na {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Aanhalings ontvang van verskaffers.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Vervang BOM en verander nuutste prys in alle BOM&#39;s
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Na {0} | {1} {2}
@@ -1704,7 +1703,7 @@
 DocType: Asset Movement,From Employee,Van Werknemer
 DocType: Driver,Cellphone Number,Selfoonnommer
 DocType: Project,Monitor Progress,Monitor vordering
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Waarskuwing: Stelsel sal nie oorbilling kontroleer nie, aangesien die bedrag vir item {0} in {1} nul is"
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Waarskuwing: Stelsel sal nie oorbilling kontroleer nie, aangesien die bedrag vir item {0} in {1} nul is"
 DocType: Journal Entry,Make Difference Entry,Maak Verskil Inskrywing
 DocType: Supplier Quotation,Auto Repeat Section,Outo Herhaal afdeling
 DocType: Upload Attendance,Attendance From Date,Bywoning vanaf datum
@@ -1807,7 +1806,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ry # {0}: Afgekeurde hoeveelheid kan nie in Aankoopopgawe ingevoer word nie
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,"Om kliëntgroep vir die gekose kliënt te verander, word nie toegelaat nie."
 ,Purchase Order Items To Be Billed,Items bestel om te bestel om gefaktureer te word
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Opdatering van geskatte aankomstye.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Opdatering van geskatte aankomstye.
 DocType: Program Enrollment Tool,Enrollment Details,Inskrywingsbesonderhede
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Kan nie verskeie itemvoorkeure vir &#39;n maatskappy stel nie.
 DocType: Purchase Invoice Item,Net Rate,Netto tarief
@@ -1821,7 +1820,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Verlof Tipe is madatory
 DocType: Support Settings,Close Issue After Days,Beslote uitgawe na dae
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Jy moet &#39;n gebruiker wees met Stelselbestuurder en Itembestuurderrolle om gebruikers by Marketplace te voeg.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Jy moet &#39;n gebruiker wees met Stelselbestuurder en Itembestuurderrolle om gebruikers by Marketplace te voeg.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Los leeg as dit oorweeg word vir alle takke
 DocType: Job Opening,Staffing Plan,Personeelplan
 DocType: Bank Guarantee,Validity in Days,Geldigheid in Dae
@@ -1841,7 +1840,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Dupliseer ry {0} met dieselfde {1}
 DocType: Marketplace Settings,Disable Marketplace,Deaktiveer Marketplace
 ,Trial Balance,Proefbalans
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Fiskale jaar {0} nie gevind nie
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Fiskale jaar {0} nie gevind nie
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Opstel van werknemers
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel besprekingsgebruiker
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Kies asseblief voorvoegsel eerste
@@ -1949,7 +1948,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Kon nie inteken nie
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Bate {0} geskep
 DocType: Special Test Items,Special Test Items,Spesiale toetsitems
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Jy moet &#39;n gebruiker wees met Stelselbestuurder- en Itembestuurderrolle om op Marketplace te registreer.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Jy moet &#39;n gebruiker wees met Stelselbestuurder- en Itembestuurderrolle om op Marketplace te registreer.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Betaalmetode
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Volgens u toegewysde Salarisstruktuur kan u nie vir voordele aansoek doen nie
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Webwerfbeeld moet &#39;n publieke lêer of webwerf-URL wees
@@ -1961,7 +1960,7 @@
 DocType: Warehouse,Warehouse Contact Info,Warehouse Kontak Info
 DocType: Payment Entry,Write Off Difference Amount,Skryf af Verskilbedrag
 DocType: Volunteer,Volunteer Name,Vrywilliger Naam
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Rye met duplikaatsperdatums in ander rye is gevind: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Rye met duplikaatsperdatums in ander rye is gevind: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: Werknemer e-pos nie gevind nie, vandaar e-pos nie gestuur nie"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Geen Salarisstruktuur toegeken vir Werknemer {0} op gegewe datum {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Versending reël nie van toepassing op land {0}
@@ -2050,6 +2049,7 @@
 DocType: Salary Component,Earning,verdien
 DocType: Supplier Scorecard,Scoring Criteria,Scoring Criteria
 DocType: Purchase Invoice,Party Account Currency,Partyrekening Geld
+DocType: Delivery Trip,Total Estimated Distance,Totale beraamde afstand
 ,BOM Browser,BOM Browser
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Dateer asseblief u status op vir hierdie opleidingsgebeurtenis
 DocType: Item Barcode,EAN,EAN
@@ -2088,7 +2088,7 @@
 DocType: Activity Cost,Projects,projekte
 DocType: Payment Request,Transaction Currency,Transaksie Geld
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Van {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Sommige e-posse is ongeldig
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Sommige e-posse is ongeldig
 DocType: Work Order Operation,Operation Description,Operasie Beskrywing
 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.,Kan nie die fiskale jaar begindatum en fiskale jaar einddatum verander sodra die fiskale jaar gestoor is nie.
 DocType: Quotation,Shopping Cart,Winkelwagen
@@ -2112,7 +2112,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Netto verandering in vaste bate
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Aantal
 DocType: Leave Control Panel,Leave blank if considered for all designations,Los leeg as dit oorweeg word vir alle benamings
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Heffing van tipe &#39;Werklik&#39; in ry {0} kan nie in Item Rate ingesluit word nie
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Heffing van tipe &#39;Werklik&#39; in ry {0} kan nie in Item Rate ingesluit word nie
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Maks: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Vanaf Datetime
 DocType: Shopify Settings,For Company,Vir Maatskappy
@@ -2126,7 +2126,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Daar was foute om Kursusskedule te skep
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Die eerste uitgawes goedere in die lys sal ingestel word as die standaard uitgawes goedkeur.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,kan nie groter as 100 wees nie
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Jy moet &#39;n ander gebruiker as Administrateur wees met Stelselbestuurder en Itembestuurderrolle om op Marketplace te registreer.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Jy moet &#39;n ander gebruiker as Administrateur wees met Stelselbestuurder en Itembestuurderrolle om op Marketplace te registreer.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Item {0} is nie &#39;n voorraaditem nie
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,ongeskeduleerde
@@ -2155,7 +2155,7 @@
 DocType: HR Settings,Employee Settings,Werknemer instellings
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Laai betaalstelsel
 ,Batch-Wise Balance History,Batch-Wise Balance Geskiedenis
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Ry # {0}: Kan nie die tarief stel as die bedrag groter is as die gefactureerde bedrag vir item {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Ry # {0}: Kan nie die tarief stel as die bedrag groter is as die gefactureerde bedrag vir item {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Drukinstellings opgedateer in die onderskeie drukformaat
 DocType: Package Code,Package Code,Pakketkode
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,vakleerling
@@ -2457,7 +2457,7 @@
 DocType: Vital Signs,Constipated,hardlywig
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Teen Verskafferfaktuur {0} gedateer {1}
 DocType: Customer,Default Price List,Standaard pryslys
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Bate Beweging rekord {0} geskep
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Bate Beweging rekord {0} geskep
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Geen items gevind nie.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,U kan nie fiskale jaar {0} uitvee nie. Fiskale jaar {0} word as verstek in Globale instellings gestel
 DocType: Share Transfer,Equity/Liability Account,Ekwiteits- / Aanspreeklikheidsrekening
@@ -2593,6 +2593,7 @@
 DocType: Blanket Order,Order Type,Bestelling Tipe
 ,Item-wise Sales Register,Item-wyse Verkope Register
 DocType: Asset,Gross Purchase Amount,Bruto aankoopbedrag
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Item Kode&gt; Itemgroep&gt; Handelsmerk
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Opening Saldo&#39;s
 DocType: Asset,Depreciation Method,Waardevermindering Metode
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Is hierdie belasting ingesluit in basiese tarief?
@@ -2673,7 +2674,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Aksie indien jaarlikse begroting oorskry op PO
 DocType: Student Leave Application,Student Leave Application,Studenteverlof Aansoek
 DocType: Item,Will also apply for variants,Sal ook aansoek doen vir variante
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Bate kan nie gekanselleer word nie, want dit is reeds {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Bate kan nie gekanselleer word nie, want dit is reeds {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Werknemer {0} op Halwe dag op {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Totale werksure moet nie groter wees nie as maksimum werksure {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,op
@@ -2696,6 +2697,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Haal data
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Maksimum verlof toegelaat in die verlof tipe {0} is {1}
 DocType: SMS Center,Create Receiver List,Skep Ontvanger Lys
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Beskikbaar vir gebruik Datum moet na aankoopdatum wees
 DocType: Vehicle,Wheels,wiele
 DocType: Packing Slip,To Package No.,Na pakket nommer
 DocType: Patient Relation,Family,familie
@@ -2709,7 +2711,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Faktureer geldeenheid moet gelyk wees aan óf die standaardmaatskappy se geldeenheid- of partyrekeninggeldeenheid
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Dui aan dat die pakket deel van hierdie aflewering is (Slegs Konsep)
 DocType: Soil Texture,Loam,leem
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Ry {0}: Due Date kan nie voor die posdatum wees nie
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Ry {0}: Due Date kan nie voor die posdatum wees nie
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Maak betalinginskrywing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Hoeveelheid vir item {0} moet minder wees as {1}
 ,Sales Invoice Trends,Verkoopsfaktuur neigings
@@ -2781,7 +2783,7 @@
 DocType: Guardian,Guardian Interests,Voogbelange
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Werk rekening naam / nommer op
 DocType: Naming Series,Current Value,Huidige waarde
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Verskeie fiskale jare bestaan vir die datum {0}. Stel asseblief die maatskappy in die fiskale jaar
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Verskeie fiskale jare bestaan vir die datum {0}. Stel asseblief die maatskappy in die fiskale jaar
 DocType: Education Settings,Instructor Records to be created by,Instrukteur Rekords wat geskep moet word deur
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} geskep
 DocType: GST Account,GST Account,GST rekening
@@ -2798,7 +2800,7 @@
 DocType: Sales Person,Name and Employee ID,Naam en Werknemer ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Betaaldatum kan nie voor die datum van inskrywing wees nie
 DocType: Website Item Group,Website Item Group,Webtuiste Itemgroep
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Geen salarisstrokie gevind vir die bogenoemde geselekteerde kriteria OF salarisstrokie wat reeds ingedien is nie
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Geen salarisstrokie gevind vir die bogenoemde geselekteerde kriteria OF salarisstrokie wat reeds ingedien is nie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Pligte en Belastings
 DocType: Projects Settings,Projects Settings,Projekte Instellings
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Voer asseblief Verwysingsdatum in
@@ -2915,6 +2917,7 @@
 ,Vehicle Expenses,Voertuiguitgawes
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Skep Lab toets (e) op verkope faktuur Submit
 DocType: Serial No,Invoice Details,Faktuur besonderhede
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Aktiveer asseblief Google Maps-instellings om roetes te skat en te optimaliseer
 DocType: Grant Application,Show on Website,Wys op die webwerf
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Begin aan
 DocType: Hub Tracked Item,Hub Category,Hub Kategorie
@@ -2954,7 +2957,7 @@
 DocType: Inpatient Record,B Positive,B Positief
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Maksimum voordeel van werknemer {0} oorskry {1} met die som {2} van vorige geëisde bedrag
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ry # {0}: Hoeveelheid moet 1 wees, aangesien item &#39;n vaste bate is. Gebruik asseblief aparte ry vir veelvuldige aantal."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ry # {0}: Hoeveelheid moet 1 wees, aangesien item &#39;n vaste bate is. Gebruik asseblief aparte ry vir veelvuldige aantal."
 DocType: Leave Block List Allow,Leave Block List Allow,Laat blokblokkering toe
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr kan nie leeg of spasie wees nie
 DocType: Patient Medical Record,Patient Medical Record,Pasiënt Mediese Rekord
@@ -2988,7 +2991,7 @@
 DocType: Workstation,Wages per hour,Lone per uur
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Voorraadbalans in Batch {0} word negatief {1} vir Item {2} by Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Volgende Materiële Versoeke is outomaties opgestel op grond van die item se herbestellingsvlak
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Rekening {0} is ongeldig. Rekeninggeldeenheid moet {1} wees
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Rekening {0} is ongeldig. Rekeninggeldeenheid moet {1} wees
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Vanaf datum {0} kan nie na werknemer se verligting wees nie Datum {1}
 DocType: Supplier,Is Internal Supplier,Is Interne Verskaffer
 DocType: Employee,Create User Permission,Skep gebruikertoestemming
@@ -3132,7 +3135,7 @@
 DocType: Account,Fixed Asset,Vaste bate
 DocType: Amazon MWS Settings,After Date,Na datum
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Serialized Inventory
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Ongeldige {0} vir Intermaatskappyfaktuur.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Ongeldige {0} vir Intermaatskappyfaktuur.
 ,Department Analytics,Departement Analytics
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-pos word nie in verstekkontak gevind nie
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Genereer Geheime
@@ -3144,7 +3147,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Program in die Fooistruktuur en Studentegroep {0} is anders.
 DocType: Bank Statement Transaction Entry,Receivable Account,Ontvangbare rekening
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Geldig vanaf datum moet minder wees as geldige datum datum.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Ry # {0}: Bate {1} is reeds {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Ry # {0}: Bate {1} is reeds {2}
 DocType: Quotation Item,Stock Balance,Voorraadbalans
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Verkoopsbestelling tot Betaling
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,hoof uitvoerende beampte
@@ -3186,6 +3189,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Debiet na is nodig
 DocType: Clinical Procedure,Inpatient Record,Inpatient Rekord
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Tydskrifte help om tred te hou met tyd, koste en faktuur vir aktiwiteite wat deur u span gedoen is"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Verskaffer&gt; Verskaffer Tipe
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Aankooppryslys
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Datum van transaksie
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Templates van verskaffers telkaart veranderlikes.
@@ -3228,7 +3232,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Uitruil wins / verlies
 DocType: Opportunity,Lost Reason,Verlore Rede
 DocType: Amazon MWS Settings,Enable Amazon,Aktiveer Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Ry # {0}: Rekening {1} behoort nie aan maatskappy nie {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Ry # {0}: Rekening {1} behoort nie aan maatskappy nie {2}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nuwe adres
 DocType: Quality Inspection,Sample Size,Steekproefgrootte
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,Vul asseblief die kwitansie dokument in
@@ -3337,7 +3341,7 @@
 DocType: Water Analysis,Origin,oorsprong
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Hierdie dokument is oor limiet deur {0} {1} vir item {4}. Maak jy &#39;n ander {3} teen dieselfde {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Stel asseblief herhaaldelik na die stoor
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Kies verander bedrag rekening
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Kies verander bedrag rekening
 DocType: Purchase Invoice,Price List Currency,Pryslys Geld
 DocType: Naming Series,User must always select,Gebruiker moet altyd kies
 DocType: Stock Settings,Allow Negative Stock,Laat negatiewe voorraad toe
@@ -3379,7 +3383,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Is jy seker jy wil hierdie afspraak kanselleer?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Hotel Kamerpryse
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Verkope Pyplyn
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Stel asseblief die verstek rekening in Salaris Komponent {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Stel asseblief die verstek rekening in Salaris Komponent {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Vereis Aan
 DocType: Rename Tool,File to Rename,Lêer om hernoem te word
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Kies asseblief BOM vir item in ry {0}
@@ -3400,7 +3404,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Koste van gekoopte items
 DocType: Employee Separation,Employee Separation Template,Medewerkers skeiding sjabloon
 DocType: Selling Settings,Sales Order Required,Verkope bestelling benodig
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Word &#39;n Verkoper
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Word &#39;n Verkoper
 DocType: Purchase Invoice,Credit To,Krediet aan
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Aktiewe Leiers / Kliënte
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Los leeg om die standaard afleweringsnotasformaat te gebruik
@@ -3441,7 +3445,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Maak belasting sjabloon
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Gebruikers Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Grondstowwe kan nie leeg wees nie.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Ry # {0} (Betalingstabel): Bedrag moet negatief wees
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Ry # {0} (Betalingstabel): Bedrag moet negatief wees
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Kon nie voorraad opdateer nie, faktuur bevat druppelversending item."
 DocType: Contract,Fulfilment Status,Vervulling Status
 DocType: Lab Test Sample,Lab Test Sample,Lab Test Voorbeeld
@@ -3580,7 +3584,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Doc Datum
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Fooi Rekords Geskep - {0}
 DocType: Asset Category Account,Asset Category Account,Bate Kategorie Rekening
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Ry # {0} (Betaal Tabel): Bedrag moet positief wees
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Ry # {0} (Betaal Tabel): Bedrag moet positief wees
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Kies kenmerkwaardes
 DocType: Purchase Invoice,Reason For Issuing document,Rede vir die uitreiking van dokument
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +583,Stock Entry {0} is not submitted,Voorraadinskrywing {0} is nie ingedien nie
@@ -3634,7 +3638,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Tyd waarteen materiaal ontvang is
 DocType: Products Settings,Products per Page,Produkte per bladsy
 DocType: Stock Ledger Entry,Outgoing Rate,Uitgaande koers
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,of
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,of
 DocType: Sales Order,Billing Status,Rekeningstatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Gee &#39;n probleem aan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Utility uitgawes
@@ -3661,7 +3665,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Werknemersbelastingvrystelling Verklaring
 DocType: Payment Entry,Cheque/Reference Date,Tjek / Verwysingsdatum
 DocType: Purchase Invoice,Total Taxes and Charges,Totale belasting en heffings
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Beskikbaar-vir-gebruik-datum is ingeskryf as vervaldatum
 DocType: Employee,Emergency Contact,Nood kontak
 DocType: Bank Reconciliation Detail,Payment Entry,Betaling Inskrywing
 ,sales-browser,verkope-leser
@@ -3707,6 +3710,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Is Teruggawe (Kredietnota)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Begin werk
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Serienommer is nodig vir die bate {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series vir {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Gestremde sjabloon moet nie die standaard sjabloon wees nie
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Vir ry {0}: Gee beplande hoeveelheid
 DocType: Account,Income Account,Inkomsterekening
@@ -3720,6 +3724,7 @@
 DocType: Loyalty Program,Help Section,Help afdeling
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Vorige
 DocType: Appraisal Goal,Key Responsibility Area,Sleutelverantwoordelikheidsgebied
+DocType: Delivery Trip,Distance UOM,Afstand UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Studentejoernaal help om bywoning, assessering en fooie vir studente op te spoor"
 DocType: Payment Entry,Total Allocated Amount,Totale toegewysde bedrag
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Stel verstekvoorraadrekening vir voortdurende voorraad
@@ -3759,7 +3764,7 @@
 DocType: Item Supplier,Item Supplier,Item Verskaffer
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Voer asseblief die kode in om groepsnommer te kry
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Kies asseblief &#39;n waarde vir {0} kwotasie_ tot {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Geen items gekies vir oordrag nie
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Geen items gekies vir oordrag nie
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alle adresse.
 DocType: Company,Stock Settings,Voorraadinstellings
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Samevoeging is slegs moontlik as die volgende eienskappe dieselfde in albei rekords is. Is Groep, Worteltipe, Maatskappy"
@@ -4043,7 +4048,7 @@
 DocType: Patient,Personal and Social History,Persoonlike en Sosiale Geskiedenis
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Gebruiker {0} geskep
 DocType: Fee Schedule,Fee Breakup for each student,Fooi vir elke student
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totale voorskot ({0}) teen Bestelling {1} kan nie groter wees as die Grand Total ({2}) nie.
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totale voorskot ({0}) teen Bestelling {1} kan nie groter wees as die Grand Total ({2}) nie.
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Kies Maandelikse Verspreiding om teikens oor verskillende maande te versprei.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Verander kode
 DocType: Purchase Invoice Item,Valuation Rate,Waardasietempo
@@ -4068,12 +4073,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Hoe gereeld moet projek en maatskappy opgedateer word gebaseer op verkoops transaksies.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Verval op
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Voeg studente by
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Skrap asseblief die Werknemer <a href=""#Form/Employee/{0}"">{0}</a> \ om hierdie dokument te kanselleer"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Kies asseblief {0}
 DocType: C-Form,C-Form No,C-vorm nr
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,afstand
+DocType: Delivery Stop,Distance,afstand
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Lys jou produkte of dienste wat jy koop of verkoop.
 DocType: Water Analysis,Storage Temperature,Stoor temperatuur
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4100,7 +4103,7 @@
 DocType: Homepage,Company Description for website homepage,Maatskappybeskrywing vir webwerf tuisblad
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",Vir die gerief van kliënte kan hierdie kodes gebruik word in drukformate soos fakture en afleweringsnotas
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Soepeler Naam
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Kon nie inligting vir {0} ophaal nie.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Kon nie inligting vir {0} ophaal nie.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Opening Entry Journal
 DocType: Contract,Fulfilment Terms,Vervolgingsvoorwaardes
 DocType: Sales Invoice,Time Sheet List,Tydskriflys
@@ -4278,7 +4281,7 @@
 DocType: Serial No,Warranty / AMC Details,Waarborg / AMC Besonderhede
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Kies studente handmatig vir die aktiwiteitsgebaseerde groep
 DocType: Journal Entry,User Remark,Gebruikers opmerking
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Optimalisering van roetes.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Optimalisering van roetes.
 DocType: Travel Itinerary,Non Diary,Nie Dagboek
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Kan nie Retensiebonus vir linkse werknemers skep nie
 DocType: Lead,Market Segment,Marksegment
@@ -4307,7 +4310,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Lojaliteitsprogram
 DocType: Student Guardian,Father,Vader
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Ondersteuningskaartjies
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;Op Voorraad Voorraad&#39; kan nie gekontroleer word vir vaste bateverkope nie
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;Op Voorraad Voorraad&#39; kan nie gekontroleer word vir vaste bateverkope nie
 DocType: Bank Reconciliation,Bank Reconciliation,Bankversoening
 DocType: Attendance,On Leave,Op verlof
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Kry opdaterings
@@ -4351,7 +4354,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serial No and Batch
 DocType: Warranty Claim,From Company,Van Maatskappy
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Som van punte van assesseringskriteria moet {0} wees.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Stel asseblief die aantal afskrywings wat bespreek word
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Stel asseblief die aantal afskrywings wat bespreek word
 DocType: Supplier Scorecard Period,Calculations,berekeninge
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Waarde of Hoeveelheid
 DocType: Payment Terms Template,Payment Terms,Betalingsvoorwaardes
@@ -4370,7 +4373,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Korting (%) op pryslyskoers met marges
 DocType: Healthcare Service Unit Type,Rate / UOM,Tarief / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Alle pakhuise
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Geen {0} gevind vir intermaatskappy transaksies nie.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Geen {0} gevind vir intermaatskappy transaksies nie.
 DocType: Travel Itinerary,Rented Car,Huurde motor
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Oor jou maatskappy
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Krediet Vir rekening moet &#39;n balansstaatrekening wees
@@ -4470,6 +4473,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Plantanalise Kriteria
 DocType: Cheque Print Template,Cheque Height,Kontroleer hoogte
 DocType: Supplier,Supplier Details,Verskafferbesonderhede
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Stel asseblief nommersreeks vir Bywoning via Setup&gt; Numbering Series
 DocType: Setup Progress,Setup Progress,Setup Progress
 DocType: Expense Claim,Approval Status,Goedkeuring Status
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Van waarde moet minder wees as om in ry {0} te waardeer.
@@ -4562,7 +4566,6 @@
 DocType: Travel Request,Fully Sponsored,Volledig Sponsored
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Kliënt {0} is geskep.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Installeer asseblief die Naam van Werknemers in Menslike Hulpbronne&gt; MH-instellings
 DocType: Stock Settings,Limit Percent,Limiet persentasie
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Tans is geen voorraad beskikbaar in enige pakhuis nie
 ,Payment Period Based On Invoice Date,Betalingsperiode gebaseer op faktuurdatum
@@ -4621,7 +4624,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Bron pakhuis
 DocType: Installation Note,Installation Date,Installasie Datum
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Deel Grootboek
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Ry # {0}: Bate {1} behoort nie aan maatskappy nie {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Ry # {0}: Bate {1} behoort nie aan maatskappy nie {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Verkoopsfaktuur {0} geskep
 DocType: Employee,Confirmation Date,Bevestigingsdatum
 DocType: Inpatient Occupancy,Check Out,Uitteken
@@ -4641,6 +4644,7 @@
 DocType: Production Plan,Sales Orders Detail,Verkoopsbestellings Detail
 DocType: Bin,Requested Quantity,Gevraagde Hoeveelheid
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-fooi-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Installeer asseblief die Instrukteur Naming Stelsel in Onderwys&gt; Onderwys instellings
 DocType: Patient,Marital Status,Huwelikstatus
 DocType: Stock Settings,Auto Material Request,Auto Materiaal Versoek
 DocType: Woocommerce Settings,API consumer secret,API verbruikers geheim
@@ -4693,7 +4697,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Kies Dae
 DocType: Academic Term,Term Name,Termyn Naam
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Krediet ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Skep Salarisstrokies ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Skep Salarisstrokies ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,U kan nie wortelknoop wysig nie.
 DocType: Buying Settings,Purchase Order Required,Bestelling benodig
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,timer
@@ -4729,7 +4733,7 @@
 DocType: Account,Rate at which this tax is applied,Koers waarteen hierdie belasting toegepas word
 DocType: Cash Flow Mapper,Section Name,Afdeling Naam
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Herbestel Aantal
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Waardeverminderingsreeks {0}: Verwagte waarde na nuttige lewensduur moet groter as of gelyk wees aan {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Waardeverminderingsreeks {0}: Verwagte waarde na nuttige lewensduur moet groter as of gelyk wees aan {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Huidige werksopnames
 DocType: Company,Stock Adjustment Account,Voorraadaanpassingsrekening
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Afskryf
@@ -4776,7 +4780,7 @@
 DocType: Program Enrollment,School House,Skoolhuis
 DocType: Serial No,Out of AMC,Uit AMC
 DocType: Opportunity,Opportunity Amount,Geleentheid Bedrag
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Aantal afskrywings wat bespreek word, kan nie groter wees as die totale aantal afskrywings nie"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Aantal afskrywings wat bespreek word, kan nie groter wees as die totale aantal afskrywings nie"
 DocType: Purchase Order,Order Confirmation Date,Bestelling Bevestigingsdatum
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Maak onderhoudsbesoek
@@ -4816,7 +4820,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,joernaal:
 DocType: Volunteer,Afternoon,middag
 DocType: Loyalty Program,Loyalty Program Help,Lojaliteitsprogram Help
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} &#39;{1}&#39; is gedeaktiveer
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} &#39;{1}&#39; is gedeaktiveer
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Stel as oop
 DocType: Cheque Print Template,Scanned Cheque,Geskandeerde tjek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Stuur outomatiese e-posse na Kontakte om transaksies in te dien.
@@ -4829,7 +4833,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Item en waarborgbesonderhede
 DocType: Chapter,Chapter Members,Hoofletters
 DocType: Sales Team,Contribution (%),Bydrae (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Let wel: Betalinginskrywing sal nie geskep word nie aangesien &#39;Kontant of Bankrekening&#39; nie gespesifiseer is nie
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Let wel: Betalinginskrywing sal nie geskep word nie aangesien &#39;Kontant of Bankrekening&#39; nie gespesifiseer is nie
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Projek {0} bestaan reeds
 DocType: Clinical Procedure,Nursing User,Verpleegkundige gebruiker
 DocType: Employee Benefit Application,Payroll Period,Loonstaat Periode
@@ -4837,6 +4841,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Reeksnommer {0} hoort nie by bondel {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,verantwoordelikhede
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Geldigheidsduur van hierdie aanhaling is beëindig.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Skrap asseblief die Werknemer <a href=""#Form/Employee/{0}"">{0}</a> \ om hierdie dokument te kanselleer"
 DocType: Expense Claim Account,Expense Claim Account,Koste-eisrekening
 DocType: Account,Capital Work in Progress,Kapitaalwerk in voortsetting
 DocType: Accounts Settings,Allow Stale Exchange Rates,Staaf wisselkoerse toe
@@ -4917,7 +4923,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Uitgawe Materiaal
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Koppel Shopify met ERPNext
 DocType: Material Request Item,For Warehouse,Vir pakhuis
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Afleweringsnotas {0} opgedateer
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Afleweringsnotas {0} opgedateer
 DocType: Employee,Offer Date,Aanbod Datum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,kwotasies
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Jy is in die aflyn modus. Jy sal nie kan herlaai voordat jy netwerk het nie.
@@ -4967,7 +4973,7 @@
 DocType: Shipping Rule,Calculate Based On,Bereken Gebaseer Op
 DocType: Contract,Unfulfilled,onvervulde
 DocType: Delivery Note Item,From Warehouse,Uit pakhuis
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Geen werknemers vir die genoemde kriteria
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Geen werknemers vir die genoemde kriteria
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Geen items met die materiaal om te vervaardig
 DocType: Shopify Settings,Default Customer,Verstekkliënt
 DocType: Sales Stage,Stage Name,Verhoognaam
@@ -5009,7 +5015,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Belastingbedrag na afslagbedrag
 DocType: Patient,Inpatient Status,Inpatient Status
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Daaglikse werkopsommingsinstellings
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Geselekteerde Pryslijst moet gekoop en verkoop velde nagegaan word.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Geselekteerde Pryslijst moet gekoop en verkoop velde nagegaan word.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Voer asseblief Reqd by Date in
 DocType: Payment Entry,Internal Transfer,Interne Oordrag
 DocType: Asset Maintenance,Maintenance Tasks,Onderhoudstake
@@ -5045,7 +5051,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Groep By
 DocType: Guardian,Interests,Belange
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Aktiveer / deaktiveer geldeenhede.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Kon nie &#39;n paar Salarisstrokies indien nie
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Kon nie &#39;n paar Salarisstrokies indien nie
 DocType: Exchange Rate Revaluation,Get Entries,Kry inskrywings
 DocType: Production Plan,Get Material Request,Kry materiaalversoek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Posuitgawes
@@ -5129,7 +5135,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Uitgawe rekening is verpligtend vir item {0}
 DocType: BOM,Website Description,Webwerf beskrywing
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Netto verandering in ekwiteit
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Kanselleer eers Aankoopfaktuur {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Kanselleer eers Aankoopfaktuur {0}
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Nie toegelaat. Skakel asseblief die dienseenheidstipe uit
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-pos adres moet uniek wees, bestaan reeds vir {0}"
 DocType: Serial No,AMC Expiry Date,AMC Vervaldatum
@@ -5169,7 +5175,7 @@
 DocType: Hotel Room,Hotel Room,Hotelkamer
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Rekening {0} behoort nie aan maatskappy {1}
 DocType: Leave Type,Rounding,afronding
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Reeksnommers in ry {0} stem nie ooreen met Afleweringsnota nie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Reeksnommers in ry {0} stem nie ooreen met Afleweringsnota nie
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Uitgestelde bedrag (Pro-gegradeerde)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Dan word prysreëls gefilter op grond van kliënt, kliëntegroep, gebied, verskaffer, verskaffersgroep, veldtog, verkoopsvennoot, ens."
 DocType: Student,Guardian Details,Besonderhede van die voog
@@ -5224,7 +5230,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Pakhuis benodig vir voorraad Item {0}
 DocType: Leave Allocation,Unused leaves,Ongebruikte blare
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Maak terugbetalinginskrywing
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Alle Departemente
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Alle Departemente
 DocType: Healthcare Service Unit,Vacant,vakante
 DocType: Patient,Alcohol Past Use,Alkohol Gebruik
 DocType: Fertilizer Content,Fertilizer Content,Kunsmis Inhoud
@@ -5235,7 +5241,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Werkorder {0} moet gekanselleer word voordat u hierdie verkooporder kanselleer
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Haal ontplof BOM (insluitend sub-gemeentes)
 DocType: Authorization Rule,Applicable To (Employee),Toepasbaar op (Werknemer)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Verpligte datum is verpligtend
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Verpligte datum is verpligtend
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Toename vir kenmerk {0} kan nie 0 wees nie
 DocType: Employee Benefit Claim,Benefit Type and Amount,Voordeel Tipe en Bedrag
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Kamers geboekt
@@ -5379,7 +5385,7 @@
 DocType: Purchase Invoice Item,Total Weight,Totale Gewig
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Kommissie op verkope
 DocType: Job Offer Term,Value / Description,Waarde / beskrywing
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ry # {0}: Bate {1} kan nie ingedien word nie, dit is reeds {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ry # {0}: Bate {1} kan nie ingedien word nie, dit is reeds {2}"
 DocType: Tax Rule,Billing Country,Billing Country
 DocType: Purchase Order Item,Expected Delivery Date,Verwagte afleweringsdatum
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurant bestellinginskrywing
@@ -5418,12 +5424,13 @@
 DocType: Maintenance Visit,Breakdown,Afbreek
 DocType: Travel Itinerary,Vegetarian,Vegetariese
 DocType: Patient Encounter,Encounter Date,Ontmoeting Datum
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Rekening: {0} met valuta: {1} kan nie gekies word nie
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Rekening: {0} met valuta: {1} kan nie gekies word nie
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bankdata
 DocType: Purchase Receipt Item,Sample Quantity,Monster Hoeveelheid
 DocType: Bank Guarantee,Name of Beneficiary,Naam van Begunstigde
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Werk BOM koste outomaties via Scheduler, gebaseer op die jongste waarderings koers / prys lys koers / laaste aankoop koers van grondstowwe."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Verskaffer&gt; Verskaffersgroep
 DocType: Bank Reconciliation Detail,Cheque Date,Check Date
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Rekening {0}: Ouerrekening {1} behoort nie aan maatskappy nie: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Suksesvol verwyder alle transaksies met betrekking tot hierdie maatskappy!
@@ -5451,7 +5458,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Kinder nodusse kan slegs geskep word onder &#39;Groep&#39; tipe nodusse
 DocType: Attendance Request,Half Day Date,Halfdag Datum
 DocType: Academic Year,Academic Year Name,Naam van die akademiese jaar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} mag nie met {1} handel nie. Verander asseblief die Maatskappy.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} mag nie met {1} handel nie. Verander asseblief die Maatskappy.
 DocType: Sales Partner,Contact Desc,Kontak Desc
 DocType: Email Digest,Send regular summary reports via Email.,Stuur gereelde opsommingsverslae per e-pos.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Stel asseblief die verstekrekening in Koste-eis Tipe {0}
@@ -5497,7 +5504,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Alle kliënte groepe
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,Opgehoop maandeliks
 DocType: Attendance Request,On Duty,Op diens
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} is verpligtend. Miskien is Geldwissel-rekord nie vir {1} tot {2} geskep nie.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} is verpligtend. Miskien is Geldwissel-rekord nie vir {1} tot {2} geskep nie.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Personeelplan {0} bestaan reeds vir aanwysing {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Belasting sjabloon is verpligtend.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Rekening {0}: Ouerrekening {1} bestaan nie
@@ -5576,11 +5583,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Ten minste een pakhuis is verpligtend
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Stel itemvelde soos UOM, Itemgroep, Beskrywing en Aantal ure."
 DocType: Certification Application,Certification Status,Sertifiseringsstatus
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,mark
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,mark
 DocType: Travel Itinerary,Travel Advance Required,Vereis reisvoordeel
 DocType: Subscriber,Subscriber Name,Inskrywer naam
 DocType: Serial No,Out of Warranty,Buite waarborg
-DocType: Cashier Closing,Cashier-closing-,Kassier-closing-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Mapped Data Type
 DocType: BOM Update Tool,Replace,vervang
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Geen produkte gevind.
@@ -5667,7 +5673,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Standaard belasting sjablonen vir verkope en aankoop word gemaak.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Assesseringsresultaat rekord {0} bestaan reeds.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Voorbeeld: ABCD. #####. As reeksreeks ingestel is en Batchnommer nie in transaksies genoem word nie, sal outomatiese joernaalnommer geskep word op grond van hierdie reeks. As jy dit altyd wil spesifiseer, moet jy dit loslaat. Let wel: hierdie instelling sal prioriteit geniet in die voorkeuraam van die naamreeks in voorraadinstellings."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Stel asseblief nommersreeks vir Bywoning via Setup&gt; Numbering Series
 DocType: BOM,Materials Required (Exploded),Materiaal benodig (ontplof)
 DocType: Contract,Party User,Party gebruiker
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Stel asseblief die Maatskappyfilter leeg as Groep By &#39;Maatskappy&#39; is.
@@ -5868,7 +5873,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Oppentelling
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Beide proefperiode begin datum en proeftydperk einddatum moet ingestel word
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Gemiddelde koers
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Totale Betalingsbedrag in Betaalskedule moet gelyk wees aan Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Totale Betalingsbedrag in Betaalskedule moet gelyk wees aan Grand / Rounded Total
 DocType: Subscription Plan Detail,Plan,plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bankstaatbalans soos per Algemene Grootboek
 DocType: Job Applicant,Applicant Name,Aansoeker Naam
@@ -5937,7 +5942,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Seep en wasmiddel
 DocType: BOM,Show Items,Wys items
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Van die tyd kan nie groter wees as die tyd nie.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Wil u al die kliënte per e-pos in kennis stel?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Wil u al die kliënte per e-pos in kennis stel?
 DocType: Subscription Plan,Billing Interval,Rekeninginterval
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,bestel
@@ -5946,9 +5951,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Ry {0}: {1} moet groter as 0 wees
 DocType: Assessment Criteria,Assessment Criteria Group,Assesseringskriteria Groep
 DocType: Healthcare Settings,Patient Name By,Pasiënt Naam By
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Toevallingsjoernaal Inskrywing vir salarisse vanaf {0} tot {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Toevallingsjoernaal Inskrywing vir salarisse vanaf {0} tot {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Aktiveer Uitgestelde Inkomste
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Oopopgehoopte waardevermindering moet minder wees as gelyk aan {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Oopopgehoopte waardevermindering moet minder wees as gelyk aan {0}
 DocType: Warehouse,Warehouse Name,Pakhuisnaam
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Werklike aanvangsdatum moet minder wees as die werklike einddatum
 DocType: Naming Series,Select Transaction,Kies transaksie
@@ -6099,7 +6104,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Werknemer {0} van graad {1} het geen verlofverlofbeleid nie
 DocType: Salary Detail,Salary Detail,Salarisdetail
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Kies asseblief eers {0}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Bygevoeg {0} gebruikers
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Bygevoeg {0} gebruikers
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",In die geval van &#39;n multi-vlak program sal kliënte outomaties toegewys word aan die betrokke vlak volgens hul besteding
 DocType: Appointment Type,Physician,dokter
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Batch {0} van Item {1} is verval.
@@ -6243,7 +6248,7 @@
 DocType: Asset,Custodian,bewaarder
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Verkooppunt Profiel
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} moet &#39;n waarde tussen 0 en 100 wees
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Betaling van {0} van {1} na {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Betaling van {0} van {1} na {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Onversekerde Lenings
 DocType: Cost Center,Cost Center Name,Koste Sentrum Naam
 DocType: Student,B+,B +
@@ -6275,6 +6280,7 @@
 DocType: Employee,Date of Issue,Datum van uitreiking
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Soos vir die koop-instellings as aankoopversoek benodig == &#39;JA&#39;, dan moet u vir aankoop-kwitansie eers vir item {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Ry # {0}: Stel verskaffer vir item {1}
+DocType: Global Defaults,Default Distance Unit,Verstekafstandeenheid
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Ry {0}: Ure waarde moet groter as nul wees.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Webwerfbeeld {0} verbonde aan Item {1} kan nie gevind word nie
 DocType: Issue,Content Type,Inhoud Tipe
@@ -6330,7 +6336,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Debiet Vir rekening moet &#39;n balansstaatrekening wees
 DocType: Asset,Naming Series,Naming Series
 DocType: Vital Signs,Coated,Bedekte
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Ry {0}: Verwagte Waarde Na Nuttige Lewe moet minder wees as Bruto Aankoopbedrag
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Ry {0}: Verwagte Waarde Na Nuttige Lewe moet minder wees as Bruto Aankoopbedrag
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Settings
 DocType: Leave Block List,Leave Block List Name,Verlaat bloklys naam
 DocType: Certified Consultant,Certification Validity,Sertifiseringsgeldigheid
@@ -6397,6 +6403,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Bankkop
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Bekyk labtoetse
 DocType: Hub Users,Hub Users,Hub Gebruikers
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kliënt&gt; Kliëntegroep&gt; Territorium
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Onderhoud Datum
 DocType: Purchase Invoice Item,Rejected Serial No,Afgekeurde reeksnommer
@@ -6411,7 +6418,7 @@
 DocType: SG Creation Tool Course,Max Strength,Maksimum sterkte
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Voorinstellings installeer
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Geen afleweringsnota gekies vir kliënt {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Geen afleweringsnota gekies vir kliënt {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Werknemer {0} het geen maksimum voordeelbedrag nie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Kies items gebaseer op Afleweringsdatum
 DocType: Grant Application,Has any past Grant Record,Het enige vorige Grant-rekord
@@ -6438,7 +6445,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Hotel Kamer Bespreking
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Kliëntediens
 DocType: BOM,Thumbnail,Duimnaelskets
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Geen kontakte met e-pos ID&#39;s gevind nie.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Geen kontakte met e-pos ID&#39;s gevind nie.
 DocType: Item Customer Detail,Item Customer Detail,Item kliënt detail
 DocType: Notification Control,Prompt for Email on Submission of,Vra vir epos oor indiening van
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Maksimum voordeelbedrag van werknemer {0} oorskry {1}
@@ -6693,7 +6700,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,Kan nie in Groep verskuil word nie omdat rekeningtipe gekies is.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} is gewysig. Herlaai asseblief.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop gebruikers om verloftoepassings op die volgende dae te maak.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Item Kode&gt; Itemgroep&gt; Handelsmerk
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Indien die Loyaliteitspunte onbeperk is, hou die vervaldatum leeg of 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Onderhoudspanlede
 DocType: Loyalty Point Entry,Purchase Amount,Aankoopbedrag
@@ -6701,7 +6707,7 @@
 											to fullfill Sales Order {2}",Kan nie &#39;n serienummer {0} van item {1} lewer soos dit gereserveer is om die bestelling te vul {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Verskaffer kwotasie {0} geskep
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Eindejaar kan nie voor die beginjaar wees nie
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Eindejaar kan nie voor die beginjaar wees nie
 DocType: Employee Benefit Application,Employee Benefits,Werknemervoordele
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Gepakte hoeveelheid moet gelyke hoeveelheid vir Item {0} in ry {1}
 DocType: Work Order,Manufactured Qty,Vervaardigde Aantal
@@ -6717,6 +6723,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Kies lotnommer
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Na gstin
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Wetsontwerpe wat aan kliënte gehef word.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Installeer asseblief die Naam van Werknemers in Menslike Hulpbronne&gt; MH-instellings
 DocType: Healthcare Settings,Invoice Appointments Automatically,Faktuuraanstellings outomaties
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projek-ID
 DocType: Salary Component,Variable Based On Taxable Salary,Veranderlike gebaseer op Belasbare Salaris
@@ -6765,7 +6772,7 @@
 DocType: POS Profile,Account for Change Amount,Verantwoord Veranderingsbedrag
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Koppel aan QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Totale wins / verlies
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Ongeldige Maatskappy vir Intermaatskappyfaktuur.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Ongeldige Maatskappy vir Intermaatskappyfaktuur.
 DocType: Purchase Invoice,input service,insetdiens
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ry {0}: Party / Rekening stem nie ooreen met {1} / {2} in {3} {4}
 DocType: Employee Promotion,Employee Promotion,Werknemersbevordering
@@ -6895,7 +6902,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Voorkeurarea vir Akkommodasie
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Mandjie is leeg
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Installeer asseblief die Instrukteur Naming Stelsel in Onderwys&gt; Onderwys instellings
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Item {0} het geen reeksnommer nie. Slegs geseliliseerde items \ kan aflewering hê op basis van die serienommer
 DocType: Vehicle,Model,model
@@ -6925,7 +6931,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Niks om te verander nie
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Kies asseblief &#39;n CSV-lêer
 DocType: Holiday List,Total Holidays,Totale vakansiedae
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Ontbrekende e-pos sjabloon vir gestuur. Stel asseblief een in afleweringsinstellings in.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Ontbrekende e-pos sjabloon vir gestuur. Stel asseblief een in afleweringsinstellings in.
 DocType: Student Leave Application,Mark as Present,Merk as Aanwesig
 DocType: Supplier Scorecard,Indicator Color,Indicator Kleur
 DocType: Purchase Order,To Receive and Bill,Om te ontvang en rekening
@@ -6934,7 +6940,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Kies Serial No
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Ontwerper
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Terme en Voorwaardes Sjabloon
-DocType: Serial No,Delivery Details,Afleweringsbesonderhede
+DocType: Delivery Trip,Delivery Details,Afleweringsbesonderhede
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Kostesentrum word benodig in ry {0} in Belasting tabel vir tipe {1}
 DocType: Program,Program Code,Program Kode
 DocType: Terms and Conditions,Terms and Conditions Help,Terme en voorwaardes Help
@@ -6958,7 +6964,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lood Tyddae
 DocType: Cash Flow Mapping,Is Income Tax Expense,Is Inkomstebelastinguitgawe
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,U bestelling is uit vir aflewering!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ry # {0}: Posdatum moet dieselfde wees as aankoopdatum {1} van bate {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ry # {0}: Posdatum moet dieselfde wees as aankoopdatum {1} van bate {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Kontroleer of die Student by die Instituut se koshuis woon.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Vul asseblief die bestellings in die tabel hierbo in
 ,Stock Summary,Voorraadopsomming
diff --git a/erpnext/translations/am.csv b/erpnext/translations/am.csv
index e662501..35ab802 100644
--- a/erpnext/translations/am.csv
+++ b/erpnext/translations/am.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,የጊዜ ስም
 DocType: Employee,Salary Mode,ደመወዝ ሁነታ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,መዝግብ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,መዝግብ
 DocType: Patient,Divorced,በፍቺ
 DocType: Support Settings,Post Route Key,የልኡክ ጽሁፍ መስመር ቁልፍ
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,ንጥል አንድ ግብይት ውስጥ በርካታ ጊዜያት መታከል ፍቀድ
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,አዲስ ልውጥ ተመን
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},የምንዛሬ ዋጋ ዝርዝር ያስፈልጋል {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ግብይቱ ላይ ይሰላሉ.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,አቅራቢ&gt; አቅራቢ አይነት
 DocType: Delivery Trip,MAT-DT-.YYYY.-,ማት-ዱብ-ያዮያን.-
 DocType: Purchase Order,Customer Contact,የደንበኛ ያግኙን
 DocType: Patient Appointment,Check availability,ተገኝነትን ያረጋግጡ
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,ክፍት አሳይ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,ተከታታይ በተሳካ ሁኔታ ዘምኗል
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,ጨርሰህ ውጣ
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} በረድፍ {1} ውስጥ
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} በረድፍ {1} ውስጥ
 DocType: Asset Finance Book,Depreciation Start Date,የዋጋ ቅነሳ መጀመሪያ ቀን
 DocType: Pricing Rule,Apply On,ላይ ተግብር
 DocType: Item Price,Multiple Item prices.,በርካታ ንጥል ዋጋዎች.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,ላብራቶሪ መድኃኒት
 ,Delay Days,የዘገየ
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,የአገልግሎት የወጪ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},መለያ ቁጥር: {0} አስቀድሞ የሽያጭ ደረሰኝ ውስጥ የተጠቆመው ነው: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},መለያ ቁጥር: {0} አስቀድሞ የሽያጭ ደረሰኝ ውስጥ የተጠቆመው ነው: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,የዋጋ ዝርዝር
 DocType: Purchase Invoice Item,Item Weight Details,የንጥል ክብደት ዝርዝሮች
 DocType: Asset Maintenance Log,Periodicity,PERIODICITY
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,ሒሳብ ሠራተኛ
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,የዋጋ ዝርዝር ዋጋ
 DocType: Patient,Tobacco Current Use,የትምባሆ ወቅታዊ አጠቃቀም
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","የመጀመሪያ ቀን እና የመጨረሻ ቀን ከስራ ካርድ ጋር <a href=""#Form/Job Card/{0}"">{1}</a> ተደራራቢ"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,የሽያጭ ፍጥነት
 DocType: Cost Center,Stock User,የአክሲዮን ተጠቃሚ
 DocType: Soil Analysis,(Ca+Mg)/K,(ካም + ኤምግ) / ኬ
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,ተዛማጅ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,የትምህርት ክትትል የቀን ሠራተኛ ዎቹ በመቀላቀል ቀን ያነሰ መሆን አይችልም
 DocType: Grading Scale,Grading Scale Name,አሰጣጥ በስምምነት ስም
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,ተጠቃሚዎችን ወደ ገበያ ቦታ አክል
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,ተጠቃሚዎችን ወደ ገበያ ቦታ አክል
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,ይህ ሥር መለያ ነው እና አርትዕ ሊደረግ አይችልም.
 DocType: Sales Invoice,Company Address,የኩባንያ አድራሻ
 DocType: BOM,Operations,ክወናዎች
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,ልዩነት
 DocType: Production Plan,Material Request Detail,የቁስ ንብረት ጥያቄ ዝርዝር
 DocType: Selling Settings,Default Quotation Validity Days,ነባሪ ትዕዛዝ ዋጋ መስጫ ቀናት
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ንጥል መጠን ረድፍ {0} ውስጥ ግብርን ማካተት, ረድፎች ውስጥ ቀረጥ {1} ደግሞ መካተት አለበት"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ንጥል መጠን ረድፍ {0} ውስጥ ግብርን ማካተት, ረድፎች ውስጥ ቀረጥ {1} ደግሞ መካተት አለበት"
 DocType: SMS Center,SMS Center,ኤስ ኤም ኤስ ማዕከል
 DocType: Payroll Entry,Validate Attendance,ተገኝነትን ያረጋግጡ
 DocType: Sales Invoice,Change Amount,ለውጥ መጠን
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,ቃላት ውስጥ መጠን ለማግኘት የመስመር ክፍተት
 DocType: Vehicle,Additional Details,ተጨማሪ ዝርዝሮች
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,የተሰጠው መግለጫ የለም
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,አቅራቢ&gt; የአቅራቢ ቡድን
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ግዢ ይጠይቁ.
 DocType: POS Closing Voucher Details,Collected Amount,የተከማቹ መጠን
 DocType: Lab Test,Submitted Date,የተረከበት ቀን
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,የተማሪ ምዝገባ
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,{0} ንጥል ተሰርዟል
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,የአከፋፈል ረድፍ {0}: የአበሻ ማስወገጃ ቀን ልክ እንደ ያለፈው ቀን ተጨምሯል
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,የአከፋፈል ረድፍ {0}: የአበሻ ማስወገጃ ቀን ልክ እንደ ያለፈው ቀን ተጨምሯል
 DocType: Contract Template,Fulfilment Terms and Conditions,የመሟላት ሁኔታዎች እና ሁኔታዎች
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,ቁሳዊ ጥያቄ
 DocType: Bank Reconciliation,Update Clearance Date,አዘምን መልቀቂያ ቀን
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,መለያዎች ቅንብሮች
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},አቅራቢው ደረሰኝ ምንም የግዢ ደረሰኝ ውስጥ አለ {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,የሽያጭ ሰው ዛፍ ያቀናብሩ.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.",የጉግል ካርታዎች ቅንጅት ስለማይሰራ መንገዱን ማስኬድ አይቻልም.
 DocType: Job Applicant,Cover Letter,የፊት ገፅ ደብዳቤ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ያልተከፈሉ Cheques እና ማጽዳት ተቀማጭ
 DocType: Item,Synced With Hub,ማዕከል ጋር ተመሳስሏል
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,አዲስ የንብረት እሴት
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,የደንበኛ ምንዛሬ ደንበኛ መሰረታዊ ምንዛሬ በመለወጥ ነው በ ተመን
 DocType: Course Scheduling Tool,Course Scheduling Tool,የኮርስ ዕቅድ መሣሪያ
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},የረድፍ # {0}: የግዢ ደረሰኝ አንድ ነባር ንብረት ላይ ማድረግ አይቻልም {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},የረድፍ # {0}: የግዢ ደረሰኝ አንድ ነባር ንብረት ላይ ማድረግ አይቻልም {1}
 DocType: Crop Cycle,LInked Analysis,LInked Analysis
 DocType: POS Closing Voucher,POS Closing Voucher,POS የመዘጋጃ ቫውቸር
 DocType: Contract,Lapsed,ተወስዷል
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} የቀየረ ውስጥ አልተመዘገበም ነው {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,የተማሪው ስም:
 DocType: POS Closing Voucher Details,Difference,ልዩነት
+DocType: Delivery Settings,Delay between Delivery Stops,በማደል ማቆሚያዎች መካከል ያለው መዘግየት
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},ተከታታይ አይ {0} የመላኪያ ማስታወሻ የእርሱ ወገን አይደለም {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","በአገልጋዩ የ GoCardless ውቅረት ላይ ችግር ያለ ይመስላል. አትጨነቅ, ካልተሳካ, ገንዘቡ ወደ ሂሳብህ ተመላሽ ይደረጋል."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext ማሳያ
@@ -693,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,ብዛት እና ደረጃ ይስጡ
 DocType: Delivery Note,% Installed,% ተጭኗል
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,ክፍሎች / ንግግሮች መርሐግብር ይቻላል የት ቤተ ሙከራ ወዘተ.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,ኩባንያዎች ሁለቱም ኩባንያዎች ከ Inter Company Transactions ጋር መጣጣም ይኖርባቸዋል.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,ኩባንያዎች ሁለቱም ኩባንያዎች ከ Inter Company Transactions ጋር መጣጣም ይኖርባቸዋል.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,የመጀመሪያ የኩባንያ ስም ያስገቡ
 DocType: Travel Itinerary,Non-Vegetarian,ቬጅ ያልሆነ
 DocType: Purchase Invoice,Supplier Name,አቅራቢው ስም
@@ -778,7 +779,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,በቀን ተከራይቷል
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,በቂ ክፍሎች መመሥረት የሚቻለው
 DocType: POS Profile User,POS Profile User,POS የመገለጫ ተጠቃሚ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,ረድፍ {0}: የአበሻ ማስወገጃ ቀን ያስፈልጋል
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,ረድፍ {0}: የአበሻ ማስወገጃ ቀን ያስፈልጋል
 DocType: Purchase Invoice Item,Service Start Date,የአገልግሎት የመጀመሪያ ቀን
 DocType: Subscription Invoice,Subscription Invoice,የምዝገባ ደረሰኝ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,ቀጥታ ገቢ
@@ -845,7 +846,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,በምህፃረ ቃል አስቀድሞ ለሌላ ኩባንያ ጥቅም ላይ
 DocType: Selling Settings,Default Customer Group,ነባሪ የደንበኛ ቡድን
 DocType: Employee,IFSC Code,የ IFSC ኮድ
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","የመጀመሪያ ቀን እና የመጨረሻ ቀን ከስራ ካርድ ጋር <a href=""#Form/Job Card/{0}"">{1}</a> ተደራራቢ"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","አቦዝን ከሆነ, «ክብ ጠቅላላ &#39;መስክ በማንኛውም ግብይት ውስጥ የሚታይ አይሆንም"
 DocType: BOM,Operating Cost,የክወና ወጪ
 DocType: Crop,Produced Items,የተመረቱ ዕቃዎች
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,RFQs ይከላከሉ
 DocType: Hub User,Hub User,Hub ተጠቃሚ
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,የሽያጭ ትዕዛዝ አድርግ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},የጊዜ ቆይታ ከ {0} እስከ {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},የጊዜ ቆይታ ከ {0} እስከ {1}
 DocType: Project Task,Project Task,ፕሮጀክት ተግባር
 DocType: Loyalty Point Entry Redemption,Redeemed Points,የታረቁ ነጥቦች
 ,Lead Id,ቀዳሚ መታወቂያ
@@ -1025,7 +1025,7 @@
 DocType: Fee Validity,Max number of visit,ከፍተኛ የጎብኝ ቁጥር
 ,Hotel Room Occupancy,የሆቴል ክፍል ባለቤትነት
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet ተፈጥሯል:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},የክፍያ ሁነታ ላይ ነባሪ በጥሬ ገንዘብ ወይም በባንክ መለያ ማዘጋጀት እባክዎ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},የክፍያ ሁነታ ላይ ነባሪ በጥሬ ገንዘብ ወይም በባንክ መለያ ማዘጋጀት እባክዎ {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,ይመዝገቡ
 DocType: GST Settings,GST Settings,GST ቅንብሮች
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},ምንዛሬ ልክ እንደ የዋጋ ዝርዝር ምንዛሬ መሆን አለበት: {0}
@@ -1079,7 +1079,7 @@
 DocType: Vehicle Log,Service Details,የአገልግሎት ዝርዝሮች
 DocType: Lab Test Template,Grouped,የተደረደሩ
 DocType: Selling Settings,Delivery Note Required,የመላኪያ ማስታወሻ ያስፈልጋል
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,ደመወዝ መጨመር ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,ደመወዝ መጨመር ...
 DocType: Bank Guarantee,Bank Guarantee Number,ባንክ ዋስትና ቁጥር
 DocType: Assessment Criteria,Assessment Criteria,የግምገማ መስፈርት
 DocType: BOM Item,Basic Rate (Company Currency),መሠረታዊ ተመን (የኩባንያ የምንዛሬ)
@@ -1104,13 +1104,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,የክፍያ Entry አስቀድሞ የተፈጠረ ነው
 DocType: Request for Quotation,Get Suppliers,አቅራቢዎችን ያግኙ
 DocType: Purchase Receipt Item Supplied,Current Stock,የአሁኑ የአክሲዮን
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},የረድፍ # {0}: {1} የንብረት ንጥል ጋር የተገናኘ አይደለም {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},የረድፍ # {0}: {1} የንብረት ንጥል ጋር የተገናኘ አይደለም {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,ቅድመ-የቀጣሪ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,መለያ {0} በርካታ ጊዜ ገብቷል ታይቷል
 DocType: Account,Expenses Included In Valuation,ወጪዎች ግምቱ ውስጥ ተካቷል
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,አባልነትዎ በ 30 ቀናት ውስጥ የሚያልቅ ከሆነ ብቻ መታደስ የሚችሉት
 DocType: Shopping Cart Settings,Show Stock Availability,የኤክስቴንሽን አቅርቦት አሳይ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},{0} ን በንብረት ምድብ {1} ወይም ኩባንያ {2} ውስጥ ያዘጋጁ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},{0} ን በንብረት ምድብ {1} ወይም ኩባንያ {2} ውስጥ ያዘጋጁ
 DocType: Location,Longitude,ኬንትሮስ
 ,Absent Student Report,ብርቅ የተማሪ ሪፖርት
 DocType: Crop,Crop Spacing UOM,UOM ከርክም አሰርጥ
@@ -1182,7 +1182,7 @@
 DocType: Soil Texture,Sand,አሸዋ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,ኃይል
 DocType: Opportunity,Opportunity From,ከ አጋጣሚ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ረድፍ {0}: {1} የቁጥር ቁጥሮች ለ Item {2} ያስፈልጋሉ. {3} ሰጥተሃል.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ረድፍ {0}: {1} የቁጥር ቁጥሮች ለ Item {2} ያስፈልጋሉ. {3} ሰጥተሃል.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,እባክህ ሰንጠረዥ ምረጥ
 DocType: BOM,Website Specifications,የድር ጣቢያ ዝርዝር
 DocType: Special Test Items,Particulars,ዝርዝሮች
@@ -1274,7 +1274,7 @@
 DocType: Item,Items with higher weightage will be shown higher,ከፍተኛ weightage ጋር ንጥሎች ከፍተኛ ይታያል
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,የላብራቶሪ ሙከራዎች እና ወሳኝ ምልክቶች
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ባንክ ማስታረቅ ዝርዝር
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,የረድፍ # {0}: የንብረት {1} መቅረብ አለበት
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,የረድፍ # {0}: የንብረት {1} መቅረብ አለበት
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ምንም ሰራተኛ አልተገኘም
 DocType: Item,If subcontracted to a vendor,አንድ አቅራቢው subcontracted ከሆነ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,የተማሪ ቡድን አስቀድሞ የዘመነ ነው.
@@ -1328,7 +1328,6 @@
 DocType: Loyalty Program Collection,Tier Name,የደረጃ ስም
 DocType: HR Settings,Enter retirement age in years,ዓመታት ውስጥ ጡረታ ዕድሜ ያስገቡ
 DocType: Crop,Target Warehouse,ዒላማ መጋዘን
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,እባክዎን በቅንብር&gt; ቅንጅቶች&gt; የስምሪት ስሞች በኩል በ {0} ስም ማዕቀብ ያዘጋጁ
 DocType: Payroll Employee Detail,Payroll Employee Detail,የደመወዝ ተቀጣሪ ዝርዝር
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,አንድ መጋዘን ይምረጡ
 DocType: Cheque Print Template,Starting location from left edge,ግራ ጠርዝ አካባቢ በመጀመር ላይ
@@ -1418,7 +1417,7 @@
 DocType: Work Order,Plan material for sub-assemblies,ንዑስ-አብያተ ክርስቲያናት ለ እቅድ ቁሳዊ
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,የሽያጭ አጋሮች እና ግዛት
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} ገባሪ መሆን አለበት
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,ለሽግግር ምንም የለም
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,ለሽግግር ምንም የለም
 DocType: Employee Boarding Activity,Activity Name,የእንቅስቃሴ ስም
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,የተለቀቀበት ቀን ለውጥ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,የተጠናቀቀው የምርት ብዛት <b>{0}</b> እና ለ Quantity <b>{1}</b> ሊለወጥ አይችልም
@@ -1644,6 +1643,7 @@
 DocType: Project,First Email,የመጀመሪያ ኢሜይል
 DocType: Company,Exception Budget Approver Role,የባለሙያ የበጀት አፀፋፊ ሚና
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","አንዴ ከተዘጋጀ, ይህ የዋጋ መጠየቂያ የተጠናቀቀበት ቀን እስከሚቆይ ይቆያል"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,የሽያጭ ትዕዛዝ / ያለቀለት ዕቃዎች መጋዘን ውስጥ የተያዘ መጋዘን
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,ሽያጭ መጠን
 DocType: Repayment Schedule,Interest Amount,የወለድ መጠን
@@ -1655,7 +1655,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,መዛግብት
 DocType: Asset,Scrapped,በመዛጉ
 DocType: Item,Item Defaults,ንጥል ነባሪዎች
-DocType: Purchase Invoice,Returns,ይመልሳል
+DocType: Cashier Closing,Returns,ይመልሳል
 DocType: Job Card,WIP Warehouse,WIP መጋዘን
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},ተከታታይ አይ {0} እስከሁለት ጥገና ኮንትራት ስር ነው {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,ምልመላ
@@ -1669,7 +1669,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,የማስተላለፍ አይነት
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,የሽያጭ ወጪዎች
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ደንበኛ&gt; የሽያጭ ቡድን&gt; ግዛት
 DocType: Diagnosis,Diagnosis,ምርመራ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,መደበኛ ሊገዙ
 DocType: Attendance Request,Explanation,ማብራርያ
@@ -1682,7 +1681,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,የግዢ ትዕዛዞችን ያለፈባቸው ናቸው
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,አካባቢያዊ መለያ ቁጥር
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},የሽያጭ ትዕዛዝ {0} ነው {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},በብድር ውስጥ የወለድ ገቢን ይምረጡ {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},በብድር ውስጥ የወለድ ገቢን ይምረጡ {0}
 DocType: Opportunity,Contact Info,የመገኛ አድራሻ
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,የክምችት ግቤቶችን ማድረግ
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,በአስተዳዳሪ ሁኔታ ወደ ሠራተኛ ማስተዋወቅ አይቻልም
@@ -1694,7 +1693,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,ደረሰኝ ወደ ዜሮ የክፍያ አከፋፈል ሰዓት ሊሠራ አይችልም
 DocType: Company,Date of Commencement,የመጀመርያው ቀን
 DocType: Sales Person,Select company name first.,በመጀመሪያ ይምረጡ የኩባንያ ስም.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},ኢሜል ወደ {0} ተልኳል
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},ኢሜል ወደ {0} ተልኳል
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ጥቅሶች አቅራቢዎች ደርሷል.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOM ን ይተኩ እና በሁሉም የ BOM ዎች ውስጥ አዲስ ዋጋን ያዘምኑ
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},ወደ {0} | {1} {2}
@@ -1714,7 +1713,7 @@
 DocType: Asset Movement,From Employee,የሰራተኛ ከ
 DocType: Driver,Cellphone Number,የሞባይል ስልክ ቁጥር
 DocType: Project,Monitor Progress,የክትትል ሂደት
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ማስጠንቀቂያ: የስርዓት ንጥል ለ መጠን ጀምሮ overbilling ይመልከቱ በ {0} ውስጥ {1} ዜሮ ነው
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ማስጠንቀቂያ: የስርዓት ንጥል ለ መጠን ጀምሮ overbilling ይመልከቱ በ {0} ውስጥ {1} ዜሮ ነው
 DocType: Journal Entry,Make Difference Entry,ለችግሮችህ Entry አድርግ
 DocType: Supplier Quotation,Auto Repeat Section,ራስ-ሰር ይድገሙ
 DocType: Upload Attendance,Attendance From Date,ቀን ጀምሮ በስብሰባው
@@ -1816,7 +1815,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,የረድፍ # {0}: ብዛት ግዢ መመለስ ውስጥ ገብቶ ሊሆን አይችልም ተቀባይነት አላገኘም
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,ለተመረጠው ደንበኛ የደንበኞች ቡድን መቀየር አይፈቀድም.
 ,Purchase Order Items To Be Billed,የግዢ ትዕዛዝ ንጥሎች እንዲከፍሉ ለማድረግ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,የተገመተው የመድረሻ ጊዜዎችን በማዘመን ላይ.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,የተገመተው የመድረሻ ጊዜዎችን በማዘመን ላይ.
 DocType: Program Enrollment Tool,Enrollment Details,የመመዝገቢያ ዝርዝሮች
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,የአንድ ኩባንያ ብዙ ንጥል ነባሪዎችን ማዘጋጀት አይቻልም.
 DocType: Purchase Invoice Item,Net Rate,የተጣራ ተመን
@@ -1830,7 +1829,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,ውጣ ውጣ በጣም አስገራሚ ነው
 DocType: Support Settings,Close Issue After Days,ቀናት በኋላ ዝጋ እትም
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,ተጠቃሚዎችን ወደ ገበያ ቦታ የሚያክሉት የስርዓት አቀናባሪ እና የንጥል አስተዳዳሪ ሚናዎች ተጠቃሚ መሆን አለብዎት.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,ተጠቃሚዎችን ወደ ገበያ ቦታ የሚያክሉት የስርዓት አቀናባሪ እና የንጥል አስተዳዳሪ ሚናዎች ተጠቃሚ መሆን አለብዎት.
 DocType: Leave Control Panel,Leave blank if considered for all branches,ሁሉም ቅርንጫፎች ተደርጎ ከሆነ ባዶውን ይተው
 DocType: Job Opening,Staffing Plan,የሰራተኛ እቅድ
 DocType: Bank Guarantee,Validity in Days,ቀኖች ውስጥ የተገቢነት
@@ -1850,7 +1849,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},ጋር የተባዛ ረድፍ {0} ተመሳሳይ {1}
 DocType: Marketplace Settings,Disable Marketplace,የገበያ ቦታን አሰናክል
 ,Trial Balance,በችሎት ሒሳብ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,አልተገኘም በጀት ዓመት {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,አልተገኘም በጀት ዓመት {0}
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,ሰራተኞች በማቀናበር ላይ
 DocType: Hotel Room Reservation,Hotel Reservation User,የሆቴል መያዣ ተጠቃሚ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,መጀመሪያ ቅድመ ቅጥያ ይምረጡ
@@ -1958,7 +1957,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,ለመግባት ተስኗል
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,ንብረት {0} ተፈጥሯል
 DocType: Special Test Items,Special Test Items,ልዩ የፈተና ንጥሎች
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,በገበያ ቦታ ላይ ለመመዝገብ የስርዓት አቀናባሪ እና የንጥል አስተዳዳሪ ሚናዎች ተጠቃሚ መሆን አለብዎት.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,በገበያ ቦታ ላይ ለመመዝገብ የስርዓት አቀናባሪ እና የንጥል አስተዳዳሪ ሚናዎች ተጠቃሚ መሆን አለብዎት.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,የክፍያ ሁነታ
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,በተመደበው የደመወዝ ስነስርዓት መሰረት ለእርዳታ ማመልከት አይችሉም
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,የድር ጣቢያ ምስል ይፋዊ ፋይል ወይም ድር ጣቢያ ዩ አር ኤል መሆን አለበት
@@ -1970,7 +1969,7 @@
 DocType: Warehouse,Warehouse Contact Info,መጋዘን የእውቂያ መረጃ
 DocType: Payment Entry,Write Off Difference Amount,ለችግሮችህ መጠን ጠፍቷል ይጻፉ
 DocType: Volunteer,Volunteer Name,የበጎ ፈቃደኝነት ስም
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},በሌሎች ረድፎች ውስጥ ባሉ የተባዙ ቀነ-ቀናት ላይ ያሉ ረድፎች ተገኝተዋል: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},በሌሎች ረድፎች ውስጥ ባሉ የተባዙ ቀነ-ቀናት ላይ ያሉ ረድፎች ተገኝተዋል: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent",{0}: የሰራተኛ ኢሜይል አልተገኘም: ከዚህ አልተላከም ኢሜይል
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},በተሰጠው ቀን {0} ላይ ለተቀጠረ ተቀጣሪ {0} የተመደበ ደመወዝ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},የመላኪያ ደንቡ ለአገር አይተገበርም {0}
@@ -2059,6 +2058,7 @@
 DocType: Salary Component,Earning,ማግኘት
 DocType: Supplier Scorecard,Scoring Criteria,የውጤት መስፈርት
 DocType: Purchase Invoice,Party Account Currency,የድግስ መለያ ምንዛሬ
+DocType: Delivery Trip,Total Estimated Distance,ጠቅላላ የተገመተው ርቀት
 ,BOM Browser,BOM አሳሽ
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,እባክዎ ለዚህ የሥልጠና በዓል ያለዎትን ሁኔታ ያሻሽሉ
 DocType: Item Barcode,EAN,EAN
@@ -2097,7 +2097,7 @@
 DocType: Activity Cost,Projects,ፕሮጀክቶች
 DocType: Payment Request,Transaction Currency,የግብይት ምንዛሬ
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},ከ {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,አንዳንድ ኢሜሎች ልክ አይደሉም
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,አንዳንድ ኢሜሎች ልክ አይደሉም
 DocType: Work Order Operation,Operation Description,ክወና መግለጫ
 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.,የ በጀት ዓመት ተቀምጧል አንዴ በጀት ዓመት የመጀመሪያ ቀን እና በጀት ዓመት መጨረሻ ቀን መቀየር አይቻልም.
 DocType: Quotation,Shopping Cart,ወደ ግዢ ሳጥን ጨመር
@@ -2121,7 +2121,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,ቋሚ ንብረት ውስጥ የተጣራ ለውጥ
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,ሁሉንም ስያሜዎች እየታሰቡ ከሆነ ባዶውን ይተው
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,አይነት &#39;ትክክለኛው&#39; ረድፍ ውስጥ ኃላፊነት {0} ንጥል ተመን ውስጥ ሊካተቱ አይችሉም
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,አይነት &#39;ትክክለኛው&#39; ረድፍ ውስጥ ኃላፊነት {0} ንጥል ተመን ውስጥ ሊካተቱ አይችሉም
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},ከፍተኛ: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,ከ DATETIME
 DocType: Shopify Settings,For Company,ኩባንያ ለ
@@ -2135,7 +2135,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,የጊዜ ሰሌዳን የሚፈጥሩ ስህተቶች ነበሩ
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,በዝርዝሩ ውስጥ ያለው የመጀመሪያ ወጪ ተቀባይ እንደ ነባሪው ወጪ አውጪ ይዋቀራል.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,የበለጠ ከ 100 በላይ ሊሆን አይችልም
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,በገበያ ቦታ ላይ ለመመዝገብ ከስተማይ አስተናጋጅ እና ከአልታ አቀናባሪ ሚናዎች ሌላ ተጠቃሚ መሆን አለብዎት.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,በገበያ ቦታ ላይ ለመመዝገብ ከስተማይ አስተናጋጅ እና ከአልታ አቀናባሪ ሚናዎች ሌላ ተጠቃሚ መሆን አለብዎት.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,{0} ንጥል ከአክሲዮን ንጥል አይደለም
 DocType: Packing Slip,MAT-PAC-.YYYY.-,ማት-ፓክ-ያዮይሂ.-
 DocType: Maintenance Visit,Unscheduled,E ሶችን
@@ -2164,7 +2164,7 @@
 DocType: HR Settings,Employee Settings,የሰራተኛ ቅንብሮች
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,የክፍያ ስርዓት በመጫን ላይ
 ,Batch-Wise Balance History,ባች-ጥበበኛ ባላንስ ታሪክ
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,ረድፍ # {0}: መጠን ከንጥል {1} ከተከፈለበት መጠን በላይ ከሆነ ያለው መጠን ማዘጋጀት አልተቻለም.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,ረድፍ # {0}: መጠን ከንጥል {1} ከተከፈለበት መጠን በላይ ከሆነ ያለው መጠን ማዘጋጀት አልተቻለም.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,የህትመት ቅንብሮች በሚመለከታቸው የህትመት ቅርጸት ዘምኗል
 DocType: Package Code,Package Code,ጥቅል ኮድ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,ሞያ ተማሪ
@@ -2395,7 +2395,7 @@
 DocType: Delivery Trip,Optimize Route,መስመርን ያመቻቹ
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,አስቀድሞ X ቀኖች ለ ቀዶ ዕቅድ ይሞክሩ.
 DocType: HR Settings,Stop Birthday Reminders,አቁም የልደት ቀን አስታዋሾች
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},ኩባንያ ውስጥ ነባሪ የደመወዝ ክፍያ ሊከፈል መለያ ማዘጋጀት እባክዎ {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},ኩባንያ ውስጥ ነባሪ የደመወዝ ክፍያ ሊከፈል መለያ ማዘጋጀት እባክዎ {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,የፋይናንስ ክፍያን እና የአቅርቦት ውሂብ በአማዞን ያግኙ
 DocType: SMS Center,Receiver List,ተቀባይ ዝርዝር
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,የፍለጋ ንጥል
@@ -2465,7 +2465,7 @@
 DocType: Vital Signs,Constipated,ተለዋዋጭ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},አቅራቢው ላይ የደረሰኝ {0} የተዘጋጀው {1}
 DocType: Customer,Default Price List,ነባሪ ዋጋ ዝርዝር
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,የንብረት እንቅስቃሴ መዝገብ {0} ተፈጥሯል
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,የንብረት እንቅስቃሴ መዝገብ {0} ተፈጥሯል
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,ምንም ንጥሎች አልተገኙም.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,አንተ መሰረዝ አይችሉም በጀት ዓመት {0}. በጀት ዓመት {0} አቀፍ ቅንብሮች ውስጥ እንደ ነባሪ ተዘጋጅቷል
 DocType: Share Transfer,Equity/Liability Account,የፍትሃዊነት / ተጠያቂነት መለያን
@@ -2601,6 +2601,7 @@
 DocType: Blanket Order,Order Type,ትዕዛዝ አይነት
 ,Item-wise Sales Register,ንጥል-ጥበብ የሽያጭ መመዝገቢያ
 DocType: Asset,Gross Purchase Amount,አጠቃላይ የግዢ መጠን
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,የእንጥል ኮድ&gt; የንጥል ቡድን&gt; ግሩፕ
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,ክፍት እጆችን መክፈቻ
 DocType: Asset,Depreciation Method,የእርጅና ስልት
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,መሰረታዊ ተመን ውስጥ ተካትቷል ይህ ታክስ ነው?
@@ -2681,7 +2682,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,ዓመታዊ በጀት በፖስት ከተደረገ
 DocType: Student Leave Application,Student Leave Application,የተማሪ ፈቃድ ማመልከቻ
 DocType: Item,Will also apply for variants,በተጨማሪም ተለዋጮች ማመልከት ይሆን
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","አስቀድሞ እንደ ንብረት, ሊሰረዝ አይችልም {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","አስቀድሞ እንደ ንብረት, ሊሰረዝ አይችልም {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},ላይ ግማሽ ቀን ላይ ሠራተኛ {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},ጠቅላላ የሥራ ሰዓቶች ከፍተኛ የሥራ ሰዓት በላይ መሆን የለበትም {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ላይ
@@ -2705,6 +2706,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,ውሂብ ማምጣት
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},በአለቀቀው አይነት {0} ውስጥ የሚፈቀድ የመጨረሻ ፍቃድ {1}
 DocType: SMS Center,Create Receiver List,ተቀባይ ዝርዝር ፍጠር
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,ሊገኝ የሚችልበት ቀን ከግዢ ቀን በኋላ መሆን አለበት
 DocType: Vehicle,Wheels,መንኮራኩሮች
 DocType: Packing Slip,To Package No.,ቁ ወደ ጥቅሉ
 DocType: Patient Relation,Family,ቤተሰብ
@@ -2718,7 +2720,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,የማስከፈያ ምንዛሬ ከሁለቱም የኩባንያዎች ምንዛሬ ወይም የፓርቲው የመገበያያ ገንዘብ ጋር እኩል መሆን አለበት
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),የጥቅል ይህን የመላኪያ (ብቻ ረቂቅ) አንድ ክፍል እንደሆነ ይጠቁማል
 DocType: Soil Texture,Loam,ፈገግታ
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,ረድፍ {0}: የሚላክበት ቀኑ ከተለቀቀበት ቀን በፊት ሊሆን አይችልም
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,ረድፍ {0}: የሚላክበት ቀኑ ከተለቀቀበት ቀን በፊት ሊሆን አይችልም
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,የክፍያ Entry አድርግ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},ንጥል ለ ብዛት {0} ያነሰ መሆን አለበት {1}
 ,Sales Invoice Trends,የሽያጭ ደረሰኝ አዝማሚያዎች
@@ -2788,7 +2790,7 @@
 DocType: Guardian,Guardian Interests,አሳዳጊ ፍላጎቶች
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,የመለያ ስም / ቁጥር ያዘምኑ
 DocType: Naming Series,Current Value,የአሁኑ ዋጋ
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,በርካታ የበጀት ዓመታት ቀን {0} አገልግሎቶች አሉ. በጀት ዓመት ውስጥ ኩባንያ ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,በርካታ የበጀት ዓመታት ቀን {0} አገልግሎቶች አሉ. በጀት ዓመት ውስጥ ኩባንያ ማዘጋጀት እባክዎ
 DocType: Education Settings,Instructor Records to be created by,የአስተማሪው መዝገብ በ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} ተፈጥሯል
 DocType: GST Account,GST Account,GST መለያ
@@ -2805,7 +2807,7 @@
 DocType: Sales Person,Name and Employee ID,ስም እና የሰራተኛ መታወቂያ
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,መጠናቀቅ ያለበት ቀን ቀን መለጠፍ በፊት ሊሆን አይችልም
 DocType: Website Item Group,Website Item Group,የድር ጣቢያ ንጥል ቡድን
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ከላይ ከተዘረዘሩት መስፈርቶች ወይም የደመወዝ ወረቀት አስቀድሞ ገቢ የተደረገበት ደመወዝ አልተገኘም
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ከላይ ከተዘረዘሩት መስፈርቶች ወይም የደመወዝ ወረቀት አስቀድሞ ገቢ የተደረገበት ደመወዝ አልተገኘም
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,ተግባርና ግብሮች
 DocType: Projects Settings,Projects Settings,የፕሮጀክት ቅንብሮች
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,የማጣቀሻ ቀን ያስገቡ
@@ -2814,7 +2816,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,እጠነቀቅማለሁ ብዛት
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-yYYYY.-
 DocType: Purchase Order Item,Material Request Item,ቁሳዊ ጥያቄ ንጥል
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,እባክዎ መጀመሪያ የግዢ ደረሰኝ {0} ይሰርዙ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,እባክዎ መጀመሪያ የግዢ ደረሰኝ {0} ይሰርዙ
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,ንጥል ቡድኖች መካከል ዛፍ.
 DocType: Production Plan,Total Produced Qty,ጠቅላላ የተጨመረለት ብዛት
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,ይህ የክፍያ ዓይነት የአሁኑ ረድፍ ቁጥር ይበልጣል ወይም እኩል ረድፍ ቁጥር ሊያመለክት አይችልም
@@ -2923,6 +2925,7 @@
 ,Vehicle Expenses,የተሽከርካሪ ወጪ
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,በሽያጭ ደረሰኝ ላይ ላብራቶሪ ሙከራ (ሞች) ይፍጠሩ
 DocType: Serial No,Invoice Details,የደረሰኝ ዝርዝሮች
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,መስመሮችን ለመገመት እና ለማመቻቸት እባክዎ የ Google ካርታዎች ቅንብሮችን ያንቁ
 DocType: Grant Application,Show on Website,በድረገፅ አሳይ
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,ጀምር
 DocType: Hub Tracked Item,Hub Category,Hub ምድብ
@@ -2962,7 +2965,7 @@
 DocType: Inpatient Record,B Positive,ቢ አዎንታዊ
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",የአሠሪው ከፍተኛው ጥቅም {0} የቀድሞው የይገባኛል ጥያቄ መጠን \ {2} በ {2} ላይ ይበልጣል
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",የረድፍ # {0}: ንጥል ቋሚ ንብረት ነው እንደ ብዛት: 1 መሆን አለበት. በርካታ ብዛት የተለያየ ረድፍ ይጠቀሙ.
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",የረድፍ # {0}: ንጥል ቋሚ ንብረት ነው እንደ ብዛት: 1 መሆን አለበት. በርካታ ብዛት የተለያየ ረድፍ ይጠቀሙ.
 DocType: Leave Block List Allow,Leave Block List Allow,አግድ ዝርዝር ፍቀድ ይነሱ
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr ባዶ ወይም ባዶ መሆን አይችልም
 DocType: Patient Medical Record,Patient Medical Record,ታካሚ የሕክምና መዝገብ
@@ -2996,7 +2999,7 @@
 DocType: Workstation,Wages per hour,በሰዓት የደመወዝ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},ባች ውስጥ የአክሲዮን ቀሪ {0} ይሆናል አሉታዊ {1} መጋዘን ላይ ንጥል {2} ለ {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,ቁሳዊ ጥያቄዎች የሚከተሉት ንጥል ዳግም-ትዕዛዝ ደረጃ ላይ ተመስርቶ በራስ-ሰር ከፍ ተደርጓል
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},መለያ {0} ልክ ያልሆነ ነው. መለያ ምንዛሬ መሆን አለበት {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},መለያ {0} ልክ ያልሆነ ነው. መለያ ምንዛሬ መሆን አለበት {1}
 DocType: Supplier,Is Internal Supplier,ውስጣዊ አቅራቢ
 DocType: Employee,Create User Permission,የተጠቃሚ ፍቃድ ፍጠር
 DocType: Employee Benefit Claim,Employee Benefit Claim,የሠራተኛ የድጐማ ጥያቄ
@@ -3139,7 +3142,7 @@
 DocType: Account,Fixed Asset,የተወሰነ ንብረት
 DocType: Amazon MWS Settings,After Date,ከቀኑ በኋላ
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Serialized ቆጠራ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,ለ Inter-company Invoice ልክ ያልሆነ {0}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,ለ Inter-company Invoice ልክ ያልሆነ {0}.
 ,Department Analytics,መምሪያ ትንታኔ
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,ኢሜይል በነባሪ እውቂያ አልተገኘም
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,ሚስጥራዊ አፍልቅ
@@ -3151,7 +3154,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,በ &quot;Fee Structure&quot; እና &quot;Student Group&quot; {0} ውስጥ ያለው ፕሮግራም የተለያዩ ናቸው.
 DocType: Bank Statement Transaction Entry,Receivable Account,የሚሰበሰብ መለያ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,ልክ ቀን ከፀናበት እስከ ቀን ድረስ ከተጠቀሰው ቀን ያነሰ መሆን አለበት.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},የረድፍ # {0}: የንብረት {1} አስቀድሞ ነው; {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},የረድፍ # {0}: የንብረት {1} አስቀድሞ ነው; {2}
 DocType: Quotation Item,Stock Balance,የአክሲዮን ቀሪ
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,ክፍያ የሽያጭ ትዕዛዝ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,ዋና ሥራ አስኪያጅ
@@ -3192,6 +3195,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,ዴት ወደ ያስፈልጋል
 DocType: Clinical Procedure,Inpatient Record,Inpatient Record
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets በእርስዎ ቡድን እንዳደረገ activites ጊዜ, ወጪ እና የማስከፈያ እንዲከታተሉ ለመርዳት"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,አቅራቢ&gt; አቅራቢ አይነት
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,የግዢ ዋጋ ዝርዝር
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,የግብይት ቀን
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,የአቅራቢዎች የውጤት መለኪያዎች አብነቶች.
@@ -3234,7 +3238,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,የ Exchange ቅሰም / ማጣት
 DocType: Opportunity,Lost Reason,የጠፋ ምክንያት
 DocType: Amazon MWS Settings,Enable Amazon,Amazon ን አንቃ
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},ረድፍ # {0}: መለያ {1} የኩባንያውን አይደለም {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},ረድፍ # {0}: መለያ {1} የኩባንያውን አይደለም {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType {0} ማግኘት አልተቻለም.
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,አዲስ አድራሻ
 DocType: Quality Inspection,Sample Size,የናሙና መጠን
@@ -3345,7 +3349,7 @@
 DocType: Water Analysis,Origin,መነሻ
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ይህ ሰነድ በ ገደብ በላይ ነው {0} {1} ንጥል {4}. እናንተ እያደረግን ነው በዚያው ላይ ሌላ {3} {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,በማስቀመጥ ላይ በኋላ ተደጋጋሚ ማዘጋጀት እባክዎ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,ይምረጡ ለውጥ መጠን መለያ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,ይምረጡ ለውጥ መጠን መለያ
 DocType: Purchase Invoice,Price List Currency,የዋጋ ዝርዝር ምንዛሬ
 DocType: Naming Series,User must always select,ተጠቃሚው ሁልጊዜ መምረጥ አለብዎ
 DocType: Stock Settings,Allow Negative Stock,አሉታዊ የአክሲዮን ፍቀድ
@@ -3387,7 +3391,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,እርግጠኛ ነዎት ይህንን ቀጠሮ መሰረዝ ይፈልጋሉ?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,የሆቴል ክፍት የዋጋ ማቅረቢያ ጥቅል
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,የሽያጭ Pipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},ደመወዝ ክፍለ አካል ውስጥ ነባሪ መለያ ማዘጋጀት እባክዎ {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},ደመወዝ ክፍለ አካል ውስጥ ነባሪ መለያ ማዘጋጀት እባክዎ {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ያስፈልጋል ላይ
 DocType: Rename Tool,File to Rename,ዳግም ሰይም ፋይል
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},ረድፍ ውስጥ ንጥል ለማግኘት BOM ይምረጡ {0}
@@ -3408,7 +3412,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,የተገዙ ንጥሎች መካከል ወጪ
 DocType: Employee Separation,Employee Separation Template,የሰራተኛ መለያ መለኪያ
 DocType: Selling Settings,Sales Order Required,የሽያጭ ትዕዛዝ ያስፈልጋል
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,ሻጭ ሁን
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,ሻጭ ሁን
 DocType: Purchase Invoice,Credit To,ወደ ክሬዲት
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,ገባሪ እርሳሶች / ደንበኞች
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,ደረጃውን የጠበቀ የማሳወቂያ ቅርፀት ለመጠቀም ባዶውን ይተዉት
@@ -3449,7 +3453,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,የግብር አብነት ስራ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,የተጠቃሚ መድረክ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,ጥሬ እቃዎች ባዶ መሆን አይችልም.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,ረድፍ # {0} (የክፍያ ሰንጠረዥ): መጠኑ አሉታዊ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,ረድፍ # {0} (የክፍያ ሰንጠረዥ): መጠኑ አሉታዊ መሆን አለበት
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","የአክሲዮን ማዘመን አልተቻለም, መጠየቂያ ጠብታ መላኪያ ንጥል ይዟል."
 DocType: Contract,Fulfilment Status,የመሟላት ሁኔታ
 DocType: Lab Test Sample,Lab Test Sample,የቤተ ሙከራ የሙከራ ናሙና
@@ -3588,7 +3592,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Doc Date
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},ክፍያ መዛግብት ፈጥሯል - {0}
 DocType: Asset Category Account,Asset Category Account,የንብረት ምድብ መለያ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,ረድፍ # {0} (የክፍያ ሰንጠረዥ): መጠኑ አዎንታዊ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,ረድፍ # {0} (የክፍያ ሰንጠረዥ): መጠኑ አዎንታዊ መሆን አለበት
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},የሽያጭ ትዕዛዝ ብዛት የበለጠ ንጥል {0} ማፍራት የማይችሉ {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,የባህርይ እሴቶች ይምረጡ
 DocType: Purchase Invoice,Reason For Issuing document,ለሰነድ የማስወጫ ምክንያት
@@ -3643,7 +3647,7 @@
 DocType: Purchase Receipt,Time at which materials were received,ቁሳቁስ ተሰጥቷቸዋል ነበር ይህም በ ጊዜ
 DocType: Products Settings,Products per Page,ምርቶች በአንድ ገጽ
 DocType: Stock Ledger Entry,Outgoing Rate,የወጪ ተመን
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,ወይም
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,ወይም
 DocType: Sales Order,Billing Status,አከፋፈል ሁኔታ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ችግር ሪፖርት ያድርጉ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,መገልገያ ወጪ
@@ -3670,7 +3674,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,የሰራተኞች የግብር ነጻነት መግለጫ
 DocType: Payment Entry,Cheque/Reference Date,ቼክ / የማጣቀሻ ቀን
 DocType: Purchase Invoice,Total Taxes and Charges,ጠቅላላ ግብሮች እና ክፍያዎች
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,ሊሰራበት የሚችልበት ቀን እንደአለፈው ቀን ተጨምሯል
 DocType: Employee,Emergency Contact,ለድንገተኛ ጊዜ ተጠሪ
 DocType: Bank Reconciliation Detail,Payment Entry,የክፍያ Entry
 ,sales-browser,ሽያጭ-አሳሽ
@@ -3716,6 +3719,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),ተመላሽ ነው (የብድር ማስታወሻ)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,ስራ ጀምር
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},መለያው ለስርቁ {0} ያስፈልጋል
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,እባክዎን በቅንብር&gt; ቅንጅቶች&gt; የስምሪት ስሞች በኩል በ {0} ስም ማዕቀብ ያዘጋጁ
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,የተሰናከለ አብነት ነባሪ አብነት መሆን የለበትም
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,ለረድፍ {0}: የታቀዱ qty አስገባ
 DocType: Account,Income Account,የገቢ መለያ
@@ -3729,6 +3733,7 @@
 DocType: Loyalty Program,Help Section,የእገዛ ክፍል
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,የቀድሞው
 DocType: Appraisal Goal,Key Responsibility Area,ቁልፍ ኃላፊነት አካባቢ
+DocType: Delivery Trip,Distance UOM,የርቀት ዩአሞ
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","የተማሪ ቡድኖች እናንተ ተማሪዎች ክትትልን, ግምገማዎች እና ክፍያዎች ይከታተሉ ለመርዳት"
 DocType: Payment Entry,Total Allocated Amount,ጠቅላላ የተመደበ መጠን
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,ዘላቂ በመጋዘኑ አዘጋጅ ነባሪ ቆጠራ መለያ
@@ -3770,7 +3775,7 @@
 DocType: Item Supplier,Item Supplier,ንጥል አቅራቢ
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,ባች ምንም ለማግኘት ንጥል ኮድ ያስገቡ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},{0} quotation_to እሴት ይምረጡ {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,ለመተላለፍ ምንም የተመረጡ ንጥሎች የሉም
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,ለመተላለፍ ምንም የተመረጡ ንጥሎች የሉም
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ሁሉም አድራሻዎች.
 DocType: Company,Stock Settings,የክምችት ቅንብሮች
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","የሚከተሉትን ባሕሪያት በሁለቱም መዝገቦች ላይ ተመሳሳይ ከሆነ ሕዋሶችን ብቻ ነው. ቡድን, ሥር ዓይነት, ኩባንያ ነው?"
@@ -4055,7 +4060,7 @@
 DocType: Patient,Personal and Social History,የግል እና ማህበራዊ ታሪክ
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,የተጠቃሚ {0} ተፈጥሯል
 DocType: Fee Schedule,Fee Breakup for each student,ለእያንዳንዱ ተማሪ ክፍያ ይፈጽማል
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ጠቅላላ የቅድሚያ ({0}) ትዕዛዝ ላይ {1} ግራንድ ጠቅላላ መብለጥ አይችልም ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ጠቅላላ የቅድሚያ ({0}) ትዕዛዝ ላይ {1} ግራንድ ጠቅላላ መብለጥ አይችልም ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ከማያምኑ ወራት በመላ ዒላማ ማሰራጨት ወርሃዊ ስርጭት ይምረጡ.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,ኮድ ቀይር
 DocType: Purchase Invoice Item,Valuation Rate,ግምቱ ተመን
@@ -4064,7 +4069,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,በ ITC Cess ማግኘት
 ,Student Monthly Attendance Sheet,የተማሪ ወርሃዊ ክትትል ሉህ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,የማጓጓዣ ደንብ ለሽያጭ ብቻ ነው የሚመለከተው
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,የአከፋፈል ቅደም ተከተራ {0}: የቀጣዩ ቀን ቅነሳ ቀን ከግዢ ቀን በፊት ሊሆን አይችልም
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,የአከፋፈል ቅደም ተከተራ {0}: የቀጣዩ ቀን ቅነሳ ቀን ከግዢ ቀን በፊት ሊሆን አይችልም
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,ፕሮጀክት መጀመሪያ ቀን
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,ድረስ
 DocType: Rename Tool,Rename Log,ምዝግብ ማስታወሻ ዳግም ሰይም
@@ -4081,12 +4086,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,በሽርክም ትራንስፖርቶች መሠረት ፕሮጀክቱ እና ኩባንያው በየስንት ጊዜ ማዘመን አለባቸው.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ጊዜው የሚያልፍበት
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,ተማሪዎች ያክሉ
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","ይህን ሰነድ ለመሰረዝ እባክዎ ተቀጣሪውን <a href=""#Form/Employee/{0}"">{0}</a> \ ሰርዝ"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},እባክዎ ይምረጡ {0}
 DocType: C-Form,C-Form No,ሲ-ቅጽ የለም
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,ርቀት
+DocType: Delivery Stop,Distance,ርቀት
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,የምትገዛቸውን ወይም የምትሸጧቸውን ምርቶች ወይም አገልግሎቶች ይዘርዝሩ.
 DocType: Water Analysis,Storage Temperature,የማከማቻ መጠን
 DocType: Sales Order,SAL-ORD-.YYYY.-,ሳል ኦል-ያዮይሂ.-
@@ -4113,7 +4116,7 @@
 DocType: Homepage,Company Description for website homepage,ድር መነሻ ገጽ ለ ኩባንያ መግለጫ
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ደንበኞች ወደ ምቾት ሲባል, እነዚህ ኮዶች ደረሰኞች እና የመላኪያ ማስታወሻዎች እንደ የህትመት ቅርጸቶች ውስጥ ጥቅም ላይ ሊውል ይችላል"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier ስም
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,ለ {0} መረጃ ማምጣት አልተቻለም.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,ለ {0} መረጃ ማምጣት አልተቻለም.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,የመግቢያ ጆርናል
 DocType: Contract,Fulfilment Terms,የመሟላት ለውጦች
 DocType: Sales Invoice,Time Sheet List,የጊዜ ሉህ ዝርዝር
@@ -4293,7 +4296,7 @@
 DocType: Serial No,Warranty / AMC Details,የዋስትና / AMC ዝርዝሮች
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,የ እንቅስቃሴ ላይ የተመሠረተ ቡድን በእጅ ይምረጡ ተማሪዎች
 DocType: Journal Entry,User Remark,የተጠቃሚ አስተያየት
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,መስመሮችን በማመቻቸት.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,መስመሮችን በማመቻቸት.
 DocType: Travel Itinerary,Non Diary,አስቀያሚ ያልሆነ
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,ለቀጣሪ ሰራተኞች የድህረ ክፍያ ጉርሻ መፍጠር አይቻልም
 DocType: Lead,Market Segment,ገበያ ክፍሉ
@@ -4323,7 +4326,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,የታማኝነት ፕሮግራም
 DocType: Student Guardian,Father,አባት
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,ትኬቶችን ይደግፉ
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;አዘምን Stock&#39; ቋሚ ንብረት ለሽያጭ ሊረጋገጥ አልቻለም
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;አዘምን Stock&#39; ቋሚ ንብረት ለሽያጭ ሊረጋገጥ አልቻለም
 DocType: Bank Reconciliation,Bank Reconciliation,ባንክ ማስታረቅ
 DocType: Attendance,On Leave,አረፍት ላይ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ዝማኔዎች አግኝ
@@ -4368,7 +4371,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,ተከታታይ የለም እና ባች
 DocType: Warranty Claim,From Company,ኩባንያ ከ
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,ግምገማ መስፈርት በበርካታ ድምር {0} መሆን አለበት.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Depreciations ብዛት የተመዘገበ ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Depreciations ብዛት የተመዘገበ ማዘጋጀት እባክዎ
 DocType: Supplier Scorecard Period,Calculations,ስሌቶች
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,እሴት ወይም ብዛት
 DocType: Payment Terms Template,Payment Terms,የክፍያ ውል
@@ -4387,7 +4390,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,ኅዳግ ጋር የዋጋ ዝርዝር ተመን ላይ ቅናሽ (%)
 DocType: Healthcare Service Unit Type,Rate / UOM,ደረጃ / ዩሞ
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,ሁሉም መጋዘኖችን
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,ለድርጅት ኩባንያዎች ግብይት አልተገኘም {0}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,ለድርጅት ኩባንያዎች ግብይት አልተገኘም {0}.
 DocType: Travel Itinerary,Rented Car,የተከራየች መኪና
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,ስለ የእርስዎ ኩባንያ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,መለያ ወደ ክሬዲት ሚዛን ሉህ መለያ መሆን አለበት
@@ -4488,6 +4491,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,የአትክልት ትንታኔ መስፈርቶች
 DocType: Cheque Print Template,Cheque Height,ቼክ ቁመት
 DocType: Supplier,Supplier Details,አቅራቢ ዝርዝሮች
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,እባክዎ በአካባቢያዊ ቅንጅቶች በኩል የቁጥር ተከታታይ ቁጥሮች ያስተካክሉ&gt; በማስተካከል ተከታታይ ቁጥር
 DocType: Setup Progress,Setup Progress,የማዋቀር ሂደት
 DocType: Expense Claim,Approval Status,የማጽደቅ ሁኔታ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},እሴት ረድፍ ውስጥ እሴት ያነሰ መሆን አለበት ከ {0}
@@ -4579,7 +4583,6 @@
 DocType: Travel Request,Fully Sponsored,ሙሉ በሙሉ የተደገፈ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,የተራዘመ የጆርናሉ ምዝገባ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ደንበኛ {0} ተፈጥሯል.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,እባክዎ የሰራተኛ ስም ማስቀመጫ ሲስተም በሰብል ሪሶርስ&gt; HR ቅንጅቶች ያዘጋጁ
 DocType: Stock Settings,Limit Percent,ገድብ መቶኛ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,በአሁኑ ጊዜ በማንኛውም መጋዘን ውስጥ ምንም አክሲዮስ የለም
 ,Payment Period Based On Invoice Date,ደረሰኝ ቀን ላይ የተመሠረተ የክፍያ ክፍለ ጊዜ
@@ -4638,7 +4641,7 @@
 DocType: BOM Explosion Item,Source Warehouse,ምንጭ መጋዘን
 DocType: Installation Note,Installation Date,መጫን ቀን
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Ledger አጋራ
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},የረድፍ # {0}: የንብረት {1} ኩባንያ የእርሱ ወገን አይደለም {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},የረድፍ # {0}: የንብረት {1} ኩባንያ የእርሱ ወገን አይደለም {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,የሽያጭ ደረሰኝ {0} ተፈጥሯል
 DocType: Employee,Confirmation Date,ማረጋገጫ ቀን
 DocType: Inpatient Occupancy,Check Out,ጨርሰህ ውጣ
@@ -4658,6 +4661,7 @@
 DocType: Production Plan,Sales Orders Detail,የሽያጭ ትዕዛዞች ዝርዝር
 DocType: Bin,Requested Quantity,ጠይቀዋል ብዛት
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-yYYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,እባክዎ የመምህርውን ስም ስርዓትን በስርዓት&gt; የትምህርት ቅንብሮች ያዋቅሩ
 DocType: Patient,Marital Status,የጋብቻ ሁኔታ
 DocType: Stock Settings,Auto Material Request,ራስ-ሐሳብ ያለው ጥያቄ
 DocType: Woocommerce Settings,API consumer secret,የኤ.ፒ.አይ ተጠቃሚ ቁልፍ
@@ -4710,7 +4714,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,ቀኖች ይምረጡ
 DocType: Academic Term,Term Name,የሚለው ቃል ስም
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),ብድር ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,የደመወዝ ወረቀቶችን በመፍጠር ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,የደመወዝ ወረቀቶችን በመፍጠር ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,የስር ሥፍራ ማረም አይችሉም.
 DocType: Buying Settings,Purchase Order Required,ትዕዛዝ ያስፈልጋል ግዢ
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,ሰዓት ቆጣሪ
@@ -4746,7 +4750,7 @@
 DocType: Account,Rate at which this tax is applied,ይህ ግብር ተግባራዊ ሲሆን በ ተመን
 DocType: Cash Flow Mapper,Section Name,የክፍል ስም
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,አስይዝ ብዛት
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},የዋጋ ቅነሳ ድርድር {0}: ከቫይረሱ በኋላ የሚጠበቀው ዋጋ ከ {1} የበለጠ ወይም እኩል መሆን አለበት
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},የዋጋ ቅነሳ ድርድር {0}: ከቫይረሱ በኋላ የሚጠበቀው ዋጋ ከ {1} የበለጠ ወይም እኩል መሆን አለበት
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,የአሁኑ ክፍት የሥራ ቦታዎች
 DocType: Company,Stock Adjustment Account,የአክሲዮን የማስተካከያ መለያ
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ሰረዘ
@@ -4793,7 +4797,7 @@
 DocType: Program Enrollment,School House,ትምህርት ቤት
 DocType: Serial No,Out of AMC,AMC ውጪ
 DocType: Opportunity,Opportunity Amount,እድል ብዛት
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,የተመዘገበ Depreciations ቁጥር Depreciations አጠቃላይ ብዛት በላይ ሊሆን አይችልም
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,የተመዘገበ Depreciations ቁጥር Depreciations አጠቃላይ ብዛት በላይ ሊሆን አይችልም
 DocType: Purchase Order,Order Confirmation Date,የትዕዛዝ ማረጋገጫ ቀን
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-yYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,የጥገና ጉብኝት አድርግ
@@ -4834,7 +4838,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,ባች:
 DocType: Volunteer,Afternoon,ከሰአት
 DocType: Loyalty Program,Loyalty Program Help,የታማኝነት ፕሮግራም እገዛ
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} »{1}» ተሰናክሏል
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} »{1}» ተሰናክሏል
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ክፍት እንደ አዘጋጅ
 DocType: Cheque Print Template,Scanned Cheque,የተቃኘው ቼክ
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,በማስገባት ላይ ግብይቶች ላይ እውቂያዎች ራስ-ሰር ኢሜይሎች ይላኩ.
@@ -4847,7 +4851,7 @@
 DocType: Warranty Claim,Item and Warranty Details,ንጥል እና ዋስትና መረጃ
 DocType: Chapter,Chapter Members,የምዕራፍ ክፍሎች
 DocType: Sales Team,Contribution (%),መዋጮ (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ማስታወሻ: የክፍያ Entry ጀምሮ አይፈጠርም &#39;በጥሬ ገንዘብ ወይም በባንክ አካውንት&#39; አልተገለጸም
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ማስታወሻ: የክፍያ Entry ጀምሮ አይፈጠርም &#39;በጥሬ ገንዘብ ወይም በባንክ አካውንት&#39; አልተገለጸም
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,ፕሮጀክት {0} አስቀድሞም ይገኛል
 DocType: Clinical Procedure,Nursing User,የነርሶች ተጠቃሚ
 DocType: Employee Benefit Application,Payroll Period,የደመወዝ ክፍያ ግዜ
@@ -4855,6 +4859,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Serial No {0} የቡድን {1} አይደለም
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,ሃላፊነቶች
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,የዚህ ጥቅስ ዋጋ ያለው ጊዜ ተጠናቅቋል.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","ይህን ሰነድ ለመሰረዝ እባክዎ ተቀጣሪውን <a href=""#Form/Employee/{0}"">{0}</a> \ ሰርዝ"
 DocType: Expense Claim Account,Expense Claim Account,የወጪ የይገባኛል ጥያቄ መለያ
 DocType: Account,Capital Work in Progress,ካፒታል በሂደት ላይ
 DocType: Accounts Settings,Allow Stale Exchange Rates,የተለመዱ ትውልዶች ፍቀድ
@@ -4935,7 +4941,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,እትም ይዘት
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,ከ ERPNext ጋር ግዢን ያገናኙ
 DocType: Material Request Item,For Warehouse,መጋዘን ለ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,የማድረስ መላኪያ ማስታወሻዎች {0} ዘምኗል
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,የማድረስ መላኪያ ማስታወሻዎች {0} ዘምኗል
 DocType: Employee,Offer Date,ቅናሽ ቀን
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,ጥቅሶች
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,ከመስመር ውጪ ሁነታ ላይ ነው ያሉት. እርስዎ መረብ ድረስ ዳግም አይችሉም.
@@ -4985,7 +4991,7 @@
 DocType: Shipping Rule,Calculate Based On,የተመረኮዘ ላይ ማስላት
 DocType: Contract,Unfulfilled,አልተፈጸሙም
 DocType: Delivery Note Item,From Warehouse,መጋዘን ከ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,ለተጠቀሱት መስፈርቶች ምንም ሰራተኞች የሉም
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,ለተጠቀሱት መስፈርቶች ምንም ሰራተኞች የሉም
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,ዕቃዎች መካከል ቢል ጋር ምንም ንጥሎች ለማምረት
 DocType: Shopify Settings,Default Customer,ነባሪ ደንበኛ
 DocType: Sales Stage,Stage Name,የመድረክ ስም
@@ -5027,7 +5033,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,የቅናሽ መጠን በኋላ የግብር መጠን
 DocType: Patient,Inpatient Status,የሆስፒታል ሁኔታ
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,ዕለታዊ የስራ ማጠቃለያ ቅንብሮች
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,የተመረጠው የወጪ ዝርዝር መስኮቶችን መገበያየት እና መሸጥ ይኖርበታል.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,የተመረጠው የወጪ ዝርዝር መስኮቶችን መገበያየት እና መሸጥ ይኖርበታል.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,እባክዎ በቀን Reqd ያስገባሉ
 DocType: Payment Entry,Internal Transfer,ውስጣዊ ማስተላለፍ
 DocType: Asset Maintenance,Maintenance Tasks,የጥገና ተግባራት
@@ -5063,7 +5069,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,ቡድን በ
 DocType: Guardian,Interests,ፍላጎቶች
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,/ አቦዝን ምንዛሬዎች ያንቁ.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,አንዳንድ የደመወዝ ወረቀቶችን ማስገባት አልተቻለም
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,አንዳንድ የደመወዝ ወረቀቶችን ማስገባት አልተቻለም
 DocType: Exchange Rate Revaluation,Get Entries,ግቤቶችን ያግኙ
 DocType: Production Plan,Get Material Request,የቁስ ጥያቄ ያግኙ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,የፖስታ ወጪዎች
@@ -5145,7 +5151,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},ወጪ መለያ ንጥል ግዴታ ነው {0}
 DocType: BOM,Website Description,የድር ጣቢያ መግለጫ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,ፍትህ ውስጥ የተጣራ ለውጥ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,በመጀመሪያ የግዢ ደረሰኝ {0} ይቅር እባክዎ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,በመጀመሪያ የግዢ ደረሰኝ {0} ይቅር እባክዎ
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,አይፈቀድም. እባክዎ የአገልግሎት አይነቱን አይነት ያጥፉ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","የኢሜይል አድራሻ አስቀድሞ ስለ አለ, ልዩ መሆን አለበት {0}"
 DocType: Serial No,AMC Expiry Date,AMC የሚቃጠልበት ቀን
@@ -5185,7 +5191,7 @@
 DocType: Hotel Room,Hotel Room,የሆቴል ክፍል
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},መለያ {0} ነው ኩባንያ ንብረት አይደለም {1}
 DocType: Leave Type,Rounding,መደርደር
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,{0} ረድፍ ላይ መለያ ቁጥር አሰጣጥ ማስታወሻ ጋር አይዛመድም
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,{0} ረድፍ ላይ መለያ ቁጥር አሰጣጥ ማስታወሻ ጋር አይዛመድም
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),የተከፈለ መጠን (የቅድሚያ ደረጃ የተሰጠው)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","ከዚያም የዋጋ አሰጣጥ ደንቦች በደንበኛ, ደንበኛ ቡድን, በተሪቶሪ, አቅራቢ, አቅራቢ ቡድን, ዘመቻ, ሽያጭ አጋዥ ወዘተ. ላይ ተመርኩዘዋል."
 DocType: Student,Guardian Details,አሳዳጊ ዝርዝሮች
@@ -5240,7 +5246,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},የመጋዘን የአክሲዮን ንጥል ያስፈልጋል {0}
 DocType: Leave Allocation,Unused leaves,ያልዋለ ቅጠሎች
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,የክፍያ ተመላሽ ማድረግ
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,ሁሉም መምሪያዎች
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,ሁሉም መምሪያዎች
 DocType: Healthcare Service Unit,Vacant,ተከራይ
 DocType: Patient,Alcohol Past Use,አልኮል ጊዜ ያለፈበት አጠቃቀም
 DocType: Fertilizer Content,Fertilizer Content,የማዳበሪያ ይዘት
@@ -5251,7 +5257,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,ይህን የሽያጭ ትእዛዝን ከመሰረዝዎ በፊት የስራ ትዕዛዝ {0} መሰረዝ አለበት
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),(ንዑስ-አብያተ ክርስቲያናት ጨምሮ) ፈንድቶ BOM ሰብስብ
 DocType: Authorization Rule,Applicable To (Employee),የሚመለከታቸው ለማድረግ (ሰራተኛ)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,መጠናቀቅ ያለበት ቀን የግዴታ ነው
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,መጠናቀቅ ያለበት ቀን የግዴታ ነው
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,አይነታ ጭማሬ {0} 0 መሆን አይችልም
 DocType: Employee Benefit Claim,Benefit Type and Amount,የዋስትና አይነት እና መጠን
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Rooms Booked
@@ -5394,7 +5400,7 @@
 DocType: Purchase Invoice Item,Total Weight,ጠቅላላ ክብደት
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,የሽያጭ ላይ ኮሚሽን
 DocType: Job Offer Term,Value / Description,እሴት / መግለጫ
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","የረድፍ # {0}: የንብረት {1} ማስገባት አይችልም, ቀድሞውንም ነው {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","የረድፍ # {0}: የንብረት {1} ማስገባት አይችልም, ቀድሞውንም ነው {2}"
 DocType: Tax Rule,Billing Country,አከፋፈል አገር
 DocType: Purchase Order Item,Expected Delivery Date,የሚጠበቀው የመላኪያ ቀን
 DocType: Restaurant Order Entry,Restaurant Order Entry,የምግብ ቤት የመግቢያ ግቢ
@@ -5433,12 +5439,13 @@
 DocType: Maintenance Visit,Breakdown,መሰባበር
 DocType: Travel Itinerary,Vegetarian,ቬጀቴሪያን
 DocType: Patient Encounter,Encounter Date,የግጥሚያ ቀን
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,መለያ: {0} ምንዛሬ ጋር: {1} መመረጥ አይችልም
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,መለያ: {0} ምንዛሬ ጋር: {1} መመረጥ አይችልም
 DocType: Bank Statement Transaction Settings Item,Bank Data,የባንክ መረጃ
 DocType: Purchase Receipt Item,Sample Quantity,ናሙና መጠኑ
 DocType: Bank Guarantee,Name of Beneficiary,የዋና ተጠቃሚ ስም
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",በቅርብ ጊዜ የተመን ዋጋ / የዋጋ ዝርዝር / በመጨረሻው የጥሬ ዕቃ ዋጋ ላይ በመመርኮዝ የወኪል ማስተካከያውን በጊዜ መርሐግብር በኩል በራስሰር ያስከፍላል.
 DocType: Supplier,SUP-.YYYY.-,SUP-YYYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,አቅራቢ&gt; የአቅራቢ ቡድን
 DocType: Bank Reconciliation Detail,Cheque Date,ቼክ ቀን
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},መለያ {0}: የወላጅ መለያ {1} ኩባንያ የእርሱ ወገን አይደለም: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,በተሳካ ሁኔታ ከዚህ ድርጅት ጋር የተያያዙ ሁሉም ግብይቶች ተሰርዟል!
@@ -5466,7 +5473,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,የልጆች እባጮች ብቻ &#39;ቡድን&#39; አይነት አንጓዎች ስር ሊፈጠር ይችላል
 DocType: Attendance Request,Half Day Date,ግማሾቹ ቀን ቀን
 DocType: Academic Year,Academic Year Name,ትምህርታዊ ዓመት ስም
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} ከ {1} ጋር ለመግባባት አልተፈቀደለትም. እባክዎ ኩባንያውን ይቀይሩ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} ከ {1} ጋር ለመግባባት አልተፈቀደለትም. እባክዎ ኩባንያውን ይቀይሩ.
 DocType: Sales Partner,Contact Desc,የእውቂያ DESC
 DocType: Email Digest,Send regular summary reports via Email.,በኢሜይል በኩል መደበኛ የማጠቃለያ ሪፖርቶች ላክ.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},የወጪ የይገባኛል ጥያቄ አይነት ውስጥ ነባሪ መለያ ማዘጋጀት እባክዎ {0}
@@ -5499,7 +5506,7 @@
 DocType: Hotel Room,Hotel Manager,የሆቴል ሥራ አስኪያጅ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,ወደ ግዢ ሳጥን ጨመር ያዘጋጁ ግብር ደንብ
 DocType: Purchase Invoice,Taxes and Charges Added,ግብሮች እና ክፍያዎች ታክሏል
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,የአከፋፈል ቅደም ተከተልን {0}: የሚቀጥለው የአለሜሽን ቀን ከክፍያ ጋር ለመገናኘት የሚውል ቀን ከመሆኑ በፊት ሊሆን አይችልም
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,የአከፋፈል ቅደም ተከተልን {0}: የሚቀጥለው የአለሜሽን ቀን ከክፍያ ጋር ለመገናኘት የሚውል ቀን ከመሆኑ በፊት ሊሆን አይችልም
 ,Sales Funnel,የሽያጭ ማጥለያ
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,ምህጻረ ቃል የግዴታ ነው
 DocType: Project,Task Progress,ተግባር ሂደት
@@ -5513,7 +5520,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,ሁሉም የደንበኛ ቡድኖች
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,ሲጠራቀሙ ወርሃዊ
 DocType: Attendance Request,On Duty,በስራ ላይ
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} የግዴታ ነው. ምናልባት የገንዘብ ምንዛሪ ዘገባ {1} {2} ዘንድ አልተፈጠረም ነው.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} የግዴታ ነው. ምናልባት የገንዘብ ምንዛሪ ዘገባ {1} {2} ዘንድ አልተፈጠረም ነው.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,የግብር መለጠፊያ የግዴታ ነው.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,መለያ {0}: የወላጅ መለያ {1} የለም
 DocType: POS Closing Voucher,Period Start Date,የጊዜ መጀመሪያ ቀን
@@ -5591,11 +5598,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,ቢያንስ አንድ መጋዘን የግዴታ ነው
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","እንደ UOM, የቡድን ምድብ, ገለፃ እና የሰዓት ብዛት ያሉ የንጥል መስመሮችን ያዋቅሩ."
 DocType: Certification Application,Certification Status,የዕውቅና ማረጋገጫ ሁኔታ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,የገበያ ቦታ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,የገበያ ቦታ
 DocType: Travel Itinerary,Travel Advance Required,የጉዞ ቅድመ ሁኔታ ያስፈልጋል
 DocType: Subscriber,Subscriber Name,የተመዝጋቢ ስም
 DocType: Serial No,Out of Warranty,የዋስትና ውጪ
-DocType: Cashier Closing,Cashier-closing-,ገንዘብ ተቀባይ-መዝጊያ-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,የታተመ የውሂብ አይነት
 DocType: BOM Update Tool,Replace,ተካ
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,ምንም ምርቶች አልተገኙም.
@@ -5682,7 +5688,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,ለሽያጭ እና ለግዢ ነባሪ የግብር አብነቶች ተፈጥረዋል.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,የአመሳሾቹ ውጤት ዘገባ {0} አስቀድሞም ይገኛል.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","ምሳሌ ABCD. #####. ተከታታይነት ከተዘጋጀ እና የቡድን ቁጥር በግብይቶች ውስጥ ካልተጠቀሰ, በዚህ ተከታታይ ላይ ተመስርተው ራስ-ሰር ቁጥሩ ቁጥር ይፈጠራል. ለእዚህ ንጥል እቃ ዝርዝር በግልጽ ለመጥቀስ የሚፈልጉ ከሆነ, ይህንን ባዶ ይተውት. ማሳሰቢያ: ይህ ቅንብር በስምሪት ቅንጅቶች ውስጥ ከሚታወቀው Seriesing ቅድመ-ቅጥያ ቅድሚያ ይሰጠዋል."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,እባክዎ በአካባቢያዊ ቅንጅቶች በኩል የቁጥር ተከታታይ ቁጥሮች ያስተካክሉ&gt; በማስተካከል ተከታታይ ቁጥር
 DocType: BOM,Materials Required (Exploded),ቁሳቁሶች (የፈነዳ) ያስፈልጋል
 DocType: Contract,Party User,የጭፈራ ተጠቃሚ
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',የቡድን በ «ኩባንያ &#39;ከሆነ ኩባንያ ባዶ ማጣሪያ ያዘጋጁ እባክዎ
@@ -5883,7 +5888,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp ቆጠራ
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,ሁለቱም የፍርድ ሂደት የመጀመሪያ ቀን እና ሙከራ ክፍለ ጊዜ ማብቂያ ቀን መዘጋጀት አለበት
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,አማካኝ ደረጃ
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ጠቅላላ የክፍያ መጠን በክፍያ ሠንጠረዥ ውስጥ ከትልቅ / ጠቅላላ ድምር ጋር መሆን አለበት
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ጠቅላላ የክፍያ መጠን በክፍያ ሠንጠረዥ ውስጥ ከትልቅ / ጠቅላላ ድምር ጋር መሆን አለበት
 DocType: Subscription Plan Detail,Plan,ዕቅድ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,አጠቃላይ የሒሳብ መዝገብ መሠረት የባንክ መግለጫ ቀሪ
 DocType: Job Applicant,Applicant Name,የአመልካች ስም
@@ -5952,7 +5957,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,ሳሙና እና ሳሙና
 DocType: BOM,Show Items,አሳይ ንጥሎች
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,ከጊዜ ወደ ጊዜ በላይ ሊሆን አይችልም.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,ሁሉንም ደንበኞች በኢሜል ማሳወቅ ይፈልጋሉ?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,ሁሉንም ደንበኞች በኢሜል ማሳወቅ ይፈልጋሉ?
 DocType: Subscription Plan,Billing Interval,የማስከፈያ ልዩነት
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,የተንቀሳቃሽ ምስል እና ቪዲዮ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,የዕቃው መረጃ
@@ -5961,9 +5966,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,ረድፍ {0}: {1} ከ 0 በላይ መሆን አለበት
 DocType: Assessment Criteria,Assessment Criteria Group,የግምገማ መስፈርት ቡድን
 DocType: Healthcare Settings,Patient Name By,የታካሚ ስም በ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},የደመወዝ ጭማሪ ከ {0} እስከ {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},የደመወዝ ጭማሪ ከ {0} እስከ {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,የተዘገበው ገቢ ያንቁ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},ክምችት የእርጅና በመክፈት ጋር እኩል ያነሰ መሆን አለበት {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},ክምችት የእርጅና በመክፈት ጋር እኩል ያነሰ መሆን አለበት {0}
 DocType: Warehouse,Warehouse Name,የመጋዘን ስም
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,ትክክለኛው የመጀመሪያ ቀን ከእውነተኛ ማብቂያ ቀን ያነሰ መሆን አለበት
 DocType: Naming Series,Select Transaction,ይምረጡ የግብይት
@@ -6113,7 +6118,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise አስይዝ ደረጃ የሚመከር
 DocType: Salary Detail,Salary Detail,ደመወዝ ዝርዝር
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,በመጀመሪያ {0} እባክዎ ይምረጡ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,የታከሉ {0} ተጠቃሚዎች
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,የታከሉ {0} ተጠቃሚዎች
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","በባለብዙ ደረጃ መርሃግብር ሁኔታ, ደንበኞች በተጠቀሱት ወጪ መሰረት ለተሰጣቸው ደረጃ ደረጃ በራስ መተላለፍ ይኖራቸዋል"
 DocType: Appointment Type,Physician,ሐኪም
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,ንጥል ባች {0} {1} ጊዜው አልፎበታል.
@@ -6256,7 +6261,7 @@
 DocType: Asset,Custodian,ጠባቂ
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,ነጥብ-መካከል-ሽያጭ መገለጫ
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} በ 0 እና 100 መካከል የሆነ እሴት መሆን አለበት
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},የ {0} ክፍያ ከ {1} እስከ {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},የ {0} ክፍያ ከ {1} እስከ {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,ደህንነቱ ያልተጠበቀ ብድሮች
 DocType: Cost Center,Cost Center Name,ኪሳራ ማዕከል ስም
 DocType: Student,B+,ለ +
@@ -6288,6 +6293,7 @@
 DocType: Employee,Date of Issue,የተሰጠበት ቀን
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","የ ሊገዙ ቅንብሮች መሰረት የግዥ Reciept ያስፈልጋል == &#39;አዎ&#39; ከዚያም የግዥ ደረሰኝ ለመፍጠር, የተጠቃሚ ንጥል መጀመሪያ የግዢ ደረሰኝ መፍጠር አለብዎት ከሆነ {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},የረድፍ # {0}: ንጥል አዘጋጅ አቅራቢው {1}
+DocType: Global Defaults,Default Distance Unit,ነባሪ የልቀት ርቀት
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,ረድፍ {0}: ሰዓቶች ዋጋ ከዜሮ በላይ መሆን አለበት.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,ንጥል {1} ጋር ተያይዞ ድር ጣቢያ ምስል {0} ሊገኝ አልቻለም
 DocType: Issue,Content Type,የይዘት አይነት
@@ -6343,7 +6349,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,መለያ ወደ ዴቢት አንድ ሚዛን ሉህ መለያ መሆን አለበት
 DocType: Asset,Naming Series,መሰየምን ተከታታይ
 DocType: Vital Signs,Coated,የተሸፈነው
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,ረድፍ {0}: ከተመዘገበ በኋላ የሚጠበቀው ዋጋ ከዋጋ ግዢ መጠን ያነሰ መሆን አለበት
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,ረድፍ {0}: ከተመዘገበ በኋላ የሚጠበቀው ዋጋ ከዋጋ ግዢ መጠን ያነሰ መሆን አለበት
 DocType: GoCardless Settings,GoCardless Settings,የ GoCardless ቅንጅቶች
 DocType: Leave Block List,Leave Block List Name,አግድ ዝርዝር ስም ውጣ
 DocType: Certified Consultant,Certification Validity,የዕውቅና ማረጋገጫ ግቤት
@@ -6410,6 +6416,7 @@
 DocType: Bank Statement Settings Item,Bank Header,የባንክ ርእስ
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,የሙከራ ፈተናዎችን ይመልከቱ
 DocType: Hub Users,Hub Users,ሃቢ ተጠቃሚዎች
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ደንበኛ&gt; የሽያጭ ቡድን&gt; ግዛት
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,ጥገና ቀን
 DocType: Purchase Invoice Item,Rejected Serial No,ውድቅ ተከታታይ ምንም
@@ -6424,7 +6431,7 @@
 DocType: SG Creation Tool Course,Max Strength,ከፍተኛ ጥንካሬ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,ቅድመ-ቅምዶችን በመጫን ላይ
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-yYYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},ለደንበኛ {@} ለማድረስ የማድረሻ መላኪያ አልተሰጠም
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},ለደንበኛ {@} ለማድረስ የማድረሻ መላኪያ አልተሰጠም
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,ተቀጣሪ / ሰራተኛ {0} ከፍተኛውን ጥቅም የለውም
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,በሚላክበት ቀን መሰረት የሆኑ ንጥሎችን ይምረጡ
 DocType: Grant Application,Has any past Grant Record,ከዚህ በፊት የተመዝጋቢ መዝገብ አለው
@@ -6451,7 +6458,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,የሆቴል ክፍል ማስያዣ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,የደንበኞች ግልጋሎት
 DocType: BOM,Thumbnail,ድንክዬ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,ከኢሜይል መታወቂያዎች ጋር ምንም ዕውቂያዎች አልተገኙም.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,ከኢሜይል መታወቂያዎች ጋር ምንም ዕውቂያዎች አልተገኙም.
 DocType: Item Customer Detail,Item Customer Detail,ንጥል የደንበኛ ዝርዝር
 DocType: Notification Control,Prompt for Email on Submission of,ማቅረቢያ ላይ ኢሜይል ለ ሊጠይቃቸው
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},ከፍተኛ የደመወዝ መጠን {0} ከ {1}
@@ -6706,7 +6713,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,የመለያ አይነት ተመርጧል ነው ምክንያቱም ቡድን ጋር በድብቅ አይቻልም.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} ተቀይሯል. እባክዎ ያድሱ.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,በሚቀጥሉት ቀኖች ላይ ፈቃድ መተግበሪያዎች በማድረጉ ተጠቃሚዎች አቁም.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,የእንጥል ኮድ&gt; የንጥል ቡድን&gt; ግሩፕ
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.",ለትክክለኛ ነጥቦች ያልተገደበ ጊዜ ካለብዎት የአገልግሎት ጊዜው ባዶውን ወይም 0ትን ያስቀምጡ.
 DocType: Asset Maintenance Team,Maintenance Team Members,የጥገና ቡድን አባላት
 DocType: Loyalty Point Entry,Purchase Amount,የግዢ መጠን
@@ -6714,7 +6720,7 @@
 											to fullfill Sales Order {2}",የዝርዝር ቅደም ተከተሉን {2} ሙሉ ለሙሉ ተይዟል \ {1} ን አይነት {0} መላክ አይቻልም.
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-yYYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,አቅራቢው ትዕምርተ {0} ተፈጥሯል
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,የመጨረሻ ዓመት የጀመረበት ዓመት በፊት ሊሆን አይችልም
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,የመጨረሻ ዓመት የጀመረበት ዓመት በፊት ሊሆን አይችልም
 DocType: Employee Benefit Application,Employee Benefits,የሰራተኛ ጥቅማ ጥቅም
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},የታሸጉ የብዛት ረድፍ ውስጥ ንጥል {0} ለ ብዛት ጋር እኩል መሆን አለባቸው {1}
 DocType: Work Order,Manufactured Qty,የሚመረተው ብዛት
@@ -6730,6 +6736,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,ምረጥ ባች ቁጥሮች
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,ወደ GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ደንበኞች ከሞት ደረሰኞች.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,እባክዎ የሰራተኛ ስም ማስቀመጫ ሲስተም በሰብል ሪሶርስ&gt; HR ቅንጅቶች ያዘጋጁ
 DocType: Healthcare Settings,Invoice Appointments Automatically,ደረሰኝ ቀጠሮዎች በራስ ሰር
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,የፕሮጀክት መታወቂያ
 DocType: Salary Component,Variable Based On Taxable Salary,በወታዊ የግብር ደመወዝ ላይ የተመሠረተ
@@ -6778,7 +6785,7 @@
 DocType: POS Profile,Account for Change Amount,ለውጥ መጠን መለያ
 DocType: QuickBooks Migrator,Connecting to QuickBooks,ወደ QuickBooks በማገናኘት ላይ
 DocType: Exchange Rate Revaluation,Total Gain/Loss,ጠቅላላ ገቢ / ኪሳራ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,ትክክለኛ ያልሆነ ኩባንያ ለድርጅት ኩባንያ ደረሰኝ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,ትክክለኛ ያልሆነ ኩባንያ ለድርጅት ኩባንያ ደረሰኝ.
 DocType: Purchase Invoice,input service,የግቤት አገልግሎት
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ረድፍ {0}: ፓርቲ / መለያዎ ጋር አይመሳሰልም {1} / {2} ውስጥ {3} {4}
 DocType: Employee Promotion,Employee Promotion,የሰራተኛ ማስተዋወቂያ
@@ -6907,7 +6914,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,ለማረፊያ የሚመረጥ ቦታ
 apps/erpnext/erpnext/config/selling.py +184,Analytics,ትንታኔ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,ጋሪ ባዶ ነው
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,እባክዎ የመምህርውን ስም ስርዓትን በስርዓት&gt; የትምህርት ቅንብሮች ያዋቅሩ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",እቃ {0} እሴይ ቁጥር የለውም. በመደበኛ ቁጥር ላይ ተመስርቶ ልውውጥ መድረስ ይችላል
 DocType: Vehicle,Model,ሞዴል
@@ -6937,7 +6943,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,ምንም የሚቀይር ነገር የለም
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,የ CSV ፋይል ይምረጡ
 DocType: Holiday List,Total Holidays,ጠቅላላ የበዓል ቀኖች
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,ለላኪያ የኢሜል አብነት ይጎድላል. እባክዎ በማቅረቢያ ቅንብሮች ውስጥ አንድ ያዋቅሩ.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,ለላኪያ የኢሜል አብነት ይጎድላል. እባክዎ በማቅረቢያ ቅንብሮች ውስጥ አንድ ያዋቅሩ.
 DocType: Student Leave Application,Mark as Present,አቅርብ ምልክት አድርግበት
 DocType: Supplier Scorecard,Indicator Color,ጠቋሚ ቀለም
 DocType: Purchase Order,To Receive and Bill,ይቀበሉ እና ቢል
@@ -6946,7 +6952,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,መለያ ቁጥርን ይምረጡ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,ዕቅድ ሠሪ
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,ውል እና ሁኔታዎች አብነት
-DocType: Serial No,Delivery Details,የመላኪያ ዝርዝሮች
+DocType: Delivery Trip,Delivery Details,የመላኪያ ዝርዝሮች
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},አይነት ወጪ ማዕከል ረድፍ ውስጥ ያስፈልጋል {0} ግብሮች ውስጥ ሰንጠረዥ {1}
 DocType: Program,Program Code,ፕሮግራም ኮድ
 DocType: Terms and Conditions,Terms and Conditions Help,ውሎች እና ሁኔታዎች እገዛ
@@ -6970,7 +6976,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ሰዓት ቀኖች ሊመራ
 DocType: Cash Flow Mapping,Is Income Tax Expense,የገቢ ግብር ታክስ ነው
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,ትዕዛዝዎ ለማድረስ ወጥቷል!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},የረድፍ # {0}: ቀን መለጠፍ የግዢ ቀን ጋር ተመሳሳይ መሆን አለበት {1} ንብረት {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},የረድፍ # {0}: ቀን መለጠፍ የግዢ ቀን ጋር ተመሳሳይ መሆን አለበት {1} ንብረት {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,የተማሪ ተቋም ዎቹ ሆስተል ላይ የሚኖር ከሆነ ይህን ምልክት ያድርጉ.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,ከላይ በሰንጠረዡ ውስጥ የሽያጭ ትዕዛዞች ያስገቡ
 ,Stock Summary,የአክሲዮን ማጠቃለያ
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index 8103698..abc6d7e 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,اسم الفترة
 DocType: Employee,Salary Mode,طريقة تحصيل الراتب
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,تسجيل
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,تسجيل
 DocType: Patient,Divorced,مطلق
 DocType: Support Settings,Post Route Key,وظيفة الطريق الرئيسي
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,السماح بإضافة صنف لأكثر من مرة في عملية تجارية
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,سعر صرف جديد
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},العملة مطلوبة لقائمة الأسعار {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* سيتم احتسابه في المعاملة.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,المورد&gt; نوع المورد
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,معلومات اتصال العميل
 DocType: Patient Appointment,Check availability,التحقق من الصلاحية
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,عرض مفتوح
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,تم تحديث الترقيم المتسلسل بنجاح
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,دفع
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} في الحقل {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} في الحقل {1}
 DocType: Asset Finance Book,Depreciation Start Date,تاريخ بداية الإهلاك
 DocType: Pricing Rule,Apply On,تنطبق على
 DocType: Item Price,Multiple Item prices.,أسعار الإغلاق متعددة .
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,وصفة المختبر
 ,Delay Days,أيام التأخير
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,نفقات الصيانة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},الرقم التسلسلي: {0} تم الإشارة إليه من قبل في فاتورة المبيعات: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},الرقم التسلسلي: {0} تم الإشارة إليه من قبل في فاتورة المبيعات: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,فاتورة
 DocType: Purchase Invoice Item,Item Weight Details,وزن السلعة التفاصيل
 DocType: Asset Maintenance Log,Periodicity,دورية
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,محاسب
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,قائمة أسعار البيع
 DocType: Patient,Tobacco Current Use,التبغ الاستخدام الحالي
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","تاريخ البدء وتاريخ الانتهاء متداخل مع بطاقة الوظيفة <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,معدل البيع
 DocType: Cost Center,Stock User,مخزون العضو
 DocType: Soil Analysis,(Ca+Mg)/K,(الكالسيوم +المغنيسيوم ) / ك
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,ذات صلة
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,تاريخ الحضور لا يمكن أن يكون قبل تاريخ إلتحاق الموظف بالعمل
 DocType: Grading Scale,Grading Scale Name,الدرجات اسم النطاق
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,إضافة مستخدمين إلى Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,إضافة مستخدمين إلى Marketplace
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,.هذا حساب جذري و لايمكن تعديله
 DocType: Sales Invoice,Company Address,عنوان الشركة
 DocType: BOM,Operations,العمليات
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,الفرق الكمية
 DocType: Production Plan,Material Request Detail,المواد طلب التفاصيل
 DocType: Selling Settings,Default Quotation Validity Days,أيام صلاحية عرض الأسعار الافتراضية
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",ل تشمل الضريبة في الصف {0} في معدل الإغلاق ، {1} ويجب أيضا تضمين الضرائب في الصفوف
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",ل تشمل الضريبة في الصف {0} في معدل الإغلاق ، {1} ويجب أيضا تضمين الضرائب في الصفوف
 DocType: SMS Center,SMS Center,مركز رسائل SMS
 DocType: Payroll Entry,Validate Attendance,التحقق من صحة الحضور
 DocType: Sales Invoice,Change Amount,تغيير المبلغ
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,سطر فارغ للمبلغ بالحروف
 DocType: Vehicle,Additional Details,تفاصيل اضافية
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,لم يتم اعطاء وصف
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,مورد&gt; مجموعة الموردين
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,طلب للشراء.
 DocType: POS Closing Voucher Details,Collected Amount,المبلغ المجمع
 DocType: Lab Test,Submitted Date,تاريخ التقديم / التسجيل
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,قبول الطلاب
 ,Terretory,إقليم
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,تم إلغاء البند {0}
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,صف الإهلاك {0}: تاريخ بدء الإهلاك يتم إدخاله كتاريخ سابق
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,صف الإهلاك {0}: تاريخ بدء الإهلاك يتم إدخاله كتاريخ سابق
 DocType: Contract Template,Fulfilment Terms and Conditions,شروط وأحكام الوفاء
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,طلب مواد
 DocType: Bank Reconciliation,Update Clearance Date,تحديث تاريخ التخليص
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,إعدادات الحسابات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},المورد فاتورة لا يوجد في شراء الفاتورة {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,إدارة شجرة موظفي المبيعات.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.",لا يمكن معالجة المسار ، نظرًا لتعطيل إعدادات خرائط Google.
 DocType: Job Applicant,Cover Letter,محتويات الرسالة المرفقة
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,الشيكات و الإيداعات المعلقة لتوضيح او للمقاصة
 DocType: Item,Synced With Hub,مزامن مع المحور
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,قيمة الأصول الجديدة
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,المعدل الذي يتم تحويل العملة إلى عملة الأساس العملاء العميل
 DocType: Course Scheduling Tool,Course Scheduling Tool,أداة الجدول الزمني للمقرر التعليمي
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},الصف # {0}: لا يمكن انشاء فاتورة شراء  مقابل الأصول الموجودة {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},الصف # {0}: لا يمكن انشاء فاتورة شراء  مقابل الأصول الموجودة {1}
 DocType: Crop Cycle,LInked Analysis,تحليل ملزم
 DocType: POS Closing Voucher,POS Closing Voucher,قسيمة إغلاق POS
 DocType: Contract,Lapsed,ساقطا
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} غير مسجل في الدورة {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,أسم الطالب:
 DocType: POS Closing Voucher Details,Difference,فرق
+DocType: Delivery Settings,Delay between Delivery Stops,التأخير بين توقفات التسليم
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},رقم المسلسل {0} لا تنتمي إلى التسليم ملاحظة {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.",يبدو أن هناك مشكلة في تهيئة GoCardless للخادم. لا تقلق ، في حالة الفشل ، سيتم رد المبلغ إلى حسابك.
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext تجريبي
@@ -693,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,كمية وقيم
 DocType: Delivery Note,% Installed,٪ تم تركيب
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,الفصول الدراسية / المختبرات وغيرها حيث يمكن جدولة المحاضرات.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,يجب أن تتطابق عملات الشركة لكلتا الشركتين مع معاملات Inter Inter Company.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,يجب أن تتطابق عملات الشركة لكلتا الشركتين مع معاملات Inter Inter Company.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,الرجاء إدخال اسم الشركة اولاً
 DocType: Travel Itinerary,Non-Vegetarian,غير نباتي
 DocType: Purchase Invoice,Supplier Name,اسم المورد
@@ -778,7 +779,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,مستأجر من التاريخ
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,يكفي لبناء أجزاء
 DocType: POS Profile User,POS Profile User,نقاط البيع الشخصية الملف الشخصي
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,الصف {0}: تاريخ بداية الإهلاك مطلوب
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,الصف {0}: تاريخ بداية الإهلاك مطلوب
 DocType: Purchase Invoice Item,Service Start Date,تاريخ بدء الخدمة
 DocType: Subscription Invoice,Subscription Invoice,فاتورة الاشتراك
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,دخل مباشر
@@ -845,7 +846,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,هذا الاختصار تم استخدامه لشركة أخرى
 DocType: Selling Settings,Default Customer Group,المجموعة الافتراضية العملاء
 DocType: Employee,IFSC Code,رمز IFSC
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","تاريخ البدء وتاريخ الانتهاء متداخل مع بطاقة الوظيفة <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","إذا تم تعطيله، فلن يكون الحقل ""أجمالي تقريب"" مرئيا في أي معاملة"
 DocType: BOM,Operating Cost,تكاليف التشغيل
 DocType: Crop,Produced Items,العناصر المنتجة
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,منع رفق
 DocType: Hub User,Hub User,محور المستخدم
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,أنشاء طلب مبيعات
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},زلة الراتب المقدمة للفترة من {0} إلى {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},زلة الراتب المقدمة للفترة من {0} إلى {1}
 DocType: Project Task,Project Task,عمل مشروع
 DocType: Loyalty Point Entry Redemption,Redeemed Points,النقاط المستردة
 ,Lead Id,معرف مبادرة البيع
@@ -1027,7 +1027,7 @@
 DocType: Fee Validity,Max number of visit,الحد الأقصى لعدد الزيارات
 ,Hotel Room Occupancy,فندق غرفة إشغال
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,الجدول الزمني الانشاء:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},يرجى تعيين حساب النقد أو الحساب المصرفيالافتراضي لطريقة الدفع {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},يرجى تعيين حساب النقد أو الحساب المصرفيالافتراضي لطريقة الدفع {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,سجل
 DocType: GST Settings,GST Settings,إعدادات غست
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},يجب أن تكون العملة مماثلة لعملة قائمة الأسعار: {0}
@@ -1081,7 +1081,7 @@
 DocType: Vehicle Log,Service Details,تفاصيل الخدمة
 DocType: Lab Test Template,Grouped,مجمعة
 DocType: Selling Settings,Delivery Note Required,ملاحظة التسليم مطلوبة
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,تقديم قسائم الرواتب ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,تقديم قسائم الرواتب ...
 DocType: Bank Guarantee,Bank Guarantee Number,رقم ضمان البنك
 DocType: Assessment Criteria,Assessment Criteria,معايير التقييم
 DocType: BOM Item,Basic Rate (Company Currency),سعر أساسي (عملة الشركة)
@@ -1106,13 +1106,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,تدوين المدفوعات تم انشاؤه بالفعل
 DocType: Request for Quotation,Get Suppliers,الحصول على الموردين
 DocType: Purchase Receipt Item Supplied,Current Stock,المخزون الحالية
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},الصف # {0}: الأصل {1} غير مترابط مع البند {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},الصف # {0}: الأصل {1} غير مترابط مع البند {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,معاينة كشف الراتب
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,تم إدخال الحساب {0} عدة مرات
 DocType: Account,Expenses Included In Valuation,المصروفات متضمنة في تقييم السعر
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,يمكنك تجديد عضويتك اذا انتهت عضويتك خلال 30 يوما
 DocType: Shopping Cart Settings,Show Stock Availability,عرض توافر المخزون
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},تعيين {0} في فئة الأصول {1} أو الشركة {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},تعيين {0} في فئة الأصول {1} أو الشركة {2}
 DocType: Location,Longitude,خط الطول
 ,Absent Student Report,تقرير طالب متغيب
 DocType: Crop,Crop Spacing UOM,تباعد المحاصيل أوم
@@ -1184,7 +1184,7 @@
 DocType: Soil Texture,Sand,رمل
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,طاقة
 DocType: Opportunity,Opportunity From,فرصة من
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,الصف {0}: {1} الأرقام التسلسلية المطلوبة للبند {2}. لقد قدمت {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,الصف {0}: {1} الأرقام التسلسلية المطلوبة للبند {2}. لقد قدمت {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,يرجى تحديد جدول
 DocType: BOM,Website Specifications,موقع المواصفات
 DocType: Special Test Items,Particulars,تفاصيل
@@ -1295,7 +1295,7 @@
 DocType: Item,Items with higher weightage will be shown higher,البنود ذات الاهمية العالية سوف تظهر بالاعلى
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,اختبارات المختبر وعلامات حيوية
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,تفاصيل التسويات المصرفية
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,الصف # {0}: الأصل {1} يجب أن يتم تقديمه
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,الصف # {0}: الأصل {1} يجب أن يتم تقديمه
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,لا يوجد موظف
 DocType: Item,If subcontracted to a vendor,إذا الباطن للبائع
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,تم تحديث مجموعة الطلاب بالفعل.
@@ -1349,7 +1349,6 @@
 DocType: Loyalty Program Collection,Tier Name,اسم الطبقة
 DocType: HR Settings,Enter retirement age in years,أدخل سن التقاعد بالسنوات
 DocType: Crop,Target Warehouse,المخزن المستهدف
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,يرجى تعيين سلسلة التسمية لـ {0} عبر الإعداد&gt; الإعدادات&gt; تسمية السلسلة
 DocType: Payroll Employee Detail,Payroll Employee Detail,الرواتب الموظف التفاصيل
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,يرجى تحديد مستودع
 DocType: Cheque Print Template,Starting location from left edge,بدءا الموقع من الحافة اليسرى
@@ -1439,7 +1438,7 @@
 DocType: Work Order,Plan material for sub-assemblies,المواد خطة للجمعيات الفرعي
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,المناديب و المناطق
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,قائمة المواد {0} يجب أن تكون نشطة
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,لا توجد عناصر متاحة للنقل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,لا توجد عناصر متاحة للنقل
 DocType: Employee Boarding Activity,Activity Name,اسم النشاط
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,تغيير تاريخ الإصدار
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,لا يمكن أن تكون كمية المنتج النهائي <b>{0}</b> و For Quantity <b>{1}</b> مختلفة
@@ -1666,6 +1665,7 @@
 DocType: Project,First Email,البريد الإلكتروني الأول
 DocType: Company,Exception Budget Approver Role,دور الموافقة على الموازنة الاستثنائية
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date",بمجرد تعيينها ، ستكون هذه الفاتورة قيد الانتظار حتى التاريخ المحدد
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,مستودع محجوزة في ترتيب المبيعات / السلع تامة الصنع في معرض النماذج
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,كمية البيع
 DocType: Repayment Schedule,Interest Amount,مبلغ الفائدة
@@ -1677,7 +1677,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,تسجيل
 DocType: Asset,Scrapped,ألغت
 DocType: Item,Item Defaults,البند الافتراضي
-DocType: Purchase Invoice,Returns,عائدات
+DocType: Cashier Closing,Returns,عائدات
 DocType: Job Card,WIP Warehouse,مستودع WIP
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},الرقم التسلسلي {0} تحت عقد الصيانة حتى {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,التوظيف
@@ -1691,7 +1691,6 @@
 DocType: Student,A-,-A
 DocType: Share Transfer,Transfer Type,نوع النقل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,نفقات المبيعات
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,العميل&gt; مجموعة العملاء&gt; الإقليم
 DocType: Diagnosis,Diagnosis,التشخيص
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,شراء القياسية
 DocType: Attendance Request,Explanation,تفسير
@@ -1704,7 +1703,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,أوامر الشراء البنود المتأخرة
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,الرمز البريدي
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},طلب المبيعات {0} هو {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},اختر حساب دخل الفائدة في القرض {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},اختر حساب دخل الفائدة في القرض {0}
 DocType: Opportunity,Contact Info,معلومات الاتصال
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,إنشاء إدخالات مخزون
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,لا يمكن ترقية موظف بحالة مغادرة
@@ -1716,7 +1715,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,لا يمكن إجراء الفاتورة لمدة صفر ساعة
 DocType: Company,Date of Commencement,تاريخ البدء
 DocType: Sales Person,Select company name first.,حدد اسم الشركة الأول.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},أرسل بريد إلكتروني إلى {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},أرسل بريد إلكتروني إلى {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,عروض تم استقبالها من الموردين.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,استبدال بوم وتحديث أحدث الأسعار في جميع بومس
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},إلى {0} | {1} {2}
@@ -1736,7 +1735,7 @@
 DocType: Asset Movement,From Employee,من الموظف
 DocType: Driver,Cellphone Number,رقم الهاتف المحمول
 DocType: Project,Monitor Progress,التقدم المرئى
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,تحذير : سيقوم النظام لا تحقق بالمغالاة في الفواتير منذ مبلغ القطعة ل {0} في {1} هو صفر
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,تحذير : سيقوم النظام لا تحقق بالمغالاة في الفواتير منذ مبلغ القطعة ل {0} في {1} هو صفر
 DocType: Journal Entry,Make Difference Entry,جعل دخول الفرق
 DocType: Supplier Quotation,Auto Repeat Section,تكرار تلقائي للقسم
 DocType: Upload Attendance,Attendance From Date,الحضور من تاريخ
@@ -1839,7 +1838,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,الصف # {0}: لا يمكن إدخال الكمية المرفوضة في المشتريات الراجعة
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,لا يسمح بتغيير مجموعة العملاء للعميل المحدد.
 ,Purchase Order Items To Be Billed,تم اصدار فاتورة لأصناف امر الشراء
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,تحديث أوقات الوصول المقدرة.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,تحديث أوقات الوصول المقدرة.
 DocType: Program Enrollment Tool,Enrollment Details,تفاصيل التسجيل
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,لا يمكن تعيين عدة عناصر افتراضية لأي شركة.
 DocType: Purchase Invoice Item,Net Rate,صافي معدل
@@ -1853,7 +1852,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,نوع الإجازة مجنونة
 DocType: Support Settings,Close Issue After Days,العدد قريب بعد يوم
 ,Eway Bill,Eway بيل
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,يجب أن تكون مستخدمًا بأدوار System Manager و Item Manager لإضافة المستخدمين إلى Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,يجب أن تكون مستخدمًا بأدوار System Manager و Item Manager لإضافة المستخدمين إلى Marketplace.
 DocType: Leave Control Panel,Leave blank if considered for all branches,اتركها فارغه اذا كنت تريد تطبيقها لجميع الفروع
 DocType: Job Opening,Staffing Plan,خطة التوظيف
 DocType: Bank Guarantee,Validity in Days,الصلاحية في أيام
@@ -1873,7 +1872,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},صف مكرر {0} مع نفس {1}
 DocType: Marketplace Settings,Disable Marketplace,تعطيل السوق
 ,Trial Balance,ميزان المراجعة
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,السنة المالية {0} غير موجودة
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,السنة المالية {0} غير موجودة
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,إعداد الموظفين
 DocType: Hotel Room Reservation,Hotel Reservation User,فندق حجز المستخدم
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,الرجاء اختيار البادئة اولا
@@ -1981,7 +1980,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,فشل في تسجيل الدخول
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,تم إنشاء الأصل {0}
 DocType: Special Test Items,Special Test Items,عناصر الاختبار الخاصة
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,يجب أن تكون مستخدمًا بأدوار System Manager و Item Manager للتسجيل في Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,يجب أن تكون مستخدمًا بأدوار System Manager و Item Manager للتسجيل في Marketplace.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,طريقة الدفع
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,حسب هيكل الرواتب المعيّن الخاص بك ، لا يمكنك التقدم بطلب للحصول على مخصصات
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,وينبغي أن يكون موقع صورة ملف العامة أو عنوان الموقع
@@ -1993,7 +1992,7 @@
 DocType: Warehouse,Warehouse Contact Info,معلومات الأتصال بالمستودع
 DocType: Payment Entry,Write Off Difference Amount,شطب الفرق المبلغ
 DocType: Volunteer,Volunteer Name,اسم المتطوعين
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},تم العثور على صفوف ذات تواريخ استحقاق مكررة في صفوف أخرى: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},تم العثور على صفوف ذات تواريخ استحقاق مكررة في صفوف أخرى: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent",{0}: البريد الإلكتروني للموظف غير موجود، وبالتالي لن يتم إرسال البريد الإلكتروني
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},لا يتم تحديد هيكل الراتب للموظف {0} في تاريخ معين {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},قاعدة الشحن لا تنطبق على البلد {0}
@@ -2082,6 +2081,7 @@
 DocType: Salary Component,Earning,مستحق
 DocType: Supplier Scorecard,Scoring Criteria,معايير التسجيل
 DocType: Purchase Invoice,Party Account Currency,عملة حساب الطرف
+DocType: Delivery Trip,Total Estimated Distance,مجموع المسافة المقدرة
 ,BOM Browser,BOM متصفح
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,يرجى تحديث حالتك لهذا الحدث التدريبي
 DocType: Item Barcode,EAN,EAN
@@ -2120,7 +2120,7 @@
 DocType: Activity Cost,Projects,مشاريع
 DocType: Payment Request,Transaction Currency,عملية العملات
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},من {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,بعض رسائل البريد الإلكتروني غير صالحة
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,بعض رسائل البريد الإلكتروني غير صالحة
 DocType: Work Order Operation,Operation Description,وصف العملية
 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.,لا يمكن تغيير تاريخ بداية السنة المالية وتاريخ نهاية السنة المالية بعد حفظ السنة المالية.
 DocType: Quotation,Shopping Cart,سلة التسوق
@@ -2144,7 +2144,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,صافي التغير في الأصول الثابتة
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,الكمية المقسمة
 DocType: Leave Control Panel,Leave blank if considered for all designations,اتركها فارغه اذا كنت تريد تطبيقها لجميع المسميات الوظيفية
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,الرسوم من النوع (فعلي) في الصف {0} لا يمكن تضمينها في سعر البند
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,الرسوم من النوع (فعلي) في الصف {0} لا يمكن تضمينها في سعر البند
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},الحد الأقصى: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,من (التاريخ والوقت)
 DocType: Shopify Settings,For Company,للشركة
@@ -2158,7 +2158,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,حدثت أخطاء أثناء إنشاء جدول الدورات التدريبية
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,سيتم تعيين أول Expense Approver في القائمة كمصاريف النفقات الافتراضية.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,لا يمكن أن يكون أكبر من 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,يجب أن تكون مستخدمًا غير المسؤول مع أدوار مدير النظام وإدارة العنصر للتسجيل في Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,يجب أن تكون مستخدمًا غير المسؤول مع أدوار مدير النظام وإدارة العنصر للتسجيل في Marketplace.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,البند {0} ليس بند مخزون
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,غير المجدولة
@@ -2187,7 +2187,7 @@
 DocType: HR Settings,Employee Settings,إعدادات الموظف
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,تحميل نظام الدفع
 ,Batch-Wise Balance History,دفعة الحكيم التاريخ الرصيد
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,الصف # {0}: لا يمكن تعيين &quot;معدل&quot; إذا كان المقدار أكبر من مبلغ الفاتورة للعنصر {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,الصف # {0}: لا يمكن تعيين &quot;معدل&quot; إذا كان المقدار أكبر من مبلغ الفاتورة للعنصر {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,يتم تحديث إعدادات الطباعة في شكل تنسيق الطباعة
 DocType: Package Code,Package Code,رمز الحزمة
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,وضع تحت التدريب
@@ -2421,7 +2421,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",تم التخطيط مسبقا لعدد {0} شواغر وعدد {1} ميزانيات لـ {2} شركات تابعة للشركة الأم {3}. \ يمكنك فقط التخطيط لـعدد {4} شواغر وعدد {5} ميزانيات وفقًا لخطة التوظيف {6} للشركة الأم {3}.
 DocType: HR Settings,Stop Birthday Reminders,ايقاف التذكير بأعياد الميلاد
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},الرجاء تحديد الحساب افتراضي لدفع الرواتب في الشركة {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},الرجاء تحديد الحساب افتراضي لدفع الرواتب في الشركة {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,الحصول على تفكك مالي للبيانات الضرائب والرسوم من قبل الأمازون
 DocType: SMS Center,Receiver List,قائمة الاستقبال
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,بحث البند
@@ -2491,7 +2491,7 @@
 DocType: Vital Signs,Constipated,ممسك
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},مقابل فاتورة المورد {0} بتاريخ {1}
 DocType: Customer,Default Price List,قائمة الأسعار الافتراضي
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,سجل حركة الأصول {0} تم إنشاؤه
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,سجل حركة الأصول {0} تم إنشاؤه
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,لم يتم العثور على العناصر.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,لا يمكنك حذف السنة المالية {0}. تم تحديد السنة المالية {0} كأفتراضي في الإعدادات الشاملة
 DocType: Share Transfer,Equity/Liability Account,حساب الأسهم / المسؤولية
@@ -2629,6 +2629,7 @@
 DocType: Blanket Order,Order Type,نوع الطلب
 ,Item-wise Sales Register,سجل مبيعات الصنف
 DocType: Asset,Gross Purchase Amount,اجمالي مبلغ المشتريات
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,رمز البند&gt; مجموعة البند&gt; العلامة التجارية
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,أرصدة الافتتاح
 DocType: Asset,Depreciation Method,طريقة الاهلاك
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,هل هذه الضريبة متضمنة في الاسعار الأساسية؟
@@ -2709,7 +2710,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,الإجراء إذا تجاوزت الميزانية السنوية في ص
 DocType: Student Leave Application,Student Leave Application,طالب ترك التطبيق
 DocType: Item,Will also apply for variants,سوف تطبق أيضا على المتغيرات
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}",لا يمكن إلغاء الأصل، لانه بالفعل {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}",لا يمكن إلغاء الأصل، لانه بالفعل {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},الموظف {0} لديه اجازة نصف يوم في {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},عدد ساعات العمل الكلي يجب ألا يكون أكثر من العدد الأقصى لساعات العمل {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,في
@@ -2733,6 +2734,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,ابحث عن المعلومة
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},الحد الأقصى للإجازة المسموح بها في نوع الإجازة {0} هو {1}
 DocType: SMS Center,Create Receiver List,إنشاء قائمة استقبال
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,يجب أن يكون التاريخ متاحًا بعد تاريخ الشراء
 DocType: Vehicle,Wheels,عجلات
 DocType: Packing Slip,To Package No.,لحزم رقم
 DocType: Patient Relation,Family,العائلة
@@ -2746,7 +2748,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,يجب أن تكون عملة الفوترة مساوية لعملة الشركة الافتراضية أو عملة حساب الطرف
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),يشير إلى أن الحزمة هو جزء من هذا التسليم (مشروع فقط)
 DocType: Soil Texture,Loam,طين
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,الصف {0}: لا يمكن أن يكون تاريخ الاستحقاق قبل تاريخ النشر
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,الصف {0}: لا يمكن أن يكون تاريخ الاستحقاق قبل تاريخ النشر
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,انشئ تدوين مدفوعات
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},كمية القطعة ل {0} يجب أن يكون أقل من {1}
 ,Sales Invoice Trends,اتجاهات فاتورة المبيعات
@@ -2818,7 +2820,7 @@
 DocType: Guardian,Guardian Interests,أهتمامات الوصي
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,تحديث اسم / رقم الحساب
 DocType: Naming Series,Current Value,القيمة الحالية
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,توجد سنوات مالية متعددة للتاريخ {0}. يرجى تحديد الشركة في السنة المالية
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,توجد سنوات مالية متعددة للتاريخ {0}. يرجى تحديد الشركة في السنة المالية
 DocType: Education Settings,Instructor Records to be created by,سجلات المعلم ليتم إنشاؤها من قبل
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} تم انشاؤه
 DocType: GST Account,GST Account,حساب ضريبة السلع والخدمات
@@ -2835,7 +2837,7 @@
 DocType: Sales Person,Name and Employee ID,الاسم والرقم الوظيفي
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,لا يمكن أن يكون تاريخ الاستحقاق قبل تاريخ الترحيل
 DocType: Website Item Group,Website Item Group,مجموعة الأصناف للموقع
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,لم يتم العثور على أي زلة الراتب لتقديم المعايير المذكورة أعلاه أو زلة الراتب قدمت بالفعل
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,لم يتم العثور على أي زلة الراتب لتقديم المعايير المذكورة أعلاه أو زلة الراتب قدمت بالفعل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,الرسوم والضرائب
 DocType: Projects Settings,Projects Settings,إعدادات المشاريع
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,من فضلك ادخل تاريخ المرجع
@@ -2844,7 +2846,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,الموردة الكمية
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,طلب المواد الإغلاق
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,الرجاء إلغاء استلام الشراء {0} أولاً
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,الرجاء إلغاء استلام الشراء {0} أولاً
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,شجرة مجموعات البنود .
 DocType: Production Plan,Total Produced Qty,إجمالي الكمية المنتجة
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,لا يمكن أن يشير رقم الصف أكبر من أو يساوي رقم الصف الحالي لهذا النوع المسؤول
@@ -2953,6 +2955,7 @@
 ,Vehicle Expenses,مصاريف المركبة
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,قم بإنشاء اختبار (اختبارات) معملية في إرسال فاتورة المبيعات
 DocType: Serial No,Invoice Details,تفاصيل الفاتورة
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,يرجى تمكين إعدادات خرائط Google لتقدير المسارات وتحسينها
 DocType: Grant Application,Show on Website,عرض على الموقع
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,ابدأ
 DocType: Hub Tracked Item,Hub Category,فئة المحور
@@ -2992,7 +2995,7 @@
 DocType: Inpatient Record,B Positive,B موجب
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",أقصى فائدة للموظف {0} يتجاوز {1} بقيمة {2} المبلغ السابق المطالب \ المبلغ
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",الصف # {0}: يجب أن تكون الكمية 1، حيث أن البند هو اصول ثابتة. الرجاء استخدام صف منفصل لكمية متعددة.
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",الصف # {0}: يجب أن تكون الكمية 1، حيث أن البند هو اصول ثابتة. الرجاء استخدام صف منفصل لكمية متعددة.
 DocType: Leave Block List Allow,Leave Block List Allow,تفعيل قائمة الإجازات المحظورة
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,الاسم المختصر لا يمكن أن يكون فارغاً او به مسافة
 DocType: Patient Medical Record,Patient Medical Record,السجل الطبي للمريض
@@ -3026,7 +3029,7 @@
 DocType: Workstation,Wages per hour,الأجور في الساعة
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},توازن الأسهم في الدفعة {0} ستصبح سلبية {1} القطعة ل{2} في {3} مستودع
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,تم رفع طلبات المواد التالية تلقائيا بناء على مستوى اعادة الطلب للبنود
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},الحساب {0} غير صحيح. يجب أن تكون عملة الحساب {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},الحساب {0} غير صحيح. يجب أن تكون عملة الحساب {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},من تاريخ {0} لا يمكن أن يكون بعد تاريخ التخفيف من الموظف {1}
 DocType: Supplier,Is Internal Supplier,هو المورد الداخلي
 DocType: Employee,Create User Permission,إنشاء صلاحية المستخدم
@@ -3170,7 +3173,7 @@
 DocType: Account,Fixed Asset,الأصول الثابتة
 DocType: Amazon MWS Settings,After Date,بعد التاريخ
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,جرد المتسلسلة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,غير صالح {0} لفاتورة شركة إنتر.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,غير صالح {0} لفاتورة شركة إنتر.
 ,Department Analytics,تحليلات الإدارة
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,لم يتم العثور على البريد الإلكتروني في جهة الاتصال الافتراضية
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,توليد سر
@@ -3182,7 +3185,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,البرنامج في هيكل الرسوم ومجموعة الطلاب {0} مختلفة.
 DocType: Bank Statement Transaction Entry,Receivable Account,حساب مدين
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,يجب أن يكون صالحًا من تاريخ أقل من تاريخ صالحة صالح.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},الصف # {0}: الأصل {1} هو بالفعل {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},الصف # {0}: الأصل {1} هو بالفعل {2}
 DocType: Quotation Item,Stock Balance,رصيد المخزون
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,ترتيب مبيعات لدفع
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,المدير التنفيذي
@@ -3224,6 +3227,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,مدين الي مطلوب
 DocType: Clinical Procedure,Inpatient Record,سجل المرضى الداخليين
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",الجداول الزمنية تساعد على الحفاظ على المسار من الوقت والتكلفة وإعداد الفواتير للنشاطات الذي قام به فريقك
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,المورد&gt; نوع المورد
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,قائمة أسعار الشراء
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,تاريخ المعاملة
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,نماذج من متغيرات بطاقة الأداء المورد.
@@ -3266,7 +3270,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,أرباح / خسائر الناتجة عن صرف العملة
 DocType: Opportunity,Lost Reason,فقد السبب
 DocType: Amazon MWS Settings,Enable Amazon,تمكين الأمازون
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},الصف # {0}: الحساب {1} لا ينتمي إلى الشركة {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},الصف # {0}: الحساب {1} لا ينتمي إلى الشركة {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},تعذر العثور على نوع الملف {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,عنوان جديد
 DocType: Quality Inspection,Sample Size,حجم العينة
@@ -3377,7 +3381,7 @@
 DocType: Water Analysis,Origin,الأصل
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,هذه الوثيقة هي على حد كتبها {0} {1} لمادة {4}. وجعل لكم آخر {3} ضد نفسه {2}؟
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,يرجى تحديد (تكرار) بعد الحفظ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,حساب كمية حدد التغيير
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,حساب كمية حدد التغيير
 DocType: Purchase Invoice,Price List Currency,قائمة الأسعار العملات
 DocType: Naming Series,User must always select,يجب دائما مستخدم تحديد
 DocType: Stock Settings,Allow Negative Stock,السماح بالقيم السالبة للمخزون
@@ -3419,7 +3423,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,هل تريد بالتأكيد إلغاء هذا الموعد؟
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,غرفة فندق بريسينغ باكيج
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,خط أنابيب المبيعات
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},الرجاء تحديد حساب افتراضي في مكون الراتب {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},الرجاء تحديد حساب افتراضي في مكون الراتب {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,مطلوب في
 DocType: Rename Tool,File to Rename,إعادة تسمية الملف
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},الرجاء تحديد قائمة المواد للبند في الصف {0}
@@ -3440,7 +3444,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,تكلفة البنود التي تم شراؤها
 DocType: Employee Separation,Employee Separation Template,قالب فصل الموظفين
 DocType: Selling Settings,Sales Order Required,طلب المبيعات مطلوبة
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,كن بائعًا
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,كن بائعًا
 DocType: Purchase Invoice,Credit To,دائن الى
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,الزبائن المحتملين النشطاء / زبائن
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,اتركه فارغًا لاستخدام تنسيق &quot;ملاحظة التسليم&quot; القياسي
@@ -3481,7 +3485,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,صنع قالب الضرائب
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,المنتدى المستعمل
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,لا يمكن ترك المواد الخام فارغة.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,الصف # {0} (جدول الدفع): يجب أن يكون المبلغ سلبيًا
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,الصف # {0} (جدول الدفع): يجب أن يكون المبلغ سلبيًا
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.",تعذر تحديث المخزون، الفاتورة تحتوي علي بند مبعد الشحن.
 DocType: Contract,Fulfilment Status,حالة الوفاء
 DocType: Lab Test Sample,Lab Test Sample,عينة اختبار المختبر
@@ -3640,7 +3644,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,وثيقة التاريخ
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},سجلات الرسوم  تم انشاؤها - {0}
 DocType: Asset Category Account,Asset Category Account,حساب فئة الأصول
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,الصف رقم {0} (جدول الدفع): يجب أن يكون المبلغ موجبا
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,الصف رقم {0} (جدول الدفع): يجب أن يكون المبلغ موجبا
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},لا يمكن أن تنتج المزيد من البند {0} اكثر من كمية طلب المبيعات {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,حدد قيم السمات
 DocType: Purchase Invoice,Reason For Issuing document,سبب إصدار المستند
@@ -3695,7 +3699,7 @@
 DocType: Purchase Receipt,Time at which materials were received,الوقت الذي وردت المواد
 DocType: Products Settings,Products per Page,المنتجات لكل صفحة
 DocType: Stock Ledger Entry,Outgoing Rate,أسعار المنتهية ولايته
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,أو
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,أو
 DocType: Sales Order,Billing Status,الحالة الفواتير
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,أبلغ عن مشكلة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,نفقات المرافق
@@ -3722,7 +3726,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,إعلان الإعفاء من ضريبة الموظف
 DocType: Payment Entry,Cheque/Reference Date,تاريخ الصك / السند المرجع
 DocType: Purchase Invoice,Total Taxes and Charges,مجموع الضرائب والرسوم
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,متاح للاستخدام يتم إدخال التاريخ كتاريخ سابق
 DocType: Employee,Emergency Contact,الاتصال في حالات الطوارئ
 DocType: Bank Reconciliation Detail,Payment Entry,تدوينات المدفوعات
 ,sales-browser,تصفح-المبيعات
@@ -3768,6 +3771,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),هو العودة (ملاحظة الائتمان)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,بدء العمل
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},الرقم التسلسلي مطلوب للموجود {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,يرجى تعيين سلسلة التسمية لـ {0} عبر الإعداد&gt; الإعدادات&gt; تسمية السلسلة
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,يجب ألا يكون النموذج المعطل هو النموذج الافتراضي
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,بالنسبة إلى الصف {0}: أدخل الكمية المخطط لها
 DocType: Account,Income Account,حساب الدخل
@@ -3781,6 +3785,7 @@
 DocType: Loyalty Program,Help Section,قسم المساعدة
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,السابق
 DocType: Appraisal Goal,Key Responsibility Area,وصف معيار التقييم
+DocType: Delivery Trip,Distance UOM,المسافة UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",دفعات طالب تساعدك على تتبع الحضور، وتقييمات والرسوم للطلاب
 DocType: Payment Entry,Total Allocated Amount,إجمالي المبلغ المخصص
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,تعيين حساب المخزون الافتراضي للمخزون الدائم
@@ -3822,7 +3827,7 @@
 DocType: Item Supplier,Item Supplier,البند مزود
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,الرجاء إدخال كود البند للحصول على رقم الدفعة
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},يرجى اختيار قيمة ل {0} عرض مسعر إلى {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,لم يتم تحديد أي عناصر للنقل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,لم يتم تحديد أي عناصر للنقل
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,جميع العناوين.
 DocType: Company,Stock Settings,إعدادات المخزون
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",دمج غير ممكن إلا إذا الخصائص التالية هي نفسها في كل السجلات. هي المجموعة، نوع الجذر، شركة
@@ -4119,7 +4124,7 @@
 DocType: Patient,Personal and Social History,التاريخ الشخصي والاجتماعي
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,تم إنشاء المستخدم {0}
 DocType: Fee Schedule,Fee Breakup for each student,رسوم فصل لكل طالب
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),مجموع مقدما ({0}) ضد النظام {1} لا يمكن أن يكون أكبر من المجموع الكلي ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),مجموع مقدما ({0}) ضد النظام {1} لا يمكن أن يكون أكبر من المجموع الكلي ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,اختر التوزيع الشهري لتوزيع غير متساو أهداف على مدى عدة شهور.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,تغيير رمز
 DocType: Purchase Invoice Item,Valuation Rate,معدل التقييم
@@ -4128,7 +4133,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,استفاد من إيتس سيس
 ,Student Monthly Attendance Sheet,طالب ورقة الحضور الشهري
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,الشحن القاعدة المعمول بها فقط للبيع
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,صف الإهلاك {0}: لا يمكن أن يكون تاريخ الاستهلاك قبل تاريخ الشراء
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,صف الإهلاك {0}: لا يمكن أن يكون تاريخ الاستهلاك قبل تاريخ الشراء
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,تاريخ بدء المشروع
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,حتى
 DocType: Rename Tool,Rename Log,إعادة تسمية الدخول
@@ -4145,12 +4150,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,كم مرة يجب تحديث المشروع والشركة استنادًا إلى معاملات المبيعات.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,تنتهي صلاحيته في
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,أضف طلاب
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","يرجى حذف الموظف <a href=""#Form/Employee/{0}"">{0}</a> \ لإلغاء هذا المستند"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},الرجاء اختيار {0}
 DocType: C-Form,C-Form No,رقم النموذج - س
 DocType: BOM,Exploded_items,البنود المفصصة
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,مسافه: بعد
+DocType: Delivery Stop,Distance,مسافه: بعد
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,قائمة المنتجات أو الخدمات التي تشتريها أو تبيعها.
 DocType: Water Analysis,Storage Temperature,درجة حرارة التخزين
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4177,7 +4180,7 @@
 DocType: Homepage,Company Description for website homepage,وصف الشركة للصفة الرئيسيه بالموقع الألكتروني
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",لراحة العملاء، ويمكن استخدام هذه الرموز في أشكال الطباعة مثل الفواتير والسندات التسليم
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,اسم Suplier
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,تعذر استرداد المعلومات ل {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,تعذر استرداد المعلومات ل {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,افتتاح مجلة الدخول
 DocType: Contract,Fulfilment Terms,شروط الوفاء
 DocType: Sales Invoice,Time Sheet List,الساعة قائمة ورقة
@@ -4357,7 +4360,7 @@
 DocType: Serial No,Warranty / AMC Details,الضمان / AMC تفاصيل
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,حدد الطلاب يدويا لمجموعة الأنشطة القائمة
 DocType: Journal Entry,User Remark,ملاحظة المستخدم
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,تحسين الطرق.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,تحسين الطرق.
 DocType: Travel Itinerary,Non Diary,غير يوميات
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,لا يمكن إنشاء مكافأة الاحتفاظ بموظفي اليسار
 DocType: Lead,Market Segment,سوق القطاع
@@ -4387,7 +4390,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,برنامج الولاء
 DocType: Student Guardian,Father,الآب
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,تذاكر الدعم الفني
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,"تحديث المخزون""  لا يمكن إختياره من مبيعات الأصول الثابته"""
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,"تحديث المخزون""  لا يمكن إختياره من مبيعات الأصول الثابته"""
 DocType: Bank Reconciliation,Bank Reconciliation,تسويات مصرفية
 DocType: Attendance,On Leave,في إجازة
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,الحصول على التحديثات
@@ -4432,7 +4435,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,رقم المسلسل و الدفعة
 DocType: Warranty Claim,From Company,من شركة
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,مجموع العشرات من معايير التقييم يجب أن يكون {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,الرجاء تعيين عدد الاهلاكات المستنفده مسبقا
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,الرجاء تعيين عدد الاهلاكات المستنفده مسبقا
 DocType: Supplier Scorecard Period,Calculations,العمليات الحسابية
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,القيمة أو الكمية
 DocType: Payment Terms Template,Payment Terms,شروط الدفع
@@ -4451,7 +4454,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,الخصم (٪) على سعر قائمة السعر مع الهامش
 DocType: Healthcare Service Unit Type,Rate / UOM,معدل / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,جميع المخازن
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,لم يتم العثور على {0} معاملات Inter Company.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,لم يتم العثور على {0} معاملات Inter Company.
 DocType: Travel Itinerary,Rented Car,سيارة مستأجرة
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,عن شركتك
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,دائن الى حساب يجب أن يكون من حسابات قائمة المركز المالي
@@ -4552,6 +4555,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,معايير تحليل النباتات
 DocType: Cheque Print Template,Cheque Height,ارتفاع الصك
 DocType: Supplier,Supplier Details,تفاصيل المورد
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,يرجى إعداد سلسلة ترقيم الإعداد للحضور عبر الإعداد&gt; سلسلة الترقيم
 DocType: Setup Progress,Setup Progress,إعداد التقدم
 DocType: Expense Claim,Approval Status,حالة الموافقة
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},(من القيمة) يجب أن تكون أقل من (الي القيمة) في الصف {0}
@@ -4644,7 +4648,6 @@
 DocType: Travel Request,Fully Sponsored,برعاية كاملة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,عكس دخول المجلة
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,تم إنشاء العميل {0}.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,يرجى إعداد نظام تسمية الموظف في الموارد البشرية&gt; إعدادات الموارد البشرية
 DocType: Stock Settings,Limit Percent,الحد في المئة
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,حاليا لا يوجد مخزون متاح في أي مستودع
 ,Payment Period Based On Invoice Date,طريقة الدفع بناء على تاريخ الفاتورة
@@ -4703,7 +4706,7 @@
 DocType: BOM Explosion Item,Source Warehouse,مصدر مستودع
 DocType: Installation Note,Installation Date,تثبيت تاريخ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,مشاركة دفتر الأستاذ
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},الصف # {0}: الأصل {1} لا تتبع الشركة {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},الصف # {0}: الأصل {1} لا تتبع الشركة {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,تم إنشاء فاتورة المبيعات {0}
 DocType: Employee,Confirmation Date,تاريخ التأكيد
 DocType: Inpatient Occupancy,Check Out,الدفع
@@ -4723,6 +4726,7 @@
 DocType: Production Plan,Sales Orders Detail,تفاصيل أوامر المبيعات
 DocType: Bin,Requested Quantity,الكمية المطلوبة
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,يرجى إعداد برنامج تسمية المعلم في التعليم&gt; إعدادات التعليم
 DocType: Patient,Marital Status,الحالة الإجتماعية
 DocType: Stock Settings,Auto Material Request,طلب مواد تلقائي
 DocType: Woocommerce Settings,API consumer secret,كلمة مرور مستخدم API
@@ -4775,7 +4779,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,حدد أيام
 DocType: Academic Term,Term Name,اسم الشرط
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),الائتمان ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,إنشاء قسائم الرواتب ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,إنشاء قسائم الرواتب ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,لا يمكنك تحرير عقدة الجذر.
 DocType: Buying Settings,Purchase Order Required,أمر الشراء مطلوب
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,مؤقت
@@ -4811,7 +4815,7 @@
 DocType: Account,Rate at which this tax is applied,السعر الذي يتم فيه تطبيق هذه الضريبة
 DocType: Cash Flow Mapper,Section Name,اسم القسم
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,الكمية المحددة عند اعادة الطلب
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},صف الإهلاك {0}: يجب أن تكون القيمة المتوقعة بعد العمر الافتراضي أكبر من أو تساوي {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},صف الإهلاك {0}: يجب أن تكون القيمة المتوقعة بعد العمر الافتراضي أكبر من أو تساوي {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,فرص العمل الحالية
 DocType: Company,Stock Adjustment Account,حساب تسوية الأوراق المالية
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,لا تصلح
@@ -4858,7 +4862,7 @@
 DocType: Program Enrollment,School House,مدرسة دار
 DocType: Serial No,Out of AMC,من AMC
 DocType: Opportunity,Opportunity Amount,مبلغ الفرصة
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,عدد الاهلاكات المستنفده مسبقا لا يمكن أن يكون أكبر من إجمالي عدد الاهلاكات خلال العمر الافتراضي النافع
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,عدد الاهلاكات المستنفده مسبقا لا يمكن أن يكون أكبر من إجمالي عدد الاهلاكات خلال العمر الافتراضي النافع
 DocType: Purchase Order,Order Confirmation Date,تاريخ تأكيد الطلب
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,إنشاء زيارة صيانة
@@ -4899,7 +4903,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,دفعة:
 DocType: Volunteer,Afternoon,بعد الظهر
 DocType: Loyalty Program,Loyalty Program Help,مساعدة برنامج الولاء
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' معطل
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' معطل
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,على النحو المفتوحة
 DocType: Cheque Print Template,Scanned Cheque,الممسوحة ضوئيا شيك
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,إرسال رسائل البريد الإلكتروني التلقائي لاتصالات على المعاملات تقديم.
@@ -4912,7 +4916,7 @@
 DocType: Warranty Claim,Item and Warranty Details,البند والضمان تفاصيل
 DocType: Chapter,Chapter Members,أعضاء الفصل
 DocType: Sales Team,Contribution (%),مساهمة (٪)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"ملاحظة : لن يتم إنشاء تدوين المدفوعات نظرا لأن "" حساب النقد او المصرف"" لم يتم تحديده"
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"ملاحظة : لن يتم إنشاء تدوين المدفوعات نظرا لأن "" حساب النقد او المصرف"" لم يتم تحديده"
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,المشروع {0} موجود بالفعل
 DocType: Clinical Procedure,Nursing User,التمريض المستخدم
 DocType: Employee Benefit Application,Payroll Period,فترة المرتبات
@@ -4920,6 +4924,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},المسلسل لا {0} لا ينتمي إلى الدفعة {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,المسؤوليات
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,انتهت فترة صلاحية هذا الاقتباس.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","يرجى حذف الموظف <a href=""#Form/Employee/{0}"">{0}</a> \ لإلغاء هذا المستند"
 DocType: Expense Claim Account,Expense Claim Account,حساب المطالبة بالنفقات
 DocType: Account,Capital Work in Progress,العمل الرأسمالي في التقدم
 DocType: Accounts Settings,Allow Stale Exchange Rates,السماح لأسعار الصرف الثابتة
@@ -5000,7 +5006,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,قضية المواد
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,قم بتوصيل Shopify باستخدام ERPNext
 DocType: Material Request Item,For Warehouse,لمستودع
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,ملاحظات التسليم {0} محدثة
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,ملاحظات التسليم {0} محدثة
 DocType: Employee,Offer Date,تاريخ العرض
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,عروض مسعرة
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,كنت في وضع غير متصل بالشبكة. أنت لن تكون قادرة على تحميل حتى يكون لديك شبكة
@@ -5050,7 +5056,7 @@
 DocType: Shipping Rule,Calculate Based On,إحسب الربح بناء على
 DocType: Contract,Unfulfilled,لم تتحقق
 DocType: Delivery Note Item,From Warehouse,من المخزن
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,لا يوجد موظفون للمعايير المذكورة
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,لا يوجد موظفون للمعايير المذكورة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,لا توجد بنود في قائمة المواد للتصنيع
 DocType: Shopify Settings,Default Customer,العميل الافتراضي
 DocType: Sales Stage,Stage Name,اسم المرحلة
@@ -5092,7 +5098,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,المبلغ الضريبي بعد خصم المبلغ
 DocType: Patient,Inpatient Status,حالة المرضى الداخليين
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,إعدادات ملخص العمل اليومي
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,قائمة الأسعار المختارة يجب أن يكون لديها حقول بيع وشراء محددة.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,قائمة الأسعار المختارة يجب أن يكون لديها حقول بيع وشراء محددة.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,الرجاء إدخال ريد حسب التاريخ
 DocType: Payment Entry,Internal Transfer,نقل داخلي
 DocType: Asset Maintenance,Maintenance Tasks,مهام الصيانة
@@ -5128,7 +5134,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,المجموعة حسب
 DocType: Guardian,Interests,الإهتمامات
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,تمكين / تعطيل العملات .
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,لا يمكن تقديم بعض قسائم الرواتب
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,لا يمكن تقديم بعض قسائم الرواتب
 DocType: Exchange Rate Revaluation,Get Entries,الحصول على مقالات
 DocType: Production Plan,Get Material Request,الحصول على المواد طلب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,نفقات بريدية
@@ -5212,7 +5218,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},اجباري حساب النفقات للصنف {0}
 DocType: BOM,Website Description,وصف الموقع
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,صافي التغير في حقوق الملكية
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,يرجى إلغاء فاتورة المشتريات {0} أولاً
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,يرجى إلغاء فاتورة المشتريات {0} أولاً
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,غير مسموح به. يرجى تعطيل نوع وحدة الخدمة
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",البريد الإلكتروني {0} مسجل مسبقا
 DocType: Serial No,AMC Expiry Date,AMC تاريخ انتهاء الاشتراك
@@ -5252,7 +5258,7 @@
 DocType: Hotel Room,Hotel Room,غرفة الفندق
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},الحساب {0} لا ينتمي إلى الشركة {1}
 DocType: Leave Type,Rounding,التقريب
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,لا تتطابق الأرقام التسلسلية في الصف {0} مع ملاحظة التسليم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,لا تتطابق الأرقام التسلسلية في الصف {0} مع ملاحظة التسليم
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),المبلغ المخفَّض (المحسوب)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.",ثم يتم تصفية قواعد التسعير على أساس العميل أو مجموعة العملاء أو الإقليم أو المورد أو مجموعة الموردين أو الحملة أو شريك المبيعات إلخ.
 DocType: Student,Guardian Details,تفاصيل الوصي
@@ -5307,7 +5313,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},مستودع الأسهم المطلوبة لل تفاصيل {0}
 DocType: Leave Allocation,Unused leaves,إجازات غير مستخدمة
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,جعل إدخال السداد
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,جميع الاقسام
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,جميع الاقسام
 DocType: Healthcare Service Unit,Vacant,شاغر
 DocType: Patient,Alcohol Past Use,الاستخدام الماضي للكحول
 DocType: Fertilizer Content,Fertilizer Content,محتوى الأسمدة
@@ -5318,7 +5324,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,يجب إلغاء طلب العمل {0} قبل إلغاء أمر المبيعات هذا
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),جلب BOM انفجرت (بما في ذلك المجالس الفرعية)
 DocType: Authorization Rule,Applicable To (Employee),قابلة للتطبيق على (الموظف)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,(تاريخ الاستحقاق) إلزامي
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,(تاريخ الاستحقاق) إلزامي
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,الاضافة للخاصية {0} لا يمكن أن تكون 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,نوع المنفعة والمبلغ
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,الغرف غرف الفندق مكيفة،
@@ -5462,7 +5468,7 @@
 DocType: Purchase Invoice Item,Total Weight,الوزن الكلي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,عمولة على المبيعات
 DocType: Job Offer Term,Value / Description,القيمة / الوصف
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",الصف # {0}: الاصل {1} لا يمكن تقديمه ، لانه بالفعل {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",الصف # {0}: الاصل {1} لا يمكن تقديمه ، لانه بالفعل {2}
 DocType: Tax Rule,Billing Country,بلد إرسال الفواتير
 DocType: Purchase Order Item,Expected Delivery Date,تاريخ التسليم المتوقع
 DocType: Restaurant Order Entry,Restaurant Order Entry,مطعم دخول الطلب
@@ -5501,12 +5507,13 @@
 DocType: Maintenance Visit,Breakdown,انهيار
 DocType: Travel Itinerary,Vegetarian,نباتي
 DocType: Patient Encounter,Encounter Date,تاريخ لقاء
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,الحساب: {0} مع العملة: {1} لا يمكن اختياره
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,الحساب: {0} مع العملة: {1} لا يمكن اختياره
 DocType: Bank Statement Transaction Settings Item,Bank Data,بيانات البنك
 DocType: Purchase Receipt Item,Sample Quantity,كمية العينة
 DocType: Bank Guarantee,Name of Beneficiary,اسم المستفيد
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",تحديث تكلفة بوم تلقائيا عبر جدولة، استنادا إلى أحدث معدل التقييم / سعر قائمة معدل / آخر معدل شراء المواد الخام.
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,مورد&gt; مجموعة الموردين
 DocType: Bank Reconciliation Detail,Cheque Date,تاريخ الشيك
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},الحساب {0}: الحساب الرئيسي {1} لا ينتمي إلى الشركة: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,تم حذف جميع المعاملات المتعلقة بهذه الشركة!
@@ -5534,7 +5541,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,العقد التابعة يمكن أن تنشأ إلا في إطار العقد نوع &#39;المجموعة&#39;
 DocType: Attendance Request,Half Day Date,تاريخ نصف اليوم
 DocType: Academic Year,Academic Year Name,اسم العام الدراسي
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} غير مسموح بالتعامل مع {1}. يرجى تغيير الشركة.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} غير مسموح بالتعامل مع {1}. يرجى تغيير الشركة.
 DocType: Sales Partner,Contact Desc,الاتصال التفاصيل
 DocType: Email Digest,Send regular summary reports via Email.,إرسال تقارير موجزة منتظمة عبر البريد الإلكتروني.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},الرجاء تعيين الحساب الافتراضي في (نوع المطالبة بالنفقات) {0}
@@ -5567,7 +5574,7 @@
 DocType: Hotel Room,Hotel Manager,مدير الفندق
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,مجموعة القاعدة الضريبية لعربة التسوق
 DocType: Purchase Invoice,Taxes and Charges Added,أضيفت الضرائب والرسوم
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,صف الإهلاك {0}: لا يمكن أن يكون تاريخ الاستهلاك التالي قبل التاريخ المتاح للاستخدام
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,صف الإهلاك {0}: لا يمكن أن يكون تاريخ الاستهلاك التالي قبل التاريخ المتاح للاستخدام
 ,Sales Funnel,قمع المبيعات
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,الاسم المختصر إلزامي
 DocType: Project,Task Progress,تقدم المهمة
@@ -5581,7 +5588,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,جميع مجموعات الزبائن
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,متراكمة شهريا
 DocType: Attendance Request,On Duty,في الخدمة
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} إلزامي. ربما لم يتم إنشاء سجل سعر صرف العملة ل{1} إلى {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} إلزامي. ربما لم يتم إنشاء سجل سعر صرف العملة ل{1} إلى {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},خطة التوظيف {0} موجودة بالفعل للتسمية {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,قالب الضرائب إلزامي.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,الحساب {0}: الحسابه الأب {1} غير موجود
@@ -5661,11 +5668,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,واحدة على الاقل مستودع إلزامي
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.",تكوين حقول العناصر مثل UOM ومجموعة العناصر والوصف وعدد الساعات.
 DocType: Certification Application,Certification Status,حالة الشهادة
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,السوق
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,السوق
 DocType: Travel Itinerary,Travel Advance Required,سلف السفر المطلوبة
 DocType: Subscriber,Subscriber Name,اسم المشترك
 DocType: Serial No,Out of Warranty,لا تغطيه الضمان
-DocType: Cashier Closing,Cashier-closing-,أمين الصندوق، closing-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,نوع البيانات المعينة
 DocType: BOM Update Tool,Replace,استبدل
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,لم يتم العثور على منتجات.
@@ -5752,7 +5758,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,يتم إنشاء قوالب الضرائب الافتراضية للمبيعات والشراء.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,سجل نتيجة التقييم {0} موجود بالفعل.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",مثال: ABCD. #####. إذا تم ضبط المسلسل ولم يتم ذكر رقم الدفعة في المعاملات ، فسيتم إنشاء رقم الدفعة تلقائيًا استنادًا إلى هذه السلسلة. إذا كنت تريد دائمًا الإشارة صراحة إلى Batch No لهذا العنصر ، فاترك هذا فارغًا. ملاحظة: سيأخذ هذا الإعداد الأولوية على بادئة Naming Series في إعدادات المخزون.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,يرجى إعداد سلسلة ترقيم الإعداد للحضور عبر الإعداد&gt; سلسلة الترقيم
 DocType: BOM,Materials Required (Exploded),المواد المطلوبة (مفصصة)
 DocType: Contract,Party User,مستخدم الحزب
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',الرجاء تعيين فلتر الشركة فارغا إذا كانت المجموعة بي هي &#39;كومباني&#39;
@@ -5953,7 +5958,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,أوب كونت
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,يجب تعيين كل من تاريخ بدء الفترة التجريبية وتاريخ انتهاء الفترة التجريبية
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,المعدل المتوسط
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,يجب أن يكون إجمالي مبلغ الدفع في جدول الدفع مساويا للمجموع الكبير / المستدير
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,يجب أن يكون إجمالي مبلغ الدفع في جدول الدفع مساويا للمجموع الكبير / المستدير
 DocType: Subscription Plan Detail,Plan,خطة
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,كشف رصيد الحساب المصرفي وفقا لدفتر الأستاذ العام
 DocType: Job Applicant,Applicant Name,اسم طالب الوظيفة
@@ -6024,7 +6029,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,الصابون والمنظفات
 DocType: BOM,Show Items,إظهار العناصر
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,(من الوقت) لا يمكن أن يكون بعد من (الي الوقت).
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,هل تريد أن تخطر جميع العملاء عن طريق البريد الإلكتروني؟
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,هل تريد أن تخطر جميع العملاء عن طريق البريد الإلكتروني؟
 DocType: Subscription Plan,Billing Interval,فواتير الفوترة
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,الصور المتحركة والفيديو
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,تم طلبه
@@ -6033,9 +6038,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,الصف {0}: يجب أن يكون {1} أكبر من 0
 DocType: Assessment Criteria,Assessment Criteria Group,مجموعة معايير تقييم
 DocType: Healthcare Settings,Patient Name By,اسم المريض بي
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},مدخل يومية تراكمية للرواتب من {0} إلى {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},مدخل يومية تراكمية للرواتب من {0} إلى {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,تمكين الإيرادات المؤجلة
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},الاهلاك المتراكم الافتتاحي  يجب أن يكون أقل من أو يساوي {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},الاهلاك المتراكم الافتتاحي  يجب أن يكون أقل من أو يساوي {0}
 DocType: Warehouse,Warehouse Name,اسم المستودع
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,يجب أن يكون تاريخ البدء الفعلي أقل من تاريخ الانتهاء الفعلي
 DocType: Naming Series,Select Transaction,حدد المعاملات
@@ -6187,7 +6192,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,ليس لدى الموظف {0} من الدرجة {1} سياسة إجازة افتراضية
 DocType: Salary Detail,Salary Detail,تفاصيل الراتب
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,الرجاء اختيار {0} أولاً
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,تمت إضافة {0} مستخدمين
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,تمت إضافة {0} مستخدمين
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",في حالة البرنامج متعدد المستويات ، سيتم تعيين العملاء تلقائيًا إلى الطبقة المعنية وفقًا للإنفاق
 DocType: Appointment Type,Physician,الطبيب المعالج
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,دفعة {0} من البند {1} قد انتهت صلاحيتها.
@@ -6331,7 +6336,7 @@
 DocType: Asset,Custodian,وصي
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,ملف نقطة البيع
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} يجب أن تكون القيمة بين 0 و 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},دفع {0} من {1} إلى {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},دفع {0} من {1} إلى {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,القروض غير المضمونة
 DocType: Cost Center,Cost Center Name,اسم مركز تكلفة
 DocType: Student,B+,B+
@@ -6363,6 +6368,7 @@
 DocType: Employee,Date of Issue,تاريخ الإصدار
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",وفقا لإعدادات الشراء في حالة ايصال الشراء مطلوب == 'نعم'، لإنشاء فاتورة شراء، يحتاج المستخدم إلى إنشاء إيصال الشراء أولا للبند {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},الصف # {0}: حدد المورد للبند {1}
+DocType: Global Defaults,Default Distance Unit,وحدة المسافة الافتراضية
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,صف {0}: يجب أن تكون قيمة الساعات أكبر من الصفر.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,الموقع صورة {0} تعلق على البند {1} لا يمكن العثور
 DocType: Issue,Content Type,نوع المحتوى
@@ -6418,7 +6424,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,مدين لحساب يجب أن يكون حساب قائمة المركز المالي
 DocType: Asset,Naming Series,التسمية التسلسلية
 DocType: Vital Signs,Coated,مطلي
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,الصف {0}: القيمة المتوقعة بعد أن تكون الحياة المفيدة أقل من إجمالي مبلغ الشراء
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,الصف {0}: القيمة المتوقعة بعد أن تكون الحياة المفيدة أقل من إجمالي مبلغ الشراء
 DocType: GoCardless Settings,GoCardless Settings,إعدادات GoCardless
 DocType: Leave Block List,Leave Block List Name,اسم قائمة الإجازات المحظورة
 DocType: Certified Consultant,Certification Validity,صلاحية التصديق
@@ -6485,6 +6491,7 @@
 DocType: Bank Statement Settings Item,Bank Header,ترويسة المصرف
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,مشاهدة اختبارات مختبر
 DocType: Hub Users,Hub Users,مستخدمو المحور
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,العميل&gt; مجموعة العملاء&gt; الإقليم
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,تاريخ الصيانة
 DocType: Purchase Invoice Item,Rejected Serial No,رقم المسلسل رفض
@@ -6500,7 +6507,7 @@
 DocType: SG Creation Tool Course,Max Strength,القوة القصوى
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,تثبيت الإعدادات المسبقة
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},لم يتم تحديد ملاحظة التسليم للعميل {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},لم يتم تحديد ملاحظة التسليم للعميل {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,الموظف {0} ليس لديه الحد الأقصى لمبلغ الاستحقاق
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,حدد العناصر بناء على تاريخ التسليم
 DocType: Grant Application,Has any past Grant Record,لديه أي سجل المنحة الماضية
@@ -6527,7 +6534,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,حجز غرفة الفندق
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,خدمة العملاء
 DocType: BOM,Thumbnail,المصغرات
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,لم يتم العثور على جهات اتصال مع معرّفات البريد الإلكتروني.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,لم يتم العثور على جهات اتصال مع معرّفات البريد الإلكتروني.
 DocType: Item Customer Detail,Item Customer Detail,تفاصيل العميل لهذا البند
 DocType: Notification Control,Prompt for Email on Submission of,المطالبة البريد الالكتروني على تقديم
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},أقصى مبلغ لمبلغ الموظف {0} يتجاوز {1}
@@ -6782,7 +6789,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,لا يمكن تحويل الحساب إلى تصنيف مجموعة لأن نوع الحساب تم اختياره.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,تم تعديل {0} {1}، يرجى تحديث الصفحة من المتصفح
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,وقف المستخدمين من طلب إجازة في الأيام التالية.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,رمز البند&gt; مجموعة البند&gt; العلامة التجارية
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.",إذا كان انتهاء الصلاحية غير محدود لنقاط الولاء ، فاحتفظ مدة الصلاحية فارغة أو 0.
 DocType: Asset Maintenance Team,Maintenance Team Members,أعضاء فريق الصيانة
 DocType: Loyalty Point Entry,Purchase Amount,قيمة الشراء
@@ -6790,7 +6796,7 @@
 											to fullfill Sales Order {2}",لا يمكن تسليم Serial No {0} من البند {1} حيث إنه محجوز \ لإكمال أمر المبيعات {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,المورد الاقتباس {0} خلق
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,نهاية العام لا يمكن أن يكون قبل بداية العام
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,نهاية العام لا يمكن أن يكون قبل بداية العام
 DocType: Employee Benefit Application,Employee Benefits,الميزات للموظف
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},الكمية المعبأة يجب ان تساي كمية البند {0} في الصف {1}
 DocType: Work Order,Manufactured Qty,الكمية المصنعة
@@ -6806,6 +6812,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,حدد أرقام الدفعة
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,إلى GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,فواتير حولت للزبائن.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,يرجى إعداد نظام تسمية الموظف في الموارد البشرية&gt; إعدادات الموارد البشرية
 DocType: Healthcare Settings,Invoice Appointments Automatically,مواعيد الفاتورة تلقائيا
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,هوية المشروع
 DocType: Salary Component,Variable Based On Taxable Salary,متغير على أساس الخاضع للضريبة
@@ -6854,7 +6861,7 @@
 DocType: POS Profile,Account for Change Amount,حساب لتغيير المبلغ
 DocType: QuickBooks Migrator,Connecting to QuickBooks,الاتصال QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,إجمالي الربح / الخسارة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,شركة غير صالحة لفاتورة شركة إنتر.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,شركة غير صالحة لفاتورة شركة إنتر.
 DocType: Purchase Invoice,input service,خدمة الإدخال
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},الصف {0}: حزب / حساب لا يتطابق مع {1} / {2} في {3} {4}
 DocType: Employee Promotion,Employee Promotion,ترقية الموظف
@@ -6984,7 +6991,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,المنطقة المفضلة للسكن
 apps/erpnext/erpnext/config/selling.py +184,Analytics,التحليلات
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,السلة فارغة
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,يرجى إعداد برنامج تسمية المعلم في التعليم&gt; إعدادات التعليم
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",لا يحتوي العنصر {0} على الرقم التسلسلي. فقط العناصر المسلسلة \ يمكن أن يكون التسليم على أساس الرقم التسلسلي
 DocType: Vehicle,Model,نموذج
@@ -7014,7 +7020,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,لا شيء للتغيير
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,يرجى اختيار ملف CSV
 DocType: Holiday List,Total Holidays,مجموع العطلات
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,قالب بريد إلكتروني مفقود للإرسال. يرجى ضبط واحد في إعدادات التسليم.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,قالب بريد إلكتروني مفقود للإرسال. يرجى ضبط واحد في إعدادات التسليم.
 DocType: Student Leave Application,Mark as Present,إجعلها الحاضر
 DocType: Supplier Scorecard,Indicator Color,لون المؤشر
 DocType: Purchase Order,To Receive and Bill,لتلقي وبيل
@@ -7023,7 +7029,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,حدد المسلسل لا
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,مصمم
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,قالب الشروط والأحكام
-DocType: Serial No,Delivery Details,تفاصيل الدفع
+DocType: Delivery Trip,Delivery Details,تفاصيل الدفع
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},مركز التكلفة مطلوب في الصف {0} في جدول الضرائب للنوع {1}
 DocType: Program,Program Code,رمز البرنامج
 DocType: Terms and Conditions,Terms and Conditions Help,مساعدة الشروط والأحكام
@@ -7047,7 +7053,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,المدة الزمنية بين بدء وإنهاء عملية الإنتاج
 DocType: Cash Flow Mapping,Is Income Tax Expense,هو ضريبة الدخل
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,طلبك تحت التسليم!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},الصف # {0}: تاريخ الترحيل يجب أن يكون نفس تاريخ شراء {1} الأصل {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},الصف # {0}: تاريخ الترحيل يجب أن يكون نفس تاريخ شراء {1} الأصل {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,تحقق من ذلك إذا كان الطالب يقيم في نزل المعهد.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,الرجاء إدخال طلب المبيعات في الجدول أعلاه
 ,Stock Summary,ملخص الأوراق المالية
diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv
index e36deeb..21729cd 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Име на периода
 DocType: Employee,Salary Mode,Mode Заплата
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Регистрирам
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Регистрирам
 DocType: Patient,Divorced,Разведен
 DocType: Support Settings,Post Route Key,Ключ за маршрут
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Оставя т да бъдат добавени няколко пъти в една сделка
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Нов обменен курс
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Изисква се валута за Ценоразпис {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Ще се изчисли при транзакция.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Доставчик&gt; Тип доставчик
 DocType: Delivery Trip,MAT-DT-.YYYY.-,МАТ-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Клиент - Контакти
 DocType: Patient Appointment,Check availability,Провери наличността
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Покажи отворен
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Номерацията е успешно обновена
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Поръчка
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} на ред {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} на ред {1}
 DocType: Asset Finance Book,Depreciation Start Date,Начална дата на амортизацията
 DocType: Pricing Rule,Apply On,Приложи върху
 DocType: Item Price,Multiple Item prices.,Множество цени елемент.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Лабораторни предписания
 ,Delay Days,Дни в забава
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Expense Service
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Сериен номер: {0} вече е посочен в фактурата за продажби: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Сериен номер: {0} вече е посочен в фактурата за продажби: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Фактура
 DocType: Purchase Invoice Item,Item Weight Details,Елемент за теглото на елемента
 DocType: Asset Maintenance Log,Periodicity,Периодичност
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Счетоводител
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Ценова листа за продажба
 DocType: Patient,Tobacco Current Use,Тютюновата текуща употреба
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Началната дата и крайната дата се припокриват с работната карта <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Продажна цена
 DocType: Cost Center,Stock User,Склад за потребителя
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,сроден
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,дата Присъствие не може да бъде по-малко от дата присъедини служител
 DocType: Grading Scale,Grading Scale Name,Оценъчна скала - Име
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Добавяне на потребители към пазара
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Добавяне на потребители към пазара
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Това е корен сметка и не може да се редактира.
 DocType: Sales Invoice,Company Address,Адрес на компанията
 DocType: BOM,Operations,Операции
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Размер на размера
 DocType: Production Plan,Material Request Detail,Подробности за заявка за материал
 DocType: Selling Settings,Default Quotation Validity Days,Начални дни на валидност на котировката
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да включват курортна такса в ред {0} в скоростта на т, данъци в редове {1} трябва да се включат и"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да включват курортна такса в ред {0} в скоростта на т, данъци в редове {1} трябва да се включат и"
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Payroll Entry,Validate Attendance,Утвърждаване на присъствието
 DocType: Sales Invoice,Change Amount,Промяна сума
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Разстоянието между редовете за сумата с думи
 DocType: Vehicle,Additional Details,допълнителни детайли
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Не е зададено описание
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Доставчик&gt; Група доставчици
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Заявка за покупка.
 DocType: POS Closing Voucher Details,Collected Amount,Събрана сума
 DocType: Lab Test,Submitted Date,Изпратена дата
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,прием на студенти
 ,Terretory,Територия
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Точка {0} е отменена
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Амортизационен ред {0}: Началната дата на амортизацията е въведена като минала дата
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Амортизационен ред {0}: Началната дата на амортизацията е въведена като минала дата
 DocType: Contract Template,Fulfilment Terms and Conditions,Условия и условия за изпълнение
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Заявка за материал
 DocType: Bank Reconciliation,Update Clearance Date,Актуализация Клирънсът Дата
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,Настройки за сметки
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Фактура на доставчик не съществува в фактурата за покупка {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Управление на продажбите Person Tree.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Не може да се обработи маршрут, тъй като настройките на Google Карти са деактивирани."
 DocType: Job Applicant,Cover Letter,Мотивационно писмо
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Неуредени Чекове и Депозити
 DocType: Item,Synced With Hub,Синхронизирано с хъб
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Нова стойност на активите
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Скоростта, с която Customer валути се превръща в основна валута на клиента"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Инструмент за създаване на график на курса
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row {0}: Покупка на фактура не може да се направи срещу съществуващ актив {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row {0}: Покупка на фактура не може да се направи срещу съществуващ актив {1}
 DocType: Crop Cycle,LInked Analysis,Свързан Анализ
 DocType: POS Closing Voucher,POS Closing Voucher,POS Валута за затваряне
 DocType: Contract,Lapsed,Отпаднали
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} не е записан в курса {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Име на студента:
 DocType: POS Closing Voucher Details,Difference,разлика
+DocType: Delivery Settings,Delay between Delivery Stops,Закъснение между спирането на доставката
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Сериен № {0} не принадлежи на стокова разписка {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Изглежда има проблем с конфигурацията на GoCardless на сървъра. Не се притеснявайте, в случай на неуспех, сумата ще бъде възстановена в профила Ви."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Демо
@@ -693,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Брой и процент
 DocType: Delivery Note,% Installed,% Инсталиран
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Класните стаи / лаборатории и т.н., където може да бъдат насрочени лекции."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Фирмените валути на двете дружества трябва да съответстват на вътрешнофирмените сделки.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Фирмените валути на двете дружества трябва да съответстват на вътрешнофирмените сделки.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,"Моля, въведете име на компанията първа"
 DocType: Travel Itinerary,Non-Vegetarian,Не вегетарианец
 DocType: Purchase Invoice,Supplier Name,Доставчик Наименование
@@ -778,7 +779,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Нает от датата
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Достатъчно Части за изграждане
 DocType: POS Profile User,POS Profile User,Потребителски потребителски профил на POS
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Ред {0}: Изисква се начална дата на амортизацията
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Ред {0}: Изисква се начална дата на амортизацията
 DocType: Purchase Invoice Item,Service Start Date,Начална дата на услугата
 DocType: Subscription Invoice,Subscription Invoice,Фактура за абонамент
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Преки приходи
@@ -845,7 +846,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Съкращение вече се използва за друга компания
 DocType: Selling Settings,Default Customer Group,Клиентска група по подразбиране
 DocType: Employee,IFSC Code,Кодекс на IFSC
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Началната дата и крайната дата се припокриват с работната карта <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ако деактивирате, поле &quot;Rounded Общо&quot; няма да се вижда в всяка сделка"
 DocType: BOM,Operating Cost,Експлоатационни разходи
 DocType: Crop,Produced Items,Произведени елементи
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,Предотвратяване на RFQ
 DocType: Hub User,Hub User,Потребител на Hub
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Направи поръчка за продажба
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},"Талон за заплатите, подаден за период от {0} до {1}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},"Талон за заплатите, подаден за период от {0} до {1}"
 DocType: Project Task,Project Task,Задача по проект
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Изплатени точки
 ,Lead Id,Потенциален клиент - Номер
@@ -1027,7 +1027,7 @@
 DocType: Fee Validity,Max number of visit,Максимален брой посещения
 ,Hotel Room Occupancy,Заседание в залата на хотела
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,График създаден:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},"Моля, задайте по подразбиране в брой или  по банкова сметка за начин на плащане {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},"Моля, задайте по подразбиране в брой или  по банкова сметка за начин на плащане {0}"
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Записване
 DocType: GST Settings,GST Settings,Настройки за GST
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Валутата трябва да бъде същата като валутата на ценовата листа: {0}
@@ -1081,7 +1081,7 @@
 DocType: Vehicle Log,Service Details,Детайли за услугата
 DocType: Lab Test Template,Grouped,Групирани
 DocType: Selling Settings,Delivery Note Required,Складова разписка е задължителна
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Подаване на фишове за заплати ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Подаване на фишове за заплати ...
 DocType: Bank Guarantee,Bank Guarantee Number,Номер на банковата гаранция
 DocType: Assessment Criteria,Assessment Criteria,Критерии за оценка на
 DocType: BOM Item,Basic Rate (Company Currency),Основен курс (Валута на компанията)
@@ -1106,13 +1106,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Запис за плащането вече е създаден
 DocType: Request for Quotation,Get Suppliers,Вземи доставчици
 DocType: Purchase Receipt Item Supplied,Current Stock,Наличност
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Row {0}: Asset {1} не свързан с т {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Row {0}: Asset {1} не свързан с т {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Преглед на фиш за заплата
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Сметка {0} е била въведена на няколко пъти
 DocType: Account,Expenses Included In Valuation,"Разходи, включени в остойностяване"
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Можете да го подновите само ако вашето членство изтече в рамките на 30 дни
 DocType: Shopping Cart Settings,Show Stock Availability,Показване на наличностите в наличност
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Задайте {0} в категория активи {1} или фирма {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Задайте {0} в категория активи {1} или фирма {2}
 DocType: Location,Longitude,Георгафска дължина
 ,Absent Student Report,Доклад за отсъствия на учащи се
 DocType: Crop,Crop Spacing UOM,Разреждане на реколта - мерна ед-ца
@@ -1184,7 +1184,7 @@
 DocType: Soil Texture,Sand,Пясък
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Енергия
 DocType: Opportunity,Opportunity From,Възможност - От
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,"Ред {0}: {1} Серийни номера, изисквани за елемент {2}. Предоставихте {3}."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,"Ред {0}: {1} Серийни номера, изисквани за елемент {2}. Предоставихте {3}."
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,"Моля, изберете таблица"
 DocType: BOM,Website Specifications,Сайт Спецификации
 DocType: Special Test Items,Particulars,подробности
@@ -1276,7 +1276,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Предмети с висше weightage ще бъдат показани по-високи
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Лабораторни тестове и жизнени знаци
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банково извлечение - Подробности
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,{0} Row #: Asset трябва да бъде подадено {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,{0} Row #: Asset трябва да бъде подадено {1}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Няма намерен служител
 DocType: Item,If subcontracted to a vendor,Ако възложи на продавача
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Студентската група вече е актуализирана.
@@ -1330,7 +1330,6 @@
 DocType: Loyalty Program Collection,Tier Name,Име на подреждането
 DocType: HR Settings,Enter retirement age in years,Въведете пенсионна възраст в години
 DocType: Crop,Target Warehouse,Целеви склад
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Моля, задайте Naming Series за {0} чрез Setup&gt; Settings&gt; Naming Series"
 DocType: Payroll Employee Detail,Payroll Employee Detail,Детайл на служителите за заплати
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,"Моля, изберете склад"
 DocType: Cheque Print Template,Starting location from left edge,Започвайки място от левия край
@@ -1420,7 +1419,7 @@
 DocType: Work Order,Plan material for sub-assemblies,План материал за частите
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Търговски дистрибутори и територия
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} трябва да бъде активен
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Няма налични елементи за прехвърляне
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Няма налични елементи за прехвърляне
 DocType: Employee Boarding Activity,Activity Name,Име на дейност
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Промяна на датата на издаване
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Завършеното количество <b>{0}</b> и количеството <b>{1}</b> не могат да бъдат различни
@@ -1647,6 +1646,7 @@
 DocType: Project,First Email,Първи имейл
 DocType: Company,Exception Budget Approver Role,Ролята на родителите за изключване на бюджета
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","След като бъде зададена, тази фактура ще бъде задържана до определената дата"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Включено Warehouse в продажбите Поръчка / готова продукция Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Продажба Сума
 DocType: Repayment Schedule,Interest Amount,Сума на лихва
@@ -1658,7 +1658,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Записи
 DocType: Asset,Scrapped,Брак
 DocType: Item,Item Defaults,Елемент по подразбиране
-DocType: Purchase Invoice,Returns,Се завръща
+DocType: Cashier Closing,Returns,Се завръща
 DocType: Job Card,WIP Warehouse,Склад - незав.производство
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Сериен № {0} е по силата на договор за техническо обслужване до  {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,назначаване на работа
@@ -1672,7 +1672,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Тип трансфер
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Продажби Разходи
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група клиенти&gt; Територия
 DocType: Diagnosis,Diagnosis,диагноза
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standard Изкупуването
 DocType: Attendance Request,Explanation,обяснение
@@ -1685,7 +1684,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Покупки за поръчки Елементи Просрочени
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Пощенски код
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Поръчка за продажба {0} е {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Изберете сметка за доходи от лихви в заем {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Изберете сметка за доходи от лихви в заем {0}
 DocType: Opportunity,Contact Info,Информация за контакт
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Въвеждане на складови записи
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Не мога да популяризирам служител със състояние вляво
@@ -1697,7 +1696,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Фактурата не може да бъде направена за нула час на фактуриране
 DocType: Company,Date of Commencement,Дата на започване
 DocType: Sales Person,Select company name first.,Изберете име на компанията на първо място.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},Email изпратен на {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},Email изпратен на {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Оферти получени от доставчици.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Заменете BOM и актуализирайте последната цена във всички BOM
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},За  {0} | {1} {2}
@@ -1717,7 +1716,7 @@
 DocType: Asset Movement,From Employee,От служител
 DocType: Driver,Cellphone Number,номер на мобилен телефон
 DocType: Project,Monitor Progress,Наблюдение на напредъка
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Внимание: Системата няма да провери за некоректно фактуриране, тъй като сума за позиция {0} в {1} е нула"
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Внимание: Системата няма да провери за некоректно фактуриране, тъй като сума за позиция {0} в {1} е нула"
 DocType: Journal Entry,Make Difference Entry,Направи Разлика Влизане
 DocType: Supplier Quotation,Auto Repeat Section,Секция за автоматично повтаряне
 DocType: Upload Attendance,Attendance From Date,Присъствие От дата
@@ -1820,7 +1819,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: отхвърля Количество не могат да бъдат вписани в Покупка Return
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Промяната на клиентската група за избрания клиент не е разрешена.
 ,Purchase Order Items To Be Billed,"Покупка Поръчка артикули, които се таксуват"
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Актуализиране на очакваните часове на пристигане.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Актуализиране на очакваните часове на пристигане.
 DocType: Program Enrollment Tool,Enrollment Details,Детайли за записване
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Не може да се задават няколко елемента по подразбиране за компания.
 DocType: Purchase Invoice Item,Net Rate,Нетен коефициент
@@ -1834,7 +1833,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Типът напускане е безучастен
 DocType: Support Settings,Close Issue After Days,Затваряне на проблем след брой дни
 ,Eway Bill,Еуей Бил
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Трябва да сте потребител с роли на System Manager и мениджър на елементи, за да добавите потребители към Marketplace."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Трябва да сте потребител с роли на System Manager и мениджър на елементи, за да добавите потребители към Marketplace."
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Оставете празно, ако важи за всички клонове"
 DocType: Job Opening,Staffing Plan,Персонал План
 DocType: Bank Guarantee,Validity in Days,Валидност в дни
@@ -1854,7 +1853,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Дублиран ред {0} със същия {1}
 DocType: Marketplace Settings,Disable Marketplace,Деактивиране на пазара
 ,Trial Balance,Оборотна ведомост
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Фискална година {0} не е намерена
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Фискална година {0} не е намерена
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Създаване Служители
 DocType: Hotel Room Reservation,Hotel Reservation User,Потребителски резервационен хотел
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Моля изберете префикс първо
@@ -1962,7 +1961,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Неуспешно влизане
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Актив {0} е създаден
 DocType: Special Test Items,Special Test Items,Специални тестови елементи
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Трябва да сте потребител с роля на системния мениджър и мениджър на елементи, за да се регистрирате на Marketplace."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Трябва да сте потребител с роля на системния мениджър и мениджър на елементи, за да се регистрирате на Marketplace."
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Начин на плащане
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Според назначената структура на заплатите не можете да кандидатствате за обезщетения
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Сайт на снимката трябва да бъде държавна файл или уеб сайт URL
@@ -1974,7 +1973,7 @@
 DocType: Warehouse,Warehouse Contact Info,Склад - Информация за контакт
 DocType: Payment Entry,Write Off Difference Amount,Сметка за разлики от отписване
 DocType: Volunteer,Volunteer Name,Име на доброволците
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Редове с дублиращи се дати в други редове бяха намерени: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Редове с дублиращи се дати в други редове бяха намерени: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: Имейлът на служителя не е намерен, следователно не е изпратен имейл"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},"Няма структура на заплатата, определена за служител {0} на дадена дата {1}"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Правилото за доставка не е приложимо за държавата {0}
@@ -2063,6 +2062,7 @@
 DocType: Salary Component,Earning,Приходи
 DocType: Supplier Scorecard,Scoring Criteria,Критерии за оценяване
 DocType: Purchase Invoice,Party Account Currency,Компания - валута
+DocType: Delivery Trip,Total Estimated Distance,Общо оценено разстояние
 ,BOM Browser,BOM Browser
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,"Моля, актуализирайте състоянието си за това събитие за обучение"
 DocType: Item Barcode,EAN,EAN
@@ -2101,7 +2101,7 @@
 DocType: Activity Cost,Projects,Проекти
 DocType: Payment Request,Transaction Currency,Валута на транзакция
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},От {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Някои имейли са невалидни
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Някои имейли са невалидни
 DocType: Work Order Operation,Operation Description,Операция - Описание
 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.,Не може да се промени Начална и Крайна дата на фискалната година след като веднъж фискалната година е записана.
 DocType: Quotation,Shopping Cart,Количка за пазаруване
@@ -2125,7 +2125,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Нетна промяна в дълготрайни материални активи
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Необходимият брой
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Оставете празно, ако се отнася за всички наименования"
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge от тип &quot;Край&quot; в ред {0} не могат да бъдат включени в т Курсове
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge от тип &quot;Край&quot; в ред {0} не могат да бъдат включени в т Курсове
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Макс: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,От дата/час
 DocType: Shopify Settings,For Company,За компания
@@ -2139,7 +2139,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Имаше грешки при създаването на График на курса
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Първият разпоредител на разходите в списъка ще бъде зададен като подразбиращ се излишък на разходи.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,не може да бъде по-голямо от 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Трябва да сте потребител, различен от администратор със системния мениджър и ролите на мениджъра на продукти, за да се регистрирате в Marketplace."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Трябва да сте потребител, различен от администратор със системния мениджър и ролите на мениджъра на продукти, за да се регистрирате в Marketplace."
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Позиция {0} е не-в-наличност позиция
 DocType: Packing Slip,MAT-PAC-.YYYY.-,МАТ-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Нерепаративен
@@ -2168,7 +2168,7 @@
 DocType: HR Settings,Employee Settings,Настройки на служители
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Зареждане на платежна система
 ,Batch-Wise Balance History,Баланс по партиди
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Ред # {0}: Не може да зададете Оцени, ако сумата е по-голяма от таксуваната сума за елемент {1}."
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Ред # {0}: Не може да зададете Оцени, ако сумата е по-голяма от таксуваната сума за елемент {1}."
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Настройки за печат обновяват в съответния формат печат
 DocType: Package Code,Package Code,пакет Код
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Чирак
@@ -2401,7 +2401,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} свободните работни места и {1} бюджета за {2} вече са планирани за дъщерни дружества от {3}. \ Можете да планирате само до {4} свободни работни места и бюджет {5} според плана за персонал {6} за компанията-майка {3}.
 DocType: HR Settings,Stop Birthday Reminders,Stop напомняне за рождени дни
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},"Моля, задайте по подразбиране ТРЗ Задължения профил в Company {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},"Моля, задайте по подразбиране ТРЗ Задължения профил в Company {0}"
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Получете финансова разбивка на данните за данъците и таксите от Amazon
 DocType: SMS Center,Receiver List,Получател - Списък
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Търсене позиция
@@ -2471,7 +2471,7 @@
 DocType: Vital Signs,Constipated,запек
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Срещу фактура от доставчик {0} от {1}
 DocType: Customer,Default Price List,Ценоразпис по подразбиране
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Движение на актив {0} е създаден
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Движение на актив {0} е създаден
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Няма намерени елементи.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Вие не можете да изтривате фискална година {0}. Фискална година {0} е зададена по подразбиране в Global Settings
 DocType: Share Transfer,Equity/Liability Account,Сметка за собствен капитал / отговорност
@@ -2608,6 +2608,7 @@
 DocType: Blanket Order,Order Type,Тип поръчка
 ,Item-wise Sales Register,Точка-мъдър Продажби Регистрация
 DocType: Asset,Gross Purchase Amount,Брутна сума на покупката
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код на елемента&gt; Група на елементите&gt; Марка
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Начални салда
 DocType: Asset,Depreciation Method,Метод на амортизация
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,"Това ли е данък, включен в основната ставка?"
@@ -2688,7 +2689,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,"Действие, ако е надхвърлен годишният бюджет по ОП"
 DocType: Student Leave Application,Student Leave Application,Student оставите приложението
 DocType: Item,Will also apply for variants,Ще се прилага и за варианти
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Дълготраен актив не може да бъде отменен, тъй като вече е {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Дълготраен актив не може да бъде отменен, тъй като вече е {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Служител {0} на половин ден на {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Общо работно време не трябва да са по-големи от работното време макс {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,На
@@ -2712,6 +2713,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Извличане на данни
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},"Максималният отпуск, разрешен в отпуск тип {0} е {1}"
 DocType: SMS Center,Create Receiver List,Създаване на списък за получаване
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,"Датата, която трябва да се използва, трябва да бъде след датата на покупката"
 DocType: Vehicle,Wheels,Колела
 DocType: Packing Slip,To Package No.,До пакет No.
 DocType: Patient Relation,Family,семейство
@@ -2725,7 +2727,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Валутата за фактуриране трябва да бъде равна или на валутата на валутата или валутата на партията
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Показва, че опаковката е част от тази доставка (Само Проект)"
 DocType: Soil Texture,Loam,глинеста почва
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Ред {0}: Дневната дата не може да бъде преди датата на публикуване
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Ред {0}: Дневната дата не може да бъде преди датата на публикуване
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Въвеждане на плащане
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Количество за позиция {0} трябва да е по-малко от {1}
 ,Sales Invoice Trends,Тенденциите във фактурите за продажба
@@ -2797,7 +2799,7 @@
 DocType: Guardian,Guardian Interests,Guardian Интереси
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Актуализиране на името / номера на профила
 DocType: Naming Series,Current Value,Текуща стойност
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Съществуват множество фискални години за датата {0}. Моля, задайте компания в фискална година"
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Съществуват множество фискални години за датата {0}. Моля, задайте компания в фискална година"
 DocType: Education Settings,Instructor Records to be created by,"Инструктори, които трябва да бъдат създадени от"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} е създаден(а)
 DocType: GST Account,GST Account,GST профил
@@ -2814,7 +2816,7 @@
 DocType: Sales Person,Name and Employee ID,Име и Employee ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,"Падежа, не може да бъде, преди дата на осчетоводяване"
 DocType: Website Item Group,Website Item Group,Website т Group
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Не бе намерено известие за заплата за изброените по-горе критерии или вече изпратена бележка за заплатата
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Не бе намерено известие за заплата за изброените по-горе критерии или вече изпратена бележка за заплатата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Мита и такси
 DocType: Projects Settings,Projects Settings,Настройки на проекти
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,"Моля, въведете Референтна дата"
@@ -2823,7 +2825,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Доставено количество
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Заявка за материал - позиция
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,"Моля, първо да отмените разписката за покупка {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,"Моля, първо да отмените разписката за покупка {0}"
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Дърво на стокови групи.
 DocType: Production Plan,Total Produced Qty,Общ брой произведени количества
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Не може да се отнесе поредни номера по-голям или равен на текущия брой ред за този тип Charge
@@ -2932,6 +2934,7 @@
 ,Vehicle Expenses,Камион Разходи
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Създаване на лабораторни тестове за подаване на фактури за продажби
 DocType: Serial No,Invoice Details,Данни за фактурите
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,"Моля, активирайте Настройки на Google Карти, за да прецените и оптимизирате маршрутите"
 DocType: Grant Application,Show on Website,Показване на уебсайта
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Започнете
 DocType: Hub Tracked Item,Hub Category,Категория хъб
@@ -2971,7 +2974,7 @@
 DocType: Inpatient Record,B Positive,B Положителен
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Максималната полза на служител {0} надвишава {1} със сумата {2} на предходната заявена сума
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row {0}: Кол трябва да бъде 1, като елемент е дълготраен актив. Моля, използвайте отделен ред за множествена бр."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row {0}: Кол трябва да бъде 1, като елемент е дълготраен актив. Моля, използвайте отделен ред за множествена бр."
 DocType: Leave Block List Allow,Leave Block List Allow,Оставете Block List Позволете
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Съкращение не може да бъде празно или интервал
 DocType: Patient Medical Record,Patient Medical Record,Медицински запис на пациента
@@ -3005,7 +3008,7 @@
 DocType: Workstation,Wages per hour,Заплати на час
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Склад за баланс в Batch {0} ще стане отрицателна {1} за позиция {2} в склада {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,След Материал Исканията са повдигнати автоматично въз основа на нивото на повторна поръчка Точка на
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Сметка {0} е невалидна. Валутата на сметката трябва да е {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Сметка {0} е невалидна. Валутата на сметката трябва да е {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},От дата {0} не може да бъде след освобождаване на служител Дата {1}
 DocType: Supplier,Is Internal Supplier,Е вътрешен доставчик
 DocType: Employee,Create User Permission,Създаване на потребителско разрешение
@@ -3149,7 +3152,7 @@
 DocType: Account,Fixed Asset,Дълготраен актив
 DocType: Amazon MWS Settings,After Date,След датата
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Сериализирани Инвентаризация
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Невалидна {0} за фактурата на фирмата.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Невалидна {0} за фактурата на фирмата.
 ,Department Analytics,Анализ на отделите
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Имейл не е намерен в контакта по подразбиране
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Генериране на тайна
@@ -3161,7 +3164,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Програмите в структурата на таксите и студентската група {0} са различни.
 DocType: Bank Statement Transaction Entry,Receivable Account,Вземания - Сметка
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Валидността от датата трябва да бъде по-малка от Valid Up Date.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Row {0}: Asset {1} е вече {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Row {0}: Asset {1} е вече {2}
 DocType: Quotation Item,Stock Balance,Наличности
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Поръчка за продажба до Плащане
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,Изпълнителен директор
@@ -3203,6 +3206,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Дебит сметка се изисква
 DocType: Clinical Procedure,Inpatient Record,Запис в болница
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Графици, за да следите на времето, разходите и таксуването по дейности, извършени от вашия екип"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Доставчик&gt; Тип доставчик
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Покупка Ценоразпис
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Дата на транзакцията
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Шаблони на променливите на таблицата с резултатите от доставчика.
@@ -3245,7 +3249,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Exchange Печалба / загуба
 DocType: Opportunity,Lost Reason,Причина за загубата
 DocType: Amazon MWS Settings,Enable Amazon,Активирайте Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Ред # {0}: Профил {1} не принадлежи на фирма {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Ред # {0}: Профил {1} не принадлежи на фирма {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType не може да се намери {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Нов адрес
 DocType: Quality Inspection,Sample Size,Размер на извадката
@@ -3356,7 +3360,7 @@
 DocType: Water Analysis,Origin,произход
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Този документ е над ограничението от {0} {1} за елемент {4}. Възможно ли е да направи друг {3} срещу същите {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,"Моля, задайте повтарящи след спасяването"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,количество сметка Select промяна
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,количество сметка Select промяна
 DocType: Purchase Invoice,Price List Currency,Ценоразпис на валути
 DocType: Naming Series,User must always select,Потребителят трябва винаги да избере
 DocType: Stock Settings,Allow Negative Stock,Разрешаване на отрицателна наличност
@@ -3398,7 +3402,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Наистина ли искате да отмените тази среща?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Пакет за хотелско ценообразуване
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Pipeline Продажби
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},"Моля, задайте профила по подразбиране в Заплата Компонент {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},"Моля, задайте профила по подразбиране в Заплата Компонент {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Необходим на
 DocType: Rename Tool,File to Rename,Файл за Преименуване
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Моля изберете BOM за позиция в Row {0}
@@ -3419,7 +3423,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Разходи за закупени стоки
 DocType: Employee Separation,Employee Separation Template,Шаблон за разделяне на служители
 DocType: Selling Settings,Sales Order Required,Поръчка за продажба е задължителна
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Станете продавач
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Станете продавач
 DocType: Purchase Invoice,Credit To,Кредит на
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Активни Възможни клиенти / Клиенти
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,"Оставете празно, за да използвате стандартния формат на бележката за доставка"
@@ -3460,7 +3464,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Направете данъчен шаблон
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,потребителски форум
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Суровини - не могат да бъдат празни.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Ред # {0} (Платежна таблица): Сумата трябва да бъде отрицателна
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Ред # {0} (Платежна таблица): Сумата трябва да бъде отрицателна
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Не можа да се актуализира склад, фактура съдържа капка корабоплаването т."
 DocType: Contract,Fulfilment Status,Статус на изпълнение
 DocType: Lab Test Sample,Lab Test Sample,Лабораторна проба за изпитване
@@ -3599,7 +3603,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Дата на документа
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Такса - записи създадени - {0}
 DocType: Asset Category Account,Asset Category Account,Дълготраен актив Категория сметка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Ред # {0} (Платежна таблица): Сумата трябва да бъде положителна
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Ред # {0} (Платежна таблица): Сумата трябва да бъде положителна
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Не може да се произвежда повече позиция {0} от количеството в поръчка за продажба {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Изберете стойности на атрибутите
 DocType: Purchase Invoice,Reason For Issuing document,Причина за издаващия документ
@@ -3654,7 +3658,7 @@
 DocType: Purchase Receipt,Time at which materials were received,При която бяха получени материали Time
 DocType: Products Settings,Products per Page,Продукти на страница
 DocType: Stock Ledger Entry,Outgoing Rate,Изходящ Курс
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,или
 DocType: Sales Order,Billing Status,(Фактура) Статус
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Докладвай проблем
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Комунални Разходи
@@ -3681,7 +3685,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Декларация за освобождаване от данъци на служителите
 DocType: Payment Entry,Cheque/Reference Date,Чек / Референция Дата
 DocType: Purchase Invoice,Total Taxes and Charges,Общо данъци и такси
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Наличната за използване дата се въвежда като последна дата
 DocType: Employee,Emergency Contact,Контактите При Аварийни Случаи
 DocType: Bank Reconciliation Detail,Payment Entry,Плащане запис
 ,sales-browser,продажби-браузър
@@ -3727,6 +3730,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Е връщане (кредитна бележка)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Започнете работа
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Не се изисква сериен номер за актива {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Моля, задайте Naming Series за {0} чрез Setup&gt; Settings&gt; Naming Series"
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Забраненият шаблон не трябва да е този по подразбиране
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,За ред {0}: Въведете планираните количества
 DocType: Account,Income Account,Сметка за доход
@@ -3740,6 +3744,7 @@
 DocType: Loyalty Program,Help Section,Помощната секция
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Предишна
 DocType: Appraisal Goal,Key Responsibility Area,Ключова област на отговорност
+DocType: Delivery Trip,Distance UOM,Разстояние от UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Студентски Партидите ви помогне да следите на посещаемост, оценки и такси за студенти"
 DocType: Payment Entry,Total Allocated Amount,Общата отпусната сума
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Задайте профил по подразбиране за инвентара за вечни запаси
@@ -3781,7 +3786,7 @@
 DocType: Item Supplier,Item Supplier,Позиция - Доставчик
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,"Моля, въведете Код, за да получите партиден №"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Моля изберете стойност за {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Няма избрани елементи за прехвърляне
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Няма избрани елементи за прехвърляне
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Всички адреси.
 DocType: Company,Stock Settings,Сток Settings
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Сливането е възможно само ако следните свойства са същите и в двете записи. Дали Group, Root Type, Company"
@@ -4066,7 +4071,7 @@
 DocType: Patient,Personal and Social History,Лична и социална история
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Потребител {0} е създаден
 DocType: Fee Schedule,Fee Breakup for each student,Разпределение на таксите за всеки студент
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Общо предварително ({0}) срещу Заповед {1} не може да бъде по-голям от общия сбор ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Общо предварително ({0}) срещу Заповед {1} не може да бъде по-голям от общия сбор ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Изберете месец Distribution да неравномерно разпределяне цели през месеца.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Промяна на кода
 DocType: Purchase Invoice Item,Valuation Rate,Оценка Оценка
@@ -4075,7 +4080,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Наблюдаваше ITC Cess
 ,Student Monthly Attendance Sheet,Student Месечен Присъствие Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,"Правило за доставка, приложимо само за продажбата"
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Амортизационен ред {0}: Следващата дата на амортизация не може да бъде преди датата на закупуване
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Амортизационен ред {0}: Следващата дата на амортизация не може да бъде преди датата на закупуване
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Проект Начална дата
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,До
 DocType: Rename Tool,Rename Log,Преименуване - журнал
@@ -4092,12 +4097,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Колко често трябва да се актуализира проектът и фирмата въз основа на продажбите.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Изтича на
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Добави студенти
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Моля, изтрийте служителя <a href=""#Form/Employee/{0}"">{0}</a> \, за да отмените този документ"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Моля изберете {0}
 DocType: C-Form,C-Form No,Си-форма номер
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,разстояние
+DocType: Delivery Stop,Distance,разстояние
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Посочете продуктите или услугите, които купувате или продавате."
 DocType: Water Analysis,Storage Temperature,Температура на съхранение
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-РСР-.YYYY.-
@@ -4124,7 +4127,7 @@
 DocType: Homepage,Company Description for website homepage,Описание на компанията за началната страница на уеб сайта
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","За удобство на клиентите, тези кодове могат да бъдат използвани в печатни формати като фактури и доставка Notes"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Наименование Доставчик
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Информацията за {0} не можа да бъде извлечена.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Информацията за {0} не можа да бъде извлечена.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Отваряне на входния дневник
 DocType: Contract,Fulfilment Terms,Условия за изпълнение
 DocType: Sales Invoice,Time Sheet List,Време Списък Sheet
@@ -4304,7 +4307,7 @@
 DocType: Serial No,Warranty / AMC Details,Гаранция / AMC Детайли
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,"Изберете ръчно студентите за групата, базирана на дейности"
 DocType: Journal Entry,User Remark,Потребителска забележка
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Оптимизиране на маршрутите.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Оптимизиране на маршрутите.
 DocType: Travel Itinerary,Non Diary,Дневник
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Не може да се създаде бонус за задържане за останалите служители
 DocType: Lead,Market Segment,Пазарен сегмент
@@ -4334,7 +4337,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Програма за лоялност
 DocType: Student Guardian,Father,баща
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Подкрепа Билети
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,"""Актуализация на склад"" не може да бъде избрано при продажба на активи"
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,"""Актуализация на склад"" не може да бъде избрано при продажба на активи"
 DocType: Bank Reconciliation,Bank Reconciliation,Банково извлечение
 DocType: Attendance,On Leave,В отпуск
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Получаване на актуализации
@@ -4379,7 +4382,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Сериен № и Партида
 DocType: Warranty Claim,From Company,От фирма
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Сума на рекордите на критериите за оценка трябва да бъде {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,"Моля, задайте Брой амортизации Резервирано"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,"Моля, задайте Брой амортизации Резервирано"
 DocType: Supplier Scorecard Period,Calculations,Изчисленията
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Стойност или Количество
 DocType: Payment Terms Template,Payment Terms,Условия за плащане
@@ -4398,7 +4401,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Отстъпка (%) от ценовата листа с марджин
 DocType: Healthcare Service Unit Type,Rate / UOM,Честота / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Всички Складове
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,"Не {0}, намерени за сделки между фирмите."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,"Не {0}, намерени за сделки между фирмите."
 DocType: Travel Itinerary,Rented Car,Отдавна кола
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,За вашата компания
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Кредит на сметката трябва да бъде балансова сметка
@@ -4499,6 +4502,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Критерии за анализ на растенията
 DocType: Cheque Print Template,Cheque Height,Чек Височина
 DocType: Supplier,Supplier Details,Доставчик - детайли
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Моля, настроите серийна номерация за участие чрез настройка&gt; Серия за номериране"
 DocType: Setup Progress,Setup Progress,Настройка на напредъка
 DocType: Expense Claim,Approval Status,Одобрение Status
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},"От стойност трябва да е по-малко, отколкото стойността в ред {0}"
@@ -4591,7 +4595,6 @@
 DocType: Travel Request,Fully Sponsored,Напълно спонсориран
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Вписване на обратния дневник
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Клиент {0} е създаден.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройте система за наименуване на служители в Човешки ресурси&gt; Настройки за персонала"
 DocType: Stock Settings,Limit Percent,Процент лимит
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Понастоящем няма налични запаси в нито един склад
 ,Payment Period Based On Invoice Date,Заплащане Период на базата на датата на фактурата
@@ -4650,7 +4653,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Източник Склад
 DocType: Installation Note,Installation Date,Дата на инсталация
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Акционерна книга
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Row {0}: Asset {1} не принадлежи на компания {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Row {0}: Asset {1} не принадлежи на компания {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Създадена е фактура за продажба {0}
 DocType: Employee,Confirmation Date,Потвърждение Дата
 DocType: Inpatient Occupancy,Check Out,Разгледайте
@@ -4670,6 +4673,7 @@
 DocType: Production Plan,Sales Orders Detail,Детайли на поръчките за продажба
 DocType: Bin,Requested Quantity,заявеното количество
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-ТАКСА-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Моля, настройте инструмента за назначаване на инструктори в образованието&gt; Настройки за обучение"
 DocType: Patient,Marital Status,Семейно Положение
 DocType: Stock Settings,Auto Material Request,Auto Материал Искане
 DocType: Woocommerce Settings,API consumer secret,API потребителска тайна
@@ -4722,7 +4726,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Изберете Дни
 DocType: Academic Term,Term Name,Условия - Име
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Кредит ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Създаване на фишове за заплати ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Създаване на фишове за заплати ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Не можете да редактирате корен възел.
 DocType: Buying Settings,Purchase Order Required,Поръчка за покупка Задължително
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Таймер
@@ -4758,7 +4762,7 @@
 DocType: Account,Rate at which this tax is applied,"Скоростта, с която се прилага този данък"
 DocType: Cash Flow Mapper,Section Name,Име на секцията
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Пренареждане Количество
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Амортизационен ред {0}: Очакваната стойност след полезен живот трябва да бъде по-голяма или равна на {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Амортизационен ред {0}: Очакваната стойност след полезен живот трябва да бъде по-голяма или равна на {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Текущи свободни работни места
 DocType: Company,Stock Adjustment Account,Корекция на наличности - Сметка
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Отписвам
@@ -4805,7 +4809,7 @@
 DocType: Program Enrollment,School House,училище Къща
 DocType: Serial No,Out of AMC,Няма AMC
 DocType: Opportunity,Opportunity Amount,Възможност Сума
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Брой на амортизации Договорени не може да бъде по-голям от общия брой амортизации
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Брой на амортизации Договорени не може да бъде по-голям от общия брой амортизации
 DocType: Purchase Order,Order Confirmation Date,Дата на потвърждаване на поръчката
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Създаване на Посещение за поддръжка
@@ -4846,7 +4850,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Партида:
 DocType: Volunteer,Afternoon,следобед
 DocType: Loyalty Program,Loyalty Program Help,Помощ за програмата за лоялни клиенти
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} &quot;{1}&quot; е деактивирана
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} &quot;{1}&quot; е деактивирана
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Задай като Отворен
 DocType: Cheque Print Template,Scanned Cheque,Сканиран чек
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Изпрати автоматични имейли в Контакти при подаването на сделки.
@@ -4859,7 +4863,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Позиция и подробности за гаранцията
 DocType: Chapter,Chapter Members,Глава Членове
 DocType: Sales Team,Contribution (%),Принос (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Забележка: Плащане Влизане няма да се създали от &quot;пари или с банкова сметка&quot; Не е посочено
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Забележка: Плащане Влизане няма да се създали от &quot;пари или с банкова сметка&quot; Не е посочено
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Проект {0} вече съществува
 DocType: Clinical Procedure,Nursing User,Потребител на сестрински грижи
 DocType: Employee Benefit Application,Payroll Period,Период на заплащане
@@ -4867,6 +4871,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Сериен номер {0} не принадлежи на партида {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Отговорности
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Периодът на валидност на тази котировка е приключил.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Моля, изтрийте служителя <a href=""#Form/Employee/{0}"">{0}</a> \, за да отмените този документ"
 DocType: Expense Claim Account,Expense Claim Account,Expense претенция профил
 DocType: Account,Capital Work in Progress,Капиталът работи в ход
 DocType: Accounts Settings,Allow Stale Exchange Rates,Разрешаване на стационарни обменни курсове
@@ -4947,7 +4953,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Изписване на материал
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Свържете Shopify с ERPNext
 DocType: Material Request Item,For Warehouse,За склад
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Бележките за доставка {0} бяха актуализирани
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Бележките за доставка {0} бяха актуализирани
 DocType: Employee,Offer Date,Оферта - Дата
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Оферти
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,"Вие сте в офлайн режим. Вие няма да бъдете в състояние да презареждате, докато нямате мрежа."
@@ -4997,7 +5003,7 @@
 DocType: Shipping Rule,Calculate Based On,Изчислете на основата на
 DocType: Contract,Unfulfilled,неизпълнен
 DocType: Delivery Note Item,From Warehouse,От склад
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Няма служители за посочените критерии
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Няма служители за посочените критерии
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Не артикули с Бил на материали за производство на
 DocType: Shopify Settings,Default Customer,Клиент по подразбиране
 DocType: Sales Stage,Stage Name,Сценично име
@@ -5039,7 +5045,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Сума на данъка след сумата на отстъпката
 DocType: Patient,Inpatient Status,Стационарно състояние на пациентите
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Дневни Settings Work Резюме
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Избраните ценови листи трябва да са проверени и проверени.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Избраните ценови листи трябва да са проверени и проверени.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,"Моля, въведете Reqd по дата"
 DocType: Payment Entry,Internal Transfer,вътрешен трансфер
 DocType: Asset Maintenance,Maintenance Tasks,Задачи за поддръжка
@@ -5075,7 +5081,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Групирай по
 DocType: Guardian,Interests,Интереси
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Включване / Изключване на валути.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Не можах да подам няколко фишове за заплати
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Не можах да подам няколко фишове за заплати
 DocType: Exchange Rate Revaluation,Get Entries,Получете вписвания
 DocType: Production Plan,Get Material Request,Вземи заявка за материал
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Пощенски разходи
@@ -5159,7 +5165,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Разходна сметка е задължително за покупка {0}
 DocType: BOM,Website Description,Website Описание
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Нетна промяна в собствения капитал
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Моля анулирайте фактурата за покупка {0} първо
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Моля анулирайте фактурата за покупка {0} първо
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,"Не е разрешено. Моля, деактивирайте типа услуга"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail адрес трябва да бъде уникален, вече съществува за {0}"
 DocType: Serial No,AMC Expiry Date,AMC срок на годност
@@ -5199,7 +5205,7 @@
 DocType: Hotel Room,Hotel Room,Хотелска стая
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Сметка {0} не принадлежи на фирма {1}
 DocType: Leave Type,Rounding,Усъвършенстването
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Серийните номера в ред {0} не съвпадат с бележката за доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Серийните номера в ред {0} не съвпадат с бележката за доставка
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),"Сума, разпределена (пропорционално)"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","След това правилата за ценообразуване се филтрират на базата на клиент, група клиенти, територия, доставчик, доставчик група, кампания, търговски партньор и т.н."
 DocType: Student,Guardian Details,Guardian Детайли
@@ -5254,7 +5260,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Склад се изисква за артикул {0}
 DocType: Leave Allocation,Unused leaves,Неизползваните отпуски
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Направете вход за погасяване
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Всички отдели
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Всички отдели
 DocType: Healthcare Service Unit,Vacant,незает
 DocType: Patient,Alcohol Past Use,Използване на алкохол в миналото
 DocType: Fertilizer Content,Fertilizer Content,Съдържание на тор
@@ -5265,7 +5271,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Поръчката за работа {0} трябва да бъде анулирана преди отмяната на тази поръчка за продажба
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Изважда се взриви BOM (включително монтажните възли)
 DocType: Authorization Rule,Applicable To (Employee),Приложими по отношение на (Employee)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Срок за плащане е задължителен
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Срок за плащане е задължителен
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Увеличаване на атрибут {0} не може да бъде 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Вид и сума на обезщетението
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Резервирани стаи
@@ -5409,7 +5415,7 @@
 DocType: Purchase Invoice Item,Total Weight,Общо тегло
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Комисионна за покупко-продажба
 DocType: Job Offer Term,Value / Description,Стойност / Описание
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row {0}: Asset {1} не може да бъде представен, той вече е {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row {0}: Asset {1} не може да бъде представен, той вече е {2}"
 DocType: Tax Rule,Billing Country,(Фактура) Държава
 DocType: Purchase Order Item,Expected Delivery Date,Очаквана дата на доставка
 DocType: Restaurant Order Entry,Restaurant Order Entry,Реклама в ресторанта
@@ -5448,12 +5454,13 @@
 DocType: Maintenance Visit,Breakdown,Авария
 DocType: Travel Itinerary,Vegetarian,вегетарианец
 DocType: Patient Encounter,Encounter Date,Дата на среща
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Сметка: {0} с валута: не може да бъде избран {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Сметка: {0} с валута: не може да бъде избран {1}
 DocType: Bank Statement Transaction Settings Item,Bank Data,Банкови данни
 DocType: Purchase Receipt Item,Sample Quantity,Количество проба
 DocType: Bank Guarantee,Name of Beneficiary,Име на бенефициента
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Актуализиране на BOM струва автоматично чрез Scheduler, въз основа на последната скорост на оценка / ценоразпис / последната сума на покупката на суровини."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Доставчик&gt; Група доставчици
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Дата
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Сметка {0}: Родителска сметка {1} не принадлежи на фирмата: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,"Успешно изтрити всички транзакции, свързани с тази компания!"
@@ -5481,7 +5488,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,"Подвъзли могат да се създават само при възли от тип ""група"""
 DocType: Attendance Request,Half Day Date,Половин ден - Дата
 DocType: Academic Year,Academic Year Name,Учебна година - Наименование
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,"{0} не е разрешено да извършва транзакции с {1}. Моля, променете фирмата."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,"{0} не е разрешено да извършва транзакции с {1}. Моля, променете фирмата."
 DocType: Sales Partner,Contact Desc,Контакт - Описание
 DocType: Email Digest,Send regular summary reports via Email.,Изпрати редовни обобщени доклади чрез електронна поща.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},"Моля, задайте профила по подразбиране в Expense претенция Type {0}"
@@ -5514,7 +5521,7 @@
 DocType: Hotel Room,Hotel Manager,Управител на хотел
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Определете данъчни правила за количката
 DocType: Purchase Invoice,Taxes and Charges Added,Данъци и такси - Добавени
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,"Амортизационен ред {0}: Следващата дата на амортизация не може да бъде преди датата, която е налице за използване"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,"Амортизационен ред {0}: Следващата дата на амортизация не може да бъде преди датата, която е налице за използване"
 ,Sales Funnel,Фуния на продажбите
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Съкращението е задължително
 DocType: Project,Task Progress,Задача Прогрес
@@ -5528,7 +5535,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Всички групи клиенти
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,Натрупвано месечно
 DocType: Attendance Request,On Duty,На смяна
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задължително. Може би запис за обменни курсове на валута не е създаден от {1} към {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задължително. Може би запис за обменни курсове на валута не е създаден от {1} към {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Персоналният план {0} вече съществува за означаване {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Данъчен шаблон е задължителен.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Сметка {0}: Родителска сметка {1} не съществува
@@ -5607,11 +5614,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Поне един склад е задължително
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Конфигурирайте полетата на елементите като UOM, група елементи, описание и брой часове."
 DocType: Certification Application,Certification Status,Сертификационен статус
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,пазар
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,пазар
 DocType: Travel Itinerary,Travel Advance Required,Необходима е предварителна пътуване
 DocType: Subscriber,Subscriber Name,Име на абоната
 DocType: Serial No,Out of Warranty,Извън гаранция
-DocType: Cashier Closing,Cashier-closing-,Касиер-closing-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Тип данни с карти
 DocType: BOM Update Tool,Replace,Заменете
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Няма намерени продукти.
@@ -5698,7 +5704,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Създават се стандартни данъчни шаблони за продажби и покупки.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Отчет за резултата от оценката {0} вече съществува.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Пример: ABCD. #####. Ако е зададена серия и партида № не е посочена в транзакциите, тогава автоматично се създава номера на партидата въз основа на тази серия. Ако винаги искате да посочите изрично партида № за този елемент, оставете го празно. Забележка: тази настройка ще има приоритет пред Prefix на серията за наименоване в Настройки на запасите."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Моля, настроите серийна номерация за участие чрез настройка&gt; Серия за номериране"
 DocType: BOM,Materials Required (Exploded),Необходими материали (в детайли)
 DocType: Contract,Party User,Потребител на партия
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Моля, поставете фирмения филтър празен, ако Group By е &quot;Company&quot;"
@@ -5899,7 +5904,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Трябва да се настрои и началната дата на пробния период и крайната дата на изпитателния период
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Средна цена
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Общата сума за плащане в График на плащанията трябва да е равна на Голямо / Закръглено Общо
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Общата сума за плащане в График на плащанията трябва да е равна на Голямо / Закръглено Общо
 DocType: Subscription Plan Detail,Plan,план
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Банково извлечение по Главна книга
 DocType: Job Applicant,Applicant Name,Заявител Име
@@ -5968,7 +5973,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Сапуни & почистващи препарати
 DocType: BOM,Show Items,Показване на артикули
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,"""От време"" не може да бъде по-голямо отколкото на ""До време""."
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Искате ли да уведомите всички клиенти по имейл?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Искате ли да уведомите всички клиенти по имейл?
 DocType: Subscription Plan,Billing Interval,Интервал на фактуриране
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Поръчан
@@ -5977,9 +5982,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Ред {0}: {1} трябва да е по-голям от 0
 DocType: Assessment Criteria,Assessment Criteria Group,Критерии за оценка Group
 DocType: Healthcare Settings,Patient Name By,Име на пациента по
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Набиране на дневника за начисленията за заплати от {0} до {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Набиране на дневника за начисленията за заплати от {0} до {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Активиране на отложените приходи
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Откриване на начислената амортизация трябва да бъде по-малко от равна на {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Откриване на начислената амортизация трябва да бъде по-малко от равна на {0}
 DocType: Warehouse,Warehouse Name,Склад - Име
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Действителната начална дата трябва да е по-малка от действителната крайна дата
 DocType: Naming Series,Select Transaction,Изберете транзакция
@@ -6130,7 +6135,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Служител {0} от клас {1} няма правила за отпускане по подразбиране
 DocType: Salary Detail,Salary Detail,Заплата Подробности
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Моля изберете {0} първо
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Добавени са {0} потребители
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Добавени са {0} потребители
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","В случай на многостепенна програма, клиентите ще бъдат автоматично зададени на съответния подреждан по тяхна сметка"
 DocType: Appointment Type,Physician,лекар
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Партида {0} на артикул {1} е изтекла.
@@ -6274,7 +6279,7 @@
 DocType: Asset,Custodian,попечител
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,POS профил
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} трябва да бъде стойност между 0 и 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Плащането на {0} от {1} до {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Плащането на {0} от {1} до {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Необезпечени кредити
 DocType: Cost Center,Cost Center Name,Разходен център - Име
 DocType: Student,B+,B+
@@ -6306,6 +6311,7 @@
 DocType: Employee,Date of Issue,Дата на издаване
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Както е описано в Настройки за купуване, ако се изисква изискване за покупка == &quot;ДА&quot;, за да се създаде фактура за покупка, потребителят трябва първо да създаде разписка за покупка за елемент {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Row # {0}: Определете доставчик за т {1}
+DocType: Global Defaults,Default Distance Unit,Разделителна единица по подразбиране
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Row {0}: Часове стойност трябва да е по-голяма от нула.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,"Сайт на снимката {0}, прикрепена към т {1} не може да бъде намерена"
 DocType: Issue,Content Type,Съдържание Тип
@@ -6361,7 +6367,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Дебит на сметка трябва да бъде балансова сметка
 DocType: Asset,Naming Series,Поредни Номера
 DocType: Vital Signs,Coated,покрит
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Ред {0}: Очакваната стойност след полезния живот трябва да е по-малка от сумата на брутната покупка
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Ред {0}: Очакваната стойност след полезния живот трябва да е по-малка от сумата на брутната покупка
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Настройки
 DocType: Leave Block List,Leave Block List Name,Оставете Block List Име
 DocType: Certified Consultant,Certification Validity,Валидност на сертификацията
@@ -6428,6 +6434,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Заглавие на банката
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Преглед на лабораторните тестове
 DocType: Hub Users,Hub Users,Hub потребители
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група клиенти&gt; Територия
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Поддръжка Дата
 DocType: Purchase Invoice Item,Rejected Serial No,Отхвърлени Пореден №
@@ -6442,7 +6449,7 @@
 DocType: SG Creation Tool Course,Max Strength,Максимална здравина
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Инсталиране на предварителни настройки
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},За клиента не е избрано известие за доставка {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},За клиента не е избрано известие за доставка {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Служител {0} няма максимална сума на доходите
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Изберете Елементи въз основа на Дата на доставка
 DocType: Grant Application,Has any past Grant Record,Има ли някакъв минал регистър за безвъзмездни средства
@@ -6469,7 +6476,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Резервация на хотелски стаи
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Обслужване на клиенти
 DocType: BOM,Thumbnail,Thumbnail
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Няма намерени контакти с идентификационни номера на имейли.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Няма намерени контакти с идентификационни номера на имейли.
 DocType: Item Customer Detail,Item Customer Detail,Клиентска Позиция - Детайли
 DocType: Notification Control,Prompt for Email on Submission of,Пита за Email при представяне на
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Максималната стойност на доходите на служител {0} надвишава {1}
@@ -6724,7 +6731,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,"Не може да се покров Group, защото е избран типа на профила."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,"{0} {1} е променен. Моля, опреснете."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Спрете потребители от извършване Оставете Заявленията за следните дни.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код на елемента&gt; Група на елементите&gt; Марка
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.",При неограничено изтичане на срока на действие на точките за лоялност запазете времето за изтичане на валидност или 0.
 DocType: Asset Maintenance Team,Maintenance Team Members,Членове на екипа за поддръжка
 DocType: Loyalty Point Entry,Purchase Amount,сума на покупката
@@ -6732,7 +6738,7 @@
 											to fullfill Sales Order {2}","Не може да бъде доставен сериен номер {0} на елемент {1}, тъй като е запазен \, за да изпълни поръчката за продажба {2}"
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Оферта на доставчик  {0} е създадена
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Краят на годината не може да бъде преди началото на годината
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Краят на годината не може да бъде преди началото на годината
 DocType: Employee Benefit Application,Employee Benefits,Доходи на наети лица
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Опакованото количество трябва да е равно на количество за артикул {0} на ред {1}
 DocType: Work Order,Manufactured Qty,Произведено Количество
@@ -6748,6 +6754,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Изберете партидни номера
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Към GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Фактури издадени на клиенти.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройте система за наименуване на служители в Човешки ресурси&gt; Настройки за персонала"
 DocType: Healthcare Settings,Invoice Appointments Automatically,Фактуриране на срещи автоматично
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Project
 DocType: Salary Component,Variable Based On Taxable Salary,Променлива основа на облагаемата заплата
@@ -6796,7 +6803,7 @@
 DocType: POS Profile,Account for Change Amount,Сметка за ресто
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Свързване с QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Общо печалба / загуба
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Невалидна фирмена фактура за фирмата.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Невалидна фирмена фактура за фирмата.
 DocType: Purchase Invoice,input service,входна услуга
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Сметка не съвпада с {1} / {2} в {3} {4}
 DocType: Employee Promotion,Employee Promotion,Промоция на служителите
@@ -6926,7 +6933,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Предпочитана площ за настаняване
 apps/erpnext/erpnext/config/selling.py +184,Analytics,анализ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Количката е празна
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Моля, настройте инструмента за назначаване на инструктори в образованието&gt; Настройки за обучение"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Елементът {0} няма сериен номер. Само сериализираните елементи \ могат да имат доставка въз основа на сериен номер
 DocType: Vehicle,Model,Модел
@@ -6956,7 +6962,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,"Нищо, което да се промени"
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Моля изберете файл CSV
 DocType: Holiday List,Total Holidays,Общо почивки
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,"Липсва шаблон за изпращане на имейли. Моля, задайте една от настройките за доставка."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,"Липсва шаблон за изпращане на имейли. Моля, задайте една от настройките за доставка."
 DocType: Student Leave Application,Mark as Present,Маркирай като настояще
 DocType: Supplier Scorecard,Indicator Color,Цвят на индикатора
 DocType: Purchase Order,To Receive and Bill,За получаване и фактуриране
@@ -6965,7 +6971,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Изберете сериен номер
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Дизайнер
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Условия за ползване - Шаблон
-DocType: Serial No,Delivery Details,Детайли за доставка
+DocType: Delivery Trip,Delivery Details,Детайли за доставка
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Разходен център се изисква в ред {0} в таблица за данъци вид {1}
 DocType: Program,Program Code,програмен код
 DocType: Terms and Conditions,Terms and Conditions Help,Условия за ползване - Помощ
@@ -6989,7 +6995,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Време за въвеждане - Дни
 DocType: Cash Flow Mapping,Is Income Tax Expense,Разходите за данък върху дохода
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Поръчката ви е за доставка!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row {0}: Публикуване Дата трябва да е същото като датата на покупка {1} на актив {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row {0}: Публикуване Дата трябва да е същото като датата на покупка {1} на актив {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Проверете това, ако студентът пребивава в хостел на института."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Моля, въведете Поръчки за продажби в таблицата по-горе"
 ,Stock Summary,фондова Резюме
diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv
index 04e9b94..d8b4661 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,সময়কালের নাম
 DocType: Employee,Salary Mode,বেতন মোড
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,নিবন্ধন
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,নিবন্ধন
 DocType: Patient,Divorced,তালাকপ্রাপ্ত
 DocType: Support Settings,Post Route Key,পোস্ট রুট কী
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,আইটেম একটি লেনদেনের মধ্যে একাধিক বার যুক্ত করা সম্ভব
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,নতুন এক্সচেঞ্জ রেট
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},মুদ্রাটির মূল্য তালিকা জন্য প্রয়োজন {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* লেনদেনে গণনা করা হবে.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
 DocType: Delivery Trip,MAT-DT-.YYYY.-,Mat-মোর্চা-.YYYY.-
 DocType: Purchase Order,Customer Contact,গ্রাহকের পরিচিতি
 DocType: Patient Appointment,Check availability,গ্রহণযোগ্যতা যাচাই
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,খোলা দেখাও
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,সিরিজ সফলভাবে আপডেট
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,চেকআউট
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{1} সারিতে {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{1} সারিতে {1}
 DocType: Asset Finance Book,Depreciation Start Date,ঘনত্ব শুরু তারিখ
 DocType: Pricing Rule,Apply On,উপর প্রয়োগ
 DocType: Item Price,Multiple Item prices.,একাধিক আইটেম মূল্য.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,ল্যাব প্রেসক্রিপশন
 ,Delay Days,বিলম্বিত দিনগুলি
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,পরিষেবা ব্যায়ের
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},ক্রমিক সংখ্যা: {0} ইতিমধ্যে বিক্রয় চালান উল্লেখ করা হয়: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},ক্রমিক সংখ্যা: {0} ইতিমধ্যে বিক্রয় চালান উল্লেখ করা হয়: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,চালান
 DocType: Purchase Invoice Item,Item Weight Details,আইটেম ওজন বিশদ
 DocType: Asset Maintenance Log,Periodicity,পর্যাবৃত্তি
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,হিসাবরক্ষক
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,মূল্য তালিকা বিক্রি
 DocType: Patient,Tobacco Current Use,তামাক বর্তমান ব্যবহার
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","শুরুর তারিখ এবং শেষ তারিখটি কাজের কার্ডের সাথে ওভারল্যাপ করছে <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,বিক্রি হার
 DocType: Cost Center,Stock User,স্টক ইউজার
 DocType: Soil Analysis,(Ca+Mg)/K,(CA ম্যাগনেসিয়াম + +) / কে
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,সংশ্লিষ্ট
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,এ্যাটেনডেন্স তারিখ কর্মচারী এর যোগদান তারিখের কম হতে পারে না
 DocType: Grading Scale,Grading Scale Name,শূন্য স্কেল নাম
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,বাজারে ব্যবহারকারীদের যোগ করুন
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,বাজারে ব্যবহারকারীদের যোগ করুন
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,এটি একটি root অ্যাকাউন্ট এবং সম্পাদনা করা যাবে না.
 DocType: Sales Invoice,Company Address,প্রতিস্থান এর ঠিকানা
 DocType: BOM,Operations,অপারেশনস
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,ডিফ পরিমাণ
 DocType: Production Plan,Material Request Detail,উপাদান অনুরোধ বিস্তারিত
 DocType: Selling Settings,Default Quotation Validity Days,ডিফল্ট কোটেশন বৈধতা দিন
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","আইটেম রেট সারি {0} মধ্যে ট্যাক্স সহ, সারি করের {1} এছাড়াও অন্তর্ভুক্ত করা আবশ্যক"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","আইটেম রেট সারি {0} মধ্যে ট্যাক্স সহ, সারি করের {1} এছাড়াও অন্তর্ভুক্ত করা আবশ্যক"
 DocType: SMS Center,SMS Center,এসএমএস কেন্দ্র
 DocType: Payroll Entry,Validate Attendance,এ্যাটেনডেন্স যাচাই করুন
 DocType: Sales Invoice,Change Amount,পরিমাণ পরিবর্তন
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,কথায় পরিমাণ জন্য রেখার মধ্যবর্তী স্থান
 DocType: Vehicle,Additional Details,অতিরিক্ত তথ্য
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,দেওয়া কোন বিবরণ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,সরবরাহকারী&gt; সরবরাহকারী গ্রুপ
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,কেনার জন্য অনুরোধ জানান.
 DocType: POS Closing Voucher Details,Collected Amount,সংগৃহীত পরিমাণ
 DocType: Lab Test,Submitted Date,জমা দেওয়া তারিখ
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,ছাত্র-ছাত্রী ভর্তি
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,হ্রাস সারি {0}: ঘনত্ব শুরু তারিখ অতীতের তারিখ হিসাবে প্রবেশ করা হয়
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,হ্রাস সারি {0}: ঘনত্ব শুরু তারিখ অতীতের তারিখ হিসাবে প্রবেশ করা হয়
 DocType: Contract Template,Fulfilment Terms and Conditions,পরিপূরক শর্তাবলী
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,উপাদানের জন্য অনুরোধ
 DocType: Bank Reconciliation,Update Clearance Date,আপডেট পরিস্কারের তারিখ
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,অ্যাকাউন্ট এর জন্য সেটিং
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},সরবরাহকারী চালান কোন ক্রয় চালান মধ্যে বিদ্যমান {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,সেলস পারসন গাছ পরিচালনা.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","রুট প্রক্রিয়া করতে পারে না, যেহেতু Google মানচিত্র সেটিংস নিষ্ক্রিয় করা আছে।"
 DocType: Job Applicant,Cover Letter,কাভার লেটার
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,বিশিষ্ট চেক এবং পরিষ্কার আমানত
 DocType: Item,Synced With Hub,হাব সঙ্গে synced
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,নতুন সম্পদ মূল্য
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"গ্রাহক একক গ্রাহকের বেস কারেন্সি রূপান্তরিত হয়, যা এ হার"
 DocType: Course Scheduling Tool,Course Scheduling Tool,কোর্সের পূর্বপরিকল্পনা টুল
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},সারি # {0}: ক্রয় চালান একটি বিদ্যমান সম্পদ বিরুদ্ধে করা যাবে না {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},সারি # {0}: ক্রয় চালান একটি বিদ্যমান সম্পদ বিরুদ্ধে করা যাবে না {1}
 DocType: Crop Cycle,LInked Analysis,লিনাক্স বিশ্লেষণ
 DocType: POS Closing Voucher,POS Closing Voucher,পিওস ক্লোজিং ভাউচার
 DocType: Contract,Lapsed,অতিপন্ন
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} কোর্সের মধ্যে নাম নথিভুক্ত করা হয় না {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,শিক্ষার্থীর নাম:
 DocType: POS Closing Voucher Details,Difference,পার্থক্য
+DocType: Delivery Settings,Delay between Delivery Stops,ডেলিভারি স্টপ মধ্যে বিলম্ব
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},সিরিয়াল কোন {0} হুণ্ডি অন্তর্গত নয় {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","সার্ভারের GoCardless কনফিগারেশন সঙ্গে একটি সমস্যা বলে মনে হচ্ছে। ব্যর্থতার ক্ষেত্রে চিন্তা করবেন না, আপনার অ্যাকাউন্টে অর্থ ফেরত দেওয়া হবে।"
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext ডেমো
@@ -693,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,পরিমাণ ও হার
 DocType: Delivery Note,% Installed,% ইনস্টল করা হয়েছে
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,শ্রেণীকক্ষ / গবেষণাগার ইত্যাদি যেখানে বক্তৃতা নির্ধারণ করা যাবে.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,কোম্পানির উভয় কোম্পানির মুদ্রায় ইন্টার কোম্পানি লেনদেনের জন্য মিলিত হওয়া উচিত।
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,কোম্পানির উভয় কোম্পানির মুদ্রায় ইন্টার কোম্পানি লেনদেনের জন্য মিলিত হওয়া উচিত।
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,প্রথম কোম্পানি নাম লিখুন
 DocType: Travel Itinerary,Non-Vegetarian,মাংসাশি
 DocType: Purchase Invoice,Supplier Name,সরবরাহকারী নাম
@@ -778,7 +779,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,তারিখ থেকে ভাড়া দেওয়া
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,পর্যাপ্ত যন্ত্রাংশ তৈরি করুন
 DocType: POS Profile User,POS Profile User,পিওএস প্রোফাইল ব্যবহারকারী
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,সারি {0}: মূল্যের শুরু তারিখ প্রয়োজন
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,সারি {0}: মূল্যের শুরু তারিখ প্রয়োজন
 DocType: Purchase Invoice Item,Service Start Date,পরিষেবা শুরু তারিখ
 DocType: Subscription Invoice,Subscription Invoice,সাবস্ক্রিপশন ইনভয়েস
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,সরাসরি আয়
@@ -845,7 +846,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,সমাহার ইতিমধ্যে অন্য কোম্পানীর জন্য ব্যবহৃত
 DocType: Selling Settings,Default Customer Group,ডিফল্ট গ্রাহক গ্রুপ
 DocType: Employee,IFSC Code,আইএফসিসি কোড
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","শুরুর তারিখ এবং শেষ তারিখটি কাজের কার্ডের সাথে ওভারল্যাপ করছে <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","অক্ষম করলে, &#39;গোলাকৃতি মোট&#39; ক্ষেত্রের কোনো লেনদেনে দৃশ্যমান হবে না"
 DocType: BOM,Operating Cost,পরিচালনা খরচ
 DocType: Crop,Produced Items,উত্পাদিত আইটেম
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,RFQs রোধ করুন
 DocType: Hub User,Hub User,হাব ব্যবহারকারী
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,বিক্রয় আদেশ তৈরি করুন
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},{0} থেকে {1} পর্যায়কালের জন্য বেতন স্লিপ জমা
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},{0} থেকে {1} পর্যায়কালের জন্য বেতন স্লিপ জমা
 DocType: Project Task,Project Task,প্রকল্প টাস্ক
 DocType: Loyalty Point Entry Redemption,Redeemed Points,মুক্তিযুক্ত পয়েন্টগুলি
 ,Lead Id,লিড আইডি
@@ -1027,7 +1027,7 @@
 DocType: Fee Validity,Max number of visit,দেখার সর্বাধিক সংখ্যা
 ,Hotel Room Occupancy,হোটেল রুম আবাসন
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড তৈরি করা হয়েছে:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},পেমেন্ট মোডে ডিফল্ট ক্যাশ বা ব্যাংক একাউন্ট সেট করুন {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},পেমেন্ট মোডে ডিফল্ট ক্যাশ বা ব্যাংক একাউন্ট সেট করুন {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,নথিভুক্ত করা
 DocType: GST Settings,GST Settings,GST সেটিং
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},মুদ্রা মূল্য তালিকা মুদ্রা হিসাবে একই হওয়া উচিত: {0}
@@ -1081,7 +1081,7 @@
 DocType: Vehicle Log,Service Details,পরিষেবা বিশদ
 DocType: Lab Test Template,Grouped,গোষ্ঠীবদ্ধ
 DocType: Selling Settings,Delivery Note Required,ডেলিভারি নোট প্রয়োজনীয়
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,বেতন স্লিপ জমা ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,বেতন স্লিপ জমা ...
 DocType: Bank Guarantee,Bank Guarantee Number,ব্যাংক গ্যারান্টি নম্বর
 DocType: Assessment Criteria,Assessment Criteria,মূল্যায়ন মানদণ্ড
 DocType: BOM Item,Basic Rate (Company Currency),মৌলিক হার (কোম্পানি একক)
@@ -1106,13 +1106,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,পেমেন্ট ভুক্তি ইতিমধ্যে তৈরি করা হয়
 DocType: Request for Quotation,Get Suppliers,সরবরাহকারীরা পান
 DocType: Purchase Receipt Item Supplied,Current Stock,বর্তমান তহবিল
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},সারি # {0}: অ্যাসেট {1} আইটেম লিঙ্ক নেই {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},সারি # {0}: অ্যাসেট {1} আইটেম লিঙ্ক নেই {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,প্রি বেতন স্লিপ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,অ্যাকাউন্ট {0} একাধিক বার প্রবেশ করানো হয়েছে
 DocType: Account,Expenses Included In Valuation,খরচ মূল্যনির্ধারণ অন্তর্ভুক্ত
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,আপনার সদস্যপদ 30 দিনের মধ্যে মেয়াদ শেষ হয়ে গেলে আপনি শুধুমাত্র নবায়ন করতে পারেন
 DocType: Shopping Cart Settings,Show Stock Availability,স্টক প্রাপ্যতা দেখান
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},সম্পদ বিভাগ {1} বা কোম্পানী {0} সেট করুন {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},সম্পদ বিভাগ {1} বা কোম্পানী {0} সেট করুন {2}
 DocType: Location,Longitude,দ্রাঘিমা
 ,Absent Student Report,অনুপস্থিত শিক্ষার্থীর প্রতিবেদন
 DocType: Crop,Crop Spacing UOM,ফসল স্পেসিং UOM
@@ -1184,7 +1184,7 @@
 DocType: Soil Texture,Sand,বালি
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,শক্তি
 DocType: Opportunity,Opportunity From,থেকে সুযোগ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,সারি {0}: {1} আইটেমের জন্য প্রয়োজনীয় সিরিয়াল নম্বর {2}। আপনি {3} প্রদান করেছেন।
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,সারি {0}: {1} আইটেমের জন্য প্রয়োজনীয় সিরিয়াল নম্বর {2}। আপনি {3} প্রদান করেছেন।
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,একটি টেবিল নির্বাচন করুন
 DocType: BOM,Website Specifications,ওয়েবসাইট উল্লেখ
 DocType: Special Test Items,Particulars,বিবরণ
@@ -1276,7 +1276,7 @@
 DocType: Item,Items with higher weightage will be shown higher,উচ্চ গুরুত্ব দিয়ে চলছে উচ্চ দেখানো হবে
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,ল্যাব টেস্ট এবং গুরুত্বপূর্ণ চিহ্ন
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ব্যাংক পুনর্মিলন বিস্তারিত
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,সারি # {0}: অ্যাসেট {1} দাখিল করতে হবে
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,সারি # {0}: অ্যাসেট {1} দাখিল করতে হবে
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,কোন কর্মচারী পাওয়া
 DocType: Item,If subcontracted to a vendor,একটি বিক্রেতা আউটসোর্স করে
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,শিক্ষার্থীর গোষ্ঠী ইতিমধ্যেই আপডেট করা হয়।
@@ -1330,7 +1330,6 @@
 DocType: Loyalty Program Collection,Tier Name,টিয়ার নাম
 DocType: HR Settings,Enter retirement age in years,বছরে অবসরের বয়স লিখুন
 DocType: Crop,Target Warehouse,উদ্দিষ্ট ওয়্যারহাউস
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,সেটআপ&gt; সেটিংস&gt; নামকরণ সিরিজের মাধ্যমে {0} জন্য নামকরণ সিরিজ সেট করুন
 DocType: Payroll Employee Detail,Payroll Employee Detail,বেতন কর্মী বিস্তারিত
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,দয়া করে একটি গুদাম নির্বাচন
 DocType: Cheque Print Template,Starting location from left edge,বাম প্রান্ত থেকে অবস্থান শুরু হচ্ছে
@@ -1420,7 +1419,7 @@
 DocType: Work Order,Plan material for sub-assemblies,উপ-সমাহারকে পরিকল্পনা উপাদান
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,সেলস অংশীদার এবং টেরিটরি
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} সক্রিয় হতে হবে
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,স্থানান্তর জন্য কোন আইটেম উপলব্ধ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,স্থানান্তর জন্য কোন আইটেম উপলব্ধ
 DocType: Employee Boarding Activity,Activity Name,কার্যকলাপ নাম
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,রিলিজ তারিখ পরিবর্তন করুন
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,সমাপ্ত পণ্য পরিমাণ <b>{0}</b> এবং পরিমাণ জন্য <b>{1}</b> বিভিন্ন হতে পারে না
@@ -1647,6 +1646,7 @@
 DocType: Project,First Email,প্রথম ইমেল
 DocType: Company,Exception Budget Approver Role,আপত্তি বাজেটের ভূমিকা ভূমিকা
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","সেট আপ করার পরে, এই চালান সেট তারিখ পর্যন্ত রাখা হবে"
+DocType: Cashier Closing,POS-CLO-,পিওএস-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,বিক্রয় আদেশ / সমাপ্ত পণ্য গুদাম সংরক্ষিত ওয়্যারহাউস
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,বিক্রয় পরিমাণ
 DocType: Repayment Schedule,Interest Amount,সুদের পরিমাণ
@@ -1658,7 +1658,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,রেকর্ডস
 DocType: Asset,Scrapped,বাতিল
 DocType: Item,Item Defaults,আইটেম ডিফল্টগুলি
-DocType: Purchase Invoice,Returns,রিটার্নস
+DocType: Cashier Closing,Returns,রিটার্নস
 DocType: Job Card,WIP Warehouse,WIP ওয়্যারহাউস
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},সিরিয়াল কোন {0} পর্যন্ত রক্ষণাবেক্ষণ চুক্তির অধীন হয় {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,সংগ্রহ
@@ -1672,7 +1672,6 @@
 DocType: Student,A-,এ-
 DocType: Share Transfer,Transfer Type,স্থানান্তর প্রকার
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,সেলস খরচ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গ্রুপ&gt; অঞ্চল
 DocType: Diagnosis,Diagnosis,রোগ নির্ণয়
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,স্ট্যান্ডার্ড রাজধানীতে
 DocType: Attendance Request,Explanation,ব্যাখ্যা
@@ -1685,7 +1684,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,ক্রয় আদেশ আইটেম শেষ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,জিপ কোড
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},বিক্রয় আদেশ {0} হল {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},ঋণের সুদ আয় অ্যাকাউন্ট নির্বাচন করুন {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},ঋণের সুদ আয় অ্যাকাউন্ট নির্বাচন করুন {0}
 DocType: Opportunity,Contact Info,যোগাযোগের তথ্য
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,শেয়ার দাখিলা তৈরীর
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,কর্মচারী উন্নয়নে স্থিরতা বজায় রাখতে পারে না
@@ -1697,7 +1696,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,চালান শূন্য বিলিং ঘন্টা জন্য করা যাবে না
 DocType: Company,Date of Commencement,প্রারম্ভিক তারিখ
 DocType: Sales Person,Select company name first.,প্রথমটি বেছে নিন কোম্পানির নাম.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},ইমেইল পাঠানো {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},ইমেইল পাঠানো {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,এবার সরবরাহকারী থেকে প্রাপ্ত.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOM প্রতিস্থাপন করুন এবং সমস্ত BOMs মধ্যে সর্বশেষ মূল্য আপডেট করুন
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},করুন {0} | {1} {2}
@@ -1717,7 +1716,7 @@
 DocType: Asset Movement,From Employee,কর্মী থেকে
 DocType: Driver,Cellphone Number,মোবাইল নম্বর
 DocType: Project,Monitor Progress,মনিটর অগ্রগতি
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,সতর্কতা: সিস্টেম আইটেম জন্য পরিমাণ যেহেতু overbilling পরীক্ষা করা হবে না {0} মধ্যে {1} শূন্য
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,সতর্কতা: সিস্টেম আইটেম জন্য পরিমাণ যেহেতু overbilling পরীক্ষা করা হবে না {0} মধ্যে {1} শূন্য
 DocType: Journal Entry,Make Difference Entry,পার্থক্য এন্ট্রি করতে
 DocType: Supplier Quotation,Auto Repeat Section,অটো পুনরাবৃত্তি বিভাগ
 DocType: Upload Attendance,Attendance From Date,জন্ম থেকে উপস্থিতি
@@ -1820,7 +1819,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,সারি # {0}: স্টক ক্রয় ফেরত মধ্যে প্রবেশ করা যাবে না প্রত্যাখ্যাত
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,নির্বাচিত গ্রাহকের জন্য গ্রাহক গোষ্ঠী পরিবর্তিত হচ্ছে না।
 ,Purchase Order Items To Be Billed,ক্রয় আদেশ আইটেম বিল তৈরি করা
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,আনুমানিক আগমনের সময়গুলি আপডেট করা হচ্ছে
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,আনুমানিক আগমনের সময়গুলি আপডেট করা হচ্ছে
 DocType: Program Enrollment Tool,Enrollment Details,নামকরণ বিবরণ
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,একটি কোম্পানির জন্য একাধিক আইটেম ডিফল্ট সেট করতে পারবেন না।
 DocType: Purchase Invoice Item,Net Rate,নিট হার
@@ -1834,7 +1833,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,বাতিল প্রকার মাদ্রাসা
 DocType: Support Settings,Close Issue After Days,বন্ধ ইস্যু দিন পরে
 ,Eway Bill,ইওয়ে বিল
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,আপনি মার্কেটপ্লেস ব্যবহারকারীদের যুক্ত করতে সিস্টেম ম্যানেজার এবং আইটেম ম্যানেজার ভূমিকা সহ একটি ব্যবহারকারী হতে হবে
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,আপনি মার্কেটপ্লেস ব্যবহারকারীদের যুক্ত করতে সিস্টেম ম্যানেজার এবং আইটেম ম্যানেজার ভূমিকা সহ একটি ব্যবহারকারী হতে হবে
 DocType: Leave Control Panel,Leave blank if considered for all branches,সব শাখার জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
 DocType: Job Opening,Staffing Plan,স্টাফিং প্ল্যান
 DocType: Bank Guarantee,Validity in Days,দিনের মধ্যে মেয়াদ
@@ -1854,7 +1853,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},সদৃশ সারিতে {0} একই {1}
 DocType: Marketplace Settings,Disable Marketplace,মার্কেটপ্লেস অক্ষম করুন
 ,Trial Balance,ট্রায়াল ব্যালেন্স
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,অর্থবছরের {0} পাওয়া যায়নি
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,অর্থবছরের {0} পাওয়া যায়নি
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,এমপ্লয়িজ স্থাপনের
 DocType: Hotel Room Reservation,Hotel Reservation User,হোটেল রিজার্ভেশন ইউজার
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,প্রথম উপসর্গ নির্বাচন করুন
@@ -1962,7 +1961,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,লগ ইনে ব্যর্থ
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,সম্পদ {0} তৈরি করা হয়েছে
 DocType: Special Test Items,Special Test Items,বিশেষ টেস্ট আইটেম
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,মার্কেটপ্লেসে রেজিস্টার করার জন্য আপনাকে সিস্টেম ম্যানেজার এবং আইটেম ম্যানেজার ভূমিকার সাথে একজন ব্যবহারকারী হওয়া প্রয়োজন।
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,মার্কেটপ্লেসে রেজিস্টার করার জন্য আপনাকে সিস্টেম ম্যানেজার এবং আইটেম ম্যানেজার ভূমিকার সাথে একজন ব্যবহারকারী হওয়া প্রয়োজন।
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,পেমেন্ট মোড
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,আপনার নিয়োগপ্রাপ্ত বেতন গঠন অনুযায়ী আপনি বেনিফিটের জন্য আবেদন করতে পারবেন না
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,ওয়েবসাইট চিত্র একটি পাবলিক ফাইল বা ওয়েবসাইট URL হওয়া উচিত
@@ -1974,7 +1973,7 @@
 DocType: Warehouse,Warehouse Contact Info,ওয়ারহাউস যোগাযোগের তথ্য
 DocType: Payment Entry,Write Off Difference Amount,বন্ধ লিখতে পার্থক্য পরিমাণ
 DocType: Volunteer,Volunteer Name,স্বেচ্ছাসেবক নাম
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},অন্যান্য সারিতে অনুলিপিযুক্ত তারিখগুলির সাথে সারি পাওয়া গেছে: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},অন্যান্য সারিতে অনুলিপিযুক্ত তারিখগুলির সাথে সারি পাওয়া গেছে: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: কর্মচারী ইমেল পাওয়া যায়নি, অত: পর না পাঠানো ই-মেইল"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},প্রদত্ত তারিখের {0} কর্মচারীর জন্য নির্ধারিত কোন বেতন কাঠামো {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},দেশের জন্য শপিংয়ের নিয়ম প্রযোজ্য নয় {0}
@@ -2063,6 +2062,7 @@
 DocType: Salary Component,Earning,রোজগার
 DocType: Supplier Scorecard,Scoring Criteria,ক্রমিং মাপদণ্ড
 DocType: Purchase Invoice,Party Account Currency,পক্ষের অ্যাকাউন্টে একক
+DocType: Delivery Trip,Total Estimated Distance,মোট আনুমানিক দূরত্ব
 ,BOM Browser,BOM ব্রাউজার
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,এই প্রশিক্ষণ ইভেন্টের জন্য আপনার অবস্থা আপডেট করুন
 DocType: Item Barcode,EAN,মেসি
@@ -2101,7 +2101,7 @@
 DocType: Activity Cost,Projects,প্রকল্প
 DocType: Payment Request,Transaction Currency,লেনদেন মুদ্রা
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},থেকে {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,কিছু ইমেল অবৈধ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,কিছু ইমেল অবৈধ
 DocType: Work Order Operation,Operation Description,অপারেশন বিবরণ
 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.,ফিস্ক্যাল বছর একবার সংরক্ষিত হয় ফিস্ক্যাল বছর আরম্ভের তারিখ ও ফিস্ক্যাল বছর শেষ তারিখ পরিবর্তন করা যাবে না.
 DocType: Quotation,Shopping Cart,বাজারের ব্যাগ
@@ -2125,7 +2125,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,পরিসম্পদ মধ্যে নিট পরিবর্তন
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,রেকিড Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,সব প্রশিক্ষণে জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,টাইপ &#39;প্রকৃত&#39; সারিতে ভারপ্রাপ্ত {0} আইটেম রেট মধ্যে অন্তর্ভুক্ত করা যাবে না
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,টাইপ &#39;প্রকৃত&#39; সারিতে ভারপ্রাপ্ত {0} আইটেম রেট মধ্যে অন্তর্ভুক্ত করা যাবে না
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},সর্বোচ্চ: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Datetime থেকে
 DocType: Shopify Settings,For Company,কোম্পানি জন্য
@@ -2139,7 +2139,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,কোর্স সময়সূচী তৈরি ত্রুটি ছিল
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,তালিকার প্রথম ব্যয় নির্ধারণকারীকে ডিফল্ট ব্যয়ের ব্যয় হিসাবে নির্ধারণ করা হবে।
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,এর চেয়ে বড় 100 হতে পারে না
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,আপনি মার্কেটপ্লেসে রেজিস্টার করার জন্য সিস্টেম ব্যবস্থাপক এবং আইটেম ম্যানেজার ভূমিকার সাথে অ্যাডমিনিস্টরের পরিবর্তে অন্য একটি ব্যবহারকারী হওয়া প্রয়োজন।
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,আপনি মার্কেটপ্লেসে রেজিস্টার করার জন্য সিস্টেম ব্যবস্থাপক এবং আইটেম ম্যানেজার ভূমিকার সাথে অ্যাডমিনিস্টরের পরিবর্তে অন্য একটি ব্যবহারকারী হওয়া প্রয়োজন।
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
 DocType: Packing Slip,MAT-PAC-.YYYY.-,Mat-পিএসি-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,অনির্ধারিত
@@ -2168,7 +2168,7 @@
 DocType: HR Settings,Employee Settings,কর্মচারী সেটিংস
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,পেমেন্ট সিস্টেম লোড হচ্ছে
 ,Batch-Wise Balance History,ব্যাচ প্রজ্ঞাময় বাকি ইতিহাস
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,সারি # {0}: আইটেম {1} জন্য বিলের পরিমাণের চেয়ে পরিমাণের বেশি হলে রেট নির্ধারণ করা যাবে না।
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,সারি # {0}: আইটেম {1} জন্য বিলের পরিমাণের চেয়ে পরিমাণের বেশি হলে রেট নির্ধারণ করা যাবে না।
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,মুদ্রণ সেটিংস নিজ মুদ্রণ বিন্যাসে আপডেট
 DocType: Package Code,Package Code,প্যাকেজ কোড
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,শিক্ষানবিস
@@ -2399,7 +2399,7 @@
 DocType: Delivery Trip,Optimize Route,রুট অপ্টিমাইজ করুন
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,অগ্রিম এক্স দিনের জন্য অপারেশন পরিকল্পনা চেষ্টা করুন.
 DocType: HR Settings,Stop Birthday Reminders,বন্ধ করুন জন্মদিনের রিমাইন্ডার
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},কোম্পানির মধ্যে ডিফল্ট বেতনের প্রদেয় অ্যাকাউন্ট নির্ধারণ করুন {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},কোম্পানির মধ্যে ডিফল্ট বেতনের প্রদেয় অ্যাকাউন্ট নির্ধারণ করুন {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,আমাজন দ্বারা ট্যাক্স এবং চার্জ তথ্য আর্থিক ভাঙ্গন পায়
 DocType: SMS Center,Receiver List,রিসিভার তালিকা
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,অনুসন্ধান আইটেম
@@ -2469,7 +2469,7 @@
 DocType: Vital Signs,Constipated,কোষ্ঠকাঠিন্য
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},সরবরাহকারী বিরুদ্ধে চালান {0} তারিখের {1}
 DocType: Customer,Default Price List,ডিফল্ট মূল্য তালিকা
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,অ্যাসেট আন্দোলন রেকর্ড {0} সৃষ্টি
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,অ্যাসেট আন্দোলন রেকর্ড {0} সৃষ্টি
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,কোন আইটেম পাওয়া যায় নি
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,আপনি মুছে ফেলতে পারবেন না অর্থবছরের {0}. অর্থবছরের {0} গ্লোবাল সেটিংস এ ডিফল্ট হিসাবে সেট করা হয়
 DocType: Share Transfer,Equity/Liability Account,ইক্যুইটি / দায় অ্যাকাউন্ট
@@ -2606,6 +2606,7 @@
 DocType: Blanket Order,Order Type,যাতে টাইপ
 ,Item-wise Sales Register,আইটেম-জ্ঞানী সেলস নিবন্ধন
 DocType: Asset,Gross Purchase Amount,গ্রস ক্রয়ের পরিমাণ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,আইটেম কোড&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,খোলা ব্যালেন্স
 DocType: Asset,Depreciation Method,অবচয় পদ্ধতি
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,মৌলিক হার মধ্যে অন্তর্ভুক্ত এই খাজনা?
@@ -2686,7 +2687,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,কার্য সম্পাদন যদি বার্ষিক বাজেট পি.ও.
 DocType: Student Leave Application,Student Leave Application,শিক্ষার্থীর ছুটি আবেদন
 DocType: Item,Will also apply for variants,এছাড়াও ভিন্নতা জন্য আবেদন করতে হবে
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","অ্যাসেট, বাতিল করা যাবে না হিসাবে এটি আগে থেকেই {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","অ্যাসেট, বাতিল করা যাবে না হিসাবে এটি আগে থেকেই {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},কর্মচারী {0} হাফ দিনে {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},মোট কাজ ঘন্টা সর্বোচ্চ কর্মঘন্টা চেয়ে বেশী করা উচিত হবে না {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,উপর
@@ -2710,6 +2711,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,ডেটা আনুন
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},{0} ছুটির প্রকারে অনুমোদিত সর্বাধিক ছুটি হল {1}
 DocType: SMS Center,Create Receiver List,রিসিভার তালিকা তৈরি করুন
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,উপলভ্য ব্যবহারের জন্য তারিখ ক্রয়ের তারিখের পরে হওয়া উচিত
 DocType: Vehicle,Wheels,চাকা
 DocType: Packing Slip,To Package No.,নং প্যাকেজে
 DocType: Patient Relation,Family,পরিবার
@@ -2723,7 +2725,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,বিলিং মুদ্রা ডিফল্ট কোম্পানির মুদ্রার বা পার্টি অ্যাকাউন্ট মুদ্রার সমান হতে হবে
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),বাক্স এই বন্টন (শুধু খসড়া) একটি অংশ কিনা তা চিহ্নিত
 DocType: Soil Texture,Loam,দোআঁশ মাটি
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,সারি {0}: ডেট তারিখ তারিখ পোস্ট করার আগে হতে পারে না
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,সারি {0}: ডেট তারিখ তারিখ পোস্ট করার আগে হতে পারে না
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,পেমেন্ট এন্ট্রি করতে
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},আইটেমের জন্য পরিমাণ {0} চেয়ে কম হতে হবে {1}
 ,Sales Invoice Trends,বিক্রয় চালান প্রবণতা
@@ -2795,7 +2797,7 @@
 DocType: Guardian,Guardian Interests,গার্ডিয়ান রুচি
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,অ্যাকাউন্টের নাম / সংখ্যা আপডেট করুন
 DocType: Naming Series,Current Value,বর্তমান মূল্য
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,একাধিক অর্থ বছরের তারিখ {0} জন্য বিদ্যমান. অর্থবছরে কোম্পানির নির্ধারণ করুন
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,একাধিক অর্থ বছরের তারিখ {0} জন্য বিদ্যমান. অর্থবছরে কোম্পানির নির্ধারণ করুন
 DocType: Education Settings,Instructor Records to be created by,প্রশিক্ষক রেকর্ডস দ্বারা তৈরি করা হবে
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} তৈরি হয়েছে
 DocType: GST Account,GST Account,জিএসটি অ্যাকাউন্ট
@@ -2812,7 +2814,7 @@
 DocType: Sales Person,Name and Employee ID,নাম ও কর্মী ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,দরুন জন্ম তারিখ পোস্ট করার আগে হতে পারে না
 DocType: Website Item Group,Website Item Group,ওয়েবসাইট আইটেমটি গ্রুপ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,কোনও বেতন স্লিপ পাওয়া যায় নিচের নির্বাচিত মানদণ্ডের জন্য অথবা ইতিমধ্যে জমা দেওয়া বেতন স্লিপের জন্য
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,কোনও বেতন স্লিপ পাওয়া যায় নিচের নির্বাচিত মানদণ্ডের জন্য অথবা ইতিমধ্যে জমা দেওয়া বেতন স্লিপের জন্য
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,কর্তব্য এবং কর
 DocType: Projects Settings,Projects Settings,প্রকল্প সেটিংস
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,রেফারেন্স তারিখ লিখুন দয়া করে
@@ -2821,7 +2823,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,সরবরাহকৃত Qty
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-সি পি আর-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,উপাদানের জন্য অনুরোধ আইটেম
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,দয়া করে ক্রয় রশিদ বাতিল {প্রথম} {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,দয়া করে ক্রয় রশিদ বাতিল {প্রথম} {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,আইটেম গ্রুপ বৃক্ষ.
 DocType: Production Plan,Total Produced Qty,মোট উত্পাদিত পরিমাণ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,এই চার্জ ধরণ জন্য বর্তমান সারির সংখ্যা এর চেয়ে বড় বা সমান সারির সংখ্যা পড়ুন করতে পারবেন না
@@ -2930,6 +2932,7 @@
 ,Vehicle Expenses,গাড়ির খরচ
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,বিক্রয় ইনভয়েস নেভিগেশন ল্যাব টেস্ট (গুলি) তৈরি করুন
 DocType: Serial No,Invoice Details,চালান বিস্তারিত
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,অনুমান করুন এবং রাস্তা অনুকূলিত করার জন্য Google মানচিত্র সেটিংস সক্ষম করুন
 DocType: Grant Application,Show on Website,ওয়েবসাইট দেখান
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,শুরু করা যাক
 DocType: Hub Tracked Item,Hub Category,হাব বিভাগ
@@ -2969,7 +2972,7 @@
 DocType: Inpatient Record,B Positive,বি ইতিবাচক
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",কর্মচারীর সর্বাধিক বেনিফিট {1} পূর্ববর্তী দাবি করা \ sum এর সমষ্টি {2} দ্বারা {1} অতিক্রম করেছে
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","সারি # {0}: Qty, 1 হবে যেমন আইটেম একটি নির্দিষ্ট সম্পদ. একাধিক Qty এ জন্য পৃথক সারি ব্যবহার করুন."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","সারি # {0}: Qty, 1 হবে যেমন আইটেম একটি নির্দিষ্ট সম্পদ. একাধিক Qty এ জন্য পৃথক সারি ব্যবহার করুন."
 DocType: Leave Block List Allow,Leave Block List Allow,ব্লক মঞ্জুর তালিকা ত্যাগ
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,সংক্ষিপ্তকরণ ফাঁকা বা স্থান হতে পারে না
 DocType: Patient Medical Record,Patient Medical Record,রোগীর চিকিৎসা রেকর্ড
@@ -3003,7 +3006,7 @@
 DocType: Workstation,Wages per hour,প্রতি ঘন্টায় মজুরী
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},ব্যাচ স্টক ব্যালেন্স {0} হয়ে যাবে ঋণাত্মক {1} ওয়্যারহাউস এ আইটেম {2} জন্য {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,উপাদান অনুরোধ নিম্নলিখিত আইটেম এর পুনরায় আদেশ স্তরের উপর ভিত্তি করে স্বয়ংক্রিয়ভাবে উত্থাপিত হয়েছে
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},অ্যাকাউন্ট {0} অবৈধ. অ্যাকাউন্টের মুদ্রা হতে হবে {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},অ্যাকাউন্ট {0} অবৈধ. অ্যাকাউন্টের মুদ্রা হতে হবে {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},তারিখ থেকে {0} কর্মী এর relieving তারিখ {1} পরে হতে পারে না
 DocType: Supplier,Is Internal Supplier,অভ্যন্তরীণ সরবরাহকারী
 DocType: Employee,Create User Permission,ব্যবহারকারীর অনুমতি তৈরি করুন
@@ -3147,7 +3150,7 @@
 DocType: Account,Fixed Asset,নির্দিষ্ট সম্পত্তি
 DocType: Amazon MWS Settings,After Date,তারিখ পরে
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,ধারাবাহিকভাবে পরিসংখ্যা
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,আন্তঃ ইনভয়েসের জন্য অবৈধ {0}।
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,আন্তঃ ইনভয়েসের জন্য অবৈধ {0}।
 ,Department Analytics,বিভাগ বিশ্লেষণ
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,ইমেল ডিফল্ট পরিচিতিতে পাওয়া যায় নি
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,সিক্রেট তৈরি করুন
@@ -3159,7 +3162,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,ফি গঠন এবং ছাত্র গ্রুপ {0} প্রোগ্রাম পৃথক হয়।
 DocType: Bank Statement Transaction Entry,Receivable Account,গ্রহনযোগ্য অ্যাকাউন্ট
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,তারিখ থেকে বৈধ তারিখটি বৈধ তারিখ থেকে কম হওয়া আবশ্যক।
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},সারি # {0}: অ্যাসেট {1} ইতিমধ্যে {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},সারি # {0}: অ্যাসেট {1} ইতিমধ্যে {2}
 DocType: Quotation Item,Stock Balance,স্টক ব্যালেন্স
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,অর্থ প্রদান বিক্রয় আদেশ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,সিইও
@@ -3201,6 +3204,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,ডেবিট প্রয়োজন বোধ করা হয়
 DocType: Clinical Procedure,Inpatient Record,ইনপেশেন্ট রেকর্ড
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets সাহায্য আপনার দলের দ্বারা সম্পন্ন তৎপরতা জন্য সময়, খরচ এবং বিলিং ট্র্যাক রাখতে"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,ক্রয়মূল্য তালিকা
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,লেনদেনের তারিখ
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,সরবরাহকারী স্কোরকার্ড ভেরিয়েবলের টেমপ্লেট
@@ -3243,7 +3247,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,এক্সচেঞ্জ লাভ / ক্ষতির
 DocType: Opportunity,Lost Reason,লস্ট কারণ
 DocType: Amazon MWS Settings,Enable Amazon,অ্যামাজন সক্ষম করুন
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},সারি # {0}: অ্যাকাউন্ট {1} কোম্পানীর অন্তর্গত নয় {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},সারি # {0}: অ্যাকাউন্ট {1} কোম্পানীর অন্তর্গত নয় {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},ডক টাইপ {0} খুঁজে পাওয়া যায়নি
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,নতুন ঠিকানা
 DocType: Quality Inspection,Sample Size,সাধারন মাপ
@@ -3354,7 +3358,7 @@
 DocType: Water Analysis,Origin,উত্স
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,এই দস্তাবেজটি দ্বারা সীমা উত্তীর্ণ {0} {1} আইটেমের জন্য {4}. আপনি তৈরি করছেন আরেকটি {3} একই বিরুদ্ধে {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,সংরক্ষণ পরে আবর্তক নির্ধারণ করুন
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,নির্বাচন পরিবর্তনের পরিমাণ অ্যাকাউন্ট
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,নির্বাচন পরিবর্তনের পরিমাণ অ্যাকাউন্ট
 DocType: Purchase Invoice,Price List Currency,মূল্যতালিকা মুদ্রা
 DocType: Naming Series,User must always select,ব্যবহারকারী সবসময় নির্বাচন করতে হবে
 DocType: Stock Settings,Allow Negative Stock,নেতিবাচক শেয়ার মঞ্জুরি
@@ -3396,7 +3400,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,আপনি কি এই অ্যাপয়েন্টমেন্টটি বাতিল করতে চান?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,হোটেল রুম প্রাইসিং প্যাকেজ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,সেলস পাইপলাইন
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},বেতন কম্পোনেন্ট এর ডিফল্ট অ্যাকাউন্ট সেট করুন {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},বেতন কম্পোনেন্ট এর ডিফল্ট অ্যাকাউন্ট সেট করুন {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,প্রয়োজনীয় উপর
 DocType: Rename Tool,File to Rename,পুনঃনামকরণ করা ফাইল
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},সারি মধ্যে আইটেম জন্য BOM দয়া করে নির্বাচন করুন {0}
@@ -3417,7 +3421,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ক্রয় আইটেম খরচ
 DocType: Employee Separation,Employee Separation Template,কর্মচারী বিচ্ছেদ টেমপ্লেট
 DocType: Selling Settings,Sales Order Required,সেলস আদেশ প্রয়োজন
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,একটি বিক্রেতা হয়ে
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,একটি বিক্রেতা হয়ে
 DocType: Purchase Invoice,Credit To,ক্রেডিট
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,সক্রিয় বাড়ে / গ্রাহকরা
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,স্ট্যান্ডার্ড ডেলিভারি নোট বিন্যাস ব্যবহার করতে ফাঁকা ছেড়ে দিন
@@ -3458,7 +3462,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,ট্যাক্স টেমপ্লেট তৈরি করুন
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ব্যবহারকারী ফোরাম
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,কাঁচামালের ফাঁকা থাকতে পারে না.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,সারি # {0} (পেমেন্ট সারণি): পরিমাণ নেগেটিভ হতে হবে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,সারি # {0} (পেমেন্ট সারণি): পরিমাণ নেগেটিভ হতে হবে
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","স্টক আপডেট করা যায়নি, চালান ড্রপ শিপিং আইটেমটি রয়েছে."
 DocType: Contract,Fulfilment Status,পূরণের স্থিতি
 DocType: Lab Test Sample,Lab Test Sample,ল্যাব পরীক্ষার নমুনা
@@ -3597,7 +3601,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,ডক তারিখ
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},ফি রেকর্ডস নির্মিত - {0}
 DocType: Asset Category Account,Asset Category Account,অ্যাসেট শ্রেণী অ্যাকাউন্ট
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,সারি # {0} (পেমেন্ট সারণি): পরিমাণ ইতিবাচক হতে হবে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,সারি # {0} (পেমেন্ট সারণি): পরিমাণ ইতিবাচক হতে হবে
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},সেলস আদেশ পরিমাণ বেশী আইটেম {0} সৃষ্টি করতে পারে না {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,অ্যাট্রিবিউট মান নির্বাচন করুন
 DocType: Purchase Invoice,Reason For Issuing document,দস্তাবেজ ইস্যু করার জন্য কারণ
@@ -3652,7 +3656,7 @@
 DocType: Purchase Receipt,Time at which materials were received,"উপকরণ গৃহীত হয়েছে, যা এ সময়"
 DocType: Products Settings,Products per Page,পণ্য প্রতি পৃষ্ঠা
 DocType: Stock Ledger Entry,Outgoing Rate,আউটগোয়িং কলের হার
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,বা
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,বা
 DocType: Sales Order,Billing Status,বিলিং অবস্থা
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,একটি সমস্যা রিপোর্ট
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,ইউটিলিটি খরচ
@@ -3679,7 +3683,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,কর্মচারী ট্যাক্স মোছা ঘোষণা
 DocType: Payment Entry,Cheque/Reference Date,চেক / রেফারেন্স তারিখ
 DocType: Purchase Invoice,Total Taxes and Charges,মোট কর ও শুল্ক
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,উপলভ্য-জন্য-ব্যবহার তারিখ অতীতের তারিখ হিসাবে প্রবেশ করা হয়
 DocType: Employee,Emergency Contact,জরুরি ভিত্তিতে যোগাযোগ করা
 DocType: Bank Reconciliation Detail,Payment Entry,পেমেন্ট এন্ট্রি
 ,sales-browser,বিক্রয়-ব্রাউজার
@@ -3725,6 +3728,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),রিটার্ন (ক্রেডিট নোট)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,কাজ শুরু করুন
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},সম্পদ {0} জন্য সিরিয়াল নাম্বার প্রয়োজন নেই
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,সেটআপ&gt; সেটিংস&gt; নামকরণ সিরিজের মাধ্যমে {0} জন্য নামকরণ সিরিজ সেট করুন
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,অক্ষম করা হয়েছে টেমপ্লেট ডিফল্ট টেমপ্লেট হবে না
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,সারি {0} জন্য: পরিকল্পিত পরিমাণ লিখুন
 DocType: Account,Income Account,আয় অ্যাকাউন্ট
@@ -3738,6 +3742,7 @@
 DocType: Loyalty Program,Help Section,সাহায্য বিভাগ
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,পূর্ববর্তী
 DocType: Appraisal Goal,Key Responsibility Area,কী দায়িত্ব ফোন
+DocType: Delivery Trip,Distance UOM,দূরত্ব UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","ছাত্র ব্যাচ আপনি উপস্থিতি, মূল্যায়ন এবং ছাত্রদের জন্য ফি ট্র্যাক সাহায্য"
 DocType: Payment Entry,Total Allocated Amount,সর্বমোট পরিমাণ
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,চিরস্থায়ী জায় জন্য ডিফল্ট জায় অ্যাকাউন্ট সেট
@@ -3779,7 +3784,7 @@
 DocType: Item Supplier,Item Supplier,আইটেম সরবরাহকারী
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,ব্যাচ কোন পেতে আইটেম কোড প্রবেশ করুন
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},{0} quotation_to জন্য একটি মান নির্বাচন করুন {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,স্থানান্তর জন্য কোন আইটেম নির্বাচিত
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,স্থানান্তর জন্য কোন আইটেম নির্বাচিত
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,সব ঠিকানাগুলি.
 DocType: Company,Stock Settings,স্টক সেটিংস
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","নিম্নলিখিত বৈশিষ্ট্য উভয় রেকর্ডে একই হলে মার্জ শুধুমাত্র সম্ভব. গ্রুপ, root- র ধরন, কোম্পানী"
@@ -4064,7 +4069,7 @@
 DocType: Patient,Personal and Social History,ব্যক্তিগত ও সামাজিক ইতিহাস
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,ব্যবহারকারী {0} তৈরি করেছেন
 DocType: Fee Schedule,Fee Breakup for each student,প্রতিটি ছাত্র জন্য ফি ভাঙ্গন
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),মোট অগ্রিম ({0}) আদেশের বিরুদ্ধে {1} সর্বমোট তার চেয়ে অনেক বেশী হতে পারে না ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),মোট অগ্রিম ({0}) আদেশের বিরুদ্ধে {1} সর্বমোট তার চেয়ে অনেক বেশী হতে পারে না ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,অসমান মাস জুড়ে লক্ষ্যমাত্রা বিতরণ মাসিক ডিস্ট্রিবিউশন নির্বাচন.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,কোড পরিবর্তন করুন
 DocType: Purchase Invoice Item,Valuation Rate,মূল্যনির্ধারণ হার
@@ -4073,7 +4078,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,এজিড আইটিসি সেস
 ,Student Monthly Attendance Sheet,শিক্ষার্থীর মাসের এ্যাটেনডেন্স পত্রক
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,শপিং শাসন কেবল বিক্রয় জন্য প্রযোজ্য
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,হ্রাস সারি {0}: পরবর্তী দাম্পত্য তারিখ ক্রয় তারিখ আগে হতে পারে না
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,হ্রাস সারি {0}: পরবর্তী দাম্পত্য তারিখ ক্রয় তারিখ আগে হতে পারে না
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,প্রজেক্ট আরম্ভের তারিখ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,পর্যন্ত
 DocType: Rename Tool,Rename Log,পাসওয়ার্ড ভুলে গেছেন? পুনঃনামকরণ
@@ -4090,12 +4095,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,সেলস লেনদেনের উপর ভিত্তি করে কতগুলি প্রকল্প এবং কোম্পানিকে আপডেট করা উচিত।
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,মেয়াদ শেষ
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,শিক্ষার্থীরা যোগ
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","এই দস্তাবেজটি বাতিল করতে কর্মচারী <a href=""#Form/Employee/{0}"">{0}</a> \ মুছে দিন"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},দয়া করে নির্বাচন করুন {0}
 DocType: C-Form,C-Form No,সি-ফরম কোন
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,দূরত্ব
+DocType: Delivery Stop,Distance,দূরত্ব
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,আপনার পণ্য বা পরিষেবাগুলি যে আপনি কিনতে বা বিক্রয় তালিকা।
 DocType: Water Analysis,Storage Temperature,সংগ্রহস্থল তাপমাত্রা
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4121,7 +4124,7 @@
 DocType: Homepage,Company Description for website homepage,ওয়েবসাইট হোমপেজে জন্য এখানে বর্ণনা
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","গ্রাহকদের সুবিধার জন্য, এই কোড চালান এবং বিলি নোট মত মুদ্রণ বিন্যাস ব্যবহার করা যেতে পারে"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier নাম
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,{0} এর জন্য তথ্য পুনরুদ্ধার করা যায়নি।
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,{0} এর জন্য তথ্য পুনরুদ্ধার করা যায়নি।
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,প্রবেশ নিবন্ধন জার্নাল
 DocType: Contract,Fulfilment Terms,শর্তাবলী |
 DocType: Sales Invoice,Time Sheet List,টাইম শিট তালিকা
@@ -4301,7 +4304,7 @@
 DocType: Serial No,Warranty / AMC Details,পাটা / এএমসি বিস্তারিত
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,ভ্রমণ ভিত্তিক গ্রুপ জন্য ম্যানুয়ালি ছাত্র নির্বাচন
 DocType: Journal Entry,User Remark,ব্যবহারকারী মন্তব্য
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,রাস্তা অনুকূলিতকরণ
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,রাস্তা অনুকূলিতকরণ
 DocType: Travel Itinerary,Non Diary,অ ডায়েরি
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,বাম কর্মচারীদের জন্য রিটেনশন বোনাস তৈরি করতে পারবেন না
 DocType: Lead,Market Segment,মার্কেটের অংশ
@@ -4331,7 +4334,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,বিশ্বস্ততা প্রোগ্রাম
 DocType: Student Guardian,Father,পিতা
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,সমর্থন টিকেট
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;আপডেট শেয়ার&#39; স্থায়ী সম্পদ বিক্রি চেক করা যাবে না
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;আপডেট শেয়ার&#39; স্থায়ী সম্পদ বিক্রি চেক করা যাবে না
 DocType: Bank Reconciliation,Bank Reconciliation,ব্যাংক পুনর্মিলন
 DocType: Attendance,On Leave,ছুটিতে
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,আপডেট পান
@@ -4376,7 +4379,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,ক্রমিক নং এবং ব্যাচ
 DocType: Warranty Claim,From Company,কোম্পানীর কাছ থেকে
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,মূল্যায়ন মানদণ্ড স্কোর যোগফল {0} হতে হবে.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Depreciations সংখ্যা বুক নির্ধারণ করুন
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Depreciations সংখ্যা বুক নির্ধারণ করুন
 DocType: Supplier Scorecard Period,Calculations,গণনাগুলি
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,মূল্য বা স্টক
 DocType: Payment Terms Template,Payment Terms,পরিশোধের শর্ত
@@ -4395,7 +4398,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,ছাড় (%) উপর মার্জিন সহ PRICE তালিকা হার
 DocType: Healthcare Service Unit Type,Rate / UOM,হার / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,সকল গুদাম
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,ইন্টার কোম্পানি লেনদেনের জন্য কোন {0} পাওয়া যায়নি।
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,ইন্টার কোম্পানি লেনদেনের জন্য কোন {0} পাওয়া যায়নি।
 DocType: Travel Itinerary,Rented Car,ভাড়া গাড়ি
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,আপনার কোম্পানি সম্পর্কে
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,একাউন্টে ক্রেডিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
@@ -4496,6 +4499,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,উদ্ভিদ বিশ্লেষণ মানচিত্র
 DocType: Cheque Print Template,Cheque Height,চেক উচ্চতা
 DocType: Supplier,Supplier Details,সরবরাহকারী
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,সেটআপের মাধ্যমে উপস্থিতি জন্য সংখ্যায়ন সিরিজ সেটআপ করুন&gt; সংখ্যায়ন সিরিজ
 DocType: Setup Progress,Setup Progress,সেটআপ অগ্রগতি
 DocType: Expense Claim,Approval Status,অনুমোদন অবস্থা
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},মূল্য সারিতে মান কম হতে হবে থেকে {0}
@@ -4588,7 +4592,6 @@
 DocType: Travel Request,Fully Sponsored,সম্পূর্ণ স্পনসর
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,বিপরীত জার্নাল এন্ট্রি
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,গ্রাহক {0} তৈরি করা হয়।
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,মানব সম্পদ&gt; এইচআর সেটিংস মধ্যে কর্মচারী নামকরণ সিস্টেম সেটআপ করুন
 DocType: Stock Settings,Limit Percent,সীমা শতকরা
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,বর্তমানে কোন গুদামে পন্য উপলব্ধ নেই
 ,Payment Period Based On Invoice Date,চালান তারিখ উপর ভিত্তি করে পরিশোধ সময়সীমার
@@ -4647,7 +4650,7 @@
 DocType: BOM Explosion Item,Source Warehouse,উত্স ওয়্যারহাউস
 DocType: Installation Note,Installation Date,ইনস্টলেশনের তারিখ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,লেজার শেয়ার করুন
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},সারি # {0}: অ্যাসেট {1} কোম্পানির অন্তর্গত নয় {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},সারি # {0}: অ্যাসেট {1} কোম্পানির অন্তর্গত নয় {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,সেলস ইনভয়েস {0} তৈরি করেছে
 DocType: Employee,Confirmation Date,নিশ্চিতকরণ তারিখ
 DocType: Inpatient Occupancy,Check Out,চেক আউট
@@ -4667,6 +4670,7 @@
 DocType: Production Plan,Sales Orders Detail,বিক্রয় আদেশ বিস্তারিত
 DocType: Bin,Requested Quantity,অনুরোধ পরিমাণ
 DocType: Fees,EDU-FEE-.YYYY.-,Edu-ফী-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,শিক্ষা&gt; শিক্ষা সেটিংসে নির্দেশক নামকরণ সিস্টেম সেটআপ করুন
 DocType: Patient,Marital Status,বৈবাহিক অবস্থা
 DocType: Stock Settings,Auto Material Request,অটো উপাদানের জন্য অনুরোধ
 DocType: Woocommerce Settings,API consumer secret,API কনজিউমার গোপনীয়তা
@@ -4719,7 +4723,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,দিন নির্বাচন করুন
 DocType: Academic Term,Term Name,টার্ম নাম
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),ক্রেডিট ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,বেতন স্লিপ তৈরি করা হচ্ছে ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,বেতন স্লিপ তৈরি করা হচ্ছে ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,আপনি রুট নোড সম্পাদনা করতে পারবেন না।
 DocType: Buying Settings,Purchase Order Required,আদেশ প্রয়োজন ক্রয়
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,সময় নির্ণায়ক
@@ -4755,7 +4759,7 @@
 DocType: Account,Rate at which this tax is applied,"এই ট্যাক্স প্রয়োগ করা হয়, যা এ হার"
 DocType: Cash Flow Mapper,Section Name,বিভাগের নাম
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,রেকর্ডার Qty
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},হ্রাস সারি {0}: দরকারী জীবন পরে প্রত্যাশিত মান {1} এর চেয়ে বড় বা সমান হতে হবে
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},হ্রাস সারি {0}: দরকারী জীবন পরে প্রত্যাশিত মান {1} এর চেয়ে বড় বা সমান হতে হবে
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,বর্তমান জব
 DocType: Company,Stock Adjustment Account,শেয়ার সামঞ্জস্য অ্যাকাউন্ট
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,খরচ লেখা
@@ -4802,7 +4806,7 @@
 DocType: Program Enrollment,School House,স্কুল হাউস
 DocType: Serial No,Out of AMC,এএমসি আউট
 DocType: Opportunity,Opportunity Amount,সুযোগ পরিমাণ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,বুক Depreciations সংখ্যা মোট Depreciations সংখ্যা তার চেয়ে অনেক বেশী হতে পারে না
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,বুক Depreciations সংখ্যা মোট Depreciations সংখ্যা তার চেয়ে অনেক বেশী হতে পারে না
 DocType: Purchase Order,Order Confirmation Date,অর্ডার নিশ্চিতকরণ তারিখ
 DocType: Driver,HR-DRI-.YYYY.-,এইচআর-ডিআরআই-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,রক্ষণাবেক্ষণ দর্শন করা
@@ -4843,7 +4847,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,ব্যাচ:
 DocType: Volunteer,Afternoon,বিকেল
 DocType: Loyalty Program,Loyalty Program Help,আনুগত্য প্রোগ্রাম সাহায্য
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' নিষ্ক্রিয়
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' নিষ্ক্রিয়
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ওপেন হিসাবে সেট করুন
 DocType: Cheque Print Template,Scanned Cheque,স্ক্যান করা চেক
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,জমা লেনদেনের পরিচিতিতে স্বয়ংক্রিয় ইমেল পাঠান.
@@ -4856,7 +4860,7 @@
 DocType: Warranty Claim,Item and Warranty Details,আইটেম এবং পাটা বিবরণ
 DocType: Chapter,Chapter Members,অধ্যায় সদস্যবৃন্দ
 DocType: Sales Team,Contribution (%),অবদান (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,উল্লেখ্য: পেমেন্ট ভুক্তি থেকে তৈরি করা হবে না &#39;ক্যাশ বা ব্যাংক একাউন্ট&#39; উল্লেখ করা হয়নি
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,উল্লেখ্য: পেমেন্ট ভুক্তি থেকে তৈরি করা হবে না &#39;ক্যাশ বা ব্যাংক একাউন্ট&#39; উল্লেখ করা হয়নি
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,প্রকল্প {0} ইতিমধ্যে বিদ্যমান
 DocType: Clinical Procedure,Nursing User,নার্সিং ব্যবহারকারী
 DocType: Employee Benefit Application,Payroll Period,পলল সময়কাল
@@ -4864,6 +4868,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},সিরিয়াল না {0} ব্যাচের অন্তর্গত নয় {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,দায়িত্ব
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,এই উদ্ধৃতির বৈধতা মেয়াদ শেষ হয়েছে।
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","এই দস্তাবেজটি বাতিল করতে কর্মচারী <a href=""#Form/Employee/{0}"">{0}</a> \ মুছে দিন"
 DocType: Expense Claim Account,Expense Claim Account,ব্যয় দাবি অ্যাকাউন্ট
 DocType: Account,Capital Work in Progress,অগ্রগতিতে ক্যাপিটাল ওয়ার্ক
 DocType: Accounts Settings,Allow Stale Exchange Rates,স্টেলা এক্সচেঞ্জের হার মঞ্জুর করুন
@@ -4944,7 +4950,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,ইস্যু উপাদান
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,ERPNext সঙ্গে Shopify সংযোগ করুন
 DocType: Material Request Item,For Warehouse,গুদাম জন্য
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,ডেলিভারি নোট {0} আপডেট করা হয়েছে
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,ডেলিভারি নোট {0} আপডেট করা হয়েছে
 DocType: Employee,Offer Date,অপরাধ তারিখ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,উদ্ধৃতি
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,আপনি অফলাইন মোডে হয়. আপনি যতক্ষণ না আপনি নেটওয়ার্ক আছে রিলোড করতে সক্ষম হবে না.
@@ -4994,7 +5000,7 @@
 DocType: Shipping Rule,Calculate Based On,ভিত্তি করে গণনা
 DocType: Contract,Unfulfilled,অপরিটুষ্ত
 DocType: Delivery Note Item,From Warehouse,গুদাম থেকে
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,উল্লিখিত মানদণ্ড জন্য কোন কর্মচারী
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,উল্লিখিত মানদণ্ড জন্য কোন কর্মচারী
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,সামগ্রী বিল দিয়ে কোন সামগ্রী উত্পাদনপ্রণালী
 DocType: Shopify Settings,Default Customer,ডিফল্ট গ্রাহক
 DocType: Sales Stage,Stage Name,পর্যায় নাম
@@ -5036,7 +5042,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ছাড়ের পরিমাণ পরে ট্যাক্স পরিমাণ
 DocType: Patient,Inpatient Status,ইনপেশেন্ট স্ট্যাটাস
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,দৈনন্দিন কাজের সংক্ষিপ্ত সেটিং
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,নির্বাচিত মূল্য তালিকা চেক করা ক্ষেত্রগুলি চেক করা উচিত।
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,নির্বাচিত মূল্য তালিকা চেক করা ক্ষেত্রগুলি চেক করা উচিত।
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,তারিখ দ্বারা Reqd লিখুন দয়া করে
 DocType: Payment Entry,Internal Transfer,অভ্যন্তরীণ স্থানান্তর
 DocType: Asset Maintenance,Maintenance Tasks,রক্ষণাবেক্ষণ কাজ
@@ -5072,7 +5078,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,গ্রুপ দ্বারা
 DocType: Guardian,Interests,রুচি
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,/ নিষ্ক্রিয় মুদ্রা সক্রিয় করুন.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,কিছু বেতন স্লিপ জমা দিতে পারে নি
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,কিছু বেতন স্লিপ জমা দিতে পারে নি
 DocType: Exchange Rate Revaluation,Get Entries,প্রবেশ করুন প্রবেশ করুন
 DocType: Production Plan,Get Material Request,উপাদান অনুরোধ করুন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,ঠিকানা খরচ
@@ -5156,7 +5162,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},ব্যয় অ্যাকাউন্ট আইটেমের জন্য বাধ্যতামূলক {0}
 DocType: BOM,Website Description,ওয়েবসাইট বর্ণনা
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,ইক্যুইটি মধ্যে নিট পরিবর্তন
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,ক্রয় চালান {0} বাতিল অনুগ্রহ প্রথম
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,ক্রয় চালান {0} বাতিল অনুগ্রহ প্রথম
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,অননুমোদিত. দয়া করে পরিষেবা ইউনিট প্রকারটি অক্ষম করুন
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ই-মেইল ঠিকানা অবশ্যই ইউনিক হতে হবে, ইতিমধ্যে অস্তিত্বমান {0}"
 DocType: Serial No,AMC Expiry Date,এএমসি মেয়াদ শেষ হওয়ার তারিখ
@@ -5196,7 +5202,7 @@
 DocType: Hotel Room,Hotel Room,হোটেল রুম
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},অ্যাকাউন্ট {0} আছে কোম্পানীর জন্যে না {1}
 DocType: Leave Type,Rounding,রাউন্ডইং
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,{0} সারিতে সিরিয়াল নম্বর দিয়ে ডেলিভারি নোট মেলে না
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,{0} সারিতে সিরিয়াল নম্বর দিয়ে ডেলিভারি নোট মেলে না
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),অসম্পূর্ণ পরিমাণ (প্রি-রেট)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","তারপর গ্রাহক, গ্রাহক গোষ্ঠী, টেরিটরি, সরবরাহকারী, সরবরাহকারী গ্রুপ, প্রচারাভিযান, বিক্রয় অংশীদার ইত্যাদির ভিত্তিতে প্রাইসিং রুলসগুলি ফিল্টার করা হয়।"
 DocType: Student,Guardian Details,গার্ডিয়ান বিবরণ
@@ -5251,7 +5257,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},গুদাম স্টক আইটেম জন্য প্রয়োজন {0}
 DocType: Leave Allocation,Unused leaves,অব্যবহৃত পাতার
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,পুনঃঅর্থায়ন এন্ট্রি করুন
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,সব বিভাগে
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,সব বিভাগে
 DocType: Healthcare Service Unit,Vacant,খালি
 DocType: Patient,Alcohol Past Use,অ্যালকোহল অতীত ব্যবহার
 DocType: Fertilizer Content,Fertilizer Content,সার কনটেন্ট
@@ -5262,7 +5268,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,এই অর্ডার অর্ডার বাতিল করার আগে অর্ডার অর্ডার {0} বাতিল করা আবশ্যক
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),(সাব-সমাহারগুলি সহ) অপ্রমাণিত BOM পান
 DocType: Authorization Rule,Applicable To (Employee),প্রযোজ্য (কর্মচারী)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,দরুন জন্ম বাধ্যতামূলক
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,দরুন জন্ম বাধ্যতামূলক
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,অ্যাট্রিবিউট জন্য বর্ধিত {0} 0 হতে পারবেন না
 DocType: Employee Benefit Claim,Benefit Type and Amount,বেনিফিট টাইপ এবং পরিমাণ
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,রুম বুকড
@@ -5406,7 +5412,7 @@
 DocType: Purchase Invoice Item,Total Weight,সম্পূর্ণ ওজন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,বিক্রয় কমিশনের
 DocType: Job Offer Term,Value / Description,মূল্য / বিবরণ:
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","সারি # {0}: অ্যাসেট {1} জমা দেওয়া যাবে না, এটা আগে থেকেই {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","সারি # {0}: অ্যাসেট {1} জমা দেওয়া যাবে না, এটা আগে থেকেই {2}"
 DocType: Tax Rule,Billing Country,বিলিং দেশ
 DocType: Purchase Order Item,Expected Delivery Date,প্রত্যাশিত প্রসবের তারিখ
 DocType: Restaurant Order Entry,Restaurant Order Entry,রেস্টুরেন্ট অর্ডার এন্ট্রি
@@ -5445,12 +5451,13 @@
 DocType: Maintenance Visit,Breakdown,ভাঙ্গন
 DocType: Travel Itinerary,Vegetarian,নিরামিষ
 DocType: Patient Encounter,Encounter Date,দ্বন্দ্বের তারিখ
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,অ্যাকাউন্ট: {0} একক সঙ্গে: {1} নির্বাচন করা যাবে না
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,অ্যাকাউন্ট: {0} একক সঙ্গে: {1} নির্বাচন করা যাবে না
 DocType: Bank Statement Transaction Settings Item,Bank Data,ব্যাংক ডেটা
 DocType: Purchase Receipt Item,Sample Quantity,নমুনা পরিমাণ
 DocType: Bank Guarantee,Name of Beneficiary,সুবিধা গ্রহণকারীর নাম
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",সর্বশেষ মূল্যনির্ধারণ হার / মূল্য তালিকা হার / কাঁচামালের সর্বশেষ ক্রয়ের হারের ভিত্তিতে স্বয়ংক্রিয়ভাবে নির্ধারিত BOM- এর মূল্য নির্ধারনের মাধ্যমে।
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,সরবরাহকারী&gt; সরবরাহকারী গ্রুপ
 DocType: Bank Reconciliation Detail,Cheque Date,চেক তারিখ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},অ্যাকাউন্ট {0}: মূল অ্যাকাউন্ট {1} কোম্পানি অন্তর্গত নয়: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,সফলভাবে এই কোম্পানীর সাথে সম্পর্কিত সব লেনদেন মোছা!
@@ -5478,7 +5485,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,শিশু নোড শুধুমাত্র &#39;গ্রুপ&#39; টাইপ নোড অধীনে তৈরি করা যেতে পারে
 DocType: Attendance Request,Half Day Date,অর্ধদিবস তারিখ
 DocType: Academic Year,Academic Year Name,একাডেমিক বছরের নাম
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} {1} এর সাথে ট্রান্সফার করতে অনুমোদিত নয়। কোম্পানী পরিবর্তন করুন।
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} {1} এর সাথে ট্রান্সফার করতে অনুমোদিত নয়। কোম্পানী পরিবর্তন করুন।
 DocType: Sales Partner,Contact Desc,যোগাযোগ নিম্নক্রমে
 DocType: Email Digest,Send regular summary reports via Email.,ইমেইলের মাধ্যমে নিয়মিত সংক্ষিপ্ত রিপোর্ট পাঠান.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},এ ব্যায়ের দাবি প্রকার ডিফল্ট অ্যাকাউন্ট সেট করুন {0}
@@ -5511,7 +5518,7 @@
 DocType: Hotel Room,Hotel Manager,হোটেল ব্যবস্থাপক
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,শপিং কার্ট জন্য সেট করের রুল
 DocType: Purchase Invoice,Taxes and Charges Added,কর ও চার্জ যোগ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,হ্রাস সারি {0}: পরবর্তী অবচয় তারিখটি আগে উপলব্ধ নাও হতে পারে ব্যবহারের জন্য তারিখ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,হ্রাস সারি {0}: পরবর্তী অবচয় তারিখটি আগে উপলব্ধ নাও হতে পারে ব্যবহারের জন্য তারিখ
 ,Sales Funnel,বিক্রয় ফানেল
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,সমাহার বাধ্যতামূলক
 DocType: Project,Task Progress,টাস্ক অগ্রগতি
@@ -5525,7 +5532,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,সকল গ্রাহকের গ্রুপ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,সঞ্চিত মাসিক
 DocType: Attendance Request,On Duty,কাজে আছি
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} বাধ্যতামূলক. হয়তো মুদ্রা বিনিময় রেকর্ড {1} {2} করার জন্য তৈরি করা হয় না.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} বাধ্যতামূলক. হয়তো মুদ্রা বিনিময় রেকর্ড {1} {2} করার জন্য তৈরি করা হয় না.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},স্টাফিং প্ল্যান {0} ইতিমধ্যে পদায়ন জন্য বিদ্যমান {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,ট্যাক্স টেমপ্লেট বাধ্যতামূলক.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,অ্যাকাউন্ট {0}: মূল অ্যাকাউন্ট {1} অস্তিত্ব নেই
@@ -5604,11 +5611,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,অন্তত একটি গুদাম বাধ্যতামূলক
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","ইউওম, আইটেম গ্রুপ, বর্ণনা এবং ঘন্টাগুলির সংখ্যাগুলি যেমন আইটেম ক্ষেত্র কনফিগার করুন।"
 DocType: Certification Application,Certification Status,সার্টিফিকেশন স্থিতি
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,নগরচত্বর
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,নগরচত্বর
 DocType: Travel Itinerary,Travel Advance Required,ভ্রমণ অগ্রগতি প্রয়োজন
 DocType: Subscriber,Subscriber Name,গ্রাহক নাম
 DocType: Serial No,Out of Warranty,পাটা আউট
-DocType: Cashier Closing,Cashier-closing-,ক্যাশিয়ার closing-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,ম্যাপেড ডেটা টাইপ
 DocType: BOM Update Tool,Replace,প্রতিস্থাপন করা
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,কোন পণ্য পাওয়া যায় নি।
@@ -5695,7 +5701,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,বিক্রয় এবং ক্রয় জন্য ডিফল্ট ট্যাক্স টেমপ্লেট তৈরি করা হয়।
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,মূল্যায়ন ফলাফল রেকর্ড {0} ইতিমধ্যে বিদ্যমান।
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","উদাহরণ: ABCD। ##### যদি সিরিজ সেট করা থাকে এবং ব্যাচ নাম লেনদেনের ক্ষেত্রে উল্লেখ করা হয় না, তাহলে এই সিরিজের উপর ভিত্তি করে স্বয়ংক্রিয় ব্যাচ নম্বর তৈরি করা হবে। আপনি যদি সবসময় এই আইটেমটির জন্য ব্যাচ নংকে স্পষ্টভাবে উল্লেখ করতে চান, তবে এই ফাঁকা স্থানটি ছেড়ে দিন। দ্রষ্টব্য: এই সেটিং স্টক সেটিংসের নামকরণ সিরিজ প্রিফিক্সের উপর অগ্রাধিকার পাবে।"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,সেটআপের মাধ্যমে উপস্থিতি জন্য সংখ্যায়ন সিরিজ সেটআপ করুন&gt; সংখ্যায়ন সিরিজ
 DocType: BOM,Materials Required (Exploded),উপকরণ (অপ্রমাণিত) প্রয়োজন
 DocType: Contract,Party User,পার্টি ব্যবহারকারী
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',দয়া করে কোম্পানির ফাঁকা ফিল্টার সেট করুন যদি একদল &#39;কোম্পানি&#39; হল
@@ -5896,7 +5901,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,OPP কাউন্ট
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,উভয় ট্রায়াল সময়কাল শুরু তারিখ এবং ট্রায়াল সময়কাল শেষ তারিখ সেট করা আবশ্যক
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,গড় হার
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,পেমেন্ট শংসাপত্রের মোট পরিশোধের পরিমাণ গ্র্যান্ড / গোলাকার মোট সমান হওয়া আবশ্যক
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,পেমেন্ট শংসাপত্রের মোট পরিশোধের পরিমাণ গ্র্যান্ড / গোলাকার মোট সমান হওয়া আবশ্যক
 DocType: Subscription Plan Detail,Plan,পরিকল্পনা
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,জেনারেল লেজার অনুযায়ী ব্যাংক ব্যালেন্সের
 DocType: Job Applicant,Applicant Name,আবেদনকারীর নাম
@@ -5965,7 +5970,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,সাবান ও ডিটারজেন্ট
 DocType: BOM,Show Items,আইটেম দেখান
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,সময় সময় তার চেয়ে অনেক বেশী হতে পারে না.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,আপনি কি ইমেলের মাধ্যমে সমস্ত গ্রাহকদের অবহিত করতে চান?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,আপনি কি ইমেলের মাধ্যমে সমস্ত গ্রাহকদের অবহিত করতে চান?
 DocType: Subscription Plan,Billing Interval,বিলিং বিরতি
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,মোশন পিকচার ও ভিডিও
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,আদেশ
@@ -5974,9 +5979,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,সারি {0}: {1} 0 এর থেকে বড় হতে হবে
 DocType: Assessment Criteria,Assessment Criteria Group,অ্যাসেসমেন্ট নির্ণায়ক গ্রুপ
 DocType: Healthcare Settings,Patient Name By,রোগীর নাম দ্বারা
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},{0} থেকে {1} পর্যন্ত বেতন জন্য আগমন জার্নাল এন্ট্রি
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},{0} থেকে {1} পর্যন্ত বেতন জন্য আগমন জার্নাল এন্ট্রি
 DocType: Sales Invoice Item,Enable Deferred Revenue,বিলম্বিত রাজস্ব সক্ষম করুন
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},খোলা সঞ্চিত অবচয় সমান চেয়ে কম হতে হবে {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},খোলা সঞ্চিত অবচয় সমান চেয়ে কম হতে হবে {0}
 DocType: Warehouse,Warehouse Name,ওয়ারহাউস নাম
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,প্রকৃত শুরুর তারিখ প্রকৃত শেষ তারিখের চেয়ে কম হওয়া আবশ্যক
 DocType: Naming Series,Select Transaction,নির্বাচন লেনদেন
@@ -6127,7 +6132,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,গ্রেড {1} এর কর্মচারী {0} এর কোনো ডিফল্ট ছাড় নীতি নেই
 DocType: Salary Detail,Salary Detail,বেতন বিস্তারিত
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,প্রথম {0} দয়া করে নির্বাচন করুন
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,{0} ব্যবহারকারীদের যোগ করা হয়েছে
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,{0} ব্যবহারকারীদের যোগ করা হয়েছে
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","মাল্টি-টিয়ার প্রোগ্রামের ক্ষেত্রে, গ্রাহকরা তাদের ব্যয় অনুযায়ী সংশ্লিষ্ট টায়ারে স্বয়ংক্রিয়ভাবে নিয়োগ পাবেন"
 DocType: Appointment Type,Physician,চিকিত্সক
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,আইটেম এর ব্যাচ {0} {1} মেয়াদ শেষ হয়ে গেছে.
@@ -6271,7 +6276,7 @@
 DocType: Asset,Custodian,জিম্মাদার
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,পয়েন্ট অফ বিক্রয় প্রোফাইল
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} 0 এবং 100 এর মধ্যে একটি মান হওয়া উচিত
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},{1} থেকে {2} পর্যন্ত {0} অর্থ প্রদান
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},{1} থেকে {2} পর্যন্ত {0} অর্থ প্রদান
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,জামানতবিহীন ঋণ
 DocType: Cost Center,Cost Center Name,খরচ কেন্দ্র নাম
 DocType: Student,B+,B +
@@ -6303,6 +6308,7 @@
 DocType: Employee,Date of Issue,প্রদান এর তারিখ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","ক্রয় সেটিংস অনুযায়ী ক্রয় Reciept প্রয়োজনীয় == &#39;হ্যাঁ, তারপর ক্রয় চালান তৈরি করার জন্য, ব্যবহারকারী আইটেমের জন্য প্রথম ক্রয় রশিদ তৈরি করতে হবে যদি {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},সারি # {0}: আইটেমের জন্য সেট সরবরাহকারী {1}
+DocType: Global Defaults,Default Distance Unit,ডিফল্ট দূরত্ব ইউনিট
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,সারি {0}: ঘন্টা মান শূন্য থেকে বড় হওয়া উচিত.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,আইটেম {1} সংযুক্ত ওয়েবসাইট চিত্র {0} পাওয়া যাবে না
 DocType: Issue,Content Type,কোন ধরনের
@@ -6358,7 +6364,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,অ্যাকাউন্ট ডেবিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
 DocType: Asset,Naming Series,নামকরণ সিরিজ
 DocType: Vital Signs,Coated,প্রলিপ্ত
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,সারি {0}: সম্ভাব্য মূল্য পরে দরকারী জীবন গ্রস ক্রয় পরিমাণের চেয়ে কম হওয়া আবশ্যক
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,সারি {0}: সম্ভাব্য মূল্য পরে দরকারী জীবন গ্রস ক্রয় পরিমাণের চেয়ে কম হওয়া আবশ্যক
 DocType: GoCardless Settings,GoCardless Settings,GoCardless সেটিংস
 DocType: Leave Block List,Leave Block List Name,ব্লক তালিকা নাম
 DocType: Certified Consultant,Certification Validity,সার্টিফিকেশন বৈধতা
@@ -6425,6 +6431,7 @@
 DocType: Bank Statement Settings Item,Bank Header,ব্যাংক হোল্ডার
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,ল্যাব টেস্ট দেখুন
 DocType: Hub Users,Hub Users,হাব ব্যবহারকারীগণ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গ্রুপ&gt; অঞ্চল
 DocType: Purchase Invoice,Y,ওয়াই
 DocType: Maintenance Visit,Maintenance Date,রক্ষণাবেক্ষণ তারিখ
 DocType: Purchase Invoice Item,Rejected Serial No,প্রত্যাখ্যাত সিরিয়াল কোন
@@ -6439,7 +6446,7 @@
 DocType: SG Creation Tool Course,Max Strength,সর্বোচ্চ শক্তি
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,প্রিসেটগুলি ইনস্টল করা হচ্ছে
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,Edu-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},গ্রাহকের জন্য কোন ডেলিভারি নোট নির্বাচিত {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},গ্রাহকের জন্য কোন ডেলিভারি নোট নির্বাচিত {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,কর্মচারী {0} এর সর্বাধিক বেনিফিট পরিমাণ নেই
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,ডেলিভারি তারিখ উপর ভিত্তি করে আইটেম নির্বাচন করুন
 DocType: Grant Application,Has any past Grant Record,কোন অতীতের গ্রান্ট রেকর্ড আছে
@@ -6466,7 +6473,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,হোটেল রুম সংরক্ষণ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,গ্রাহক সেবা
 DocType: BOM,Thumbnail,ছোট
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,ইমেল আইডি সঙ্গে কোন যোগাযোগ পাওয়া যায় নি।
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,ইমেল আইডি সঙ্গে কোন যোগাযোগ পাওয়া যায় নি।
 DocType: Item Customer Detail,Item Customer Detail,আইটেম গ্রাহক বিস্তারিত
 DocType: Notification Control,Prompt for Email on Submission of,জমা ইমেইল জন্য অনুরোধ করা
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},কর্মীর সর্বাধিক সুবিধা পরিমাণ {0} অতিক্রম করে {1}
@@ -6721,7 +6728,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,"অ্যাকাউন্ট ধরন নির্বাচন করা হয়, কারণ গ্রুপের গোপন করা যাবে না."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} নথীটি পরিবর্তিত হয়েছে. রিফ্রেশ করুন.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,নিম্নলিখিত দিন ছুটি অ্যাপ্লিকেশন তৈরি করা থেকে ব্যবহারকারীদের বিরত থাকুন.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,আইটেম কোড&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","যদি আনুগত্যকালের আনুপাতিক মেয়াদকালের মেয়াদ শেষ হয়ে যায়, তাহলে মেয়াদ শেষের সময়টি খালি রাখুন অথবা 0।"
 DocType: Asset Maintenance Team,Maintenance Team Members,রক্ষণাবেক্ষণ দলের সদস্যদের
 DocType: Loyalty Point Entry,Purchase Amount,ক্রয় মূল
@@ -6729,7 +6735,7 @@
 											to fullfill Sales Order {2}",আইটেম {1} এর সিরিয়াল নং {0} প্রদান করা যাবে না কারণ এটি বিক্রয় আদেশটি সম্পূর্ণ করার জন্য সংরক্ষিত আছে {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,সরবরাহকারী উদ্ধৃতি {0} সৃষ্টি
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,শেষ বছরের শুরুর বছর আগে হতে পারবে না
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,শেষ বছরের শুরুর বছর আগে হতে পারবে না
 DocType: Employee Benefit Application,Employee Benefits,কর্মচারীর সুবিধা
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},বস্তাবন্দী পরিমাণ সারিতে আইটেম {0} জন্য পরিমাণ সমান নয় {1}
 DocType: Work Order,Manufactured Qty,শিল্পজাত Qty
@@ -6745,6 +6751,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,ব্যাচ নাম্বার নির্বাচন
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,GSTIN তে
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,গ্রাহকরা উত্থাপিত বিল.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,মানব সম্পদ&gt; এইচআর সেটিংস মধ্যে কর্মচারী নামকরণ সিস্টেম সেটআপ করুন
 DocType: Healthcare Settings,Invoice Appointments Automatically,স্বয়ংক্রিয়ভাবে চালান নিয়োগ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,প্রকল্প আইডি
 DocType: Salary Component,Variable Based On Taxable Salary,করযোগ্য বেতন উপর ভিত্তি করে পরিবর্তনশীল
@@ -6793,7 +6800,7 @@
 DocType: POS Profile,Account for Change Amount,পরিমাণ পরিবর্তনের জন্য অ্যাকাউন্ট
 DocType: QuickBooks Migrator,Connecting to QuickBooks,QuickBooks সাথে সংযোগ স্থাপন
 DocType: Exchange Rate Revaluation,Total Gain/Loss,মোট লাভ / ক্ষতি
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,ইন্টার কোম্পানি ইনভয়েস জন্য অবৈধ কোম্পানি।
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,ইন্টার কোম্পানি ইনভয়েস জন্য অবৈধ কোম্পানি।
 DocType: Purchase Invoice,input service,ইনপুট পরিষেবা
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},সারি {0}: পার্টি / অ্যাকাউন্টের সাথে মেলে না {1} / {2} এ {3} {4}
 DocType: Employee Promotion,Employee Promotion,কর্মচারী প্রচার
@@ -6923,7 +6930,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,লোডিং জন্য পছন্দের ক্ষেত্র
 apps/erpnext/erpnext/config/selling.py +184,Analytics,বৈশ্লেষিক ন্যায়
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,কার্ট খালি হয়
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,শিক্ষা&gt; শিক্ষা সেটিংসে নির্দেশক নামকরণ সিস্টেম সেটআপ করুন
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",আইটেম {0} এর কোন সিরিয়াল নাম্বার নেই। ক্রমাগত ক্রমিক সংখ্যাগুলি / সিরিয়াল নাম্বারের উপর ভিত্তি করে ডেলিভারি থাকতে পারে
 DocType: Vehicle,Model,মডেল
@@ -6953,7 +6959,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,পরিবর্তন করতে কিছুই নেই
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,একটি CSV ফাইল নির্বাচন করুন
 DocType: Holiday List,Total Holidays,মোট ছুটির দিন
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,প্রেরণের জন্য অনুপস্থিত ইমেল টেমপ্লেট। ডেলিভারি সেটিংস এক সেট করুন।
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,প্রেরণের জন্য অনুপস্থিত ইমেল টেমপ্লেট। ডেলিভারি সেটিংস এক সেট করুন।
 DocType: Student Leave Application,Mark as Present,বর্তমান হিসাবে চিহ্নিত করুন
 DocType: Supplier Scorecard,Indicator Color,নির্দেশক রঙ
 DocType: Purchase Order,To Receive and Bill,জখন এবং বিল থেকে
@@ -6962,7 +6968,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,সিরিয়াল নম্বর নির্বাচন করুন
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,ডিজাইনার
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,শর্তাবলী টেমপ্লেট
-DocType: Serial No,Delivery Details,প্রসবের বিবরণ
+DocType: Delivery Trip,Delivery Details,প্রসবের বিবরণ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},ধরণ জন্য খরচ কেন্দ্র সারিতে প্রয়োজন বোধ করা হয় {0} কর টেবিল {1}
 DocType: Program,Program Code,প্রোগ্রাম কোড
 DocType: Terms and Conditions,Terms and Conditions Help,চুক্তি ও শর্তাদি সহায়তা
@@ -6986,7 +6992,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,সময় দিন লিড
 DocType: Cash Flow Mapping,Is Income Tax Expense,আয়কর ব্যয় হয়
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,আপনার অর্ডার প্রসবের জন্য আউট!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},সারি # {0}: পোস্টিং তারিখ ক্রয় তারিখ হিসাবে একই হতে হবে {1} সম্পত্তির {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},সারি # {0}: পোস্টিং তারিখ ক্রয় তারিখ হিসাবে একই হতে হবে {1} সম্পত্তির {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,এই চেক শিক্ষার্থীর ইন্সটিটিউটের হোস্টেল এ অবস্থিত হয়।
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,উপরে টেবিল এ সেলস অর্ডার প্রবেশ করুন
 ,Stock Summary,শেয়ার করুন সংক্ষিপ্ত
diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv
index 010ff07..72ee8e7 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Ime perioda
 DocType: Employee,Salary Mode,Plaća način
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Registrujte se
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Registrujte se
 DocType: Patient,Divorced,Rastavljen
 DocType: Support Settings,Post Route Key,Post Route Key
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Dozvolite Stavka treba dodati više puta u transakciji
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Novi kurs
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Valuta je potreban za Cjenovnik {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Hoće li biti izračunata u transakciji.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Dobavljač&gt; Tip dobavljača
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-YYYY.-
 DocType: Purchase Order,Customer Contact,Kontakt kupca
 DocType: Patient Appointment,Check availability,Provjera dostupnosti
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Pokaži otvoren
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Serija Updated uspješno
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Provjeri
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} u redu {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} u redu {1}
 DocType: Asset Finance Book,Depreciation Start Date,Datum početka amortizacije
 DocType: Pricing Rule,Apply On,Primjeni na
 DocType: Item Price,Multiple Item prices.,Više cijene stavke.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Lab recept
 ,Delay Days,Dani odlaganja
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Servis rashodi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijski broj: {0} je već spomenut u prodaje Faktura: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijski broj: {0} je već spomenut u prodaje Faktura: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Faktura
 DocType: Purchase Invoice Item,Item Weight Details,Detaljna težina stavke
 DocType: Asset Maintenance Log,Periodicity,Periodičnost
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Računovođa
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Prodajni cjenik
 DocType: Patient,Tobacco Current Use,Upotreba duvana
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Datum početka i završetka se preklapa sa kartom posla <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Prodajna stopa
 DocType: Cost Center,Stock User,Stock korisnika
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,povezan
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Datum prisustvo ne može biti manji od datuma pristupanja zaposlenog
 DocType: Grading Scale,Grading Scale Name,Pravilo Scale Ime
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Dodajte korisnike na Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Dodajte korisnike na Marketplace
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,To jekorijen račun i ne može se mijenjati .
 DocType: Sales Invoice,Company Address,Company Adresa
 DocType: BOM,Operations,Operacije
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Količina
 DocType: Production Plan,Material Request Detail,Zahtev za materijal za materijal
 DocType: Selling Settings,Default Quotation Validity Days,Uobičajeni dani valute kvotiranja
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
 DocType: SMS Center,SMS Center,SMS centar
 DocType: Payroll Entry,Validate Attendance,Potvrdite prisustvo
 DocType: Sales Invoice,Change Amount,Promjena Iznos
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Prored za iznos u riječima
 DocType: Vehicle,Additional Details,Dodatni Detalji
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Nema opisa dano
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Dobavljač&gt; Grupa dobavljača
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Zahtjev za kupnju.
 DocType: POS Closing Voucher Details,Collected Amount,Prikupljeni iznos
 DocType: Lab Test,Submitted Date,Datum podnošenja
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,student Ulaz
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Artikal {0} je otkazan
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Redosled amortizacije {0}: Početni datum amortizacije upisuje se kao prošli datum
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Redosled amortizacije {0}: Početni datum amortizacije upisuje se kao prošli datum
 DocType: Contract Template,Fulfilment Terms and Conditions,Uslovi ispunjavanja uslova
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Materijal zahtjev
 DocType: Bank Reconciliation,Update Clearance Date,Ažurirajte provjeri datum
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,Postavke za račune
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Dobavljač Račun ne postoji u fakturi {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Menadzeri prodaje - Upravljanje.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Ne možete obrađiti rutu, pošto su Google Map Settings podešene."
 DocType: Job Applicant,Cover Letter,Pismo
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Izvanredna Čekovi i depoziti očistiti
 DocType: Item,Synced With Hub,Pohranjen Hub
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Nova vrijednost imovine
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Stopa po kojoj Kupac valuta se pretvaraju u kupca osnovne valute
 DocType: Course Scheduling Tool,Course Scheduling Tool,Naravno rasporedu Tool
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: fakturi ne može se protiv postojeće imovine {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: fakturi ne može se protiv postojeće imovine {1}
 DocType: Crop Cycle,LInked Analysis,LInked Analysis
 DocType: POS Closing Voucher,POS Closing Voucher,POS zatvoreni vaučer
 DocType: Contract,Lapsed,Propušteno
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} nije upisanim na predmetu {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Ime studenta:
 DocType: POS Closing Voucher Details,Difference,Razlika
+DocType: Delivery Settings,Delay between Delivery Stops,Kašnjenje između prekida isporuke
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serijski Ne {0} ne pripada isporuke Napomena {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Izgleda da postoji problem sa konfiguracijom GoCardless servera. Ne brinite, u slučaju neuspeha, iznos će vam biti vraćen na vaš račun."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -693,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Količina i stopa
 DocType: Delivery Note,% Installed,Instalirano%
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Učionice / laboratorije, itd, gdje se mogu zakazati predavanja."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Kompanijske valute obe kompanije treba da se podudaraju za transakcije Inter preduzeća.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Kompanijske valute obe kompanije treba da se podudaraju za transakcije Inter preduzeća.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Unesite ime tvrtke prvi
 DocType: Travel Itinerary,Non-Vegetarian,Ne-Vegetarijanac
 DocType: Purchase Invoice,Supplier Name,Dobavljač Ime
@@ -778,7 +779,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Iznajmljen od datuma
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Dosta dijelova za izgradnju
 DocType: POS Profile User,POS Profile User,POS korisnik profila
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Red {0}: datum početka amortizacije je potreban
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Red {0}: datum početka amortizacije je potreban
 DocType: Purchase Invoice Item,Service Start Date,Datum početka usluge
 DocType: Subscription Invoice,Subscription Invoice,Pretplata faktura
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Direktni prihodi
@@ -845,7 +846,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Skraćenica već koristi za druge kompanije
 DocType: Selling Settings,Default Customer Group,Zadana grupa korisnika
 DocType: Employee,IFSC Code,IFSC kod
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Datum početka i završetka se preklapa sa kartom posla <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ako onemogućite, &#39;Ukupno&#39; Zaobljeni polje neće biti vidljiv u bilo kojoj transakciji"
 DocType: BOM,Operating Cost,Operativni troškovi
 DocType: Crop,Produced Items,Proizvedene stavke
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,Sprečite RFQs
 DocType: Hub User,Hub User,Hub User
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Provjerite prodajnog naloga
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Plata za slanje poslata za period od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Plata za slanje poslata za period od {0} do {1}
 DocType: Project Task,Project Task,Projektni zadatak
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Iskorišćene tačke
 ,Lead Id,Lead id
@@ -1027,7 +1027,7 @@
 DocType: Fee Validity,Max number of visit,Maksimalan broj poseta
 ,Hotel Room Occupancy,Hotelska soba u posjedu
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet created:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,upisati
 DocType: GST Settings,GST Settings,PDV Postavke
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Valuta mora biti ista kao cenovnik Valuta: {0}
@@ -1081,7 +1081,7 @@
 DocType: Vehicle Log,Service Details,usluga Detalji
 DocType: Lab Test Template,Grouped,Grupisano
 DocType: Selling Settings,Delivery Note Required,Potrebna je otpremnica
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Podnošenje plata ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Podnošenje plata ...
 DocType: Bank Guarantee,Bank Guarantee Number,Bankarska garancija Broj
 DocType: Assessment Criteria,Assessment Criteria,Kriteriji procjene
 DocType: BOM Item,Basic Rate (Company Currency),Osnovna stopa (valuta preduzeća)
@@ -1106,13 +1106,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Plaćanje Ulaz je već stvorena
 DocType: Request for Quotation,Get Suppliers,Uzmite dobavljača
 DocType: Purchase Receipt Item Supplied,Current Stock,Trenutni Stock
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ne povezano sa Stavka {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ne povezano sa Stavka {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Preview Plaća Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Račun {0} je ušao više puta
 DocType: Account,Expenses Included In Valuation,Troškovi uključeni u vrednovanje
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Možete obnoviti samo ako vaše članstvo istekne u roku od 30 dana
 DocType: Shopping Cart Settings,Show Stock Availability,Show Stock Availability
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Postavite {0} u kategoriji aktive {1} ili kompaniju {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Postavite {0} u kategoriji aktive {1} ili kompaniju {2}
 DocType: Location,Longitude,Dužina
 ,Absent Student Report,Odsutan Student Report
 DocType: Crop,Crop Spacing UOM,Crop Spacing UOM
@@ -1184,7 +1184,7 @@
 DocType: Soil Texture,Sand,Pesak
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,energija
 DocType: Opportunity,Opportunity From,Prilika od
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Red {0}: {1} Serijski brojevi potrebni za stavku {2}. Proveli ste {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Red {0}: {1} Serijski brojevi potrebni za stavku {2}. Proveli ste {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Izaberite tabelu
 DocType: BOM,Website Specifications,Web Specifikacije
 DocType: Special Test Items,Particulars,Posebnosti
@@ -1295,7 +1295,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Predmeti sa višim weightage će biti prikazan veći
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Laboratorijski testovi i vitalni znaci
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Pomirenje Detalj
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} moraju biti dostavljeni
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} moraju biti dostavljeni
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Niti jedan zaposlenik pronađena
 DocType: Item,If subcontracted to a vendor,Ako podizvođača na dobavljača
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Student Grupa je već ažurirana.
@@ -1349,7 +1349,6 @@
 DocType: Loyalty Program Collection,Tier Name,Tier Name
 DocType: HR Settings,Enter retirement age in years,Unesite dob za odlazak u penziju u godinama
 DocType: Crop,Target Warehouse,Ciljana galerija
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo postavite Naming Series za {0} preko Setup&gt; Settings&gt; Series Naming
 DocType: Payroll Employee Detail,Payroll Employee Detail,Detalji o zaposlenima
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Molimo odaberite skladište
 DocType: Cheque Print Template,Starting location from left edge,Početna lokacija od lijevog ruba
@@ -1439,7 +1438,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Plan materijal za podsklopove
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Prodaja Partneri i teritorija
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} mora biti aktivna
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Nema stavki za prenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Nema stavki za prenos
 DocType: Employee Boarding Activity,Activity Name,Naziv aktivnosti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Promeni datum izdanja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Završena količina proizvoda <b>{0}</b> i Za količinu <b>{1}</b> ne mogu biti različite
@@ -1666,6 +1665,7 @@
 DocType: Project,First Email,Prva e-pošta
 DocType: Company,Exception Budget Approver Role,Izuzetna budžetska uloga odobravanja
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Jednom podešen, ovaj račun će biti na čekanju do određenog datuma"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervirano Warehouse u prodajni nalog / skladišta gotovih proizvoda
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Prodaja Iznos
 DocType: Repayment Schedule,Interest Amount,Iznos kamata
@@ -1677,7 +1677,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Zapisi
 DocType: Asset,Scrapped,odbačen
 DocType: Item,Item Defaults,Item Defaults
-DocType: Purchase Invoice,Returns,povraćaj
+DocType: Cashier Closing,Returns,povraćaj
 DocType: Job Card,WIP Warehouse,WIP Skladište
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serijski Ne {0} je pod ugovorom za održavanje upto {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,regrutacija
@@ -1691,7 +1691,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Tip prenosa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Prodajni troškovi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klijent&gt; Grupa klijenata&gt; Teritorija
 DocType: Diagnosis,Diagnosis,Dijagnoza
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standardna kupnju
 DocType: Attendance Request,Explanation,Objašnjenje
@@ -1704,7 +1703,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Nalozi za kupovinu narudžbine
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Poštanski broj
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Prodajnog naloga {0} je {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Izaberete račun prihoda od kamata u pozajmici {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Izaberete račun prihoda od kamata u pozajmici {0}
 DocType: Opportunity,Contact Info,Kontakt Informacije
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Izrada Stock unosi
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Ne može promovirati zaposlenika sa statusom levo
@@ -1716,7 +1715,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Faktura ne može biti napravljena za nultu cenu fakturisanja
 DocType: Company,Date of Commencement,Datum početka
 DocType: Sales Person,Select company name first.,Prvo odaberite naziv preduzeća.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},E-mail poslan na {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},E-mail poslan na {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ponude dobijene od dobavljača.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Zamijenite BOM i ažurirajte najnoviju cijenu u svim BOM
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Za {0} | {1} {2}
@@ -1736,7 +1735,7 @@
 DocType: Asset Movement,From Employee,Od zaposlenika
 DocType: Driver,Cellphone Number,Broj mobitela
 DocType: Project,Monitor Progress,Napredak monitora
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Upozorenje : Sustav neće provjeravati overbilling od iznosa za točku {0} u {1} je nula
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Upozorenje : Sustav neće provjeravati overbilling od iznosa za točku {0} u {1} je nula
 DocType: Journal Entry,Make Difference Entry,Čine razliku Entry
 DocType: Supplier Quotation,Auto Repeat Section,Auto Repeat Odjeljak
 DocType: Upload Attendance,Attendance From Date,Gledatelja Od datuma
@@ -1839,7 +1838,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Odbijena Količina ne može unijeti u Kupovina Povratak
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Promena klijentske grupe za izabranog klijenta nije dozvoljena.
 ,Purchase Order Items To Be Billed,Narudžbenica Proizvodi se naplaćuje
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Ažuriranje procijenjenih vremena dolaska.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Ažuriranje procijenjenih vremena dolaska.
 DocType: Program Enrollment Tool,Enrollment Details,Detalji upisa
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Ne može se podesiti više postavki postavki za preduzeće.
 DocType: Purchase Invoice Item,Net Rate,Neto stopa
@@ -1853,7 +1852,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Leave Type je lijevan
 DocType: Support Settings,Close Issue After Days,Zatvori Issue Nakon nekoliko dana
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Morate biti korisnik sa ulogama System Manager i Item Manager da biste dodali korisnike u Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Morate biti korisnik sa ulogama System Manager i Item Manager da biste dodali korisnike u Marketplace.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Ostavite prazno ako smatra za sve grane
 DocType: Job Opening,Staffing Plan,Plan zapošljavanja
 DocType: Bank Guarantee,Validity in Days,Valjanost u Dani
@@ -1873,7 +1872,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Dupli red {0} sa istim {1}
 DocType: Marketplace Settings,Disable Marketplace,Onemogući tržište
 ,Trial Balance,Pretresno bilanca
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađen
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađen
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Postavljanje Zaposlenih
 DocType: Hotel Room Reservation,Hotel Reservation User,Rezervacija korisnika hotela
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Odaberite prefiks prvi
@@ -1981,7 +1980,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Neuspešno se prijaviti
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Sredstvo {0} kreirano
 DocType: Special Test Items,Special Test Items,Specijalne testne jedinice
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Potrebno je da budete korisnik sa ulogama System Manager i Item Manager za prijavljivanje na Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Potrebno je da budete korisnik sa ulogama System Manager i Item Manager za prijavljivanje na Marketplace.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Način plaćanja
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Prema vašoj dodeljenoj strukturi zarada ne možete se prijaviti za naknade
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Sajt slika treba da bude javni datoteke ili web stranice URL
@@ -1993,7 +1992,7 @@
 DocType: Warehouse,Warehouse Contact Info,Kontakt informacije skladišta
 DocType: Payment Entry,Write Off Difference Amount,Otpis Razlika Iznos
 DocType: Volunteer,Volunteer Name,Ime volontera
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Redovi sa dupliciranim datumima u drugim redovima su pronađeni: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Redovi sa dupliciranim datumima u drugim redovima su pronađeni: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent",{0}: e-mail nije poslat jer e-mail zaposlenog nije pronađen
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Struktura zarada nije dodeljena zaposlenom {0} na datom datumu {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Pravilo o isporuci ne važi za zemlju {0}
@@ -2082,6 +2081,7 @@
 DocType: Salary Component,Earning,Zarada
 DocType: Supplier Scorecard,Scoring Criteria,Kriteriji bodovanja
 DocType: Purchase Invoice,Party Account Currency,Party računa valuta
+DocType: Delivery Trip,Total Estimated Distance,Ukupna procenjena rastojanja
 ,BOM Browser,BOM Browser
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Molimo ažurirajte svoj status za ovaj trening događaj
 DocType: Item Barcode,EAN,EAN
@@ -2120,7 +2120,7 @@
 DocType: Activity Cost,Projects,Projekti
 DocType: Payment Request,Transaction Currency,transakcija valuta
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Od {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Neki e-mailovi su nevažeći
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Neki e-mailovi su nevažeći
 DocType: Work Order Operation,Operation Description,Operacija Opis
 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.,Ne možete promijeniti fiskalnu godinu datum početka i datum završetka fiskalne godine kada Fiskalna godina se sprema.
 DocType: Quotation,Shopping Cart,Korpa
@@ -2144,7 +2144,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Neto promjena u fiksnoj Asset
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,Ostavite prazno ako smatra za sve oznake
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od datuma i vremena
 DocType: Shopify Settings,For Company,Za tvrtke
@@ -2158,7 +2158,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Bilo je grešaka u kreiranju rasporeda kursa
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Prvi Expens Approver na listi biće postavljen kao podrazumevani Expens Approver.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,ne može biti veća od 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Morate biti korisnik osim administratora sa ulogama upravitelja sistema i menadžera postavki za registraciju na tržištu.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Morate biti korisnik osim administratora sa ulogama upravitelja sistema i menadžera postavki za registraciju na tržištu.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Stavka {0} nijestock Stavka
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-YYYY.-
 DocType: Maintenance Visit,Unscheduled,Neplanski
@@ -2187,7 +2187,7 @@
 DocType: HR Settings,Employee Settings,Postavke zaposlenih
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Uplata platnog sistema
 ,Batch-Wise Balance History,Batch-Wise bilanca Povijest
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Red # {0}: Ne može se podesiti Rate ako je iznos veći od fakturisane količine za stavku {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Red # {0}: Ne može se podesiti Rate ako je iznos veći od fakturisane količine za stavku {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,podešavanja print ažuriran u odgovarajućim formatu print
 DocType: Package Code,Package Code,paket kod
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,šegrt
@@ -2421,7 +2421,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} slobodna radna mjesta i {1} budžet za {2} već planiran za podružnice preduzeća {3}. \ Možete planirati samo do {4} slobodnih radnih mesta i budžeta {5} po planu osoblja {6} za matičnu kompaniju {3}.
 DocType: HR Settings,Stop Birthday Reminders,Zaustavi Rođendan Podsjetnici
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Molimo podesite Uobičajeno plaće plaćaju račun poduzeća {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Molimo podesite Uobičajeno plaće plaćaju račun poduzeća {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Dobije finansijski raspad podataka o porezima i naplaćuje Amazon
 DocType: SMS Center,Receiver List,Lista primalaca
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Traži Stavka
@@ -2491,7 +2491,7 @@
 DocType: Vital Signs,Constipated,Zapremljen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Protiv Dobavljač fakture {0} od {1}
 DocType: Customer,Default Price List,Zadani cjenik
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,rekord Asset pokret {0} stvorio
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,rekord Asset pokret {0} stvorio
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Ništa nije pronađeno.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ne možete izbrisati fiskalnu godinu {0}. Fiskalna godina {0} je postavljen kao zadani u Globalne postavke
 DocType: Share Transfer,Equity/Liability Account,Račun kapitala / obaveza
@@ -2628,6 +2628,7 @@
 DocType: Blanket Order,Order Type,Vrsta narudžbe
 ,Item-wise Sales Register,Stavka-mudri prodaja registar
 DocType: Asset,Gross Purchase Amount,Bruto Kupovina Iznos
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Šifra proizvoda&gt; Grupa proizvoda&gt; Marka
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Početni balansi
 DocType: Asset,Depreciation Method,Način Amortizacija
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je li ovo pristojba uključena u osnovne stope?
@@ -2708,7 +2709,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Akcija ako je godišnji budžet prešao na PO
 DocType: Student Leave Application,Student Leave Application,Student Leave aplikacije
 DocType: Item,Will also apply for variants,Primjenjivat će se i za varijante
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Imovine ne može biti otkazan, jer je već {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Imovine ne može biti otkazan, jer je već {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Zaposlenik {0} na Poludnevni na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Ukupno radnog vremena ne smije biti veća od max radnog vremena {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,na
@@ -2732,6 +2733,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Izvadite podatke
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Maksimalni dozvoljeni odmor u tipu odlaska {0} je {1}
 DocType: SMS Center,Create Receiver List,Kreiraj listu primalaca
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Datum dostupan za korištenje treba da bude nakon datuma kupovine
 DocType: Vehicle,Wheels,Wheels
 DocType: Packing Slip,To Package No.,Za Paket br
 DocType: Patient Relation,Family,Porodica
@@ -2745,7 +2747,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Valuta za obračun mora biti jednaka valuti valute kompanije ili valute partijskog računa
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Ukazuje da je paket je dio ove isporuke (samo nacrti)
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Red {0}: Due Date ne može biti pre datuma objavljivanja
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Red {0}: Due Date ne može biti pre datuma objavljivanja
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Napravite unos Plaćanje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Količina za točku {0} mora biti manji od {1}
 ,Sales Invoice Trends,Trendovi prodajnih računa
@@ -2817,7 +2819,7 @@
 DocType: Guardian,Guardian Interests,Guardian Interesi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Ažurirajte ime / broj računa
 DocType: Naming Series,Current Value,Trenutna vrijednost
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Višestruki fiskalne godine postoje za datum {0}. Molimo podesite kompanije u fiskalnoj godini
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Višestruki fiskalne godine postoje za datum {0}. Molimo podesite kompanije u fiskalnoj godini
 DocType: Education Settings,Instructor Records to be created by,Instruktorske zapise koje kreira
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} kreirao
 DocType: GST Account,GST Account,GST račun
@@ -2835,7 +2837,7 @@
 DocType: Sales Person,Name and Employee ID,Ime i ID zaposlenika
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
 DocType: Website Item Group,Website Item Group,Web stranica artikla Grupa
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nijedan obrazovni list koji je dostavljen za navedene kriterijume ILI već dostavljen
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nijedan obrazovni list koji je dostavljen za navedene kriterijume ILI već dostavljen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Carine i porezi
 DocType: Projects Settings,Projects Settings,Postavke projekata
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Unesite Referentni datum
@@ -2844,7 +2846,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Isporučeni Količina
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-YYYY.-
 DocType: Purchase Order Item,Material Request Item,Materijal Zahtjev artikla
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Molim poništite prvo kupoprodajni nalog {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Molim poništite prvo kupoprodajni nalog {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Tree stavke skupina .
 DocType: Production Plan,Total Produced Qty,Ukupno proizvedeni količina
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Ne mogu se odnositi broj retka veći ili jednak trenutnom broju red za ovu vrstu Charge
@@ -2953,6 +2955,7 @@
 ,Vehicle Expenses,Troškovi vozila
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Napravite laboratorijske testove na računu za prodaju
 DocType: Serial No,Invoice Details,Račun Detalji
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Molimo omogućite podešavanja Google mapa da biste procijenili i optimizirali rute
 DocType: Grant Application,Show on Website,Show on Website
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Počnite
 DocType: Hub Tracked Item,Hub Category,Glavna kategorija
@@ -2992,7 +2995,7 @@
 DocType: Inpatient Record,B Positive,B Pozitivan
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Maksimalna korist zaposlenog {0} prelazi {1} za sumu {2} prethodnog zahtijevnog \ iznosa
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Količina mora biti 1, kao stavka je osnovno sredstvo. Molimo koristite posebnom redu za više kom."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Količina mora biti 1, kao stavka je osnovno sredstvo. Molimo koristite posebnom redu za više kom."
 DocType: Leave Block List Allow,Leave Block List Allow,Ostavite Blok Popis Dopustite
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Skraćeno ne može biti prazan ili prostora
 DocType: Patient Medical Record,Patient Medical Record,Medicinski zapis pacijenta
@@ -3026,7 +3029,7 @@
 DocType: Workstation,Wages per hour,Plaće po satu
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock balans u Batch {0} će postati negativan {1} {2} za tačka na skladištu {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Nakon materijala Zahtjevi su automatski podignuta na osnovu nivou ponovnog reda stavke
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Račun {0} je nevažeća. Račun valuta mora biti {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Račun {0} je nevažeća. Račun valuta mora biti {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Od datuma {0} ne može biti poslije otpuštanja zaposlenog Datum {1}
 DocType: Supplier,Is Internal Supplier,Je interni snabdevač
 DocType: Employee,Create User Permission,Kreirajte dozvolu korisnika
@@ -3170,7 +3173,7 @@
 DocType: Account,Fixed Asset,Dugotrajne imovine
 DocType: Amazon MWS Settings,After Date,Posle Datuma
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Serijalizovanoj zaliha
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Invalid {0} za Inter Company račun.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Invalid {0} za Inter Company račun.
 ,Department Analytics,Odjel analitike
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-pošta nije pronađena u podrazumevanom kontaktu
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generiraj tajnu
@@ -3182,7 +3185,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Program u strukturi naknada i studentskoj grupi {0} su različiti.
 DocType: Bank Statement Transaction Entry,Receivable Account,Potraživanja račun
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Važi od datuma mora biti manji od važećeg datuma.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} je već {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} je već {2}
 DocType: Quotation Item,Stock Balance,Kataloški bilanca
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Naloga prodaje na isplatu
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,CEO
@@ -3224,6 +3227,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,To je potrebno Debit
 DocType: Clinical Procedure,Inpatient Record,Zapisnik o stacionarnom stanju
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomoći pratiti vremena, troškova i naplate za aktivnostima obavlja svoj tim"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Dobavljač&gt; Tip dobavljača
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Kupoprodajna cijena List
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Datum transakcije
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Šabloni varijabli indeksa dobavljača.
@@ -3266,7 +3270,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Exchange dobitak / gubitak
 DocType: Opportunity,Lost Reason,Razlog gubitka
 DocType: Amazon MWS Settings,Enable Amazon,Omogućite Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Red # {0}: Račun {1} ne pripada kompaniji {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Red # {0}: Račun {1} ne pripada kompaniji {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Nije moguće pronaći DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nova adresa
 DocType: Quality Inspection,Sample Size,Veličina uzorka
@@ -3377,7 +3381,7 @@
 DocType: Water Analysis,Origin,Poreklo
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ovaj dokument je preko granice po {0} {1} za stavku {4}. Da li što još {3} u odnosu na isti {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Molimo podesite ponavljaju nakon spremanja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Izaberite promjene iznos računa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Izaberite promjene iznos računa
 DocType: Purchase Invoice,Price List Currency,Cjenik valuta
 DocType: Naming Series,User must always select,Korisničko uvijek mora odabrati
 DocType: Stock Settings,Allow Negative Stock,Dopustite negativnu zalihu
@@ -3419,7 +3423,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Da li ste sigurni da želite da otkažete ovaj termin?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Paket za hotelsku sobu
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,prodaja Pipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Molimo podesite zadani račun u Plaća Komponenta {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Molimo podesite zadani račun u Plaća Komponenta {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Potrebna On
 DocType: Rename Tool,File to Rename,File da biste preimenovali
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Molimo odaberite BOM za Stavka zaredom {0}
@@ -3440,7 +3444,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Troškovi Kupljene stavke
 DocType: Employee Separation,Employee Separation Template,Šablon za razdvajanje zaposlenih
 DocType: Selling Settings,Sales Order Required,Prodajnog naloga Obvezno
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Postanite Prodavac
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Postanite Prodavac
 DocType: Purchase Invoice,Credit To,Kreditne Da
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Aktivni Potencijani kupci / Kupci
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Ostavite prazno da biste koristili standardni format isporuke
@@ -3481,7 +3485,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Napravite poreznu šemu
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Sirovine ne može biti prazan.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Red # {0} (Tabela za plaćanje): Iznos mora biti negativan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Red # {0} (Tabela za plaćanje): Iznos mora biti negativan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Nije mogao ažurirati zaliha, faktura sadrži drop shipping stavke."
 DocType: Contract,Fulfilment Status,Status ispune
 DocType: Lab Test Sample,Lab Test Sample,Primjer laboratorijskog testa
@@ -3640,7 +3644,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Doc Date
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Naknada Records Kreirano - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategorija računa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Red # {0} (Tabela za plaćanje): Iznos mora biti pozitivan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Red # {0} (Tabela za plaćanje): Iznos mora biti pozitivan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Ne može proizvesti više predmeta {0} od prodajnog naloga količina {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Odaberite vrijednosti atributa
 DocType: Purchase Invoice,Reason For Issuing document,Razlog za izdavanje dokumenta
@@ -3695,7 +3699,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Vrijeme u kojem su materijali primili
 DocType: Products Settings,Products per Page,Proizvodi po stranici
 DocType: Stock Ledger Entry,Outgoing Rate,Odlazni Rate
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,ili
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,ili
 DocType: Sales Order,Billing Status,Status naplate
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Prijavi problem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,komunalna Troškovi
@@ -3722,7 +3726,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Izjava o izuzeću poreza na zaposlene
 DocType: Payment Entry,Cheque/Reference Date,Ček / Referentni datum
 DocType: Purchase Invoice,Total Taxes and Charges,Ukupno Porezi i naknade
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Datum dostupan za korišćenje Datum unosi kao prošli datum
 DocType: Employee,Emergency Contact,Hitni kontakt
 DocType: Bank Reconciliation Detail,Payment Entry,plaćanje Entry
 ,sales-browser,prodaja-preglednik
@@ -3768,6 +3771,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Je povratak (kreditna beleška)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Započnite posao
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Serijski broj je potreban za sredstvo {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo postavite Naming Series za {0} preko Setup&gt; Settings&gt; Series Naming
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,predložak invaliditetom ne smije biti zadani predložak
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Za red {0}: Unesite planirani broj
 DocType: Account,Income Account,Konto prihoda
@@ -3781,6 +3785,7 @@
 DocType: Loyalty Program,Help Section,Help Section
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,Područje odgovornosti
+DocType: Delivery Trip,Distance UOM,Udaljenost UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student Paketi pomoći da pratiti prisustvo, procjene i naknade za studente"
 DocType: Payment Entry,Total Allocated Amount,Ukupan dodijeljeni iznos
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Postaviti zadani račun inventar za trajnu inventar
@@ -3822,7 +3827,7 @@
 DocType: Item Supplier,Item Supplier,Dobavljač artikla
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Nije izabrana stavka za prenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Nije izabrana stavka za prenos
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Sve adrese.
 DocType: Company,Stock Settings,Stock Postavke
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je moguće samo ako sljedeće osobine su iste u oba zapisa. Grupa je, Root Tip, Društvo"
@@ -4119,7 +4124,7 @@
 DocType: Patient,Personal and Social History,Lična i društvena istorija
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Korisnik {0} kreiran
 DocType: Fee Schedule,Fee Breakup for each student,Naknada za svaki student
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Ukupno unaprijed ({0}) protiv Order {1} ne može biti veći od Grand Ukupno ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Ukupno unaprijed ({0}) protiv Order {1} ne može biti veći od Grand Ukupno ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Odaberite Mjesečni Distribucija nejednako distribuirati mete širom mjeseci.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Promeni kod
 DocType: Purchase Invoice Item,Valuation Rate,Vrednovanje Stopa
@@ -4128,7 +4133,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Iskoristio ITC Cess
 ,Student Monthly Attendance Sheet,Student Mjesečni Posjeta list
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Pravilo o isporuci primenjuje se samo za prodaju
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Redosled amortizacije {0}: Sledeći datum amortizacije ne može biti pre datuma kupovine
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Redosled amortizacije {0}: Sledeći datum amortizacije ne može biti pre datuma kupovine
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum početka Projekta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Do
 DocType: Rename Tool,Rename Log,Preimenovanje Prijavite
@@ -4145,12 +4150,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Koliko često treba ažurirati projekat i kompaniju na osnovu prodajnih transakcija.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ističe
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Dodaj Studenti
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Molimo obrišite Employee <a href=""#Form/Employee/{0}"">{0}</a> \ da biste otkazali ovaj dokument"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Odaberite {0}
 DocType: C-Form,C-Form No,C-Obrazac br
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Razdaljina
+DocType: Delivery Stop,Distance,Razdaljina
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Navedite svoje proizvode ili usluge koje kupujete ili prodajete.
 DocType: Water Analysis,Storage Temperature,Temperatura skladištenja
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-YYYY.-
@@ -4177,7 +4180,7 @@
 DocType: Homepage,Company Description for website homepage,Kompanija Opis za web stranice homepage
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Za praktičnost kupaca, te kodovi mogu se koristiti u tiskanim formata kao što su fakture i otpremnice"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier ime
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Ne mogu se preuzeti podaci za {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Ne mogu se preuzeti podaci za {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Otvaranje časopisa
 DocType: Contract,Fulfilment Terms,Uslovi ispunjenja
 DocType: Sales Invoice,Time Sheet List,Time Sheet List
@@ -4357,7 +4360,7 @@
 DocType: Serial No,Warranty / AMC Details,Jamstveni / AMC Brodu
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Izbor studenata ručno za grupe aktivnosti na osnovu
 DocType: Journal Entry,User Remark,Upute Zabilješka
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Optimizacija ruta.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Optimizacija ruta.
 DocType: Travel Itinerary,Non Diary,Non Dnevnik
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Ne mogu napraviti bonus zadržavanja za ljevičke zaposlene
 DocType: Lead,Market Segment,Tržišni segment
@@ -4387,7 +4390,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Program lojalnosti
 DocType: Student Guardian,Father,otac
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Podrška ulaznice
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; ne može se provjeriti na prodaju osnovnih sredstava
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; ne može se provjeriti na prodaju osnovnih sredstava
 DocType: Bank Reconciliation,Bank Reconciliation,Banka pomirenje
 DocType: Attendance,On Leave,Na odlasku
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Get Updates
@@ -4432,7 +4435,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serijski broj i Batch
 DocType: Warranty Claim,From Company,Iz Društva
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Zbir desetine Kriteriji procjene treba da bude {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Molimo podesite Broj Amortizacija Booked
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Molimo podesite Broj Amortizacija Booked
 DocType: Supplier Scorecard Period,Calculations,Izračunavanje
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,"Vrijednost, ili kol"
 DocType: Payment Terms Template,Payment Terms,Uslovi plaćanja
@@ -4451,7 +4454,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Popust (%) na Cjenovnik objekta sa margina
 DocType: Healthcare Service Unit Type,Rate / UOM,Rate / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Svi Skladišta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Nije pronađeno {0} za Inter Company Transactions.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Nije pronađeno {0} za Inter Company Transactions.
 DocType: Travel Itinerary,Rented Car,Iznajmljen automobil
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,O vašoj Kompaniji
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Kredit na račun mora biti bilans stanja računa
@@ -4552,6 +4555,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Kriterijumi za analizu biljaka
 DocType: Cheque Print Template,Cheque Height,Ček Visina
 DocType: Supplier,Supplier Details,Dobavljač Detalji
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molimo da podesite serije brojeva za prisustvo preko Setup&gt; Serija numeracije
 DocType: Setup Progress,Setup Progress,Napredak podešavanja
 DocType: Expense Claim,Approval Status,Status odobrenja
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Od vrijednosti mora biti manje nego vrijednosti u redu {0}
@@ -4644,7 +4648,6 @@
 DocType: Travel Request,Fully Sponsored,Fully Sponsored
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Povratni dnevnik
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Klijent {0} je kreiran.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Molimo da podesite sistem imenovanja zaposlenih u ljudskim resursima&gt; HR Settings
 DocType: Stock Settings,Limit Percent,limit Procenat
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Trenutno nema dostupnih trgovina na zalihama
 ,Payment Period Based On Invoice Date,Razdoblje za naplatu po Datum fakture
@@ -4703,7 +4706,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Izvorno skladište
 DocType: Installation Note,Installation Date,Instalacija Datum
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Share Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne pripada kompaniji {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne pripada kompaniji {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Prodajna faktura {0} kreirana
 DocType: Employee,Confirmation Date,potvrda Datum
 DocType: Inpatient Occupancy,Check Out,Provjeri
@@ -4723,6 +4726,7 @@
 DocType: Production Plan,Sales Orders Detail,Prodajna narudžbina Detail
 DocType: Bin,Requested Quantity,Tražena količina
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Molimo vas da podesite sistem imenovanja instruktora u obrazovanju&gt; Obrazovne postavke
 DocType: Patient,Marital Status,Bračni status
 DocType: Stock Settings,Auto Material Request,Auto Materijal Zahtjev
 DocType: Woocommerce Settings,API consumer secret,API potrošačke tajne
@@ -4775,7 +4779,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Izaberite Dani
 DocType: Academic Term,Term Name,term ime
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Kredit ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Kreiranje plata ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Kreiranje plata ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Ne možete uređivati root čvor.
 DocType: Buying Settings,Purchase Order Required,Narudžbenica kupnje je obavezna
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Tajmer
@@ -4811,7 +4815,7 @@
 DocType: Account,Rate at which this tax is applied,Stopa po kojoj je taj porez se primjenjuje
 DocType: Cash Flow Mapper,Section Name,Naziv odeljka
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Ponovno red Qty
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Redosled amortizacije {0}: Očekivana vrednost nakon korisnog veka mora biti veća ili jednaka {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Redosled amortizacije {0}: Očekivana vrednost nakon korisnog veka mora biti veća ili jednaka {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Trenutni Otvori Posao
 DocType: Company,Stock Adjustment Account,Stock Adjustment račun
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Otpisati
@@ -4858,7 +4862,7 @@
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Od AMC
 DocType: Opportunity,Opportunity Amount,Mogućnost Iznos
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Broj Amortizacija Booked ne može biti veća od Ukupan broj Amortizacija
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Broj Amortizacija Booked ne može biti veća od Ukupan broj Amortizacija
 DocType: Purchase Order,Order Confirmation Date,Datum potvrđivanja porudžbine
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Provjerite održavanja Posjetite
@@ -4899,7 +4903,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Serija:
 DocType: Volunteer,Afternoon,Popodne
 DocType: Loyalty Program,Loyalty Program Help,Pomoć programa za lojalnost
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' je onemogućeno
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' je onemogućeno
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Postavi status Otvoreno
 DocType: Cheque Print Template,Scanned Cheque,skeniranim Ček
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Pošaljite e-poštu automatski da Kontakti na podnošenje transakcija.
@@ -4912,7 +4916,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Stavka i garancija Detalji
 DocType: Chapter,Chapter Members,Članovi poglavlja
 DocType: Sales Team,Contribution (%),Doprinos (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Napomena : Stupanje Plaćanje neće biti izrađen od ' Gotovina ili bankovni račun ' nije naveden
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Napomena : Stupanje Plaćanje neće biti izrađen od ' Gotovina ili bankovni račun ' nije naveden
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Projekat {0} već postoji
 DocType: Clinical Procedure,Nursing User,Korisnik medicinske sestre
 DocType: Employee Benefit Application,Payroll Period,Period plaćanja
@@ -4920,6 +4924,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Serijski broj {0} ne pripada Batch {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Odgovornosti
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Rok važnosti ove ponude je završen.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Molimo obrišite Employee <a href=""#Form/Employee/{0}"">{0}</a> \ da biste otkazali ovaj dokument"
 DocType: Expense Claim Account,Expense Claim Account,Rashodi Preuzmi računa
 DocType: Account,Capital Work in Progress,Kapitalni rad je u toku
 DocType: Accounts Settings,Allow Stale Exchange Rates,Dozvolite stare kurseve
@@ -5000,7 +5006,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Tiketi - materijal
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Povežite Shopify sa ERPNext
 DocType: Material Request Item,For Warehouse,Za galeriju
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Beleške o isporuci {0} ažurirane
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Beleške o isporuci {0} ažurirane
 DocType: Employee,Offer Date,ponuda Datum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Citati
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Vi ste u isključenom modu. Nećete biti u mogućnosti da ponovo sve dok imate mrežu.
@@ -5050,7 +5056,7 @@
 DocType: Shipping Rule,Calculate Based On,Izračun zasnovan na
 DocType: Contract,Unfulfilled,Neispunjeno
 DocType: Delivery Note Item,From Warehouse,Od Skladište
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Nema zaposlenih po navedenim kriterijumima
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Nema zaposlenih po navedenim kriterijumima
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Nema artikala sa Bill materijala za proizvodnju
 DocType: Shopify Settings,Default Customer,Podrazumevani korisnik
 DocType: Sales Stage,Stage Name,Ime faze
@@ -5092,7 +5098,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Iznos poreza Nakon iznosa popusta
 DocType: Patient,Inpatient Status,Status bolesnika
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Svakodnevni rad Pregled Postavke
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Izabrana cenovna lista treba da ima provereno kupovinu i prodaju.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Izabrana cenovna lista treba da ima provereno kupovinu i prodaju.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Molimo unesite Reqd po datumu
 DocType: Payment Entry,Internal Transfer,Interna Transfer
 DocType: Asset Maintenance,Maintenance Tasks,Zadaci održavanja
@@ -5128,7 +5134,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Group By
 DocType: Guardian,Interests,Interesi
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Omogućiti / onemogućiti valute .
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Ne mogu da podnesem neke plate
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Ne mogu da podnesem neke plate
 DocType: Exchange Rate Revaluation,Get Entries,Get Entries
 DocType: Production Plan,Get Material Request,Get materijala Upit
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Poštanski troškovi
@@ -5212,7 +5218,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Rashodi račun je obvezna za predmet {0}
 DocType: BOM,Website Description,Web stranica Opis
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Neto promjena u kapitalu
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Molimo vas da otkaže fakturi {0} prvi
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Molimo vas da otkaže fakturi {0} prvi
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Nije dozvoljeno. Molim vas isključite Type Service Service Unit
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail adresa mora biti jedinstvena, već postoji za {0}"
 DocType: Serial No,AMC Expiry Date,AMC Datum isteka
@@ -5252,7 +5258,7 @@
 DocType: Hotel Room,Hotel Room,Hotelska soba
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Računa {0} ne pripada kompaniji {1}
 DocType: Leave Type,Rounding,Zaokruživanje
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Serijski brojevi u nizu {0} ne odgovara otpremnica
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Serijski brojevi u nizu {0} ne odgovara otpremnica
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Dispensed Amount (Pro-rated)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Tada Pravila cene se filtriraju na osnovu klijenta, grupe potrošača, teritorije, dobavljača, grupe dobavljača, kampanje, prodajnog partnera itd."
 DocType: Student,Guardian Details,Guardian Detalji
@@ -5307,7 +5313,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
 DocType: Leave Allocation,Unused leaves,Neiskorišteni lišće
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Unošenje otplate
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Svi odjeli
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Svi odjeli
 DocType: Healthcare Service Unit,Vacant,Slobodno
 DocType: Patient,Alcohol Past Use,Upotreba alkohola u prošlosti
 DocType: Fertilizer Content,Fertilizer Content,Sadržaj đubriva
@@ -5318,7 +5324,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Radni nalog {0} mora biti otkazan prije otkazivanja ovog prodajnog naloga
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
 DocType: Authorization Rule,Applicable To (Employee),Odnosi se na (Radnik)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Due Date je obavezno
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Due Date je obavezno
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Prirast za Atributi {0} ne može biti 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Tip i iznos povlastice
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Sobe rezervirane
@@ -5462,7 +5468,7 @@
 DocType: Purchase Invoice Item,Total Weight,Ukupna tezina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Komisija za prodaju
 DocType: Job Offer Term,Value / Description,Vrijednost / Opis
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ne može se podnijeti, to je već {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ne može se podnijeti, to je već {2}"
 DocType: Tax Rule,Billing Country,Billing Country
 DocType: Purchase Order Item,Expected Delivery Date,Očekivani rok isporuke
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restoran za unos naloga
@@ -5501,12 +5507,13 @@
 DocType: Maintenance Visit,Breakdown,Slom
 DocType: Travel Itinerary,Vegetarian,Vegetarijanac
 DocType: Patient Encounter,Encounter Date,Datum susreta
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutnom: {1} se ne mogu odabrati
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutnom: {1} se ne mogu odabrati
 DocType: Bank Statement Transaction Settings Item,Bank Data,Podaci banke
 DocType: Purchase Receipt Item,Sample Quantity,Količina uzorka
 DocType: Bank Guarantee,Name of Beneficiary,Ime korisnika
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Automatsko ažuriranje troškova BOM-a putem Planera, na osnovu najnovije procene stope / cenovnika / poslednje stope sirovina."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Dobavljač&gt; Grupa dobavljača
 DocType: Bank Reconciliation Detail,Cheque Date,Datum čeka
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Nadređeni konto {1} ne pripada preduzeću: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Uspješno obrisane sve transakcije koje se odnose na ove kompanije!
@@ -5534,7 +5541,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Dijete čvorovi se mogu kreirati samo pod &#39;Grupa&#39; tipa čvorova
 DocType: Attendance Request,Half Day Date,Pola dana datum
 DocType: Academic Year,Academic Year Name,Akademska godina Ime
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} nije dozvoljeno da radi sa {1}. Zamijenite Kompaniju.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} nije dozvoljeno da radi sa {1}. Zamijenite Kompaniju.
 DocType: Sales Partner,Contact Desc,Kontakt ukratko
 DocType: Email Digest,Send regular summary reports via Email.,Pošalji redovne zbirne izvještaje putem e-maila.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Molimo podesite zadani račun u Rashodi Preuzmi Tip {0}
@@ -5567,7 +5574,7 @@
 DocType: Hotel Room,Hotel Manager,Menadžer hotela
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Set poreza Pravilo za košarica
 DocType: Purchase Invoice,Taxes and Charges Added,Porezi i naknade Dodano
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Redosled amortizacije {0}: Sledeći datum amortizacije ne može biti pre datuma raspoloživog za upotrebu
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Redosled amortizacije {0}: Sledeći datum amortizacije ne može biti pre datuma raspoloživog za upotrebu
 ,Sales Funnel,Tok prodaje (Funnel)
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Skraćenica je obavezno
 DocType: Project,Task Progress,zadatak Napredak
@@ -5581,7 +5588,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Sve grupe kupaca
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,akumulirani Mjesečno
 DocType: Attendance Request,On Duty,Na dužnosti
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda knjigovodstveni zapis nije kreiran za {1} na {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda knjigovodstveni zapis nije kreiran za {1} na {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Plan zapošljavanja {0} već postoji za oznaku {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Porez Template je obavezno.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Konto {0}: Nadređeni konto {1} ne postoji
@@ -5661,11 +5668,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Atleast jednom skladištu je obavezno
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Konfigurirajte polja polja kao što su UOM, grupa stavki, opis i broj sati."
 DocType: Certification Application,Certification Status,Status certifikacije
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Tržište
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Tržište
 DocType: Travel Itinerary,Travel Advance Required,Potrebno je unaprediti putovanje
 DocType: Subscriber,Subscriber Name,Ime pretplatnika
 DocType: Serial No,Out of Warranty,Od jamstvo
-DocType: Cashier Closing,Cashier-closing-,Blagajna-zatvaranje-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Mapped Data Type
 DocType: BOM Update Tool,Replace,Zamijeniti
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Nema proizvoda.
@@ -5752,7 +5758,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Osnovani porezni predlošci za prodaju i kupovinu su stvoreni.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Evidencija Rezultat zapisa {0} već postoji.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Primer: ABCD. #####. Ako je serija postavljena i Batch No se ne pominje u transakcijama, na osnovu ove serije će se kreirati automatski broj serije. Ako uvek želite da eksplicitno navedete Batch No za ovu stavku, ostavite ovo praznim. Napomena: ovo podešavanje će imati prioritet nad Prefiksom naziva serije u postavkama zaliha."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molimo da podesite serije brojeva za prisustvo preko Setup&gt; Serija numeracije
 DocType: BOM,Materials Required (Exploded),Materijali Obavezno (eksplodirala)
 DocType: Contract,Party User,Party User
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Molimo podesite Company filter prazno ako Skupina Od je &#39;Company&#39;
@@ -5953,7 +5958,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,opp Count
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Moraju se podesiti datum početka probnog perioda i datum završetka probnog perioda
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Prosečna stopa
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Ukupan iznos plaćanja u rasporedu plaćanja mora biti jednak Grand / zaokruženom ukupno
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Ukupan iznos plaćanja u rasporedu plaćanja mora biti jednak Grand / zaokruženom ukupno
 DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Banka bilans po glavnoj knjizi
 DocType: Job Applicant,Applicant Name,Podnositelj zahtjeva Ime
@@ -6022,7 +6027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sapun i deterdžent
 DocType: BOM,Show Items,Pokaži Predmeti
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Od vremena ne može biti veća nego vremena.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Želite li obavijestiti sve kupce putem e-pošte?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Želite li obavijestiti sve kupce putem e-pošte?
 DocType: Subscription Plan,Billing Interval,Interval zaračunavanja
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naručeno
@@ -6031,9 +6036,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Red {0}: {1} mora biti veći od 0
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteriji procjene Group
 DocType: Healthcare Settings,Patient Name By,Ime pacijenta
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Unos teksta na obračun za plate od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Unos teksta na obračun za plate od {0} do {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Omogućite odloženi prihod
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Otvaranje Ispravka vrijednosti mora biti manji od jednak {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Otvaranje Ispravka vrijednosti mora biti manji od jednak {0}
 DocType: Warehouse,Warehouse Name,Naziv skladišta
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Stvarni datum početka mora biti manji od trenutnog datuma završetka
 DocType: Naming Series,Select Transaction,Odaberite transakciju
@@ -6184,7 +6189,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Zaposleni {0} razreda {1} nemaju nikakvu politiku za odlazni odmor
 DocType: Salary Detail,Salary Detail,Plaća Detail
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Odaberite {0} Prvi
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Dodao je {0} korisnike
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Dodao je {0} korisnike
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","U slučaju višeslojnog programa, Korisnici će automatski biti dodeljeni za dotičnu grupu po njihovom trošenju"
 DocType: Appointment Type,Physician,Lekar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Batch {0} od {1} Stavka je istekla.
@@ -6328,7 +6333,7 @@
 DocType: Asset,Custodian,Skrbnik
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Point-of-prodaju profil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} treba da bude vrednost između 0 i 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Isplata {0} od {1} do {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Isplata {0} od {1} do {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,unsecured krediti
 DocType: Cost Center,Cost Center Name,Troška Name
 DocType: Student,B+,B +
@@ -6360,6 +6365,7 @@
 DocType: Employee,Date of Issue,Datum izdavanja
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Prema Kupnja Postavke ako Kupovina Reciept željeni == &#39;DA&#39;, onda za stvaranje fakturi, korisnik treba prvo stvoriti račun za prodaju za stavku {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Row # {0}: Set dobavljač za stavku {1}
+DocType: Global Defaults,Default Distance Unit,Podrazumevana jedinica udaljenosti
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Red {0}: Radno vrijednost mora biti veća od nule.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Sajt Slika {0} prilogu Stavka {1} ne može biti pronađena
 DocType: Issue,Content Type,Vrsta sadržaja
@@ -6415,7 +6421,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Zaduženja na račun mora biti bilans stanja računa
 DocType: Asset,Naming Series,Imenovanje serije
 DocType: Vital Signs,Coated,Premazan
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Red {0}: Očekivana vrednost nakon korisnog života mora biti manja od iznosa bruto kupovine
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Red {0}: Očekivana vrednost nakon korisnog života mora biti manja od iznosa bruto kupovine
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Settings
 DocType: Leave Block List,Leave Block List Name,Ostavite popis imena Block
 DocType: Certified Consultant,Certification Validity,Validnost sertifikacije
@@ -6482,6 +6488,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Bank Header
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Pregled laboratorijskih testova
 DocType: Hub Users,Hub Users,Korisnici Hub-a
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klijent&gt; Grupa klijenata&gt; Teritorija
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Održavanje Datum
 DocType: Purchase Invoice Item,Rejected Serial No,Odbijen Serijski br
@@ -6497,7 +6504,7 @@
 DocType: SG Creation Tool Course,Max Strength,Max Snaga
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Instaliranje podešavanja
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Nije odabrana beleška za isporuku za kupca {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Nije odabrana beleška za isporuku za kupca {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Zaposleni {0} nema maksimalni iznos naknade
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Izaberite stavke na osnovu datuma isporuke
 DocType: Grant Application,Has any past Grant Record,Ima bilo kakav prošli Grant Record
@@ -6524,7 +6531,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Hotelska rezervacija
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Služba za korisnike
 DocType: BOM,Thumbnail,Thumbnail
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Nisu pronađeni kontakti sa ID-ima e-pošte.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Nisu pronađeni kontakti sa ID-ima e-pošte.
 DocType: Item Customer Detail,Item Customer Detail,Artikal - detalji kupca
 DocType: Notification Control,Prompt for Email on Submission of,Pitaj za e-poštu na podnošenje
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Maksimalan iznos naknade zaposlenog {0} prelazi {1}
@@ -6779,7 +6786,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,"Ne mogu da konvertovanje Group, jer je izabran Account Type."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} je izmijenjen . Osvježite stranicu.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Prestani korisnike od izrade ostaviti aplikacija na sljedećim danima.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Šifra proizvoda&gt; Grupa proizvoda&gt; Marka
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Ako je neograničen rok isticanja za Loyalty Bodove, zadržite Trajanje isteka prazne ili 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Članovi tima za održavanje
 DocType: Loyalty Point Entry,Purchase Amount,Kupovina Iznos
@@ -6787,7 +6793,7 @@
 											to fullfill Sales Order {2}",Ne može se dostaviti Serijski broj {0} stavke {1} pošto je rezervisan \ da biste ispunili nalog za prodaju {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-YYYY-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Dobavljač Ponuda {0} stvorio
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Kraja godine ne može biti prije početka godine
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Kraja godine ne može biti prije početka godine
 DocType: Employee Benefit Application,Employee Benefits,Primanja zaposlenih
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Prepuna količina mora biti jednaka količina za točku {0} je u redu {1}
 DocType: Work Order,Manufactured Qty,Proizvedeno Kol
@@ -6803,6 +6809,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Izaberite šarže
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Za GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Mjenice podignuta na kupce.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Molimo da podesite sistem imenovanja zaposlenih u ljudskim resursima&gt; HR Settings
 DocType: Healthcare Settings,Invoice Appointments Automatically,Automatsko postavljanje fakture
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID Projekta
 DocType: Salary Component,Variable Based On Taxable Salary,Varijabla zasnovana na oporezivoj plaći
@@ -6851,7 +6858,7 @@
 DocType: POS Profile,Account for Change Amount,Nalog za promjene Iznos
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Povezivanje na QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Ukupni dobitak / gubitak
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Nevažeća kompanija za račun kompanije.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Nevažeća kompanija za račun kompanije.
 DocType: Purchase Invoice,input service,ulazna usluga
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Red {0}: Party / računa ne odgovara {1} / {2} u {3} {4}
 DocType: Employee Promotion,Employee Promotion,Promocija zaposlenih
@@ -6981,7 +6988,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Preferirana oblast za smeštaj
 apps/erpnext/erpnext/config/selling.py +184,Analytics,analitika
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Košarica je prazna
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Molimo vas da podesite sistem imenovanja instruktora u obrazovanju&gt; Obrazovne postavke
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Stavka {0} nema serijski broj. Samo serijalizirani predmeti \ mogu imati isporuku zasnovanu na Serijski broj
 DocType: Vehicle,Model,model
@@ -7011,7 +7017,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Ništa se ne menja
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Odaberite CSV datoteku
 DocType: Holiday List,Total Holidays,Total Holidays
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Nedostajući e-mail predložak za otpremu. Molimo vas da podesite jednu od postavki isporuke.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Nedostajući e-mail predložak za otpremu. Molimo vas da podesite jednu od postavki isporuke.
 DocType: Student Leave Application,Mark as Present,Mark kao Present
 DocType: Supplier Scorecard,Indicator Color,Boja boje
 DocType: Purchase Order,To Receive and Bill,Da primi i Bill
@@ -7020,7 +7026,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Izaberite serijski broj
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Imenovatelj
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Uvjeti predloška
-DocType: Serial No,Delivery Details,Detalji isporuke
+DocType: Delivery Trip,Delivery Details,Detalji isporuke
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
 DocType: Program,Program Code,programski kod
 DocType: Terms and Conditions,Terms and Conditions Help,Uslovi Pomoć
@@ -7044,7 +7050,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Potencijalni kupac - ukupno dana
 DocType: Cash Flow Mapping,Is Income Tax Expense,Da li je porez na prihod?
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Vaša narudžba je isporučena!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Slanje poruka Datum mora biti isti kao i datum kupovine {1} od imovine {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Slanje poruka Datum mora biti isti kao i datum kupovine {1} od imovine {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Označite ovu ako student boravi na Instituta Hostel.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Molimo unesite Prodajni nalozi u gornjoj tablici
 ,Stock Summary,Stock Pregled
diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index 3df532c..90ec457 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Nom del període
 DocType: Employee,Salary Mode,Salary Mode
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Registre
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Registre
 DocType: Patient,Divorced,Divorciat
 DocType: Support Settings,Post Route Key,Clau de la ruta de publicació
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permetre article a afegir diverses vegades en una transacció
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Nou tipus de canvi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Informa de la divisa pera la Llista de preus {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Es calcularà en la transacció.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Client Contacte
 DocType: Patient Appointment,Check availability,Comprova disponibilitat
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Mostra oberts
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Sèrie actualitzat correctament
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,caixa
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} a la fila {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} a la fila {1}
 DocType: Asset Finance Book,Depreciation Start Date,Data d&#39;inici de la depreciació
 DocType: Pricing Rule,Apply On,Aplicar a
 DocType: Item Price,Multiple Item prices.,Múltiples Preus d'articles
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Prescripció del laboratori
 ,Delay Days,Dies de retard
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,despesa servei
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de sèrie: {0} ja es fa referència en factura de venda: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de sèrie: {0} ja es fa referència en factura de venda: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Factura
 DocType: Purchase Invoice Item,Item Weight Details,Detalls del pes de l&#39;element
 DocType: Asset Maintenance Log,Periodicity,Periodicitat
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Accountant
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Llista de preus de venda
 DocType: Patient,Tobacco Current Use,Ús del corrent del tabac
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","La data d&#39;inici i la data de final coincideixen amb la targeta de treball <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Velocitat de venda
 DocType: Cost Center,Stock User,Fotografia de l&#39;usuari
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,connex
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,data de l&#39;assistència no pot ser inferior a la data d&#39;unir-se als empleats
 DocType: Grading Scale,Grading Scale Name,Nom Escala de classificació
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Afegiu usuaris al mercat
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Afegiu usuaris al mercat
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Es tracta d'un compte principal i no es pot editar.
 DocType: Sales Invoice,Company Address,Direcció de l&#39;empresa
 DocType: BOM,Operations,Operacions
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Qty
 DocType: Production Plan,Material Request Detail,Detall de sol·licitud de material
 DocType: Selling Settings,Default Quotation Validity Days,Dates de validesa de cotització per defecte
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per incloure l'impost a la fila {0} en la tarifa d'article, els impostos a les files {1} també han de ser inclosos"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per incloure l'impost a la fila {0} en la tarifa d'article, els impostos a les files {1} també han de ser inclosos"
 DocType: SMS Center,SMS Center,Centre d'SMS
 DocType: Payroll Entry,Validate Attendance,Valideu l&#39;assistència
 DocType: Sales Invoice,Change Amount,Import de canvi
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,interlineat de la suma en paraules
 DocType: Vehicle,Additional Details,Detalls addicionals
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Cap descripció donada
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Proveïdor&gt; Grup de proveïdors
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Sol·licitud de venda.
 DocType: POS Closing Voucher Details,Collected Amount,Import acumulat
 DocType: Lab Test,Submitted Date,Data enviada
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,Admissió d&#39;Estudiants
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,L'article {0} està cancel·lat
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Fila de depreciació {0}: la data d&#39;inici de la depreciació s&#39;introdueix com data passada
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Fila de depreciació {0}: la data d&#39;inici de la depreciació s&#39;introdueix com data passada
 DocType: Contract Template,Fulfilment Terms and Conditions,Termes i condicions de compliment
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Sol·licitud de materials
 DocType: Bank Reconciliation,Update Clearance Date,Actualització Data Liquidació
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,Ajustaments de Comptes
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Proveïdor de factura no existeix en la factura de la compra {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Organigrama de vendes
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","No es pot processar la ruta, ja que la configuració de Google Maps està desactivada."
 DocType: Job Applicant,Cover Letter,carta de presentació
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Xecs pendents i Dipòsits per aclarir
 DocType: Item,Synced With Hub,Sincronitzat amb Hub
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Nou valor d&#39;actius
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Canvi al qual la divisa del client es converteix la moneda base del client
 DocType: Course Scheduling Tool,Course Scheduling Tool,Eina de Programació de golf
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Fila # {0}: Factura de compra no es pot fer front a un actiu existent {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Fila # {0}: Factura de compra no es pot fer front a un actiu existent {1}
 DocType: Crop Cycle,LInked Analysis,Anàlisi lliscada
 DocType: POS Closing Voucher,POS Closing Voucher,Voucher de tancament de punt de venda
 DocType: Contract,Lapsed,Ha caducat
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} no està inscrit en el curs {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Nom de l&#39;estudiant:
 DocType: POS Closing Voucher Details,Difference,Diferència
+DocType: Delivery Settings,Delay between Delivery Stops,Retard entre les parades de lliurament
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},El número de sèrie {0} no pertany a la nota de lliurament {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Sembla que hi ha un problema amb la configuració GoCardless del servidor. No us preocupeu, en cas de fracàs, l&#39;import es reemborsarà al vostre compte."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,demostració ERPNext
@@ -693,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Quantitat i taxa
 DocType: Delivery Note,% Installed,% Instal·lat
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Aules / laboratoris, etc., on les conferències es poden programar."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Les monedes d&#39;empreses d&#39;ambdues companyies han de coincidir amb les transaccions entre empreses.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Les monedes d&#39;empreses d&#39;ambdues companyies han de coincidir amb les transaccions entre empreses.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Si us plau introdueix el nom de l'empresa primer
 DocType: Travel Itinerary,Non-Vegetarian,No vegetariana
 DocType: Purchase Invoice,Supplier Name,Nom del proveïdor
@@ -778,7 +779,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Llogat a partir de la data
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Peces suficient per construir
 DocType: POS Profile User,POS Profile User,Usuari de perfil de TPV
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Fila {0}: la data d&#39;inici de la depreciació és obligatòria
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Fila {0}: la data d&#39;inici de la depreciació és obligatòria
 DocType: Purchase Invoice Item,Service Start Date,Data de començament del servei
 DocType: Subscription Invoice,Subscription Invoice,Factura de subscripció
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Ingrés Directe
@@ -845,7 +846,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Abreviatura ja utilitzat per una altra empresa
 DocType: Selling Settings,Default Customer Group,Grup predeterminat Client
 DocType: Employee,IFSC Code,Codi IFSC
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","La data d&#39;inici i la data de final coincideixen amb la targeta de treball <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Si ho desactives, el camp 'Arrodonir Total' no serà visible a cap transacció"
 DocType: BOM,Operating Cost,Cost de funcionament
 DocType: Crop,Produced Items,Articles produïts
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,Evita les RFQ
 DocType: Hub User,Hub User,Usuari del cub
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Fes la teva comanda de vendes
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Slip de pagament enviat per al període de {0} a {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Slip de pagament enviat per al període de {0} a {1}
 DocType: Project Task,Project Task,Tasca del projecte
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Punts redimits
 ,Lead Id,Identificador del client potencial
@@ -1027,7 +1027,7 @@
 DocType: Fee Validity,Max number of visit,Nombre màxim de visites
 ,Hotel Room Occupancy,Ocupació de l&#39;habitació de l&#39;hotel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Part d&#39;hores de creació:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},"Si us plau, estableix pagament en efectiu o Compte bancari predeterminat a la Forma de pagament {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},"Si us plau, estableix pagament en efectiu o Compte bancari predeterminat a la Forma de pagament {0}"
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,inscriure
 DocType: GST Settings,GST Settings,ajustaments GST
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},La moneda ha de ser igual que la llista de preus Moneda: {0}
@@ -1081,7 +1081,7 @@
 DocType: Vehicle Log,Service Details,Detalls del servei
 DocType: Lab Test Template,Grouped,Agrupats
 DocType: Selling Settings,Delivery Note Required,Nota de lliurament Obligatòria
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,S&#39;estan enviant resguards salaris ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,S&#39;estan enviant resguards salaris ...
 DocType: Bank Guarantee,Bank Guarantee Number,Nombre de Garantia Bancària
 DocType: Assessment Criteria,Assessment Criteria,Criteris d&#39;avaluació
 DocType: BOM Item,Basic Rate (Company Currency),Tarifa Bàsica (En la divisa de la companyia)
@@ -1106,13 +1106,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Ja està creat Entrada Pagament
 DocType: Request for Quotation,Get Suppliers,Obteniu proveïdors
 DocType: Purchase Receipt Item Supplied,Current Stock,Estoc actual
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Fila # {0}: {1} Actius no vinculat a l&#39;element {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Fila # {0}: {1} Actius no vinculat a l&#39;element {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Salari vista prèvia de lliscament
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Compte {0} s&#39;ha introduït diverses vegades
 DocType: Account,Expenses Included In Valuation,Despeses incloses en la valoració
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Només podeu renovar si la vostra pertinença caduca en un termini de 30 dies
 DocType: Shopping Cart Settings,Show Stock Availability,Mostra la disponibilitat d&#39;existències
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Estableix {0} a la categoria d&#39;actius {1} o a l&#39;empresa {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Estableix {0} a la categoria d&#39;actius {1} o a l&#39;empresa {2}
 DocType: Location,Longitude,Longitud
 ,Absent Student Report,Informe de l&#39;alumne absent
 DocType: Crop,Crop Spacing UOM,UOM d&#39;espaiat de cultiu
@@ -1184,7 +1184,7 @@
 DocType: Soil Texture,Sand,Sorra
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Oportunitat De
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Fila {0}: {1} Nombres de sèrie obligatoris per a l&#39;element {2}. Heu proporcionat {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Fila {0}: {1} Nombres de sèrie obligatoris per a l&#39;element {2}. Heu proporcionat {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Seleccioneu una taula
 DocType: BOM,Website Specifications,Especificacions del lloc web
 DocType: Special Test Items,Particulars,Particulars
@@ -1295,7 +1295,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Els productes amb major coeficient de ponderació se li apareixen més alta
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Proves de laboratori i signes vitals
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detall Conciliació Bancària
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Fila # {0}: {1} d&#39;actius ha de ser presentat
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Fila # {0}: {1} d&#39;actius ha de ser presentat
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,No s'ha trobat cap empeat
 DocType: Item,If subcontracted to a vendor,Si subcontractat a un proveïdor
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Grup d&#39;alumnes ja està actualitzat.
@@ -1349,7 +1349,6 @@
 DocType: Loyalty Program Collection,Tier Name,Nom del nivell
 DocType: HR Settings,Enter retirement age in years,Introdueixi l&#39;edat de jubilació en anys
 DocType: Crop,Target Warehouse,Magatzem destí
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Estableix la sèrie de noms per a {0} mitjançant la configuració&gt; Configuració&gt; Sèrie de nomenclatura
 DocType: Payroll Employee Detail,Payroll Employee Detail,Detall d&#39;empleat de la nòmina
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Seleccioneu un magatzem
 DocType: Cheque Print Template,Starting location from left edge,Posició inicial des la vora esquerra
@@ -1439,7 +1438,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Material de Pla de subconjunts
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Punts de venda i Territori
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} ha d'estar activa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Sense articles disponibles per a la transferència
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Sense articles disponibles per a la transferència
 DocType: Employee Boarding Activity,Activity Name,Nom de l&#39;activitat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Canvia la data de llançament
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,La quantitat de producte acabada <b>{0}</b> i la quantitat <b>{1}</b> no pot ser diferent
@@ -1666,6 +1665,7 @@
 DocType: Project,First Email,Primer correu electrònic
 DocType: Company,Exception Budget Approver Role,Excepció paper de l&#39;aprovació pressupostària
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Una vegada configurat, aquesta factura estarà en espera fins a la data establerta"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Magatzem Reservat a Ordres de venda / Magatzem de productes acabats
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Quantitat de Venda
 DocType: Repayment Schedule,Interest Amount,Suma d&#39;interès
@@ -1677,7 +1677,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Registres
 DocType: Asset,Scrapped,rebutjat
 DocType: Item,Item Defaults,Defaults de l&#39;element
-DocType: Purchase Invoice,Returns,les devolucions
+DocType: Cashier Closing,Returns,les devolucions
 DocType: Job Card,WIP Warehouse,WIP Magatzem
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serial No {0} està sota contracte de manteniment fins {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,reclutament
@@ -1691,7 +1691,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Tipus de transferència
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Despeses de venda
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clients&gt; Territori
 DocType: Diagnosis,Diagnosis,Diagnòstic
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Compra Standard
 DocType: Attendance Request,Explanation,Explicació
@@ -1704,7 +1703,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Ordres de compra Elements pendents
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Codi ZIP
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Vendes Sol·licitar {0} és {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Seleccioneu el compte de renda d&#39;interessos en el préstec {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Seleccioneu el compte de renda d&#39;interessos en el préstec {0}
 DocType: Opportunity,Contact Info,Informació de Contacte
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Fer comentaris Imatges
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,No es pot promocionar l&#39;empleat amb estatus d&#39;esquerra
@@ -1716,7 +1715,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,La factura no es pot fer per zero hores de facturació
 DocType: Company,Date of Commencement,Data de començament
 DocType: Sales Person,Select company name first.,Seleccioneu el nom de l'empresa en primer lloc.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},Correu electrònic enviat a {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},Correu electrònic enviat a {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ofertes rebudes dels proveïdors.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Substituïu BOM i actualitzeu el preu més recent en totes les BOM
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Per {0} | {1} {2}
@@ -1736,7 +1735,7 @@
 DocType: Asset Movement,From Employee,D'Empleat
 DocType: Driver,Cellphone Number,Número de telèfon
 DocType: Project,Monitor Progress,Progrés del monitor
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertència: El sistema no comprovarà sobrefacturació si la quantitat de l'article {0} a {1} és zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertència: El sistema no comprovarà sobrefacturació si la quantitat de l'article {0} a {1} és zero
 DocType: Journal Entry,Make Difference Entry,Feu Entrada Diferència
 DocType: Supplier Quotation,Auto Repeat Section,Secció de repetició automàtica
 DocType: Upload Attendance,Attendance From Date,Assistència des de data
@@ -1839,7 +1838,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: No aprovat Quantitat no es pot introduir en la Compra de Retorn
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,No es permet canviar el grup de clients del client seleccionat.
 ,Purchase Order Items To Be Billed,Ordre de Compra articles a facturar
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Actualització dels temps d&#39;arribada estimats.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Actualització dels temps d&#39;arribada estimats.
 DocType: Program Enrollment Tool,Enrollment Details,Detalls d&#39;inscripció
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,No es poden establir diversos valors per defecte d&#39;elements per a una empresa.
 DocType: Purchase Invoice Item,Net Rate,Taxa neta
@@ -1853,7 +1852,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,El tipus de sort és madatorio
 DocType: Support Settings,Close Issue After Days,Tancar Problema Després Dies
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Heu de ser un usuari amb les funcions del Gestor del sistema i del Gestor d&#39;elements per afegir usuaris al Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Heu de ser un usuari amb les funcions del Gestor del sistema i del Gestor d&#39;elements per afegir usuaris al Marketplace.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Deixar en blanc si es considera per a totes les branques
 DocType: Job Opening,Staffing Plan,Pla de personal
 DocType: Bank Guarantee,Validity in Days,Validesa de Dies
@@ -1873,7 +1872,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Duplicar fila {0} amb el mateix {1}
 DocType: Marketplace Settings,Disable Marketplace,Desactiva el mercat
 ,Trial Balance,Balanç provisional
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Any fiscal {0} no trobat
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Any fiscal {0} no trobat
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Configuració d&#39;Empleats
 DocType: Hotel Room Reservation,Hotel Reservation User,Usuari de la reserva d&#39;hotel
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Seleccioneu el prefix primer
@@ -1981,7 +1980,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,No s&#39;ha pogut iniciar la sessió
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Asset {0} creat
 DocType: Special Test Items,Special Test Items,Elements de prova especials
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Heu de ser un usuari amb les funcions d&#39;Administrador del sistema i d&#39;Administrador d&#39;elements per registrar-se a Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Heu de ser un usuari amb les funcions d&#39;Administrador del sistema i d&#39;Administrador d&#39;elements per registrar-se a Marketplace.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Forma de pagament
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,"Segons la seva Estructura Salarial assignada, no pot sol·licitar beneficis"
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Lloc web imatge ha de ser un arxiu públic o URL del lloc web
@@ -1993,7 +1992,7 @@
 DocType: Warehouse,Warehouse Contact Info,Informació del contacte del magatzem
 DocType: Payment Entry,Write Off Difference Amount,Amortitzar import de la diferència
 DocType: Volunteer,Volunteer Name,Nom del voluntari
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},S&#39;han trobat files amb dates de venciment duplicades en altres files: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},S&#39;han trobat files amb dates de venciment duplicades en altres files: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: No s&#39;ha trobat el correu electrònic dels empleats, per tant, no correu electrònic enviat"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},No s&#39;ha assignat cap estructura salarial assignada a l&#39;empleat {0} en una data determinada {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},La regla d&#39;enviament no és aplicable al país {0}
@@ -2082,6 +2081,7 @@
 DocType: Salary Component,Earning,Guany
 DocType: Supplier Scorecard,Scoring Criteria,Criteris de puntuació
 DocType: Purchase Invoice,Party Account Currency,Compte Partit moneda
+DocType: Delivery Trip,Total Estimated Distance,Distància estimada total
 ,BOM Browser,BOM Browser
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Actualitzeu el vostre estat per a aquest esdeveniment d&#39;entrenament
 DocType: Item Barcode,EAN,EAN
@@ -2120,7 +2120,7 @@
 DocType: Activity Cost,Projects,Projectes
 DocType: Payment Request,Transaction Currency,moneda de la transacció
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Des {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Alguns correus electrònics no són vàlids
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Alguns correus electrònics no són vàlids
 DocType: Work Order Operation,Operation Description,Descripció de la operació
 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.,No es poden canviar les dates de l'any finscal (inici i fi) una vegada ha estat desat
 DocType: Quotation,Shopping Cart,Carro De La Compra
@@ -2144,7 +2144,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Canvi net en actius fixos
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixar en blanc si es considera per a totes les designacions
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Càrrec del tipus 'real' a la fila {0} no pot ser inclòs en la partida Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Càrrec del tipus 'real' a la fila {0} no pot ser inclòs en la partida Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,A partir de data i hora
 DocType: Shopify Settings,For Company,Per a l'empresa
@@ -2158,7 +2158,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,S&#39;ha produït un error en crear un calendari de cursos
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,El primer Approver de despeses de la llista s&#39;establirà com a aprovador d&#39;inversió predeterminat.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,no pot ser major que 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Heu de ser un usuari diferent de l&#39;administrador amb les funcions Administrador del sistema i l&#39;Administrador d&#39;elements per registrar-se a Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Heu de ser un usuari diferent de l&#39;administrador amb les funcions Administrador del sistema i l&#39;Administrador d&#39;elements per registrar-se a Marketplace.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Article {0} no és un article d'estoc
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-SIYY.-
 DocType: Maintenance Visit,Unscheduled,No programada
@@ -2187,7 +2187,7 @@
 DocType: HR Settings,Employee Settings,Configuració dels empleats
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,S&#39;està carregant el sistema de pagament
 ,Batch-Wise Balance History,Batch-Wise Balance History
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Fila # {0}: no es pot establir la tarifa si la quantitat és superior a la quantitat facturada per l&#39;article {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Fila # {0}: no es pot establir la tarifa si la quantitat és superior a la quantitat facturada per l&#39;article {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Els paràmetres d&#39;impressió actualitzats en format d&#39;impressió respectiu
 DocType: Package Code,Package Code,codi paquet
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Aprenent
@@ -2419,7 +2419,7 @@
 DocType: Delivery Trip,Optimize Route,Optimitza la ruta
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Intenta operacions per a la planificació de X dies d&#39;antelació.
 DocType: HR Settings,Stop Birthday Reminders,Aturar recordatoris d'aniversari
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},"Si us plau, estableix nòmina compte per pagar per defecte en l&#39;empresa {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},"Si us plau, estableix nòmina compte per pagar per defecte en l&#39;empresa {0}"
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Obteniu una ruptura financera d&#39;impostos i dades de càrregues d&#39;Amazon
 DocType: SMS Center,Receiver List,Llista de receptors
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,cerca article
@@ -2489,7 +2489,7 @@
 DocType: Vital Signs,Constipated,Constipat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Contra Proveïdor Factura {0} {1} datat
 DocType: Customer,Default Price List,Llista de preus per defecte
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,registrar el moviment d&#39;actius {0} creat
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,registrar el moviment d&#39;actius {0} creat
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,No s&#39;ha trobat cap element.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,No es pot eliminar l&#39;any fiscal {0}. Any fiscal {0} s&#39;estableix per defecte en la configuració global
 DocType: Share Transfer,Equity/Liability Account,Compte de Patrimoni / Responsabilitat
@@ -2626,6 +2626,7 @@
 DocType: Blanket Order,Order Type,Tipus d'ordre
 ,Item-wise Sales Register,Tema-savi Vendes Registre
 DocType: Asset,Gross Purchase Amount,Compra import brut
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Codi d&#39;article&gt; Grup d&#39;elements&gt; Marca
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Balanços d&#39;obertura
 DocType: Asset,Depreciation Method,Mètode de depreciació
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Aqeust impost està inclòs a la tarifa bàsica?
@@ -2706,7 +2707,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Acció si el Pressupost Anual va superar la PO
 DocType: Student Leave Application,Student Leave Application,Aplicació Deixar estudiant
 DocType: Item,Will also apply for variants,També s'aplicarà per a les variants
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Actiu no es pot cancel·lar, com ja ho és {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Actiu no es pot cancel·lar, com ja ho és {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Empleat {0} del mig dia del {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Total d&#39;hores de treball no han de ser més grans que les hores de treball max {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,En
@@ -2730,6 +2731,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Obteniu dades
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},La permís màxim permès en el tipus d&#39;abandonament {0} és {1}
 DocType: SMS Center,Create Receiver List,Crear Llista de receptors
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,La data d&#39;ús disponible ha de ser després de la data de compra
 DocType: Vehicle,Wheels,rodes
 DocType: Packing Slip,To Package No.,Al paquet No.
 DocType: Patient Relation,Family,Família
@@ -2743,7 +2745,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,La moneda de facturació ha de ser igual a la moneda de la companyia per defecte o la moneda del compte de partit
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que el paquet és una part d'aquest lliurament (Només Projecte)
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Fila {0}: data de venciment no pot ser abans de la data de publicació
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Fila {0}: data de venciment no pot ser abans de la data de publicació
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Feu Entrada Pagament
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Quantitat d'articles per {0} ha de ser menor de {1}
 ,Sales Invoice Trends,Tendències de Factures de Vendes
@@ -2815,7 +2817,7 @@
 DocType: Guardian,Guardian Interests,Interessos de la guarda
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Actualitza el nom / número del compte
 DocType: Naming Series,Current Value,Valor actual
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Hi ha diversos exercicis per a la data {0}. Si us plau, estableix la companyia en l&#39;exercici fiscal"
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Hi ha diversos exercicis per a la data {0}. Si us plau, estableix la companyia en l&#39;exercici fiscal"
 DocType: Education Settings,Instructor Records to be created by,Instructor Records a ser creat per
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} creat
 DocType: GST Account,GST Account,Compte GST
@@ -2833,7 +2835,7 @@
 DocType: Sales Person,Name and Employee ID,Nom i ID d'empleat
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Data de venciment no pot ser anterior Data de comptabilització
 DocType: Website Item Group,Website Item Group,Lloc web Grup d'articles
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,No s&#39;ha trobat resoldre salarial per presentar els criteris seleccionats anteriorment o el resguard salarial ja presentat
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,No s&#39;ha trobat resoldre salarial per presentar els criteris seleccionats anteriorment o el resguard salarial ja presentat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Taxes i impostos
 DocType: Projects Settings,Projects Settings,Configuració dels projectes
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,"Si us plau, introduïu la data de referència"
@@ -2842,7 +2844,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Subministrat Quantitat
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Material Request Item
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Torneu a cancel·lar abans la compra del rebut {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Torneu a cancel·lar abans la compra del rebut {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Arbre dels grups d'articles.
 DocType: Production Plan,Total Produced Qty,Quantitat total produïda
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,No es pot fer referència número de la fila superior o igual al nombre de fila actual d'aquest tipus de càrrega
@@ -2951,6 +2953,7 @@
 ,Vehicle Expenses,Les despeses de vehicles
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Creeu proves de laboratori a la factura de venda
 DocType: Serial No,Invoice Details,Detalls de la factura
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Activeu la configuració de Google Maps per estimar i optimitzar rutes
 DocType: Grant Application,Show on Website,Mostra al lloc web
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Comença
 DocType: Hub Tracked Item,Hub Category,Categoria de concentrador
@@ -2990,7 +2993,7 @@
 DocType: Inpatient Record,B Positive,B Positiu
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",El benefici màxim de l&#39;empleat ({0}) supera {1} per la suma {2} de l&#39;import anterior reivindicat
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Fila # {0}: Quantitat ha de ser 1, com a element és un actiu fix. Si us plau, utilitzeu fila separada per al qty múltiple."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Fila # {0}: Quantitat ha de ser 1, com a element és un actiu fix. Si us plau, utilitzeu fila separada per al qty múltiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Leave Block List Allow
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr no pot estar en blanc o l&#39;espai
 DocType: Patient Medical Record,Patient Medical Record,Registre mèdic del pacient
@@ -3024,7 +3027,7 @@
 DocType: Workstation,Wages per hour,Els salaris per hora
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Estoc equilibri en Lot {0} es convertirà en negativa {1} per a la partida {2} a Magatzem {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Després de sol·licituds de materials s&#39;han plantejat de forma automàtica segons el nivell de re-ordre de l&#39;article
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Compte {0} no és vàlid. Compte moneda ha de ser {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Compte {0} no és vàlid. Compte moneda ha de ser {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Des de la data {0} no es pot produir després de l&#39;alleujament de l&#39;empleat Data {1}
 DocType: Supplier,Is Internal Supplier,És proveïdor intern
 DocType: Employee,Create User Permission,Crea permís d&#39;usuari
@@ -3168,7 +3171,7 @@
 DocType: Account,Fixed Asset,Actius Fixos
 DocType: Amazon MWS Settings,After Date,Després de la data
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Inventari serialitzat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,La factura de {0} no és vàlida.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,La factura de {0} no és vàlida.
 ,Department Analytics,Departament d&#39;Analytics
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,No s&#39;ha trobat el correu electrònic al contacte predeterminat
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Genera el secret
@@ -3180,7 +3183,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,El programa a l&#39;Estructura de tarifes i al grup d&#39;estudiants {0} són diferents.
 DocType: Bank Statement Transaction Entry,Receivable Account,Compte per Cobrar
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Vàlid des de la data ha de ser inferior a Vàlid fins a la data.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Fila # {0}: {1} d&#39;actius ja és {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Fila # {0}: {1} d&#39;actius ja és {2}
 DocType: Quotation Item,Stock Balance,Saldos d'estoc
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Ordres de venda al Pagament
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,CEO
@@ -3222,6 +3225,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Es requereix dèbit per
 DocType: Clinical Procedure,Inpatient Record,Registre d&#39;hospitalització
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Taula de temps ajuden a mantenir la noció del temps, el cost i la facturació d&#39;activitats realitzades pel seu equip"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Llista de preus de Compra
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Data de la transacció
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Plantilles de variables de quadre de comandament de proveïdors.
@@ -3264,7 +3268,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Guany en Canvi / Pèrdua
 DocType: Opportunity,Lost Reason,Raó Perdut
 DocType: Amazon MWS Settings,Enable Amazon,Activa Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Fila # {0}: el compte {1} no pertany a l&#39;empresa {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Fila # {0}: el compte {1} no pertany a l&#39;empresa {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},No es pot trobar DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nova adreça
 DocType: Quality Inspection,Sample Size,Mida de la mostra
@@ -3375,7 +3379,7 @@
 DocType: Water Analysis,Origin,Origen
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Aquest document està per sobre del límit de {0} {1} per a l&#39;element {4}. Estàs fent una altra {3} contra el mateix {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Si us plau conjunt recurrent després de guardar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Seleccioneu el canvi import del compte
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Seleccioneu el canvi import del compte
 DocType: Purchase Invoice,Price List Currency,Price List Currency
 DocType: Naming Series,User must always select,Usuari sempre ha de seleccionar
 DocType: Stock Settings,Allow Negative Stock,Permetre existències negatives
@@ -3417,7 +3421,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Estàs segur que vols cancel·lar aquesta cita?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Paquet de tarifes de l&#39;habitació de l&#39;hotel
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,pipeline vendes
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Si us plau valor predeterminat en compte Salari El component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Si us plau valor predeterminat en compte Salari El component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Requerit Per
 DocType: Rename Tool,File to Rename,Arxiu per canviar el nom de
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Seleccioneu la llista de materials per a l&#39;article a la fila {0}
@@ -3438,7 +3442,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,El cost d'articles comprats
 DocType: Employee Separation,Employee Separation Template,Plantilla de separació d&#39;empleats
 DocType: Selling Settings,Sales Order Required,Ordres de venda Obligatori
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Converteix-te en venedor
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Converteix-te en venedor
 DocType: Purchase Invoice,Credit To,Crèdit Per
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Leads actius / Clients
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Deixeu-vos en blanc per utilitzar el format de nota de lliurament estàndard
@@ -3479,7 +3483,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Feu la plantilla fiscal
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Fòrum d&#39;Usuaris
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Matèries primeres no poden estar en blanc.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Fila # {0} (Taula de pagaments): la quantitat ha de ser negativa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Fila # {0} (Taula de pagaments): la quantitat ha de ser negativa
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","No s&#39;ha pogut actualitzar valors, factura conté els articles de l&#39;enviament de la gota."
 DocType: Contract,Fulfilment Status,Estat de compliment
 DocType: Lab Test Sample,Lab Test Sample,Exemple de prova de laboratori
@@ -3637,7 +3641,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Data de doc
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Els registres d&#39;honoraris creats - {0}
 DocType: Asset Category Account,Asset Category Account,Compte categoria d&#39;actius
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Fila # {0} (Taula de pagaments): la quantitat ha de ser positiva
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Fila # {0} (Taula de pagaments): la quantitat ha de ser positiva
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},No es pot produir més Article {0} que en la quantitat de comandes de client {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Seleccioneu els valors de l&#39;atribut
 DocType: Purchase Invoice,Reason For Issuing document,Raó per emetre el document
@@ -3692,7 +3696,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Moment en què es van rebre els materials
 DocType: Products Settings,Products per Page,Productes per pàgina
 DocType: Stock Ledger Entry,Outgoing Rate,Sortint Rate
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,o
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,o
 DocType: Sales Order,Billing Status,Estat de facturació
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Informa d'un problema
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Despeses de serveis públics
@@ -3719,7 +3723,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Declaració d&#39;exempció d&#39;impostos als empleats
 DocType: Payment Entry,Cheque/Reference Date,Xec / Data de referència
 DocType: Purchase Invoice,Total Taxes and Charges,Total d'impostos i càrrecs
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,La data d&#39;ús disponible s&#39;introdueix com a data passada
 DocType: Employee,Emergency Contact,Contacte d'Emergència
 DocType: Bank Reconciliation Detail,Payment Entry,Entrada de pagament
 ,sales-browser,les vendes en el navegador
@@ -3765,6 +3768,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),És retorn (Nota de crèdit)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Comença a treballar
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},No es requereix serial per a l&#39;actiu {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Estableix la sèrie de noms per a {0} mitjançant la configuració&gt; Configuració&gt; Sèrie de nomenclatura
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,plantilla persones amb discapacitat no ha de ser plantilla per defecte
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Per a la fila {0}: introduïu el qty planificat
 DocType: Account,Income Account,Compte d'ingressos
@@ -3778,6 +3782,7 @@
 DocType: Loyalty Program,Help Section,Secció d&#39;ajuda
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,anterior
 DocType: Appraisal Goal,Key Responsibility Area,Àrea de Responsabilitat clau
+DocType: Delivery Trip,Distance UOM,UOM de distància
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Els lots dels estudiants ajuden a realitzar un seguiment d&#39;assistència, avaluacions i quotes per als estudiants"
 DocType: Payment Entry,Total Allocated Amount,total assignat
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Establir compte d&#39;inventari predeterminat d&#39;inventari perpetu
@@ -3819,7 +3824,7 @@
 DocType: Item Supplier,Item Supplier,Article Proveïdor
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,"Si us plau, introduïu el codi d'article per obtenir lots no"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Please select a value for {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,No hi ha elements seleccionats per a la transferència
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,No hi ha elements seleccionats per a la transferència
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Totes les direccions.
 DocType: Company,Stock Settings,Ajustaments d'estocs
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusió només és possible si les propietats són les mateixes en tots dos registres. És el Grup, Tipus Arrel, Company"
@@ -4116,7 +4121,7 @@
 DocType: Patient,Personal and Social History,Història personal i social
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,S&#39;ha creat l&#39;usuari {0}
 DocType: Fee Schedule,Fee Breakup for each student,Taxa d&#39;interrupció per cada estudiant
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),avanç total ({0}) contra l&#39;Ordre {1} no pot ser major que el total general ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),avanç total ({0}) contra l&#39;Ordre {1} no pot ser major que el total general ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Seleccioneu Distribució Mensual de distribuir de manera desigual a través d'objectius mesos.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Canvia el codi
 DocType: Purchase Invoice Item,Valuation Rate,Tarifa de Valoració
@@ -4125,7 +4130,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Aprovat ITC Cess
 ,Student Monthly Attendance Sheet,Estudiant Full d&#39;Assistència Mensual
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,La norma d&#39;enviament només és aplicable per a la venda
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Fila d&#39;amortització {0}: la següent data de depreciació no pot ser abans de la data de compra
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Fila d&#39;amortització {0}: la següent data de depreciació no pot ser abans de la data de compra
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projecte Data d'Inici
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Fins
 DocType: Rename Tool,Rename Log,Canviar el nom de registre
@@ -4142,12 +4147,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Amb quina freqüència s&#39;ha de projectar i actualitzar l&#39;empresa en funció de les transaccions comercials.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Caduca el
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Afegir estudiants
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Suprimiu l&#39;Empleat <a href=""#Form/Employee/{0}"">{0}</a> \ per cancel·lar aquest document"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Seleccioneu {0}
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Distància
+DocType: Delivery Stop,Distance,Distància
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Indiqueu els vostres productes o serveis que compreu o veniu.
 DocType: Water Analysis,Storage Temperature,Temperatura del magatzem
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4174,7 +4177,7 @@
 DocType: Homepage,Company Description for website homepage,Descripció de l&#39;empresa per a la pàgina d&#39;inici pàgina web
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Per comoditat dels clients, aquests codis es poden utilitzar en formats d'impressió, com factures i albarans"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,nom suplir
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,No s&#39;ha pogut obtenir la informació de {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,No s&#39;ha pogut obtenir la informació de {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Revista d&#39;obertura
 DocType: Contract,Fulfilment Terms,Termes de compliment
 DocType: Sales Invoice,Time Sheet List,Llista de fulls de temps
@@ -4354,7 +4357,7 @@
 DocType: Serial No,Warranty / AMC Details,Detalls de la Garantia/AMC
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Estudiants seleccionats de forma manual per al grup basat en activitats
 DocType: Journal Entry,User Remark,Observació de l'usuari
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Optimització de rutes.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Optimització de rutes.
 DocType: Travel Itinerary,Non Diary,No diari
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,No es pot crear un bonificador de retenció per als empleats de l&#39;esquerra
 DocType: Lead,Market Segment,Sector de mercat
@@ -4384,7 +4387,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Programa de fidelització
 DocType: Student Guardian,Father,pare
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Entrades de suport
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,"""Actualització d'Estoc 'no es pot comprovar en venda d'actius fixos"
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,"""Actualització d'Estoc 'no es pot comprovar en venda d'actius fixos"
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliació bancària
 DocType: Attendance,On Leave,De baixa
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obtenir actualitzacions
@@ -4429,7 +4432,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Número de sèrie i de lot
 DocType: Warranty Claim,From Company,Des de l'empresa
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Suma de les puntuacions de criteris d&#39;avaluació ha de ser {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,"Si us plau, ajusteu el número d&#39;amortitzacions Reservats"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,"Si us plau, ajusteu el número d&#39;amortitzacions Reservats"
 DocType: Supplier Scorecard Period,Calculations,Càlculs
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Valor o Quantitat
 DocType: Payment Terms Template,Payment Terms,Condicions de pagament
@@ -4448,7 +4451,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Descompte (%) sobre el preu de llista tarifa amb Marge
 DocType: Healthcare Service Unit Type,Rate / UOM,Taxa / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,tots els cellers
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,No s&#39;ha trobat {0} per a les transaccions de l&#39;empresa Inter.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,No s&#39;ha trobat {0} per a les transaccions de l&#39;empresa Inter.
 DocType: Travel Itinerary,Rented Car,Cotxe llogat
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Sobre la vostra empresa
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Crèdit al compte ha de ser un compte de Balanç
@@ -4549,6 +4552,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Criteris d&#39;anàlisi de plantes
 DocType: Cheque Print Template,Cheque Height,xec Alçada
 DocType: Supplier,Supplier Details,Detalls del proveïdor
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configureu la sèrie de numeració per assistència mitjançant la configuració&gt; Sèrie de numeració
 DocType: Setup Progress,Setup Progress,Progrés de configuració
 DocType: Expense Claim,Approval Status,Estat d'aprovació
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},De valor ha de ser inferior al valor de la fila {0}
@@ -4641,7 +4645,6 @@
 DocType: Travel Request,Fully Sponsored,Totalment patrocinat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Entrada periòdica inversa
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,S&#39;ha creat el client {0}.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configureu el sistema de nomenclatura d&#39;empleats en recursos humans&gt; Configuració de recursos humans
 DocType: Stock Settings,Limit Percent,límit de percentatge
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Actualment no hi ha existències disponibles en cap magatzem
 ,Payment Period Based On Invoice Date,Període de pagament basat en Data de la factura
@@ -4700,7 +4703,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Magatzem d'origen
 DocType: Installation Note,Installation Date,Data d'instal·lació
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Comparteix el compilador
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Fila # {0}: {1} Actius no pertany a l&#39;empresa {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Fila # {0}: {1} Actius no pertany a l&#39;empresa {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,S&#39;ha creat la factura de vendes {0}
 DocType: Employee,Confirmation Date,Data de confirmació
 DocType: Inpatient Occupancy,Check Out,Sortida
@@ -4720,6 +4723,7 @@
 DocType: Production Plan,Sales Orders Detail,Detall de comandes de venda
 DocType: Bin,Requested Quantity,quantitat sol·licitada
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE -YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Configureu el sistema de nomenclatura d&#39;instructor a l&#39;educació&gt; Configuració de l&#39;educació
 DocType: Patient,Marital Status,Estat Civil
 DocType: Stock Settings,Auto Material Request,Sol·licitud de material automàtica
 DocType: Woocommerce Settings,API consumer secret,Secret de consum de l&#39;API
@@ -4772,7 +4776,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Seleccioneu dies
 DocType: Academic Term,Term Name,nom termini
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Crèdit ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Creació d&#39;assentaments salaris ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Creació d&#39;assentaments salaris ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,No podeu editar el node arrel.
 DocType: Buying Settings,Purchase Order Required,Ordre de Compra Obligatori
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Temporitzador
@@ -4854,7 +4858,7 @@
 DocType: Program Enrollment,School House,Casa de l&#39;escola
 DocType: Serial No,Out of AMC,Fora d'AMC
 DocType: Opportunity,Opportunity Amount,Import de l&#39;oportunitat
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Nombre de Depreciacions reserva no pot ser més gran que el nombre total d&#39;amortitzacions
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Nombre de Depreciacions reserva no pot ser més gran que el nombre total d&#39;amortitzacions
 DocType: Purchase Order,Order Confirmation Date,Data de confirmació de la comanda
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI -YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Feu Manteniment Visita
@@ -4895,7 +4899,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Lote:
 DocType: Volunteer,Afternoon,Tarda
 DocType: Loyalty Program,Loyalty Program Help,Ajuda del programa de lleialtat
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' es desactiva
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' es desactiva
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Posar com a obert
 DocType: Cheque Print Template,Scanned Cheque,escanejada Xec
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correus electrònics automàtics als Contactes al Presentar les transaccions
@@ -4908,7 +4912,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Objecte i de garantia Detalls
 DocType: Chapter,Chapter Members,Membres del capítol
 DocType: Sales Team,Contribution (%),Contribució (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Nota: L'entrada de pagament no es crearà perquè no s'ha especificat 'Caixa o compte bancari"""
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Nota: L'entrada de pagament no es crearà perquè no s'ha especificat 'Caixa o compte bancari"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,El projecte {0} ja existeix
 DocType: Clinical Procedure,Nursing User,Usuari d&#39;infermeria
 DocType: Employee Benefit Application,Payroll Period,Període de nòmina
@@ -4916,6 +4920,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},El número de sèrie {0} no pertany a Batch {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Responsabilitats
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,El període de validesa d&#39;aquesta cita ha finalitzat.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Suprimiu l&#39;Empleat <a href=""#Form/Employee/{0}"">{0}</a> \ per cancel·lar aquest document"
 DocType: Expense Claim Account,Expense Claim Account,Compte de Despeses
 DocType: Account,Capital Work in Progress,Capital treball en progrés
 DocType: Accounts Settings,Allow Stale Exchange Rates,Permet els tipus d&#39;intercanvi moderats
@@ -4997,7 +5003,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Material Issue
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Connecta Shopify amb ERPNext
 DocType: Material Request Item,For Warehouse,Per Magatzem
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Notes de lliurament {0} actualitzades
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Notes de lliurament {0} actualitzades
 DocType: Employee,Offer Date,Data d'Oferta
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Cites
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Vostè està en mode fora de línia. Vostè no serà capaç de recarregar fins que tingui la xarxa.
@@ -5047,7 +5053,7 @@
 DocType: Shipping Rule,Calculate Based On,Calcula a causa del
 DocType: Contract,Unfulfilled,No s&#39;ha complert
 DocType: Delivery Note Item,From Warehouse,De Magatzem
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Cap empleat pels criteris esmentats
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Cap empleat pels criteris esmentats
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,No hi ha articles amb la llista de materials per a la fabricació de
 DocType: Shopify Settings,Default Customer,Client per defecte
 DocType: Sales Stage,Stage Name,Nom artistic
@@ -5089,7 +5095,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Suma d'impostos Després del Descompte
 DocType: Patient,Inpatient Status,Estat d&#39;internament
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Ajustos diàries Resum Treball
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,La llista de preus seleccionada hauria de comprovar els camps comprats i venuts.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,La llista de preus seleccionada hauria de comprovar els camps comprats i venuts.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Introduïu Reqd per data
 DocType: Payment Entry,Internal Transfer,transferència interna
 DocType: Asset Maintenance,Maintenance Tasks,Tasques de manteniment
@@ -5125,7 +5131,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Agrupar per
 DocType: Guardian,Interests,interessos
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Activar / desactivar les divises.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,No s&#39;han pogut enviar alguns esborranys salarials
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,No s&#39;han pogut enviar alguns esborranys salarials
 DocType: Exchange Rate Revaluation,Get Entries,Obteniu entrades
 DocType: Production Plan,Get Material Request,Obtenir Sol·licitud de materials
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Despeses postals
@@ -5209,7 +5215,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},El compte de despeses és obligatòria per a cada element {0}
 DocType: BOM,Website Description,Descripció del lloc web
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Canvi en el Patrimoni Net
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,"Si us plau, cancel·lar Factura de Compra {0} primera"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,"Si us plau, cancel·lar Factura de Compra {0} primera"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,No permès. Desactiveu el tipus d&#39;unitat de servei
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adreça de correu electrònic ha de ser únic, ja existeix per {0}"
 DocType: Serial No,AMC Expiry Date,AMC Data de caducitat
@@ -5249,7 +5255,7 @@
 DocType: Hotel Room,Hotel Room,Habitació d&#39;hotel
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Compte {0} no pertany a la companyia de {1}
 DocType: Leave Type,Rounding,Redondeig
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Números de sèrie en fila {0} no coincideix amb la nota de lliurament
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Números de sèrie en fila {0} no coincideix amb la nota de lliurament
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Quantitat distribuïda (prorratejada)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","A continuació, les Normes de preus es filtren segons client, grup de clients, territori, proveïdor, grup de proveïdors, campanya, soci de vendes, etc."
 DocType: Student,Guardian Details,guardià detalls
@@ -5304,7 +5310,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Magatzem necessari per a l'article d'estoc {0}
 DocType: Leave Allocation,Unused leaves,Fulles no utilitzades
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Feu ingrés de reemborsament
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Tots els Departaments
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Tots els Departaments
 DocType: Healthcare Service Unit,Vacant,Vacant
 DocType: Patient,Alcohol Past Use,Ús del passat alcohòlic
 DocType: Fertilizer Content,Fertilizer Content,Contingut d&#39;abonament
@@ -5315,7 +5321,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,L&#39;ordre de treball {0} s&#39;ha de cancel·lar abans de cancel·lar aquesta comanda de venda
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Fetch exploded BOM (including sub-assemblies)
 DocType: Authorization Rule,Applicable To (Employee),Aplicable a (Empleat)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Data de venciment és obligatori
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Data de venciment és obligatori
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Increment de Atribut {0} no pot ser 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Tipus de benefici i import
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Habitacions reservades
@@ -5459,7 +5465,7 @@
 DocType: Purchase Invoice Item,Total Weight,Pes total
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Comissió de Vendes
 DocType: Job Offer Term,Value / Description,Valor / Descripció
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Fila # {0}: l&#39;element {1} no pot ser presentat, el que ja és {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Fila # {0}: l&#39;element {1} no pot ser presentat, el que ja és {2}"
 DocType: Tax Rule,Billing Country,Facturació País
 DocType: Purchase Order Item,Expected Delivery Date,Data de lliurament esperada
 DocType: Restaurant Order Entry,Restaurant Order Entry,Entrada de comanda de restaurant
@@ -5498,12 +5504,13 @@
 DocType: Maintenance Visit,Breakdown,Breakdown
 DocType: Travel Itinerary,Vegetarian,Vegetariana
 DocType: Patient Encounter,Encounter Date,Data de trobada
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Compte: {0} amb la divisa: {1} no es pot seleccionar
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Compte: {0} amb la divisa: {1} no es pot seleccionar
 DocType: Bank Statement Transaction Settings Item,Bank Data,Dades bancàries
 DocType: Purchase Receipt Item,Sample Quantity,Quantitat de mostra
 DocType: Bank Guarantee,Name of Beneficiary,Nom del beneficiari
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Actualitza el cost de la BOM automàticament mitjançant Scheduler, en funció de la taxa de valoració / tarifa de preu més recent / la darrera tarifa de compra de matèries primeres."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Proveïdor&gt; Grup de proveïdors
 DocType: Bank Reconciliation Detail,Cheque Date,Data Xec
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Compte {0}: el compte Pare {1} no pertany a la companyia: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Eliminat correctament totes les transaccions relacionades amb aquesta empresa!
@@ -5531,7 +5538,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Els nodes fills només poden ser creats sota els nodes de tipus &quot;grup&quot;
 DocType: Attendance Request,Half Day Date,Medi Dia Data
 DocType: Academic Year,Academic Year Name,Nom Any Acadèmic
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} no està permès transaccionar amb {1}. Canvieu la companyia.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} no està permès transaccionar amb {1}. Canvieu la companyia.
 DocType: Sales Partner,Contact Desc,Descripció del Contacte
 DocType: Email Digest,Send regular summary reports via Email.,Enviar informes periòdics resumits per correu electrònic.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},"Si us plau, estableix per defecte en compte Tipus de Despeses {0}"
@@ -5564,7 +5571,7 @@
 DocType: Hotel Room,Hotel Manager,Gerent d&#39;hotel
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Estableixi la regla fiscal de carret de la compra
 DocType: Purchase Invoice,Taxes and Charges Added,Impostos i càrregues afegides
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,La fila de depreciació {0}: la següent data de la depreciació no pot ser abans de la data d&#39;ús disponible
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,La fila de depreciació {0}: la següent data de la depreciació no pot ser abans de la data d&#39;ús disponible
 ,Sales Funnel,Sales Funnel
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Abreviatura és obligatori
 DocType: Project,Task Progress,Grup de Progrés
@@ -5578,7 +5585,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Tots els Grups de clients
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,acumulat Mensual
 DocType: Attendance Request,On Duty,De servei
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} és obligatori. Potser el registre de canvi de divisa no es crea per {1} a {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} és obligatori. Potser el registre de canvi de divisa no es crea per {1} a {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Plantilla d&#39;impostos és obligatori.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Compte {0}: el compte superior {1} no existeix
 DocType: POS Closing Voucher,Period Start Date,Data d&#39;inici del període
@@ -5657,11 +5664,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Almenys un magatzem és obligatori
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Configurar camps d&#39;elements com UOM, grup d&#39;elements, descripció i número d&#39;hores."
 DocType: Certification Application,Certification Status,Estat de certificació
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Marketplace
 DocType: Travel Itinerary,Travel Advance Required,Cal anticipar el viatge
 DocType: Subscriber,Subscriber Name,Nom del subscriptor
 DocType: Serial No,Out of Warranty,Fora de la Garantia
-DocType: Cashier Closing,Cashier-closing-,Caixa-tancament-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Tipus de dades assignats
 DocType: BOM Update Tool,Replace,Reemplaçar
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,No s&#39;han trobat productes.
@@ -5748,7 +5754,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Es creen plantilles d&#39;impostos predeterminades per a vendes i compra.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,El registre del resultat de l&#39;avaluació {0} ja existeix.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Exemple: ABCD. #####. Si s&#39;estableix la sèrie i el lot no es menciona en les transaccions, es crearà un nombre automàtic de lot en funció d&#39;aquesta sèrie. Si sempre voleu esmentar explícitament No per a aquest element, deixeu-lo en blanc. Nota: aquesta configuració tindrà prioritat sobre el Prefix de la sèrie de noms a la configuració de valors."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configureu la sèrie de numeració per assistència mitjançant la configuració&gt; Sèrie de numeració
 DocType: BOM,Materials Required (Exploded),Materials necessaris (explotat)
 DocType: Contract,Party User,Usuari del partit
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Si us plau ajust empresa de filtres en blanc si és Agrupa per &#39;empresa&#39;
@@ -5949,7 +5954,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Comte del OPP
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Tant la data d&#39;inici del període de prova com la data de finalització del període de prova s&#39;han d&#39;establir
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Tarifa mitjana
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,L&#39;import total del pagament en el calendari de pagaments ha de ser igual a Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,L&#39;import total del pagament en el calendari de pagaments ha de ser igual a Grand / Rounded Total
 DocType: Subscription Plan Detail,Plan,Pla
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Equilibri extracte bancari segons Comptabilitat General
 DocType: Job Applicant,Applicant Name,Nom del sol·licitant
@@ -6018,7 +6023,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sabó i Detergent
 DocType: BOM,Show Items,Mostra elements
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Des del temps no pot ser més gran que en tant.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Vols notificar a tots els clients per correu electrònic?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Vols notificar a tots els clients per correu electrònic?
 DocType: Subscription Plan,Billing Interval,Interval de facturació
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Cinema i vídeo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenat
@@ -6027,9 +6032,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,La fila {0}: {1} ha de ser superior a 0
 DocType: Assessment Criteria,Assessment Criteria Group,Criteris d&#39;avaluació del Grup
 DocType: Healthcare Settings,Patient Name By,Nom del pacient mitjançant
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Salari de la publicació de la periodificació de {0} a {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Salari de la publicació de la periodificació de {0} a {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Activa els ingressos diferits
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},L&#39;obertura de la depreciació acumulada ha de ser inferior a igual a {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},L&#39;obertura de la depreciació acumulada ha de ser inferior a igual a {0}
 DocType: Warehouse,Warehouse Name,Nom Magatzem
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,La data d&#39;inici real ha de ser inferior a la data de finalització real
 DocType: Naming Series,Select Transaction,Seleccionar Transacció
@@ -6180,7 +6185,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,L&#39;empleat {0} del grau {1} no té una política d&#39;abandonament predeterminat
 DocType: Salary Detail,Salary Detail,Detall de sous
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Seleccioneu {0} primer
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,S&#39;han afegit {0} usuaris
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,S&#39;han afegit {0} usuaris
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","En el cas del programa de diversos nivells, els clients seran assignats automàticament al nivell corresponent segons el seu gastat"
 DocType: Appointment Type,Physician,Metge
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Lot {0} de {1} article ha expirat.
@@ -6323,7 +6328,7 @@
 DocType: Asset,Custodian,Custòdia
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Punt de Venda Perfil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} ha de ser un valor entre 0 i 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Pagament de {0} de {1} a {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Pagament de {0} de {1} a {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Préstecs sense garantia
 DocType: Cost Center,Cost Center Name,Nom del centre de cost
 DocType: Student,B+,B +
@@ -6355,6 +6360,7 @@
 DocType: Employee,Date of Issue,Data d'emissió
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","D&#39;acord amb la configuració de comprar si compra Reciept Obligatori == &#39;SÍ&#39;, a continuació, per a la creació de la factura de compra, l&#39;usuari necessita per crear rebut de compra per al primer element {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunt de Proveïdors per a l&#39;element {1}
+DocType: Global Defaults,Default Distance Unit,Unitat de distància predeterminada
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Fila {0}: valor Hores ha de ser més gran que zero.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Lloc web Imatge {0} unit a l&#39;article {1} no es pot trobar
 DocType: Issue,Content Type,Tipus de Contingut
@@ -6410,7 +6416,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Dèbit al compte ha de ser un compte de Balanç
 DocType: Asset,Naming Series,Sèrie de nomenclatura
 DocType: Vital Signs,Coated,Recobert
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Fila {0}: el valor esperat després de la vida útil ha de ser inferior a la quantitat bruta de compra
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Fila {0}: el valor esperat després de la vida útil ha de ser inferior a la quantitat bruta de compra
 DocType: GoCardless Settings,GoCardless Settings,Configuració sense GoCard
 DocType: Leave Block List,Leave Block List Name,Deixa Nom Llista de bloqueig
 DocType: Certified Consultant,Certification Validity,Validesa de certificació
@@ -6477,6 +6483,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Capçalera del banc
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Veure proves de laboratori
 DocType: Hub Users,Hub Users,Usuaris del concentrador
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clients&gt; Territori
 DocType: Purchase Invoice,Y,Jo
 DocType: Maintenance Visit,Maintenance Date,Manteniment Data
 DocType: Purchase Invoice Item,Rejected Serial No,Número de sèrie Rebutjat
@@ -6491,7 +6498,7 @@
 DocType: SG Creation Tool Course,Max Strength,força màx
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Instal·lació de valors predeterminats
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},No s&#39;ha seleccionat cap nota de lliurament per al client {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},No s&#39;ha seleccionat cap nota de lliurament per al client {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,L&#39;empleat {0} no té cap benefici màxim
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Seleccioneu els elements segons la data de lliurament
 DocType: Grant Application,Has any past Grant Record,Té algun registre de Grant passat
@@ -6518,7 +6525,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Reserva d&#39;habitació de l&#39;hotel
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Servei Al Client
 DocType: BOM,Thumbnail,Ungla del polze
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,No s&#39;han trobat contactes amb identificadors de correu electrònic.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,No s&#39;han trobat contactes amb identificadors de correu electrònic.
 DocType: Item Customer Detail,Item Customer Detail,Item Customer Detail
 DocType: Notification Control,Prompt for Email on Submission of,Demana el correu electrònic al Presentar
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},La quantitat de benefici màxim de l&#39;empleat {0} supera {1}
@@ -6771,7 +6778,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,No es pot encoberta al grup perquè es selecciona Tipus de compte.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,"{0} {1} ha estat modificat. Si us plau, actualitzia"
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,No permetis que els usuaris realitzin Aplicacions d'absències els següents dies.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Codi d&#39;article&gt; Grup d&#39;elements&gt; Marca
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Si expiració il·limitada dels Punts de fidelització, mantingueu la durada de caducitat buida o 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Membres de l&#39;equip de manteniment
 DocType: Loyalty Point Entry,Purchase Amount,Import de la compra
@@ -6779,7 +6785,7 @@
 											to fullfill Sales Order {2}",No es pot lliurar el número de sèrie {0} de l&#39;element {1} perquè està reservat \ a l&#39;ordre de vendes complet de {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Cita Proveïdor {0} creat
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Any de finalització no pot ser anterior inici any
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Any de finalització no pot ser anterior inici any
 DocType: Employee Benefit Application,Employee Benefits,Beneficis als empleats
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Quantitat embalada ha de ser igual a la quantitat d'articles per {0} a la fila {1}
 DocType: Work Order,Manufactured Qty,Quantitat fabricada
@@ -6795,6 +6801,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Seleccioneu els números de lot
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,A GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Factures enviades als clients.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configureu el sistema de nomenclatura d&#39;empleats en recursos humans&gt; Configuració de recursos humans
 DocType: Healthcare Settings,Invoice Appointments Automatically,Cita de factures automàticament
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Identificació del projecte
 DocType: Salary Component,Variable Based On Taxable Salary,Variable basada en el salari tributari
@@ -6843,7 +6850,7 @@
 DocType: POS Profile,Account for Change Amount,Compte per al Canvi Monto
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Connexió a QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Pèrdua / guany total
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Empresa no vàlida per a la factura de la companyia Inter.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Empresa no vàlida per a la factura de la companyia Inter.
 DocType: Purchase Invoice,input service,servei d&#39;entrada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Fila {0}: Festa / Compte no coincideix amb {1} / {2} en {3} {4}
 DocType: Employee Promotion,Employee Promotion,Promoció d&#39;empleats
@@ -6973,7 +6980,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Àrea preferida per a allotjament
 apps/erpnext/erpnext/config/selling.py +184,Analytics,analítica
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,El carret està buit
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Configureu el sistema de nomenclatura d&#39;instructor a l&#39;educació&gt; Configuració de l&#39;educació
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",L&#39;element {0} no té cap número de sèrie. Només els elements serilitzats poden tenir un lliurament basat en el número de sèrie
 DocType: Vehicle,Model,model
@@ -7003,7 +7009,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Res per canviar
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Seleccioneu un arxiu csv
 DocType: Holiday List,Total Holidays,Vacances totals
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Falta la plantilla de correu electrònic per enviar-la. Establiu-ne una a la Configuració de lliurament.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Falta la plantilla de correu electrònic per enviar-la. Establiu-ne una a la Configuració de lliurament.
 DocType: Student Leave Application,Mark as Present,Marcar com a present
 DocType: Supplier Scorecard,Indicator Color,Color indicador
 DocType: Purchase Order,To Receive and Bill,Per Rebre i Bill
@@ -7012,7 +7018,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Seleccioneu el número de sèrie
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Dissenyador
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Plantilla de Termes i Condicions
-DocType: Serial No,Delivery Details,Detalls del lliurament
+DocType: Delivery Trip,Delivery Details,Detalls del lliurament
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Es requereix de centres de cost a la fila {0} en Impostos taula per al tipus {1}
 DocType: Program,Program Code,Codi del programa
 DocType: Terms and Conditions,Terms and Conditions Help,Termes i Condicions Ajuda
@@ -7036,7 +7042,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Temps de Lliurament Dies
 DocType: Cash Flow Mapping,Is Income Tax Expense,La despesa de l&#39;impost sobre la renda
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,La teva comanda no està disponible.
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Fila # {0}: Data de comptabilització ha de ser la mateixa que la data de compra {1} d&#39;actius {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Fila # {0}: Data de comptabilització ha de ser la mateixa que la data de compra {1} d&#39;actius {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Comprovar això si l&#39;estudiant està residint a l&#39;alberg de l&#39;Institut.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Si us plau, introdueixi les comandes de client a la taula anterior"
 ,Stock Summary,Resum de la
diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv
index 8234d54..ae9f107 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Název období
 DocType: Employee,Salary Mode,Mode Plat
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Registrovat
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Registrovat
 DocType: Patient,Divorced,Rozvedený
 DocType: Support Settings,Post Route Key,Zadejte klíč trasy
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Povolit položky, které se přidávají vícekrát v transakci"
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Nový směnný kurz
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Měna je vyžadováno pro Ceníku {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bude se vypočítá v transakci.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Dodavatel&gt; Typ dodavatele
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Kontakt se zákazníky
 DocType: Patient Appointment,Check availability,Zkontrolujte dostupnost
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Ukázat otevřené
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Řada Aktualizováno Úspěšně
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Odhlásit se
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} v řádku {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} v řádku {1}
 DocType: Asset Finance Book,Depreciation Start Date,Datum zahájení odpisování
 DocType: Pricing Rule,Apply On,Naneste na
 DocType: Item Price,Multiple Item prices.,Více ceny položku.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Lab Předpis
 ,Delay Days,Delay Dny
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Service Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Sériové číslo: {0} je již uvedeno v prodejní faktuře: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Sériové číslo: {0} je již uvedeno v prodejní faktuře: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Faktura
 DocType: Purchase Invoice Item,Item Weight Details,Položka podrobnosti o hmotnosti
 DocType: Asset Maintenance Log,Periodicity,Periodicita
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Účetní
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Prodejní ceník
 DocType: Patient,Tobacco Current Use,Aktuální tabákové použití
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Datum zahájení a datum ukončení se překrývají s kartou <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Prodejní sazba
 DocType: Cost Center,Stock User,Sklad Uživatel
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Příbuzný
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Datum návštěvnost nemůže být nižší než spojovací data zaměstnance
 DocType: Grading Scale,Grading Scale Name,Klasifikační stupnice Name
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Přidejte uživatele do Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Přidejte uživatele do Marketplace
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,To je kořen účtu a nelze upravovat.
 DocType: Sales Invoice,Company Address,adresa společnosti
 DocType: BOM,Operations,Operace
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Rozdílové množství
 DocType: Production Plan,Material Request Detail,Podrobnosti o vyžádání materiálu
 DocType: Selling Settings,Default Quotation Validity Days,Výchozí dny platnosti kotací
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
 DocType: SMS Center,SMS Center,SMS centrum
 DocType: Payroll Entry,Validate Attendance,Ověřit účast
 DocType: Sales Invoice,Change Amount,změna Částka
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,řádkování za částku ve slovech
 DocType: Vehicle,Additional Details,další detaily
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,No vzhledem k tomu popis
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Dodavatel&gt; Skupina dodavatelů
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Žádost o koupi.
 DocType: POS Closing Voucher Details,Collected Amount,Sběrná částka
 DocType: Lab Test,Submitted Date,Datum odeslání
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,Student Vstupné
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Položka {0} je zrušen
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Odpisový řádek {0}: Datum zahájení odpisování je zadáno jako poslední datum
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Odpisový řádek {0}: Datum zahájení odpisování je zadáno jako poslední datum
 DocType: Contract Template,Fulfilment Terms and Conditions,Smluvní podmínky
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Požadavek na materiál
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizace Výprodej Datum
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,Nastavení účtů
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Dodavatelské faktury No existuje ve faktuře {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Správa obchodník strom.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Trasu nelze zpracovat, protože nastavení Mapy Google je zakázáno."
 DocType: Job Applicant,Cover Letter,Průvodní dopis
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Vynikající Šeky a vklady s jasnými
 DocType: Item,Synced With Hub,Synchronizovány Hub
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Nová hodnota aktiv
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Sazba, za kterou je měna zákazníka převedena na základní měnu zákazníka"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Samozřejmě Plánování Tool
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Řádek # {0}: faktury nelze provést vůči stávajícímu aktivu {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Řádek # {0}: faktury nelze provést vůči stávajícímu aktivu {1}
 DocType: Crop Cycle,LInked Analysis,Llnked Analysis
 DocType: POS Closing Voucher,POS Closing Voucher,POS uzávěrka
 DocType: Contract,Lapsed,Zrušeno
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} není zařazen do kurzu {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Jméno studenta:
 DocType: POS Closing Voucher Details,Difference,Rozdíl
+DocType: Delivery Settings,Delay between Delivery Stops,Zpoždění mezi doručením
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Pořadové číslo {0} není součástí dodávky Poznámka: {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Zdá se, že existuje problém se konfigurací serveru GoCardless. Nebojte se, v případě selhání bude částka vrácena na váš účet."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -693,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Množství a cena
 DocType: Delivery Note,% Installed,% Instalováno
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Učebny / etc laboratoře, kde mohou být naplánovány přednášky."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Společné měny obou společností by měly odpovídat mezipodnikovým transakcím.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Společné měny obou společností by měly odpovídat mezipodnikovým transakcím.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,"Prosím, zadejte nejprve název společnosti"
 DocType: Travel Itinerary,Non-Vegetarian,Nevegetarián
 DocType: Purchase Invoice,Supplier Name,Dodavatel Name
@@ -778,7 +779,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Pronajato od data
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Dost Části vybudovat
 DocType: POS Profile User,POS Profile User,Uživatel profilu POS
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Řádek {0}: Je vyžadován počáteční datum odpisování
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Řádek {0}: Je vyžadován počáteční datum odpisování
 DocType: Purchase Invoice Item,Service Start Date,Datum zahájení služby
 DocType: Subscription Invoice,Subscription Invoice,Předplatné faktura
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Přímý příjmů
@@ -845,7 +846,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Zkratka již byla použita pro jinou společnost
 DocType: Selling Settings,Default Customer Group,Výchozí Customer Group
 DocType: Employee,IFSC Code,Kód IFSC
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Datum zahájení a datum ukončení se překrývají s kartou <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Je-li zakázat, ""zaokrouhlí celková"" pole nebude viditelný v jakékoli transakce"
 DocType: BOM,Operating Cost,Provozní náklady
 DocType: Crop,Produced Items,Vyrobené položky
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,Zabraňte RFQ
 DocType: Hub User,Hub User,Uživatel Hubu
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Ujistěte se prodejní objednávky
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Zápis o platu odeslán na období od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Zápis o platu odeslán na období od {0} do {1}
 DocType: Project Task,Project Task,Úkol Project
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Vyčerpané body
 ,Lead Id,Id leadu
@@ -1027,7 +1027,7 @@
 DocType: Fee Validity,Max number of visit,Maximální počet návštěv
 ,Hotel Room Occupancy,Hotel Occupancy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Časového rozvrhu vytvoření:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Zapsat
 DocType: GST Settings,GST Settings,Nastavení GST
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Měna by měla být stejná jako měna ceníku: {0}
@@ -1081,7 +1081,7 @@
 DocType: Vehicle Log,Service Details,Podrobnosti o službě
 DocType: Lab Test Template,Grouped,Skupinové
 DocType: Selling Settings,Delivery Note Required,Delivery Note Povinné
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Odeslání platebních karet ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Odeslání platebních karet ...
 DocType: Bank Guarantee,Bank Guarantee Number,Číslo bankovní záruky
 DocType: Assessment Criteria,Assessment Criteria,Kritéria hodnocení
 DocType: BOM Item,Basic Rate (Company Currency),Basic Rate (Company měny)
@@ -1106,13 +1106,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Vstup Platba je již vytvořili
 DocType: Request for Quotation,Get Suppliers,Získejte dodavatele
 DocType: Purchase Receipt Item Supplied,Current Stock,Current skladem
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Řádek # {0}: Asset {1} není spojena s item {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Řádek # {0}: Asset {1} není spojena s item {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Preview výplatní pásce
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Účet {0} byl zadán vícekrát
 DocType: Account,Expenses Included In Valuation,Náklady ceně oceňování
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,"Můžete obnovit pouze tehdy, pokud vaše členství vyprší během 30 dnů"
 DocType: Shopping Cart Settings,Show Stock Availability,Zobrazit dostupnost skladem
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Nastavte {0} v kategorii aktiv {1} nebo ve firmě {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Nastavte {0} v kategorii aktiv {1} nebo ve firmě {2}
 DocType: Location,Longitude,Zeměpisná délka
 ,Absent Student Report,Absent Student Report
 DocType: Crop,Crop Spacing UOM,Rozdělení výsevních ploch UOM
@@ -1184,7 +1184,7 @@
 DocType: Soil Texture,Sand,Písek
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Příležitost Z
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Řádek {0}: {1} Sériová čísla vyžadovaná pro položku {2}. Poskytli jste {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Řádek {0}: {1} Sériová čísla vyžadovaná pro položku {2}. Poskytli jste {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vyberte prosím tabulku
 DocType: BOM,Website Specifications,Webových stránek Specifikace
 DocType: Special Test Items,Particulars,Podrobnosti
@@ -1295,7 +1295,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Položky s vyšším weightage budou zobrazeny vyšší
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Laboratorní testy a vitální znaky
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Odsouhlasení Detail
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Řádek # {0}: {1} Asset musí být předloženy
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Řádek # {0}: {1} Asset musí být předloženy
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Žádný zaměstnanec nalezeno
 DocType: Item,If subcontracted to a vendor,Pokud se subdodávky na dodavatele
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentská skupina je již aktualizována.
@@ -1349,7 +1349,6 @@
 DocType: Loyalty Program Collection,Tier Name,Název úrovně
 DocType: HR Settings,Enter retirement age in years,Zadejte věk odchodu do důchodu v letech
 DocType: Crop,Target Warehouse,Target Warehouse
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte prosím jmenovací řadu pro {0} přes Nastavení&gt; Nastavení&gt; Pojmenování
 DocType: Payroll Employee Detail,Payroll Employee Detail,Zaměstnanecký detail zaměstnanců
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Vyberte prosím sklad
 DocType: Cheque Print Template,Starting location from left edge,Počínaje umístění od levého okraje
@@ -1439,7 +1438,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Plán materiál pro podsestavy
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Obchodní partneři a teritoria
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} musí být aktivní
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,K přenosu nejsou k dispozici žádné položky
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,K přenosu nejsou k dispozici žádné položky
 DocType: Employee Boarding Activity,Activity Name,Název aktivity
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Změnit datum vydání
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Množství hotového produktu <b>{0}</b> a Pro množství <b>{1}</b> se nemohou lišit
@@ -1666,6 +1665,7 @@
 DocType: Project,First Email,První e-mail
 DocType: Company,Exception Budget Approver Role,Role přístupu k výjimce rozpočtu
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Jakmile bude tato faktura zadána, bude tato faktura podržena až do stanoveného data"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Vyhrazeno Warehouse v prodejní objednávky / hotových výrobků Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Prodejní Částka
 DocType: Repayment Schedule,Interest Amount,Zájem Částka
@@ -1677,7 +1677,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Evidence
 DocType: Asset,Scrapped,sešrotován
 DocType: Item,Item Defaults,Položka Výchozí
-DocType: Purchase Invoice,Returns,výnos
+DocType: Cashier Closing,Returns,výnos
 DocType: Job Card,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Pořadové číslo {0} je na základě smlouvy o údržbě aľ {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,Nábor
@@ -1691,7 +1691,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Typ přenosu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Prodejní náklady
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Skupina zákazníků&gt; Území
 DocType: Diagnosis,Diagnosis,Diagnóza
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standardní Nakupování
 DocType: Attendance Request,Explanation,Vysvětlení
@@ -1704,7 +1703,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Položky nákupních příkazů po splatnosti
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,PSČ
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Prodejní objednávky {0} {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Vyberte účet úrokového výnosu v úvěru {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Vyberte účet úrokového výnosu v úvěru {0}
 DocType: Opportunity,Contact Info,Kontaktní informace
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Tvorba přírůstků zásob
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Zaměstnanec se stavem vlevo nelze podpořit
@@ -1716,7 +1715,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Fakturu nelze provést za nulovou fakturační hodinu
 DocType: Company,Date of Commencement,Datum začátku
 DocType: Sales Person,Select company name first.,Vyberte název společnosti jako první.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},Email odeslán (komu) {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},Email odeslán (komu) {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Nabídka obdržená od Dodavatelů.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Nahraďte kusovníku a aktualizujte nejnovější cenu ve všech kusovnících
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Chcete-li {0} | {1} {2}
@@ -1736,7 +1735,7 @@
 DocType: Asset Movement,From Employee,Od Zaměstnance
 DocType: Driver,Cellphone Number,Mobilní číslo
 DocType: Project,Monitor Progress,Monitorování pokroku
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Upozornění: Systém nebude kontrolovat nadfakturace, protože částka za položku na {1} je nula {0}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Upozornění: Systém nebude kontrolovat nadfakturace, protože částka za položku na {1} je nula {0}"
 DocType: Journal Entry,Make Difference Entry,Učinit vstup Rozdíl
 DocType: Supplier Quotation,Auto Repeat Section,Sekce automatického opakování
 DocType: Upload Attendance,Attendance From Date,Účast Datum od
@@ -1839,7 +1838,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Řádek # {0}: Zamítnutí Množství nemůže být zapsán do kupní Návrat
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Změna skupiny zákazníků pro vybraného zákazníka není povolena.
 ,Purchase Order Items To Be Billed,Položky vydané objednávky k fakturaci
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Aktualizace odhadovaných časů příjezdu.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Aktualizace odhadovaných časů příjezdu.
 DocType: Program Enrollment Tool,Enrollment Details,Podrobnosti o zápisu
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Nelze nastavit více položek Výchozí pro společnost.
 DocType: Purchase Invoice Item,Net Rate,Čistá míra
@@ -1853,7 +1852,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Typ dovolené je špatný
 DocType: Support Settings,Close Issue After Days,V blízkosti Issue po několika dnech
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Musíte být uživateli s rolí Správce systému a Správce položek pro přidání uživatelů do služby Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Musíte být uživateli s rolí Správce systému a Správce položek pro přidání uživatelů do služby Marketplace.
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Ponechte prázdné, pokud se to považuje za všechny obory"
 DocType: Job Opening,Staffing Plan,Zaměstnanecký plán
 DocType: Bank Guarantee,Validity in Days,Platnost ve dnech
@@ -1873,7 +1872,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Duplicitní řádek {0} se stejným {1}
 DocType: Marketplace Settings,Disable Marketplace,Zakázat tržiště
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Fiskální rok {0} nebyl nalezen
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Fiskální rok {0} nebyl nalezen
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Nastavení Zaměstnanci
 DocType: Hotel Room Reservation,Hotel Reservation User,Uživatel rezervace ubytování
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,"Prosím, vyberte první prefix"
@@ -1981,7 +1980,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Přihlášení selhalo
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Asset {0} vytvořen
 DocType: Special Test Items,Special Test Items,Speciální zkušební položky
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Musíte být uživatelem s rolí Správce systému a Správce položek, který se má zaregistrovat na webu Marketplace."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Musíte být uživatelem s rolí Správce systému a Správce položek, který se má zaregistrovat na webu Marketplace."
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Způsob platby
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Podle vaší přiřazené struktury platu nemůžete žádat o výhody
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Webové stránky Image by měla být veřejná souboru nebo webové stránky URL
@@ -1993,7 +1992,7 @@
 DocType: Warehouse,Warehouse Contact Info,Sklad Kontaktní informace
 DocType: Payment Entry,Write Off Difference Amount,Odepsat Difference Částka
 DocType: Volunteer,Volunteer Name,Jméno dobrovolníka
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Řádky s duplicitními daty v jiných řádcích byly nalezeny: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Řádky s duplicitními daty v jiných řádcích byly nalezeny: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: e-mail zaměstnanec nebyl nalezen, a proto je pošta neposlal"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Žádná struktura výdělku pro zaměstnance {0} v daný den {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Pravidlo odeslání se nevztahuje na zemi {0}
@@ -2082,6 +2081,7 @@
 DocType: Salary Component,Earning,Získávání
 DocType: Supplier Scorecard,Scoring Criteria,Kritéria hodnocení
 DocType: Purchase Invoice,Party Account Currency,Party Měna účtu
+DocType: Delivery Trip,Total Estimated Distance,Celková odhadovaná vzdálenost
 ,BOM Browser,Prohlížeč kusovníku
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Aktualizujte svůj stav pro tuto tréninkovou akci
 DocType: Item Barcode,EAN,EAN
@@ -2120,7 +2120,7 @@
 DocType: Activity Cost,Projects,Projekty
 DocType: Payment Request,Transaction Currency,Transakční měna
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Od {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Některé e-maily jsou neplatné
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Některé e-maily jsou neplatné
 DocType: Work Order Operation,Operation Description,Operace Popis
 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.,"Nelze měnit Fiskální rok Datum zahájení a fiskální rok datum ukončení, jakmile fiskální rok se uloží."
 DocType: Quotation,Shopping Cart,Nákupní vozík
@@ -2144,7 +2144,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Čistá změna ve stálých aktiv
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Požadovaný počet
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Ponechte prázdné, pokud se to považuje za všechny označení"
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od datetime
 DocType: Shopify Settings,For Company,Pro Společnost
@@ -2158,7 +2158,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Došlo k chybám při vytváření plánu rozvrhů
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,První Průvodce výdajů v seznamu bude nastaven jako výchozí schvalovatel výdajů.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,nemůže být větší než 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Musíte být jiným uživatelem než správcem s rolí Správce systému a Správce položek, který se má zaregistrovat na webu Marketplace."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Musíte být jiným uživatelem než správcem s rolí Správce systému a Správce položek, který se má zaregistrovat na webu Marketplace."
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Položka {0} není skladem
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Neplánovaná
@@ -2187,7 +2187,7 @@
 DocType: HR Settings,Employee Settings,Nastavení zaměstnanců
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Načítání platebního systému
 ,Batch-Wise Balance History,Batch-Wise Balance History
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Řádek # {0}: Nelze nastavit hodnotu, pokud je částka vyšší než částka fakturovaná pro položku {1}."
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Řádek # {0}: Nelze nastavit hodnotu, pokud je částka vyšší než částka fakturovaná pro položku {1}."
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Nastavení tisku aktualizovány v příslušném formátu tisku
 DocType: Package Code,Package Code,Code Package
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Učeň
@@ -2421,7 +2421,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} volných pracovních míst a {1} rozpočtu pro {2} již plánované pro dceřiné společnosti {3}. \ Plánujete pouze {4} volných míst a rozpočet {5} podle personálního plánu {6} pro mateřské společnosti {3}.
 DocType: HR Settings,Stop Birthday Reminders,Zastavit připomenutí narozenin
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},"Prosím nastavit výchozí mzdy, splatnou účet ve firmě {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},"Prosím nastavit výchozí mzdy, splatnou účet ve firmě {0}"
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Získejte finanční rozdělení údajů o daních a poplatcích od společnosti Amazon
 DocType: SMS Center,Receiver List,Přijímač Seznam
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Hledání položky
@@ -2491,7 +2491,7 @@
 DocType: Vital Signs,Constipated,Zácpa
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Proti faktuře dodavatele {0} ze dne {1}
 DocType: Customer,Default Price List,Výchozí Ceník
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Záznam Asset Pohyb {0} vytvořil
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Záznam Asset Pohyb {0} vytvořil
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Žádné předměty nenalezeny.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nelze odstranit fiskální rok {0}. Fiskální rok {0} je nastaven jako výchozí v globálním nastavení
 DocType: Share Transfer,Equity/Liability Account,Účet vlastního kapitálu / odpovědnosti
@@ -2628,6 +2628,7 @@
 DocType: Blanket Order,Order Type,Typ objednávky
 ,Item-wise Sales Register,Item-moudrý Sales Register
 DocType: Asset,Gross Purchase Amount,Gross Částka nákupu
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položek&gt; Značka
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Počáteční zůstatky
 DocType: Asset,Depreciation Method,odpisy Metoda
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je to poplatek v ceně základní sazbě?
@@ -2708,7 +2709,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Opatření v případě překročení ročního rozpočtu na OP
 DocType: Student Leave Application,Student Leave Application,Student nechat aplikaci
 DocType: Item,Will also apply for variants,Bude platit i pro varianty
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Asset nelze zrušit, protože je již {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Asset nelze zrušit, protože je již {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Zaměstnanec {0} na půl dne na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Celkem pracovní doba by neměla být větší než maximální pracovní doby {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Kdy
@@ -2732,6 +2733,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Načíst data
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Maximální povolená dovolená v typu dovolené {0} je {1}
 DocType: SMS Center,Create Receiver List,Vytvořit přijímače seznam
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Data k dispozici k použití by měla být po datu nákupu
 DocType: Vehicle,Wheels,kola
 DocType: Packing Slip,To Package No.,Balit No.
 DocType: Patient Relation,Family,Rodina
@@ -2745,7 +2747,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Měna fakturace se musí rovnat buď měně výchozí měny nebo měně stran účtu
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Označuje, že balíček je součástí této dodávky (Pouze návrhu)"
 DocType: Soil Texture,Loam,Hlína
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Řádek {0}: K datu splatnosti nemůže být datum odeslání
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Řádek {0}: K datu splatnosti nemůže být datum odeslání
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Učinit vstup platby
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Množství k bodu {0} musí být menší než {1}
 ,Sales Invoice Trends,Prodejní faktury Trendy
@@ -2817,7 +2819,7 @@
 DocType: Guardian,Guardian Interests,Guardian Zájmy
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Aktualizovat název účtu / číslo
 DocType: Naming Series,Current Value,Current Value
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Několik fiskálních let existují pro data {0}. Prosím nastavte společnost ve fiskálním roce
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Několik fiskálních let existují pro data {0}. Prosím nastavte společnost ve fiskálním roce
 DocType: Education Settings,Instructor Records to be created by,"Záznamy instruktorů, které mají být vytvořeny"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} vytvořil
 DocType: GST Account,GST Account,Účet GST
@@ -2835,7 +2837,7 @@
 DocType: Sales Person,Name and Employee ID,Jméno a ID zaměstnance
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
 DocType: Website Item Group,Website Item Group,Website Item Group
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Žádný výplatní list nebyl předložen za výše uvedené kritéria NEBO platový výpis již předložen
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Žádný výplatní list nebyl předložen za výše uvedené kritéria NEBO platový výpis již předložen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Odvody a daně
 DocType: Projects Settings,Projects Settings,Nastavení projektů
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,"Prosím, zadejte Referenční den"
@@ -2844,7 +2846,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Dodávané Množství
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Materiál Žádost o bod
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Nejprve zrušte potvrzení o nákupu {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Nejprve zrušte potvrzení o nákupu {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Strom skupiny položek.
 DocType: Production Plan,Total Produced Qty,Celkový vyrobený počet
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Nelze odkazovat číslo řádku větší nebo rovnou aktuální číslo řádku pro tento typ Charge
@@ -2953,6 +2955,7 @@
 ,Vehicle Expenses,Náklady pro auta
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Vytvořte laboratorní test (y) na faktuře Odeslání faktury
 DocType: Serial No,Invoice Details,Podrobnosti faktury
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Aktivujte a optimalizujte trasy
 DocType: Grant Application,Show on Website,Zobrazit na webu
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Začněte dál
 DocType: Hub Tracked Item,Hub Category,Kategorie Hubu
@@ -2992,7 +2995,7 @@
 DocType: Inpatient Record,B Positive,B Pozitivní
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Maximální přínos zaměstnance {0} přesahuje {1} součtem {2} předchozí požadované částky
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Řádek # {0}: Množství musí být 1, když je položka investičního majetku. Prosím použít samostatný řádek pro vícenásobné Mn."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Řádek # {0}: Množství musí být 1, když je položka investičního majetku. Prosím použít samostatný řádek pro vícenásobné Mn."
 DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Zkratka nemůže být prázdný znak nebo mezera
 DocType: Patient Medical Record,Patient Medical Record,Záznam pacienta
@@ -3026,7 +3029,7 @@
 DocType: Workstation,Wages per hour,Mzda za hodinu
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Sklad bilance v dávce {0} se zhorší {1} k bodu {2} ve skladu {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Následující materiál žádosti byly automaticky zvýšena na základě úrovni re-pořadí položky
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatný. Měna účtu musí být {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatný. Měna účtu musí být {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Od data {0} nemůže být po uvolnění zaměstnance Datum {1}
 DocType: Supplier,Is Internal Supplier,Je interní dodavatel
 DocType: Employee,Create User Permission,Vytvořit oprávnění uživatele
@@ -3170,7 +3173,7 @@
 DocType: Account,Fixed Asset,Základní Jmění
 DocType: Amazon MWS Settings,After Date,Po datu
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Serialized Zásoby
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Neplatná {0} pro interní fakturu společnosti.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Neplatná {0} pro interní fakturu společnosti.
 ,Department Analytics,Oddělení Analytics
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-mail nebyl nalezen ve výchozím kontaktu
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generovat tajemství
@@ -3182,7 +3185,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Program ve struktuře poplatků a studentské skupině {0} jsou různé.
 DocType: Bank Statement Transaction Entry,Receivable Account,Účet pohledávky
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Platné od data musí být menší než Platné do data.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Řádek # {0}: Asset {1} je již {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Řádek # {0}: Asset {1} je již {2}
 DocType: Quotation Item,Stock Balance,Reklamní Balance
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Prodejní objednávky na platby
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,výkonný ředitel
@@ -3224,6 +3227,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Debetní K je vyžadováno
 DocType: Clinical Procedure,Inpatient Record,Ústavní záznam
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomůže udržet přehled o času, nákladů a účtování pro aktivit hotový svého týmu"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Dodavatel&gt; Typ dodavatele
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Nákupní Ceník
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Datum transakce
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Šablony proměnných tabulky dodavatelů dodavatelů.
@@ -3266,7 +3270,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Exchange zisk / ztráta
 DocType: Opportunity,Lost Reason,Důvod ztráty
 DocType: Amazon MWS Settings,Enable Amazon,Povolit službu Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Řádek # {0}: Účet {1} nepatří společnosti {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Řádek # {0}: Účet {1} nepatří společnosti {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Nelze najít DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nová adresa
 DocType: Quality Inspection,Sample Size,Velikost vzorku
@@ -3377,7 +3381,7 @@
 DocType: Water Analysis,Origin,Původ
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tento dokument je nad hranicí {0} {1} pro položku {4}. Děláte si jiný {3} proti stejné {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Prosím nastavte opakující se po uložení
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Vybrat změna výše účet
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Vybrat změna výše účet
 DocType: Purchase Invoice,Price List Currency,Ceník Měna
 DocType: Naming Series,User must always select,Uživatel musí vždy vybrat
 DocType: Stock Settings,Allow Negative Stock,Povolit Negativní Sklad
@@ -3419,7 +3423,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Opravdu chcete tuto schůzku zrušit?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Balíček ceny pokojů hotelu
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,prodejní Pipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Prosím nastavit výchozí účet platu Component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Prosím nastavit výchozí účet platu Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Povinné On
 DocType: Rename Tool,File to Rename,Soubor k přejmenování
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Prosím, vyberte BOM pro položku v řádku {0}"
@@ -3440,7 +3444,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Náklady na zakoupené zboží
 DocType: Employee Separation,Employee Separation Template,Šablona oddělení zaměstnanců
 DocType: Selling Settings,Sales Order Required,Prodejní objednávky Povinné
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Staňte se prodejcem
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Staňte se prodejcem
 DocType: Purchase Invoice,Credit To,Kredit:
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Aktivní LEADS / Zákazníci
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,"Chcete-li použít standardní formát doručení, nechte prázdné"
@@ -3481,7 +3485,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Vytvořte šablonu daní
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Řádek # {0} (platební tabulka): Částka musí být záporná
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Řádek # {0} (platební tabulka): Částka musí být záporná
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Nelze aktualizovat zásob, faktura obsahuje pokles lodní dopravy zboží."
 DocType: Contract,Fulfilment Status,Stav plnění
 DocType: Lab Test Sample,Lab Test Sample,Laboratorní testovací vzorek
@@ -3640,7 +3644,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Datum dokumentu
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Fee Records Vytvořil - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategorie Account
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Řádek # {0} (platební tabulka): Částka musí být kladná
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Řádek # {0} (platební tabulka): Částka musí být kladná
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Nelze produkují více položku {0} než prodejní objednávky množství {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Vyberte hodnoty atributů
 DocType: Purchase Invoice,Reason For Issuing document,Důvod pro vydávací dokument
@@ -3695,7 +3699,7 @@
 DocType: Purchase Receipt,Time at which materials were received,"Čas, kdy bylo přijato materiály"
 DocType: Products Settings,Products per Page,Produkty na stránku
 DocType: Stock Ledger Entry,Outgoing Rate,Odchozí Rate
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,nebo
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,nebo
 DocType: Sales Order,Billing Status,Status Fakturace
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Nahlásit problém
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Utility Náklady
@@ -3722,7 +3726,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Vyhlášení osvobození od daně z pracovních sil
 DocType: Payment Entry,Cheque/Reference Date,Šek / Referenční datum
 DocType: Purchase Invoice,Total Taxes and Charges,Celkem Daně a poplatky
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,"Datum, které je k dispozici, je zadáno jako poslední datum"
 DocType: Employee,Emergency Contact,Kontakt v nouzi
 DocType: Bank Reconciliation Detail,Payment Entry,platba Entry
 ,sales-browser,Prodejní-browser
@@ -3768,6 +3771,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Je návrat (kreditní poznámka)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Spustit úlohu
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Sériové číslo je požadováno pro položku {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte prosím jmenovací řadu pro {0} přes Nastavení&gt; Nastavení&gt; Pojmenování
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Bezbariérový šablona nesmí být výchozí šablonu
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Pro řádek {0}: Zadejte plánované množství
 DocType: Account,Income Account,Účet příjmů
@@ -3781,6 +3785,7 @@
 DocType: Loyalty Program,Help Section,Část nápovědy
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Předch
 DocType: Appraisal Goal,Key Responsibility Area,Key Odpovědnost Area
+DocType: Delivery Trip,Distance UOM,Vzdálenost UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student Šarže pomůže sledovat docházku, posudky a poplatků pro studenty"
 DocType: Payment Entry,Total Allocated Amount,Celková alokovaná částka
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Nastavte výchozí inventář pro trvalý inventář
@@ -3822,7 +3827,7 @@
 DocType: Item Supplier,Item Supplier,Položka Dodavatel
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,"Prosím, zadejte kód položky se dostat dávku no"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Nebyly vybrány žádné položky pro přenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Nebyly vybrány žádné položky pro přenos
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Všechny adresy.
 DocType: Company,Stock Settings,Stock Nastavení
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spojení je možné pouze tehdy, pokud tyto vlastnosti jsou stejné v obou záznamech. Je Group, Root Type, Company"
@@ -4119,7 +4124,7 @@
 DocType: Patient,Personal and Social History,Osobní a sociální historie
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Uživatel {0} byl vytvořen
 DocType: Fee Schedule,Fee Breakup for each student,Rozdělení poplatků za každého studenta
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Celková záloha ({0}) na objednávku {1} nemůže být větší než celkový součet ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Celková záloha ({0}) na objednávku {1} nemůže být větší než celkový součet ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vyberte měsíční výplatou na nerovnoměrně distribuovat cílů napříč měsíců.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Změnit kód
 DocType: Purchase Invoice Item,Valuation Rate,Ocenění
@@ -4128,7 +4133,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Využil ITC Cess
 ,Student Monthly Attendance Sheet,Student měsíční návštěvnost Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Pravidlo plavby platí pouze pro prodej
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Odpisový řádek {0}: Další datum odpisu nemůže být před datem nákupu
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Odpisový řádek {0}: Další datum odpisu nemůže být před datem nákupu
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum zahájení projektu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Dokud
 DocType: Rename Tool,Rename Log,Přejmenovat Přihlásit
@@ -4145,12 +4150,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Jak často by měl být projekt a společnost aktualizovány na základě prodejních transakcí.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,vyprší dne
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Přidejte studenty
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Vymažte prosím zaměstnance <a href=""#Form/Employee/{0}"">{0}</a> \, chcete-li tento dokument zrušit"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},"Prosím, vyberte {0}"
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Vzdálenost
+DocType: Delivery Stop,Distance,Vzdálenost
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Seznamte své produkty nebo služby, které kupujete nebo prodáváte."
 DocType: Water Analysis,Storage Temperature,Skladovací teplota
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4177,7 +4180,7 @@
 DocType: Homepage,Company Description for website homepage,Společnost Popis pro webové stránky domovskou stránku
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pro pohodlí zákazníků, tyto kódy mohou být použity v tiskových formátech, jako na fakturách a dodacích listech"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Jméno suplier
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Nelze načíst informace pro {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Nelze načíst informace pro {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Otevření deníku zápisu
 DocType: Contract,Fulfilment Terms,Podmínky plnění
 DocType: Sales Invoice,Time Sheet List,Doba Seznam Sheet
@@ -4357,7 +4360,7 @@
 DocType: Serial No,Warranty / AMC Details,Záruka / AMC Podrobnosti
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Vyberte studenty ručně pro skupinu založenou na aktivitách
 DocType: Journal Entry,User Remark,Uživatel Poznámka
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Optimalizace tras.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Optimalizace tras.
 DocType: Travel Itinerary,Non Diary,Bez deníku
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Nelze vytvořit retenční bonus pro levé zaměstnance
 DocType: Lead,Market Segment,Segment trhu
@@ -4387,7 +4390,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Věrnostní program
 DocType: Student Guardian,Father,Otec
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Vstupenky na podporu
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,"""Aktualizace Sklad"" nemohou být zaškrtnuty na prodej dlouhodobého majetku"
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,"""Aktualizace Sklad"" nemohou být zaškrtnuty na prodej dlouhodobého majetku"
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Odsouhlasení
 DocType: Attendance,On Leave,Na odchodu
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Získat aktualizace
@@ -4432,7 +4435,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Pořadové číslo a Batch
 DocType: Warranty Claim,From Company,Od Společnosti
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Součet skóre hodnotících kritérií musí být {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Prosím nastavte Počet Odpisy rezervováno
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Prosím nastavte Počet Odpisy rezervováno
 DocType: Supplier Scorecard Period,Calculations,Výpočty
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Hodnota nebo Množství
 DocType: Payment Terms Template,Payment Terms,Platební podmínky
@@ -4451,7 +4454,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Sleva (%) na cenovou nabídku s marží
 DocType: Healthcare Service Unit Type,Rate / UOM,Rate / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Celý sklad
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Nebylo nalezeno {0} pro interní transakce společnosti.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Nebylo nalezeno {0} pro interní transakce společnosti.
 DocType: Travel Itinerary,Rented Car,Pronajaté auto
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,O vaší společnosti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Připsat na účet musí být účtu Rozvaha
@@ -4552,6 +4555,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Kritéria analýzy rostlin
 DocType: Cheque Print Template,Cheque Height,Šek Výška
 DocType: Supplier,Supplier Details,Dodavatele Podrobnosti
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosím, nastavte číselnou sérii pro Účast přes Nastavení&gt; Číslovací série"
 DocType: Setup Progress,Setup Progress,Pokročilé nastavení
 DocType: Expense Claim,Approval Status,Stav schválení
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Z hodnota musí být menší než hodnota v řadě {0}
@@ -4644,7 +4648,6 @@
 DocType: Travel Request,Fully Sponsored,Plně sponzorováno
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Zadání reverzního deníku
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Zákazník {0} je vytvořen.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosím, nastavte systém pro pojmenování zaměstnanců v oblasti lidských zdrojů&gt; Nastavení HR"
 DocType: Stock Settings,Limit Percent,Limit Procento
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,V současné době žádné skladové zásoby nejsou k dispozici
 ,Payment Period Based On Invoice Date,Platební období na základě data vystavení faktury
@@ -4703,7 +4706,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Zdroj Warehouse
 DocType: Installation Note,Installation Date,Datum instalace
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Sdílet knihu
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Řádek # {0}: {1} Asset nepatří do společnosti {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Řádek # {0}: {1} Asset nepatří do společnosti {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Byla vytvořena prodejní faktura {0}
 DocType: Employee,Confirmation Date,Potvrzení Datum
 DocType: Inpatient Occupancy,Check Out,Překontrolovat
@@ -4723,6 +4726,7 @@
 DocType: Production Plan,Sales Orders Detail,Detail prodejních objednávek
 DocType: Bin,Requested Quantity,Požadované množství
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.RRRR.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Prosím, nastavte systém pro pojmenování instruktorů ve vzdělání&gt; Nastavení vzdělávání"
 DocType: Patient,Marital Status,Rodinný stav
 DocType: Stock Settings,Auto Material Request,Auto materiálu Poptávka
 DocType: Woocommerce Settings,API consumer secret,API spotřebitelské tajemství
@@ -4775,7 +4779,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Vyberte dny
 DocType: Academic Term,Term Name,termín Name
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Úvěr ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Vytváření salicích ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Vytváření salicích ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Nelze upravit kořenový uzel.
 DocType: Buying Settings,Purchase Order Required,Vydaná objednávka je vyžadována
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Časovač
@@ -4811,7 +4815,7 @@
 DocType: Account,Rate at which this tax is applied,"Sazba, při které se používá tato daň"
 DocType: Cash Flow Mapper,Section Name,Název oddílu
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Změna pořadí Množství
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Odpisová řada {0}: Očekávaná hodnota po uplynutí životnosti musí být větší nebo rovna {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Odpisová řada {0}: Očekávaná hodnota po uplynutí životnosti musí být větší nebo rovna {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Aktuální pracovní příležitosti
 DocType: Company,Stock Adjustment Account,Reklamní Nastavení účtu
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Odepsat
@@ -4858,7 +4862,7 @@
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
 DocType: Opportunity,Opportunity Amount,Částka příležitostí
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Počet Odpisy rezervováno nemůže být větší než celkový počet Odpisy
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Počet Odpisy rezervováno nemůže být větší než celkový počet Odpisy
 DocType: Purchase Order,Order Confirmation Date,Datum potvrzení objednávky
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Proveďte návštěv údržby
@@ -4899,7 +4903,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Dávka:
 DocType: Volunteer,Afternoon,Odpoledne
 DocType: Loyalty Program,Loyalty Program Help,Nápověda věrnostního programu
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' je vypnuté
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' je vypnuté
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastavit jako Otevřít
 DocType: Cheque Print Template,Scanned Cheque,skenovaných Šek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Posílat automatické e-maily na Kontakty na předložení transakcí.
@@ -4912,7 +4916,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Položka a Záruka Podrobnosti
 DocType: Chapter,Chapter Members,Členové kapitoly
 DocType: Sales Team,Contribution (%),Příspěvek (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Poznámka: Položka Platba nebude vytvořili, protože ""v hotovosti nebo bankovním účtu"" nebyl zadán"
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Poznámka: Položka Platba nebude vytvořili, protože ""v hotovosti nebo bankovním účtu"" nebyl zadán"
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Projekt {0} již existuje
 DocType: Clinical Procedure,Nursing User,Ošetřujícího uživatele
 DocType: Employee Benefit Application,Payroll Period,Mzdové období
@@ -4920,6 +4924,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Sériové číslo {0} nepatří do skupiny Batch {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Odpovědnost
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Platnost této nabídky skončila.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Vymažte prosím zaměstnance <a href=""#Form/Employee/{0}"">{0}</a> \, chcete-li tento dokument zrušit"
 DocType: Expense Claim Account,Expense Claim Account,Náklady na pojistná Account
 DocType: Account,Capital Work in Progress,Kapitálová práce probíhá
 DocType: Accounts Settings,Allow Stale Exchange Rates,Povolit stávající kurzy měn
@@ -5000,7 +5006,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Vydání Material
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Connect Shopify s ERPNext
 DocType: Material Request Item,For Warehouse,Pro Sklad
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Dodací poznámky {0} byly aktualizovány
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Dodací poznámky {0} byly aktualizovány
 DocType: Employee,Offer Date,Nabídka Date
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Citace
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,"Jste v režimu offline. Nebudete moci obnovit stránku, dokud nebudete na síťi."
@@ -5050,7 +5056,7 @@
 DocType: Shipping Rule,Calculate Based On,Vypočítat založené na
 DocType: Contract,Unfulfilled,Nesplněno
 DocType: Delivery Note Item,From Warehouse,Ze skladu
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Žádní zaměstnanci nesplnili uvedená kritéria
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Žádní zaměstnanci nesplnili uvedená kritéria
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Žádné položky s Billem materiálů k výrobě
 DocType: Shopify Settings,Default Customer,Výchozí zákazník
 DocType: Sales Stage,Stage Name,Pseudonym
@@ -5092,7 +5098,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Částka daně po slevě Částka
 DocType: Patient,Inpatient Status,Stavy hospitalizace
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Každodenní práci Souhrnné Nastavení
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Vybraný ceník by měl kontrolovat nákupní a prodejní pole.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Vybraný ceník by měl kontrolovat nákupní a prodejní pole.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Zadejte Reqd podle data
 DocType: Payment Entry,Internal Transfer,vnitřní Převod
 DocType: Asset Maintenance,Maintenance Tasks,Úkoly údržby
@@ -5128,7 +5134,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Seskupit podle
 DocType: Guardian,Interests,zájmy
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Povolit / zakázat měny.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Nelze odeslat některé výplatní pásky
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Nelze odeslat některé výplatní pásky
 DocType: Exchange Rate Revaluation,Get Entries,Získejte položky
 DocType: Production Plan,Get Material Request,Získat Materiál Request
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Poštovní náklady
@@ -5212,7 +5218,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
 DocType: BOM,Website Description,Popis webu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Čistá změna ve vlastním kapitálu
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Zrušte faktuře {0} první
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Zrušte faktuře {0} první
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Nepovoleno. Zakažte typ servisní jednotky
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailová adresa musí být jedinečná, již existuje pro {0}"
 DocType: Serial No,AMC Expiry Date,AMC Datum vypršení platnosti
@@ -5252,7 +5258,7 @@
 DocType: Hotel Room,Hotel Room,Hotelový pokoj
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Účet {0} nepatří společnosti {1}
 DocType: Leave Type,Rounding,Zaokrouhlení
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Sériová čísla v řádku {0} neodpovídají poznámce k doručení
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Sériová čísla v řádku {0} neodpovídají poznámce k doručení
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Vyčerpaná částka (pro-hodnocena)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Následně jsou pravidla pro stanovení cen vyfiltrována na základě zákazníka, skupiny zákazníků, území, dodavatele, skupiny dodavatelů, kampaně, prodejního partnera atd."
 DocType: Student,Guardian Details,Guardian Podrobnosti
@@ -5307,7 +5313,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
 DocType: Leave Allocation,Unused leaves,Nepoužité listy
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Zadejte položku vrácení peněz
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Všechny oddělení
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Všechny oddělení
 DocType: Healthcare Service Unit,Vacant,Volný
 DocType: Patient,Alcohol Past Use,Alkohol v minulosti
 DocType: Fertilizer Content,Fertilizer Content,Obsah hnojiv
@@ -5318,7 +5324,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Objednávka práce {0} musí být zrušena před zrušením této objednávky
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
 DocType: Authorization Rule,Applicable To (Employee),Vztahující se na (Employee)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Datum splatnosti je povinné
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Datum splatnosti je povinné
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Přírůstek pro atribut {0} nemůže být 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Typ příspěvku a částka
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Pokoje objednané
@@ -5461,7 +5467,7 @@
 DocType: Purchase Invoice Item,Total Weight,Celková váha
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Provize z prodeje
 DocType: Job Offer Term,Value / Description,Hodnota / Popis
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Řádek # {0}: Asset {1} nemůže být předložen, je již {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Řádek # {0}: Asset {1} nemůže být předložen, je již {2}"
 DocType: Tax Rule,Billing Country,Fakturace Země
 DocType: Purchase Order Item,Expected Delivery Date,Očekávané datum dodání
 DocType: Restaurant Order Entry,Restaurant Order Entry,Vstup do objednávky restaurace
@@ -5500,12 +5506,13 @@
 DocType: Maintenance Visit,Breakdown,Rozbor
 DocType: Travel Itinerary,Vegetarian,Vegetariánský
 DocType: Patient Encounter,Encounter Date,Datum setkání
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Účet: {0} s měnou: {1} nelze vybrat
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Účet: {0} s měnou: {1} nelze vybrat
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bankovní údaje
 DocType: Purchase Receipt Item,Sample Quantity,Množství vzorku
 DocType: Bank Guarantee,Name of Beneficiary,Název příjemce
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Aktualizujte náklady na BOM automaticky pomocí programu Plánovač, založený na nejnovější hodnotící sazbě / ceníku / posledním nákupu surovin."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Dodavatel&gt; Skupina dodavatelů
 DocType: Bank Reconciliation Detail,Cheque Date,Šek Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Účet {0}: Nadřazený účet {1} nepatří ke společnosti: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Úspěšně vypouští všechny transakce související s tímto společnosti!
@@ -5533,7 +5540,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Podřízené uzly mohou být vytvořeny pouze na základě typu uzly &quot;skupina&quot;
 DocType: Attendance Request,Half Day Date,Half Day Date
 DocType: Academic Year,Academic Year Name,Akademický rok Jméno
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} není povoleno transakce s {1}. Změňte prosím společnost.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} není povoleno transakce s {1}. Změňte prosím společnost.
 DocType: Sales Partner,Contact Desc,Kontakt Popis
 DocType: Email Digest,Send regular summary reports via Email.,Zasílat pravidelné souhrnné zprávy e-mailem.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Prosím nastavit výchozí účet v Expense reklamační typu {0}
@@ -5566,7 +5573,7 @@
 DocType: Hotel Room,Hotel Manager,Hotelový manažer
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Sada Daňové Pravidlo pro nákupního košíku
 DocType: Purchase Invoice,Taxes and Charges Added,Daně a poplatky přidané
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Odpisový řádek {0}: Další datum odpisování nemůže být před datem k dispozici
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Odpisový řádek {0}: Další datum odpisování nemůže být před datem k dispozici
 ,Sales Funnel,Prodej Nálevka
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Zkratka je povinná
 DocType: Project,Task Progress,Pokrok úkol
@@ -5580,7 +5587,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Všechny skupiny zákazníků
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,nahromaděné za měsíc
 DocType: Attendance Request,On Duty,Ve službě
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možná není vytvořen záznam směnného kurzu pro {1} na {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možná není vytvořen záznam směnného kurzu pro {1} na {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Personální plán {0} již existuje pro označení {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Daňová šablona je povinné.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Účet {0}: Nadřazený účet {1} neexistuje
@@ -5660,11 +5667,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Alespoň jeden sklad je povinný
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Konfigurovat pole položek jako UOM, skupina položek, popis a počet hodin."
 DocType: Certification Application,Certification Status,Stav certifikace
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Trh
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Trh
 DocType: Travel Itinerary,Travel Advance Required,Vyžaduje se cestovní záloha
 DocType: Subscriber,Subscriber Name,Jméno účastníka
 DocType: Serial No,Out of Warranty,Out of záruky
-DocType: Cashier Closing,Cashier-closing-,Pokladní závěrka-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Mapovaný typ dat
 DocType: BOM Update Tool,Replace,Vyměnit
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Nenašli se žádné produkty.
@@ -5751,7 +5757,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Výchozí daňové šablony pro prodej a nákup jsou vytvořeny.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Výsledky hodnocení {0} již existuje.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Příklad: ABCD. #####. Je-li nastavena řada a v transakcích není uvedena šarže, pak se na základě této série vytvoří automatické číslo šarže. Pokud chcete výslovně uvést číslo dávky pro tuto položku, ponechte prázdné místo. Poznámka: Toto nastavení bude mít přednost před předčíslí série Naming v nastavení akcí."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosím, nastavte číselnou sérii pro Účast přes Nastavení&gt; Číslovací série"
 DocType: BOM,Materials Required (Exploded),Potřebný materiál (Rozložený)
 DocType: Contract,Party User,Party Uživatel
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Nastavte filtr společnosti prázdný, pokud je Skupina By je &#39;Company&#39;"
@@ -5952,7 +5957,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Musí být nastaven datum zahájení zkušebního období a datum ukončení zkušebního období
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Průměrné hodnocení
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Celková částka platby v rozpisu plateb se musí rovnat hodnotě Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Celková částka platby v rozpisu plateb se musí rovnat hodnotě Grand / Rounded Total
 DocType: Subscription Plan Detail,Plan,Plán
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Výpis z bankovního účtu zůstatek podle hlavní knihy
 DocType: Job Applicant,Applicant Name,Žadatel Název
@@ -6021,7 +6026,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Soap & Detergent
 DocType: BOM,Show Items,Zobrazit položky
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Od doby nemůže být větší než na čas.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Chcete upozornit všechny zákazníky e-mailem?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Chcete upozornit všechny zákazníky e-mailem?
 DocType: Subscription Plan,Billing Interval,Interval fakturace
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Objednáno
@@ -6030,9 +6035,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Řádek {0}: {1} musí být větší než 0
 DocType: Assessment Criteria,Assessment Criteria Group,Hodnotící kritéria Group
 DocType: Healthcare Settings,Patient Name By,Jméno pacienta
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Záznam o akruálním deníku pro platy od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Záznam o akruálním deníku pro platy od {0} do {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Aktivovat odložené výnosy
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Otevření Oprávky musí být menší než rovná {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Otevření Oprávky musí být menší než rovná {0}
 DocType: Warehouse,Warehouse Name,Název Skladu
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Aktuální datum zahájení musí být menší než skutečné datum ukončení
 DocType: Naming Series,Select Transaction,Vybrat Transaction
@@ -6183,7 +6188,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Zaměstnanec {0} z platové třídy {1} nemá žádnou výchozí politiku dovolené
 DocType: Salary Detail,Salary Detail,plat Detail
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,"Prosím, nejprve vyberte {0}"
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Přidali jsme {0} uživatele
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Přidali jsme {0} uživatele
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",V případě víceúrovňového programu budou zákazníci automaticky přiděleni danému vrstvě podle svých vynaložených nákladů
 DocType: Appointment Type,Physician,Lékař
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Šarže {0} položky {1} vypršela.
@@ -6327,7 +6332,7 @@
 DocType: Asset,Custodian,Depozitář
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Point-of-Sale Profil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} by měla být hodnota mezi 0 a 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Platba {0} od {1} do {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Platba {0} od {1} do {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Nezajištěných úvěrů
 DocType: Cost Center,Cost Center Name,Jméno nákladového střediska
 DocType: Student,B+,B +
@@ -6359,6 +6364,7 @@
 DocType: Employee,Date of Issue,Datum vydání
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Podle nákupních nastavení, pokud je požadováno nákupní požadavek == &#39;ANO&#39;, pak pro vytvoření nákupní faktury musí uživatel nejprve vytvořit doklad o nákupu pro položku {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Řádek # {0}: Nastavte Dodavatel pro položku {1}
+DocType: Global Defaults,Default Distance Unit,Výchozí jednotka vzdálenosti
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Řádek {0}: doba hodnota musí být větší než nula.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Webové stránky Image {0} připojuje k bodu {1} nelze nalézt
 DocType: Issue,Content Type,Typ obsahu
@@ -6414,7 +6420,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Debetní Na účet musí být účtu Rozvaha
 DocType: Asset,Naming Series,Číselné řady
 DocType: Vital Signs,Coated,Povlečené
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Řádek {0}: Očekávaná hodnota po uplynutí životnosti musí být nižší než částka hrubého nákupu
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Řádek {0}: Očekávaná hodnota po uplynutí životnosti musí být nižší než částka hrubého nákupu
 DocType: GoCardless Settings,GoCardless Settings,Nastavení GoCardless
 DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
 DocType: Certified Consultant,Certification Validity,Platnost certifikátu
@@ -6481,6 +6487,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Záhlaví banky
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Zobrazit laboratorní testy
 DocType: Hub Users,Hub Users,Uživatelé Hubu
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Skupina zákazníků&gt; Území
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Datum údržby
 DocType: Purchase Invoice Item,Rejected Serial No,Odmítnuté sériové číslo
@@ -6496,7 +6503,7 @@
 DocType: SG Creation Tool Course,Max Strength,Max Síla
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Instalace předvoleb
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Pro zákazníka nebyl vybrán žádný zákazník {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Pro zákazníka nebyl vybrán žádný zákazník {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Zaměstnanec {0} nemá maximální částku prospěchu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Vyberte položky podle data doručení
 DocType: Grant Application,Has any past Grant Record,Má nějaký minulý grantový záznam
@@ -6523,7 +6530,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Rezervace pokojů v hotelu
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Služby zákazníkům
 DocType: BOM,Thumbnail,Thumbnail
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Nebyly nalezeny žádné kontakty s identifikátory e-mailu.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Nebyly nalezeny žádné kontakty s identifikátory e-mailu.
 DocType: Item Customer Detail,Item Customer Detail,Položka Detail Zákazník
 DocType: Notification Control,Prompt for Email on Submission of,Výzva pro e-mail na předkládání
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Maximální výše příspěvku zaměstnance {0} přesahuje {1}
@@ -6778,7 +6785,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,"Nelze skryté do skupiny, protože je požadovaný typ účtu."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} byl změněn. Prosím aktualizujte.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Přestaňte uživatelům provádět Nechat aplikací v následujících dnech.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položek&gt; Značka
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.",Při neomezeném uplynutí platnosti věrnostních bodů nechte dobu trvání platnosti prázdné nebo 0.
 DocType: Asset Maintenance Team,Maintenance Team Members,Členové týmu údržby
 DocType: Loyalty Point Entry,Purchase Amount,Částka nákupu
@@ -6786,7 +6792,7 @@
 											to fullfill Sales Order {2}","Nelze doručit pořadové číslo {0} položky {1}, protože je rezervováno \ k plnění objednávky prodeje {2}"
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Dodavatel Cen {0} vytvořil
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Konec roku nemůže být před uvedením do provozu roku
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Konec roku nemůže být před uvedením do provozu roku
 DocType: Employee Benefit Application,Employee Benefits,Zaměstnanecké benefity
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Balíčky množství se musí rovnat množství pro položku {0} v řadě {1}
 DocType: Work Order,Manufactured Qty,Vyrobeno Množství
@@ -6802,6 +6808,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Zvolte čísla šarží
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Na GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Směnky vznesené zákazníkům.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosím, nastavte systém pro pojmenování zaměstnanců v oblasti lidských zdrojů&gt; Nastavení HR"
 DocType: Healthcare Settings,Invoice Appointments Automatically,Fakturační schůzky automaticky
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID projektu
 DocType: Salary Component,Variable Based On Taxable Salary,Proměnná založená na zdanitelném platu
@@ -6850,7 +6857,7 @@
 DocType: POS Profile,Account for Change Amount,Účet pro změnu Částka
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Připojení ke službě QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Celkový zisk / ztráta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Neplatná společnost pro meziproduktovou fakturu.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Neplatná společnost pro meziproduktovou fakturu.
 DocType: Purchase Invoice,input service,vstupní službu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Řádek {0}: Party / Account neshoduje s {1} / {2} do {3} {4}
 DocType: Employee Promotion,Employee Promotion,Propagace zaměstnanců
@@ -6980,7 +6987,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Preferovaná oblast pro ubytování
 apps/erpnext/erpnext/config/selling.py +184,Analytics,analytika
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Košík je prázdný
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Prosím, nastavte systém pro pojmenování instruktorů ve vzdělání&gt; Nastavení vzdělávání"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Položka {0} nemá žádné sériové číslo. Serializované položky \ mohou být doručeny na základě sériového čísla
 DocType: Vehicle,Model,Model
@@ -7010,7 +7016,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Nic se nemění
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Vyberte soubor csv
 DocType: Holiday List,Total Holidays,Celkem prázdnin
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Chybí šablona e-mailu pro odeslání. Nastavte prosím jednu z možností Nastavení doručení.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Chybí šablona e-mailu pro odeslání. Nastavte prosím jednu z možností Nastavení doručení.
 DocType: Student Leave Application,Mark as Present,Označit jako dárek
 DocType: Supplier Scorecard,Indicator Color,Barva indikátoru
 DocType: Purchase Order,To Receive and Bill,Přijímat a Bill
@@ -7019,7 +7025,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Zvolte pořadové číslo
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Návrhář
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Podmínky Template
-DocType: Serial No,Delivery Details,Zasílání
+DocType: Delivery Trip,Delivery Details,Zasílání
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
 DocType: Program,Program Code,Kód programu
 DocType: Terms and Conditions,Terms and Conditions Help,Podmínky nápovědy
@@ -7043,7 +7049,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Dodací lhůta dny
 DocType: Cash Flow Mapping,Is Income Tax Expense,Jsou náklady na daň z příjmů
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Vaše objednávka je k dodání!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Řádek # {0}: Vysílání datum musí být stejné jako datum nákupu {1} aktiva {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Řádek # {0}: Vysílání datum musí být stejné jako datum nákupu {1} aktiva {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Zkontrolujte, zda student bydlí v Hostelu ústavu."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Prosím, zadejte Prodejní objednávky v tabulce výše"
 ,Stock Summary,Sklad Souhrn
diff --git a/erpnext/translations/da-DK.csv b/erpnext/translations/da-DK.csv
index 32f0fb9..334cbf5 100644
--- a/erpnext/translations/da-DK.csv
+++ b/erpnext/translations/da-DK.csv
@@ -16,7 +16,7 @@
 DocType: Lead,Lead Owner,Bly Owner
 apps/erpnext/erpnext/controllers/stock_controller.py +240,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Udgiftområde er obligatorisk for varen {2}
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,o
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,o
 DocType: Sales Order,% of materials billed against this Sales Order,% Af materialer faktureret mod denne Sales Order
 DocType: SMS Center,All Lead (Open),Alle Bly (Open)
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Hent opdateringer
diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index 1593bed..77b155a 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Navn på periode
 DocType: Employee,Salary Mode,Løn-tilstand
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Tilmeld
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Tilmeld
 DocType: Patient,Divorced,Skilt
 DocType: Support Settings,Post Route Key,Indtast rute nøgle
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Tillad vare der skal tilføjes flere gange i en transaktion
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Ny valutakurs
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Valuta er nødvendig for prisliste {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil blive beregnet i transaktionen.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Kundeservicekontakt
 DocType: Patient Appointment,Check availability,Tjek tilgængelighed
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Vis åben
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Nummerserien opdateret
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,bestilling
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} i række {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} i række {1}
 DocType: Asset Finance Book,Depreciation Start Date,Afskrivning Startdato
 DocType: Pricing Rule,Apply On,Gælder for
 DocType: Item Price,Multiple Item prices.,Flere varepriser.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Lab Prescription
 ,Delay Days,Forsinkelsesdage
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,tjenesten Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} er allerede refereret i salgsfaktura: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} er allerede refereret i salgsfaktura: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Faktura
 DocType: Purchase Invoice Item,Item Weight Details,Vægt Vægt Detaljer
 DocType: Asset Maintenance Log,Periodicity,Hyppighed
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Revisor
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Salgsprisliste
 DocType: Patient,Tobacco Current Use,Tobaks nuværende anvendelse
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Startdato og slutdato overlapper jobkortet <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Salgspris
 DocType: Cost Center,Stock User,Lagerbruger
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Relaterede
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Fremmødedato kan ikke være mindre end medarbejderens ansættelsesdato
 DocType: Grading Scale,Grading Scale Name,Karakterbekendtgørelsen Navn
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Tilføj brugere til Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Tilføj brugere til Marketplace
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Dette er en rod-konto og kan ikke redigeres.
 DocType: Sales Invoice,Company Address,Virksomhedsadresse
 DocType: BOM,Operations,Operationer
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Antal
 DocType: Production Plan,Material Request Detail,Materialeforespørgsel Detail
 DocType: Selling Settings,Default Quotation Validity Days,Standard Quotation Gyldighedsdage
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hvis du vil medtage skat i række {0} i Item sats, skatter i rækker {1} skal også medtages"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hvis du vil medtage skat i række {0} i Item sats, skatter i rækker {1} skal også medtages"
 DocType: SMS Center,SMS Center,SMS-center
 DocType: Payroll Entry,Validate Attendance,Validere tilstedeværelse
 DocType: Sales Invoice,Change Amount,ændring beløb
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Linjeafstand for beløb i ord
 DocType: Vehicle,Additional Details,Yderligere detaljer
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Ingen beskrivelse
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Leverandør&gt; Leverandørgruppe
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Indkøbsanmodning.
 DocType: POS Closing Voucher Details,Collected Amount,Samlet beløb
 DocType: Lab Test,Submitted Date,Indsendt dato
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,Studerende optagelse
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Vare {0} er aflyst
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Afskrivningsrække {0}: Afskrivning Startdato er indtastet som tidligere dato
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Afskrivningsrække {0}: Afskrivning Startdato er indtastet som tidligere dato
 DocType: Contract Template,Fulfilment Terms and Conditions,Opfyldelsesbetingelser
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Materialeanmodning
 DocType: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,Indstillinger for regnskab
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Leverandør faktura nr eksisterer i købsfaktura {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Administrer Sales Person Tree.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Kan ikke behandle rute, da Google Maps-indstillinger er deaktiveret."
 DocType: Job Applicant,Cover Letter,Følgebrev
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Anvendes ikke
 DocType: Item,Synced With Hub,Synkroniseret med Hub
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Ny aktivværdi
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Hastighed, hvormed kunden Valuta omdannes til kundens basisvaluta"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kursusplanlægningsværktøj
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Køb Faktura kan ikke foretages mod en eksisterende aktiv {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Køb Faktura kan ikke foretages mod en eksisterende aktiv {1}
 DocType: Crop Cycle,LInked Analysis,Analyseret
 DocType: POS Closing Voucher,POS Closing Voucher,POS Closing Voucher
 DocType: Contract,Lapsed,bortfaldet
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} er ikke tilmeldt kurset {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Elevnavn:
 DocType: POS Closing Voucher Details,Difference,Forskel
+DocType: Delivery Settings,Delay between Delivery Stops,Forsinkelse mellem Leveringsstop
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serienummer {0} hører ikke til følgeseddel {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Der ser ud til at være et problem med serverens GoCardless-konfiguration. Du skal ikke bekymre dig, i tilfælde af fiasko vil beløbet blive refunderet til din konto."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -693,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Mængde og Pris
 DocType: Delivery Note,% Installed,% Installeret
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,Klasseværelser / Laboratorier osv hvor foredrag kan planlægges.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Selskabets valutaer for begge virksomheder skal matche for Inter Company Transactions.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Selskabets valutaer for begge virksomheder skal matche for Inter Company Transactions.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Indtast venligst firmanavn først
 DocType: Travel Itinerary,Non-Vegetarian,Ikke-Vegetarisk
 DocType: Purchase Invoice,Supplier Name,Leverandørnavn
@@ -778,7 +779,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Lejet fra dato
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Nok Dele til Build
 DocType: POS Profile User,POS Profile User,POS profil bruger
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Række {0}: Afskrivning Startdato er påkrævet
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Række {0}: Afskrivning Startdato er påkrævet
 DocType: Purchase Invoice Item,Service Start Date,Service Startdato
 DocType: Subscription Invoice,Subscription Invoice,Abonnementsfaktura
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Direkte indkomst
@@ -845,7 +846,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Forkortelse allerede brugt til et andet selskab
 DocType: Selling Settings,Default Customer Group,Standard kundegruppe
 DocType: Employee,IFSC Code,IFSC-kode
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Startdato og slutdato overlapper jobkortet <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Hvis deaktivere, &#39;Afrundet Total&#39; felt, vil ikke være synlig i enhver transaktion"
 DocType: BOM,Operating Cost,Driftsomkostninger
 DocType: Crop,Produced Items,Producerede varer
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,Forebygg RFQs
 DocType: Hub User,Hub User,Navbruger
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Opret salgsordre
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Lønslip indgivet for perioden fra {0} til {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Lønslip indgivet for perioden fra {0} til {1}
 DocType: Project Task,Project Task,Sagsopgave
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Forladte point
 ,Lead Id,Emne-Id
@@ -1027,7 +1027,7 @@
 DocType: Fee Validity,Max number of visit,Maks antal besøg
 ,Hotel Room Occupancy,Hotelværelse Occupancy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timeseddel oprettet:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Indstil standard Kontant eller bank konto i mode for betaling {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Indstil standard Kontant eller bank konto i mode for betaling {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Indskrive
 DocType: GST Settings,GST Settings,GST-indstillinger
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Valuta bør være den samme som Prisliste Valuta: {0}
@@ -1081,7 +1081,7 @@
 DocType: Vehicle Log,Service Details,Service Detaljer
 DocType: Lab Test Template,Grouped,grupperet
 DocType: Selling Settings,Delivery Note Required,Følgeseddel er påkrævet
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Indsendelse af lønlister ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Indsendelse af lønlister ...
 DocType: Bank Guarantee,Bank Guarantee Number,Bankgaranti nummer
 DocType: Assessment Criteria,Assessment Criteria,vurderingskriterier
 DocType: BOM Item,Basic Rate (Company Currency),Basissats (firmavaluta)
@@ -1106,13 +1106,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Betalingspost er allerede dannet
 DocType: Request for Quotation,Get Suppliers,Få leverandører
 DocType: Purchase Receipt Item Supplied,Current Stock,Aktuel lagerbeholdning
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ikke er knyttet til Vare {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ikke er knyttet til Vare {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Lønseddel kladde
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Konto {0} er indtastet flere gange
 DocType: Account,Expenses Included In Valuation,Udgifter inkluderet i Værdiansættelse
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,"Du kan kun forny, hvis dit medlemskab udløber inden for 30 dage"
 DocType: Shopping Cart Settings,Show Stock Availability,Vis lager tilgængelighed
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Indstil {0} i aktivkategori {1} eller firma {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Indstil {0} i aktivkategori {1} eller firma {2}
 DocType: Location,Longitude,Længde
 ,Absent Student Report,Ikke-tilstede studerende rapport
 DocType: Crop,Crop Spacing UOM,Beskær afstanden UOM
@@ -1184,7 +1184,7 @@
 DocType: Soil Texture,Sand,Sand
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energi
 DocType: Opportunity,Opportunity From,Salgsmulighed fra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Række {0}: {1} Serienumre er nødvendige for punkt {2}. Du har angivet {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Række {0}: {1} Serienumre er nødvendige for punkt {2}. Du har angivet {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vælg venligst en tabel
 DocType: BOM,Website Specifications,Website Specifikationer
 DocType: Special Test Items,Particulars,Oplysninger
@@ -1276,7 +1276,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Elementer med højere weightage vises højere
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Lab Tests og Vital Signs
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Afstemning Detail
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Række # {0}: Aktiv {1} skal godkendes
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Række # {0}: Aktiv {1} skal godkendes
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Ingen medarbejder fundet
 DocType: Item,If subcontracted to a vendor,Hvis underentreprise til en sælger
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentgruppen er allerede opdateret.
@@ -1330,7 +1330,6 @@
 DocType: Loyalty Program Collection,Tier Name,Tiernavn
 DocType: HR Settings,Enter retirement age in years,Indtast pensionsalderen i år
 DocType: Crop,Target Warehouse,Target Warehouse
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Indstil navngivningsserien for {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Payroll Employee Detail,Payroll Employee Detail,Betalingsmedarbejder Detail
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Vælg venligst et lager
 DocType: Cheque Print Template,Starting location from left edge,Start fra venstre kant
@@ -1420,7 +1419,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Plan materiale til sub-enheder
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Forhandlere og områder
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,Stykliste {0} skal være aktiv
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Ingen emner til overførsel
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Ingen emner til overførsel
 DocType: Employee Boarding Activity,Activity Name,Aktivitetsnavn
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Skift Udgivelsesdato
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Færdig produktmængde <b>{0}</b> og For Mængde <b>{1}</b> kan ikke være anderledes
@@ -1647,6 +1646,7 @@
 DocType: Project,First Email,Første Email
 DocType: Company,Exception Budget Approver Role,Undtagelse Budget Approver Rol
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Når den er indstillet, vil denne faktura være i venteposition indtil den fastsatte dato"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserveret Warehouse i kundeordre / færdigvarer Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Salgsbeløb
 DocType: Repayment Schedule,Interest Amount,Renter Beløb
@@ -1658,7 +1658,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Records
 DocType: Asset,Scrapped,Skrottet
 DocType: Item,Item Defaults,Standardindstillinger
-DocType: Purchase Invoice,Returns,Retur
+DocType: Cashier Closing,Returns,Retur
 DocType: Job Card,WIP Warehouse,Varer-i-arbejde-lager
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serienummer {0} er under vedligeholdelseskontrakt ind til d. {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,Rekruttering
@@ -1672,7 +1672,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Overførselstype
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Salgsomkostninger
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 DocType: Diagnosis,Diagnosis,Diagnose
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standard Buying
 DocType: Attendance Request,Explanation,Forklaring
@@ -1685,7 +1684,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Indkøbsordrer Varer Forfaldne
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Postnummer
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Salgsordre {0} er {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Vælg renteindtægter konto i lån {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Vælg renteindtægter konto i lån {0}
 DocType: Opportunity,Contact Info,Kontaktinformation
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Making Stock Angivelser
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Kan ikke fremme medarbejder med status til venstre
@@ -1697,7 +1696,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Fakturaen kan ikke laves for nul faktureringstid
 DocType: Company,Date of Commencement,Dato for påbegyndelse
 DocType: Sales Person,Select company name first.,Vælg firmanavn først.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},E-mail sendt til {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},E-mail sendt til {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Tilbud modtaget fra leverandører.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Erstat BOM og opdater seneste pris i alle BOM&#39;er
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Til {0} | {1} {2}
@@ -1717,7 +1716,7 @@
 DocType: Asset Movement,From Employee,Fra Medarbejder
 DocType: Driver,Cellphone Number,telefon nummer
 DocType: Project,Monitor Progress,Monitor Progress
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Advarsel: Systemet vil ikke tjekke for overfakturering, da beløbet for vare {0} i {1} er nul"
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Advarsel: Systemet vil ikke tjekke for overfakturering, da beløbet for vare {0} i {1} er nul"
 DocType: Journal Entry,Make Difference Entry,Make Difference indtastning
 DocType: Supplier Quotation,Auto Repeat Section,Automatisk gentag sektion
 DocType: Upload Attendance,Attendance From Date,Fremmøde fradato
@@ -1820,7 +1819,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Afvist Antal kan ikke indtastes i Indkøb Return
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Ændring af kundegruppe for den valgte kunde er ikke tilladt.
 ,Purchase Order Items To Be Billed,Indkøbsordre varer til fakturering
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Opdaterer forventede ankomsttider.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Opdaterer forventede ankomsttider.
 DocType: Program Enrollment Tool,Enrollment Details,Indtastningsdetaljer
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Kan ikke indstille flere standardindstillinger for en virksomhed.
 DocType: Purchase Invoice Item,Net Rate,Nettosats
@@ -1834,7 +1833,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Forlad Type er madatory
 DocType: Support Settings,Close Issue After Days,Luk Issue efter dage
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Du skal være bruger med System Manager og Item Manager roller for at tilføje brugere til Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Du skal være bruger med System Manager og Item Manager roller for at tilføje brugere til Marketplace.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Lad feltet stå tomt hvis det skal gælde for alle filialer
 DocType: Job Opening,Staffing Plan,Bemandingsplan
 DocType: Bank Guarantee,Validity in Days,Gyldighed i dage
@@ -1854,7 +1853,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Duplikér række {0} med samme {1}
 DocType: Marketplace Settings,Disable Marketplace,Deaktiver Marketplace
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Regnskabsår {0} blev ikke fundet
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Regnskabsår {0} blev ikke fundet
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Opsætning af Medarbejdere
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel Reservation Bruger
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Vælg venligst præfiks først
@@ -1962,7 +1961,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Kunne ikke logge ind
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Asset {0} oprettet
 DocType: Special Test Items,Special Test Items,Særlige testelementer
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Du skal være en bruger med System Manager og Item Manager roller til at registrere på Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Du skal være en bruger med System Manager og Item Manager roller til at registrere på Marketplace.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Betalingsmåde
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,I henhold til din tildelte lønstruktur kan du ikke søge om ydelser
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Website Billede bør være en offentlig fil eller webadresse
@@ -1974,7 +1973,7 @@
 DocType: Warehouse,Warehouse Contact Info,Lagerkontaktinformation
 DocType: Payment Entry,Write Off Difference Amount,Skriv Off Forskel Beløb
 DocType: Volunteer,Volunteer Name,Frivilligt navn
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Rækker med dubletter forfaldsdatoer i andre rækker blev fundet: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Rækker med dubletter forfaldsdatoer i andre rækker blev fundet: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: Medarbejderens e-mail er ikke fundet, og derfor er e-mailen ikke sendt"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Ingen lønstrukturer tildelt medarbejder {0} på en given dato {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Forsendelsesregel gælder ikke for land {0}
@@ -2063,6 +2062,7 @@
 DocType: Salary Component,Earning,Tillæg
 DocType: Supplier Scorecard,Scoring Criteria,Scoringskriterier
 DocType: Purchase Invoice,Party Account Currency,Party Account Valuta
+DocType: Delivery Trip,Total Estimated Distance,Samlet estimeret afstand
 ,BOM Browser,Styklistesøgning
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Opdater venligst din status for denne træningsbegivenhed
 DocType: Item Barcode,EAN,EAN
@@ -2101,7 +2101,7 @@
 DocType: Activity Cost,Projects,Sager
 DocType: Payment Request,Transaction Currency,Transaktionsvaluta
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Fra {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Nogle e-mails er ugyldige
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Nogle e-mails er ugyldige
 DocType: Work Order Operation,Operation Description,Operation Beskrivelse
 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.,Kan ikke ændre regnskabsår Start Dato og Skatteårsafslutning Dato når regnskabsår er gemt.
 DocType: Quotation,Shopping Cart,Indkøbskurv
@@ -2125,7 +2125,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Nettoændring i anlægsaktiver
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Antal
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lad feltet stå tomt hvis det skal gælde for alle betegnelser
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Afgift af typen &#39;Actual &quot;i rækken {0} kan ikke indgå i Item Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Afgift af typen &#39;Actual &quot;i rækken {0} kan ikke indgå i Item Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Fra datotid
 DocType: Shopify Settings,For Company,Til firma
@@ -2139,7 +2139,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Der opstod fejl ved at oprette kursusplan
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Den første udgiftsgodkendelse i listen bliver indstillet som standard Expense Approver.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,må ikke være større end 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Du skal være en anden bruger end Administrator med System Manager og Item Manager roller for at registrere dig på Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Du skal være en anden bruger end Administrator med System Manager og Item Manager roller for at registrere dig på Marketplace.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Vare {0} er ikke en lagervare
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Uplanlagt
@@ -2168,7 +2168,7 @@
 DocType: HR Settings,Employee Settings,Medarbejderindstillinger
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Indlæser betalingssystem
 ,Batch-Wise Balance History,Historik sorteret pr. parti
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Row # {0}: Kan ikke indstille Rate hvis beløb er større end faktureret beløb for Item {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Row # {0}: Kan ikke indstille Rate hvis beløb er større end faktureret beløb for Item {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Udskriftsindstillinger opdateret i respektive print format
 DocType: Package Code,Package Code,Pakkekode
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Lærling
@@ -2401,7 +2401,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.","{0} ledige stillinger og {1} budget for {2}, der allerede er planlagt til datterselskaber af {3}. \ Du kan kun planlægge op til {4} ledige stillinger og og budget {5} i henhold til personaleplan {6} for moderselskabet {3}."
 DocType: HR Settings,Stop Birthday Reminders,Stop Fødselsdag Påmindelser
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Venligst sæt Standard Payroll Betales konto i Company {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Venligst sæt Standard Payroll Betales konto i Company {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Få økonomisk opsplitning af skatter og afgifter data fra Amazon
 DocType: SMS Center,Receiver List,Modtageroversigt
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Søg Vare
@@ -2471,7 +2471,7 @@
 DocType: Vital Signs,Constipated,forstoppet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Imod Leverandør Faktura {0} dateret {1}
 DocType: Customer,Default Price List,Standardprisliste
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Asset Movement rekord {0} skabt
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Asset Movement rekord {0} skabt
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Ingen emner fundet.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Du kan ikke slette Fiscal År {0}. Regnskabsår {0} er indstillet som standard i Globale indstillinger
 DocType: Share Transfer,Equity/Liability Account,Egenkapital / Ansvarskonto
@@ -2608,6 +2608,7 @@
 DocType: Blanket Order,Order Type,Bestil Type
 ,Item-wise Sales Register,Vare-wise Sales Register
 DocType: Asset,Gross Purchase Amount,Bruttokøbesum
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Varenummer&gt; Varegruppe&gt; Mærke
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Åbning af saldi
 DocType: Asset,Depreciation Method,Afskrivningsmetode
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Er denne Tax inkluderet i Basic Rate?
@@ -2688,7 +2689,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Handling hvis årligt budget oversteg på PO
 DocType: Student Leave Application,Student Leave Application,Student Leave Application
 DocType: Item,Will also apply for variants,Vil også gælde for varianter
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke annulleres, da det allerede er {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke annulleres, da det allerede er {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Medarbejder {0} på halv tid den {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Arbejdstid i alt bør ikke være større end maksimal arbejdstid {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,På
@@ -2712,6 +2713,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Hent data
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Maksimal tilladelse tilladt i orlovstypen {0} er {1}
 DocType: SMS Center,Create Receiver List,Opret Modtager liste
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Tilgængelig til brug Dato bør være efter købsdato
 DocType: Vehicle,Wheels,Hjul
 DocType: Packing Slip,To Package No.,Til pakkenr.
 DocType: Patient Relation,Family,Familie
@@ -2725,7 +2727,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Faktureringsvaluta skal være lig med enten standardfirmaets valuta eller part konto konto valuta
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Angiver, at pakken er en del af denne leverance (Kun udkast)"
 DocType: Soil Texture,Loam,lerjord
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Række {0}: Forfaldsdato kan ikke være før bogføringsdato
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Række {0}: Forfaldsdato kan ikke være før bogføringsdato
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Indtast indbetaling
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Mængde for vare {0} skal være mindre end {1}
 ,Sales Invoice Trends,Salgsfaktura Trends
@@ -2797,7 +2799,7 @@
 DocType: Guardian,Guardian Interests,Guardian Interesser
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Opdater konto navn / nummer
 DocType: Naming Series,Current Value,Aktuel værdi
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flere regnskabsår findes for den dato {0}. Indstil selskab i regnskabsåret
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flere regnskabsår findes for den dato {0}. Indstil selskab i regnskabsåret
 DocType: Education Settings,Instructor Records to be created by,"Instruktør Records, der skal oprettes af"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} oprettet
 DocType: GST Account,GST Account,GST-konto
@@ -2814,7 +2816,7 @@
 DocType: Sales Person,Name and Employee ID,Navn og medarbejdernr.
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Forfaldsdato kan ikke være før bogføringsdatoen
 DocType: Website Item Group,Website Item Group,Hjemmeside-varegruppe
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Ingen lønseddel fundet for at indsende for ovennævnte udvalgte kriterier ELLER lønsliste allerede indsendt
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Ingen lønseddel fundet for at indsende for ovennævnte udvalgte kriterier ELLER lønsliste allerede indsendt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Skatter og afgifter
 DocType: Projects Settings,Projects Settings,Projekter Indstillinger
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Indtast referencedato
@@ -2823,7 +2825,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Medfølgende Antal
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Materialeanmodningsvare
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Annuller købs kvittering {0} først
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Annuller købs kvittering {0} først
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Varegruppetræer
 DocType: Production Plan,Total Produced Qty,I alt produceret antal
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Kan ikke henvise rækken tal større end eller lig med aktuelle række nummer til denne Charge typen
@@ -2932,6 +2934,7 @@
 ,Vehicle Expenses,Køretøjsudgifter
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Opret labtest (er) på salgsfaktura Send
 DocType: Serial No,Invoice Details,Faktura detaljer
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Aktivér Google Maps Indstillinger til at estimere og optimere ruter
 DocType: Grant Application,Show on Website,Vis på hjemmesiden
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Start på
 DocType: Hub Tracked Item,Hub Category,Nav kategori
@@ -2971,7 +2974,7 @@
 DocType: Inpatient Record,B Positive,B positiv
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Maksimal fordel for medarbejderen {0} overstiger {1} med summen {2} af tidligere hævdede beløb
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Række # {0}: Antal skal være én, eftersom varen er et anlægsaktiv. Brug venligst separat række til flere antal."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Række # {0}: Antal skal være én, eftersom varen er et anlægsaktiv. Brug venligst separat række til flere antal."
 DocType: Leave Block List Allow,Leave Block List Allow,Tillad blokerede fraværsansøgninger
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
 DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
@@ -3005,7 +3008,7 @@
 DocType: Workstation,Wages per hour,Timeløn
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Lagersaldo i parti {0} vil blive negativ {1} for vare {2} på lager {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Følgende materialeanmodninger er blevet dannet automatisk baseret på varens genbestillelsesniveau
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Konto Valuta skal være {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Konto Valuta skal være {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Fra dato {0} kan ikke være efter medarbejderens lindrende dato {1}
 DocType: Supplier,Is Internal Supplier,Er intern leverandør
 DocType: Employee,Create User Permission,Opret brugertilladelse
@@ -3149,7 +3152,7 @@
 DocType: Account,Fixed Asset,Anlægsaktiv
 DocType: Amazon MWS Settings,After Date,Efter dato
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Serienummer-lager
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Ugyldig {0} for interfirmafaktura.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Ugyldig {0} for interfirmafaktura.
 ,Department Analytics,Afdeling Analytics
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Email ikke fundet i standardkontakt
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generer Secret
@@ -3161,7 +3164,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Program i gebyrstrukturen og studentegruppen {0} er forskellige.
 DocType: Bank Statement Transaction Entry,Receivable Account,Tilgodehavende konto
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Gyldig fra dato skal være mindre end gyldig upto dato.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} er allerede {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} er allerede {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Salgsordre til betaling
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,Direktør
@@ -3203,6 +3206,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Debet-til skal angives
 DocType: Clinical Procedure,Inpatient Record,Inpatient Record
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Tidskladder hjælper med at holde styr på tid, omkostninger og fakturering for aktiviteter udført af dit team"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Indkøbsprisliste
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Dato for transaktion
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Skabeloner af leverandør scorecard variabler.
@@ -3245,7 +3249,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Exchange Gevinst / Tab
 DocType: Opportunity,Lost Reason,Tabsårsag
 DocType: Amazon MWS Settings,Enable Amazon,Aktivér Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Række nr. {0}: Konto {1} tilhører ikke firma {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Række nr. {0}: Konto {1} tilhører ikke firma {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Kunne ikke finde DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Ny adresse
 DocType: Quality Inspection,Sample Size,Sample Size
@@ -3356,7 +3360,7 @@
 DocType: Water Analysis,Origin,Oprindelse
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dette dokument er over grænsen ved {0} {1} for vare {4}. Er du gør en anden {3} mod samme {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Venligst sæt tilbagevendende efter besparelse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Vælg ændringsstørrelse konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Vælg ændringsstørrelse konto
 DocType: Purchase Invoice,Price List Currency,Prisliste Valuta
 DocType: Naming Series,User must always select,Brugeren skal altid vælge
 DocType: Stock Settings,Allow Negative Stock,Tillad negativ lagerbeholdning
@@ -3398,7 +3402,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,"Er du sikker på, at du vil annullere denne aftale?"
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Hotel værelsesprispakke
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Salgspipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Angiv standardkonto i lønart {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Angiv standardkonto i lønart {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Forfalder den
 DocType: Rename Tool,File to Rename,Fil der skal omdøbes
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Vælg BOM for Item i række {0}
@@ -3419,7 +3423,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Omkostninger ved Købte varer
 DocType: Employee Separation,Employee Separation Template,Medarbejderseparationsskabelon
 DocType: Selling Settings,Sales Order Required,Salgsordre påkrævet
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Bliv sælger
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Bliv sælger
 DocType: Purchase Invoice,Credit To,Credit Til
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Aktive Emner / Kunder
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Forlad blanket for at bruge standardleveringsformatet
@@ -3460,7 +3464,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Lav skatskabelon
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Brugerforum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Råmaterialer kan ikke være tom.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Row # {0} (Betalingstabel): Beløbet skal være negativt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Row # {0} (Betalingstabel): Beløbet skal være negativt
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Kunne ikke opdatere lager, faktura indeholder drop shipping element."
 DocType: Contract,Fulfilment Status,Opfyldelsesstatus
 DocType: Lab Test Sample,Lab Test Sample,Lab Test prøve
@@ -3599,7 +3603,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Dok Dato
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Fee Records Oprettet - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategori konto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Row # {0} (Betalingstabel): Beløbet skal være positivt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Row # {0} (Betalingstabel): Beløbet skal være positivt
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke producere mere Item {0} end Sales Order mængde {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Vælg Attributværdier
 DocType: Purchase Invoice,Reason For Issuing document,Årsag til udstedelse af dokument
@@ -3654,7 +3658,7 @@
 DocType: Purchase Receipt,Time at which materials were received,"Tidspunkt, hvor materialer blev modtaget"
 DocType: Products Settings,Products per Page,Produkter pr. Side
 DocType: Stock Ledger Entry,Outgoing Rate,Udgående Rate
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,eller
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,eller
 DocType: Sales Order,Billing Status,Faktureringsstatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Rapporter et problem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,"El, vand og varmeudgifter"
@@ -3681,7 +3685,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Skattefritagelseserklæring fra ansatte
 DocType: Payment Entry,Cheque/Reference Date,Anvendes ikke
 DocType: Purchase Invoice,Total Taxes and Charges,Moms i alt
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Tilgængelig til brug Dato er indtastet som tidligere dato
 DocType: Employee,Emergency Contact,Emergency Kontakt
 DocType: Bank Reconciliation Detail,Payment Entry,Betaling indtastning
 ,sales-browser,salg-browser
@@ -3727,6 +3730,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Er Retur (Kredit Bemærk)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Start Job
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Serienummer er påkrævet for aktivet {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Indstil navngivningsserien for {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Deaktiveret skabelon må ikke være standardskabelon
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,For række {0}: Indtast planlagt antal
 DocType: Account,Income Account,Indtægtskonto
@@ -3740,6 +3744,7 @@
 DocType: Loyalty Program,Help Section,Hjælp sektion
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,forrige
 DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility Area
+DocType: Delivery Trip,Distance UOM,Afstand UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Elevgrupper hjælper dig med at administrere fremmøde, vurderinger og gebyrer for eleverne"
 DocType: Payment Entry,Total Allocated Amount,Samlet bevilgede beløb
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Indstil standard lagerkonto for evigvarende opgørelse
@@ -3781,7 +3786,7 @@
 DocType: Item Supplier,Item Supplier,Vareleverandør
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Indtast venligst varenr. for at få partinr.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Vælg en værdi for {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Ingen emner valgt til overførsel
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Ingen emner valgt til overførsel
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alle adresser.
 DocType: Company,Stock Settings,Lagerindstillinger
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenlægning er kun muligt, hvis følgende egenskaber er ens i begge poster: Er en kontogruppe, Rodtype og firma"
@@ -4066,7 +4071,7 @@
 DocType: Patient,Personal and Social History,Personlig og social historie
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Bruger {0} oprettet
 DocType: Fee Schedule,Fee Breakup for each student,Fee Breakup for hver elev
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Samlet forhånd ({0}) mod Order {1} kan ikke være større end Grand alt ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Samlet forhånd ({0}) mod Order {1} kan ikke være større end Grand alt ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vælg Månedlig Distribution til ujævnt distribuere mål på tværs måneder.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Skift kode
 DocType: Purchase Invoice Item,Valuation Rate,Værdiansættelsesbeløb
@@ -4075,7 +4080,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Benyttet ITC Cess
 ,Student Monthly Attendance Sheet,Student Månedlig Deltagelse Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Forsendelsesregel gælder kun for salg
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Afskrivningsrække {0}: Næste afskrivningsdato kan ikke være før købsdato
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Afskrivningsrække {0}: Næste afskrivningsdato kan ikke være før købsdato
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Sag startdato
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Indtil
 DocType: Rename Tool,Rename Log,Omdøb log
@@ -4092,12 +4097,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Hvor ofte skal projektet og virksomheden opdateres baseret på salgstransaktioner.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Udløber på
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Tilføj studerende
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Fjern venligst medarbejderen <a href=""#Form/Employee/{0}"">{0}</a> \ for at annullere dette dokument"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Vælg {0}
 DocType: C-Form,C-Form No,C-Form Ingen
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Afstand
+DocType: Delivery Stop,Distance,Afstand
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Skriv dine produkter eller tjenester, som du køber eller sælger."
 DocType: Water Analysis,Storage Temperature,Stuetemperatur
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4124,7 +4127,7 @@
 DocType: Homepage,Company Description for website homepage,Firmabeskrivelse til hjemmesiden
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Af hensyn til kunderne, kan disse koder bruges i udskriftsformater ligesom fakturaer og følgesedler"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Navn
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Kunne ikke hente oplysninger for {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Kunne ikke hente oplysninger for {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Åbning Entry Journal
 DocType: Contract,Fulfilment Terms,Opfyldelsesbetingelser
 DocType: Sales Invoice,Time Sheet List,Timeregistreringsoversigt
@@ -4304,7 +4307,7 @@
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Vælg studerende manuelt for aktivitetsbaseret gruppe
 DocType: Journal Entry,User Remark,Brugerbemærkning
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Optimering af ruter.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Optimering af ruter.
 DocType: Travel Itinerary,Non Diary,Ikke-dagbog
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Kan ikke oprette tilbageholdelsesbonus for venstre medarbejdere
 DocType: Lead,Market Segment,Markedssegment
@@ -4334,7 +4337,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Loyalitetsprogram
 DocType: Student Guardian,Father,Far
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Support Billetter
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,'Opdater lager' kan ikke kontrolleres pga. salg af anlægsaktiver
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,'Opdater lager' kan ikke kontrolleres pga. salg af anlægsaktiver
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Afstemning
 DocType: Attendance,On Leave,Fraværende
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Modtag nyhedsbrev
@@ -4379,7 +4382,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serienummer og parti
 DocType: Warranty Claim,From Company,Fra firma
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Summen af Snesevis af Assessment Criteria skal være {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Venligst sæt Antal Afskrivninger Reserveret
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Venligst sæt Antal Afskrivninger Reserveret
 DocType: Supplier Scorecard Period,Calculations,Beregninger
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Værdi eller mængde
 DocType: Payment Terms Template,Payment Terms,Betalingsbetingelser
@@ -4398,7 +4401,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Rabat (%) på prisliste med margen
 DocType: Healthcare Service Unit Type,Rate / UOM,Rate / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Alle lagre
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Nej {0} fundet for Inter Company Transactions.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Nej {0} fundet for Inter Company Transactions.
 DocType: Travel Itinerary,Rented Car,Lejet bil
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Om din virksomhed
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Kredit til konto skal være en balance konto
@@ -4499,6 +4502,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Plant Analyse Kriterier
 DocType: Cheque Print Template,Cheque Height,Anvendes ikke
 DocType: Supplier,Supplier Details,Leverandør Detaljer
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Venligst opsæt nummereringsserier for Tilstedeværelse via Opsætning&gt; Nummereringsserie
 DocType: Setup Progress,Setup Progress,Setup Progress
 DocType: Expense Claim,Approval Status,Godkendelsesstatus
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Fra værdi skal være mindre end at værdien i række {0}
@@ -4591,7 +4595,6 @@
 DocType: Travel Request,Fully Sponsored,Fuldt sponsoreret
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Kunden {0} er oprettet.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Opsæt venligst medarbejdernavnesystem i menneskelige ressourcer&gt; HR-indstillinger
 DocType: Stock Settings,Limit Percent,Begrænsningsprocent
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Der er i øjeblikket ingen lager på lageret
 ,Payment Period Based On Invoice Date,Betaling Periode Baseret på Fakturadato
@@ -4650,7 +4653,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Kildelager
 DocType: Installation Note,Installation Date,Installation Dato
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Del Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Række # {0}: Aktiv {1} hører ikke til firma {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Række # {0}: Aktiv {1} hører ikke til firma {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Salgsfaktura {0} oprettet
 DocType: Employee,Confirmation Date,Bekræftet den
 DocType: Inpatient Occupancy,Check Out,Check ud
@@ -4670,6 +4673,7 @@
 DocType: Production Plan,Sales Orders Detail,Salgsordrer Detail
 DocType: Bin,Requested Quantity,Anmodet mængde
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Indstil venligst instruktørens navngivningssystem under Uddannelse&gt; Uddannelsesindstillinger
 DocType: Patient,Marital Status,Civilstand
 DocType: Stock Settings,Auto Material Request,Automatisk materialeanmodning
 DocType: Woocommerce Settings,API consumer secret,API forbruger hemmelighed
@@ -4722,7 +4726,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Vælg dage
 DocType: Academic Term,Term Name,Betingelsesnavn
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Kredit ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Oprettelse af lønlister ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Oprettelse af lønlister ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Du kan ikke redigere root node.
 DocType: Buying Settings,Purchase Order Required,Indkøbsordre påkrævet
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Timer
@@ -4758,7 +4762,7 @@
 DocType: Account,Rate at which this tax is applied,"Hastighed, hvormed denne afgift anvendes"
 DocType: Cash Flow Mapper,Section Name,Sektionens navn
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Genbestil Antal
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Afskrivningsrække {0}: Forventet værdi efter brugstid skal være større end eller lig med {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Afskrivningsrække {0}: Forventet værdi efter brugstid skal være større end eller lig med {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Aktuelle ledige stillinger
 DocType: Company,Stock Adjustment Account,Stock Justering konto
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Afskriv
@@ -4805,7 +4809,7 @@
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Ud af AMC
 DocType: Opportunity,Opportunity Amount,Mulighedsbeløb
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antal Afskrivninger Reserverede kan ikke være større end alt Antal Afskrivninger
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antal Afskrivninger Reserverede kan ikke være større end alt Antal Afskrivninger
 DocType: Purchase Order,Order Confirmation Date,Ordrebekræftelsesdato
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Make Vedligeholdelse Besøg
@@ -4846,7 +4850,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Parti:
 DocType: Volunteer,Afternoon,Eftermiddag
 DocType: Loyalty Program,Loyalty Program Help,Hjælp til loyalitetsprogram
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} &#39;{1}&#39; er deaktiveret
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} &#39;{1}&#39; er deaktiveret
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Sæt som Open
 DocType: Cheque Print Template,Scanned Cheque,Anvendes ikke
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Sende automatiske e-mails til Kontakter på Indsendelse transaktioner.
@@ -4859,7 +4863,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Item og garanti Detaljer
 DocType: Chapter,Chapter Members,Kapitel Medlemmer
 DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Bemærk: Betaling indtastning vil ikke blive oprettet siden &#39;Kontant eller bank konto&#39; er ikke angivet
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Bemærk: Betaling indtastning vil ikke blive oprettet siden &#39;Kontant eller bank konto&#39; er ikke angivet
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Projekt {0} eksisterer allerede
 DocType: Clinical Procedure,Nursing User,Sygeplejerske bruger
 DocType: Employee Benefit Application,Payroll Period,Lønningsperiode
@@ -4867,6 +4871,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Serienummer {0} tilhører ikke Batch {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Ansvar
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Gyldighedsperioden for dette citat er afsluttet.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Fjern venligst medarbejderen <a href=""#Form/Employee/{0}"">{0}</a> \ for at annullere dette dokument"
 DocType: Expense Claim Account,Expense Claim Account,Udlægskonto
 DocType: Account,Capital Work in Progress,Kapitalarbejde i fremskridt
 DocType: Accounts Settings,Allow Stale Exchange Rates,Tillad forældede valutakurser
@@ -4948,7 +4954,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Issue Materiale
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Tilslut Shopify med ERPNext
 DocType: Material Request Item,For Warehouse,Til lager
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Leveringsnotater {0} opdateret
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Leveringsnotater {0} opdateret
 DocType: Employee,Offer Date,Dato
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Tilbud
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,"Du er i offline-tilstand. Du vil ikke være i stand til at genindlæse, indtil du har netværk igen."
@@ -4998,7 +5004,7 @@
 DocType: Shipping Rule,Calculate Based On,Beregn baseret på
 DocType: Contract,Unfulfilled,uopfyldte
 DocType: Delivery Note Item,From Warehouse,Fra lager
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Ingen ansatte for de nævnte kriterier
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Ingen ansatte for de nævnte kriterier
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Ingen stykliste-varer at fremstille
 DocType: Shopify Settings,Default Customer,Standardkunden
 DocType: Sales Stage,Stage Name,Kunstnernavn
@@ -5040,7 +5046,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skat Beløb Efter Discount Beløb
 DocType: Patient,Inpatient Status,Inpatient Status
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Daglige Arbejde Resumé Indstillinger
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Udvalgt prisliste skal have købs- og salgsfelter kontrolleret.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Udvalgt prisliste skal have købs- og salgsfelter kontrolleret.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Indtast venligst Reqd by Date
 DocType: Payment Entry,Internal Transfer,Intern overførsel
 DocType: Asset Maintenance,Maintenance Tasks,Vedligeholdelsesopgaver
@@ -5076,7 +5082,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Sortér efter
 DocType: Guardian,Interests,Interesser
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Aktivér / deaktivér valuta.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Kunne ikke indsende nogle Lønslister
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Kunne ikke indsende nogle Lønslister
 DocType: Exchange Rate Revaluation,Get Entries,Få indlæg
 DocType: Production Plan,Get Material Request,Hent materialeanmodning
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Portoudgifter
@@ -5160,7 +5166,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Udgiftskonto er obligatorisk for element {0}
 DocType: BOM,Website Description,Hjemmesidebeskrivelse
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Nettoændring i Equity
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Annullér købsfaktura {0} først
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Annullér købsfaktura {0} først
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Ikke tilladt. Deaktiver venligst serviceenhedstypen
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailadresse skal være unik, findes allerede for {0}"
 DocType: Serial No,AMC Expiry Date,AMC Udløbsdato
@@ -5200,7 +5206,7 @@
 DocType: Hotel Room,Hotel Room,Hotelværelse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Konto {0} ikke hører til virksomheden {1}
 DocType: Leave Type,Rounding,Afrunding
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Serienumre i række {0} stemmer ikke overens med Leveringsnotat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Serienumre i række {0} stemmer ikke overens med Leveringsnotat
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Dispensed Amount (Pro-rated)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Derefter filtreres prisreglerne ud fra kunde, kundegruppe, territorium, leverandør, leverandørgruppe, kampagne, salgspartner mv."
 DocType: Student,Guardian Details,Guardian Detaljer
@@ -5255,7 +5261,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Lager kræves for lagervare {0}
 DocType: Leave Allocation,Unused leaves,Ubrugte blade
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Lav tilbagebetalingstildeling
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Alle afdelinger
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Alle afdelinger
 DocType: Healthcare Service Unit,Vacant,Ledig
 DocType: Patient,Alcohol Past Use,Alkohol tidligere brug
 DocType: Fertilizer Content,Fertilizer Content,Gødning Indhold
@@ -5266,7 +5272,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,"Arbejdsordren {0} skal annulleres, inden afbestillingen af denne salgsordre"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
 DocType: Authorization Rule,Applicable To (Employee),Gælder for (Medarbejder)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Forfaldsdato er obligatorisk
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Forfaldsdato er obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Tilvækst til Attribut {0} kan ikke være 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Fordelstype og beløb
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Værelser Reserveret
@@ -5409,7 +5415,7 @@
 DocType: Purchase Invoice Item,Total Weight,Totalvægt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Salgsprovisioner
 DocType: Job Offer Term,Value / Description,/ Beskrivelse
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} kan ikke indsendes, er det allerede {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} kan ikke indsendes, er det allerede {2}"
 DocType: Tax Rule,Billing Country,Faktureringsland
 DocType: Purchase Order Item,Expected Delivery Date,Forventet leveringsdato
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurant Order Entry
@@ -5448,12 +5454,13 @@
 DocType: Maintenance Visit,Breakdown,Sammenbrud
 DocType: Travel Itinerary,Vegetarian,Vegetarisk
 DocType: Patient Encounter,Encounter Date,Encounter Date
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan ikke vælges {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan ikke vælges {1}
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bankdata
 DocType: Purchase Receipt Item,Sample Quantity,Prøvekvantitet
 DocType: Bank Guarantee,Name of Beneficiary,Navn på modtager
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Opdater BOM omkostninger automatisk via Scheduler, baseret på seneste værdiansættelsesrate / prisliste sats / sidste købspris for råvarer."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Leverandør&gt; Leverandørgruppe
 DocType: Bank Reconciliation Detail,Cheque Date,Anvendes ikke
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Forældre-konto {1} tilhører ikke virksomheden: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Succesfuld slettet alle transaktioner i forbindelse med dette selskab!
@@ -5481,7 +5488,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Child noder kan kun oprettes under &#39;koncernens typen noder
 DocType: Attendance Request,Half Day Date,Halv dag dato
 DocType: Academic Year,Academic Year Name,Skoleårsnavn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} må ikke transagere med {1}. Vær venlig at ændre selskabet.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} må ikke transagere med {1}. Vær venlig at ændre selskabet.
 DocType: Sales Partner,Contact Desc,Kontaktbeskrivelse
 DocType: Email Digest,Send regular summary reports via Email.,Send regelmæssige sammenfattende rapporter via e-mail.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Angiv standardkonto i udlægstype {0}
@@ -5514,7 +5521,7 @@
 DocType: Hotel Room,Hotel Manager,Hotelbestyrer
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Sæt momsregel for indkøbskurv
 DocType: Purchase Invoice,Taxes and Charges Added,Skatter og Afgifter Tilføjet
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Afskrivnings række {0}: Næste afskrivningsdato kan ikke være før tilgængelig dato
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Afskrivnings række {0}: Næste afskrivningsdato kan ikke være før tilgængelig dato
 ,Sales Funnel,Salgstragt
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Forkortelsen er obligatorisk
 DocType: Project,Task Progress,Opgave-fremskridt
@@ -5528,7 +5535,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Alle kundegrupper
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,Akkumuleret månedlig
 DocType: Attendance Request,On Duty,På vagt
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Måske er valutaveksling record ikke lavet for {1} til {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Måske er valutaveksling record ikke lavet for {1} til {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Bemanningsplan {0} findes allerede til betegnelse {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Momsskabelon er obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Konto {0}: Forældre-konto {1} findes ikke
@@ -5607,11 +5614,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Mindst ét lager skal angives
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Konfigurer produktfelter som UOM, varegruppe, beskrivelse og antal timer."
 DocType: Certification Application,Certification Status,Certificeringsstatus
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Marketplace
 DocType: Travel Itinerary,Travel Advance Required,Krav til rejseudvikling
 DocType: Subscriber,Subscriber Name,Abonnentnavn
 DocType: Serial No,Out of Warranty,Garanti udløbet
-DocType: Cashier Closing,Cashier-closing-,Kasserer-closing-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Mapped Data Type
 DocType: BOM Update Tool,Replace,Udskift
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Ingen produkter fundet.
@@ -5698,7 +5704,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Standard skat skabeloner til salg og køb oprettes.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Vurdering Resultatoptegnelsen {0} eksisterer allerede.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Eksempel: ABCD. #####. Hvis serier er indstillet og Batch nr ikke er nævnt i transaktioner, oprettes automatisk batchnummer baseret på denne serie. Hvis du altid vil udtrykkeligt nævne Batch nr for dette emne, skal du lade dette være tomt. Bemærk: Denne indstilling vil have prioritet i forhold til Naming Series Prefix i lagerindstillinger."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Venligst opsæt nummereringsserier for Tilstedeværelse via Opsætning&gt; Nummereringsserie
 DocType: BOM,Materials Required (Exploded),Nødvendige materialer (Sprængskitse)
 DocType: Contract,Party User,Party bruger
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Indstil Firmafilter blankt, hvis Group By er &#39;Company&#39;"
@@ -5899,7 +5904,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Begge prøveperiode Startdato og prøveperiode Slutdato skal indstilles
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Gennemsnitlig sats
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Samlet betalingsbeløb i betalingsplan skal svare til Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Samlet betalingsbeløb i betalingsplan skal svare til Grand / Rounded Total
 DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Kontoudskrift balance pr Finans
 DocType: Job Applicant,Applicant Name,Ansøgernavn
@@ -5968,7 +5973,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sæbe &amp; Vaskemiddel
 DocType: BOM,Show Items,Vis elementer
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Fra Tiden kan ikke være større end til anden.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Vil du anmelde alle kunderne via e-mail?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Vil du anmelde alle kunderne via e-mail?
 DocType: Subscription Plan,Billing Interval,Faktureringsinterval
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestilt
@@ -5977,9 +5982,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Række {0}: {1} skal være større end 0
 DocType: Assessment Criteria,Assessment Criteria Group,Vurderingskriterier Group
 DocType: Healthcare Settings,Patient Name By,Patientnavn By
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Periodiseringsjournalen Entry for løn fra {0} til {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Periodiseringsjournalen Entry for løn fra {0} til {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Aktivér udskudt indtjening
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Åbning Akkumuleret Afskrivning skal være mindre end lig med {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Åbning Akkumuleret Afskrivning skal være mindre end lig med {0}
 DocType: Warehouse,Warehouse Name,Lagernavn
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Faktisk startdato skal være mindre end den faktiske slutdato
 DocType: Naming Series,Select Transaction,Vælg Transaktion
@@ -6130,7 +6135,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Medarbejder {0} i lønklasse {1} har ingen standardlovspolitik
 DocType: Salary Detail,Salary Detail,Løn Detail
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Vælg {0} først
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Tilføjet {0} brugere
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Tilføjet {0} brugere
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","I tilfælde af multi-tier program, vil kunder automatisk blive tildelt den pågældende tier som per deres brugt"
 DocType: Appointment Type,Physician,Læge
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Batch {0} af varer {1} er udløbet.
@@ -6274,7 +6279,7 @@
 DocType: Asset,Custodian,kontoførende
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Kassesystemprofil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} skal være en værdi mellem 0 og 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Betaling af {0} fra {1} til {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Betaling af {0} fra {1} til {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Usikrede lån
 DocType: Cost Center,Cost Center Name,Omkostningsstednavn
 DocType: Student,B+,B +
@@ -6306,6 +6311,7 @@
 DocType: Employee,Date of Issue,Udstedt den
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","I henhold til købsindstillingerne, hvis købsmodtagelse er påkrævet == &#39;JA&#39; og derefter for at oprette købsfaktura, skal brugeren først oprette købsmodtagelse for vare {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Række # {0}: Indstil Leverandør for vare {1}
+DocType: Global Defaults,Default Distance Unit,Standard Distance Unit
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Række {0}: Timer værdi skal være større end nul.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Website Billede {0} er knyttet til Vare {1} kan ikke findes
 DocType: Issue,Content Type,Indholdstype
@@ -6361,7 +6367,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Debit-Til konto skal være en balance konto
 DocType: Asset,Naming Series,Navngivningsnummerserie
 DocType: Vital Signs,Coated,coated
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Række {0}: Forventet værdi efter brugbart liv skal være mindre end brutto købsbeløb
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Række {0}: Forventet værdi efter brugbart liv skal være mindre end brutto købsbeløb
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Indstillinger
 DocType: Leave Block List,Leave Block List Name,Blokering af fraværsansøgninger
 DocType: Certified Consultant,Certification Validity,Certificering Gyldighed
@@ -6428,6 +6434,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Bankoverskrift
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Se labtest
 DocType: Hub Users,Hub Users,Hub-brugere
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Vedligeholdelsesdato
 DocType: Purchase Invoice Item,Rejected Serial No,Afvist serienummer
@@ -6442,7 +6449,7 @@
 DocType: SG Creation Tool Course,Max Strength,Max Strength
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Installation af forudindstillinger
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Ingen leveringskort valgt til kunden {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Ingen leveringskort valgt til kunden {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Medarbejder {0} har ingen maksimal ydelsesbeløb
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Vælg varer baseret på Leveringsdato
 DocType: Grant Application,Has any past Grant Record,Har nogen tidligere Grant Record
@@ -6469,7 +6476,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Hotelværelse Reservation
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Kundeservice
 DocType: BOM,Thumbnail,Thumbnail
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Ingen kontakter med e-mail-id&#39;er fundet.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Ingen kontakter med e-mail-id&#39;er fundet.
 DocType: Item Customer Detail,Item Customer Detail,Item Customer Detail
 DocType: Notification Control,Prompt for Email on Submission of,Spørg til Email på Indsendelse af
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Maksimal ydelsesbeløb for medarbejderen {0} overstiger {1}
@@ -6724,7 +6731,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,"Kan ikke skjult til gruppen, fordi Kontotype er valgt."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} er blevet ændret. Venligst opdater.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop brugere fra at oprette fraværsansøgninger for de følgende dage.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Varenummer&gt; Varegruppe&gt; Mærke
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Hvis ubegrænset udløb for loyalitetspoint, skal du holde udløbsperioden tom eller 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Vedligeholdelse Team Medlemmer
 DocType: Loyalty Point Entry,Purchase Amount,Indkøbsbeløb
@@ -6732,7 +6738,7 @@
 											to fullfill Sales Order {2}","Kan ikke aflevere serienummer {0} af punkt {1}, da det er reserveret \ for at fuldfylde salgsordre {2}"
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Leverandørtilbud {0} oprettet
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Slutår kan ikke være før startår
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Slutår kan ikke være før startår
 DocType: Employee Benefit Application,Employee Benefits,Personalegoder
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for vare {0} i række {1}
 DocType: Work Order,Manufactured Qty,Fremstillet mængde
@@ -6748,6 +6754,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Vælg batchnumre
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Til GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Regninger sendt til kunder.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Opsæt venligst medarbejdernavnesystem i menneskelige ressourcer&gt; HR-indstillinger
 DocType: Healthcare Settings,Invoice Appointments Automatically,Fakturaaftaler automatisk
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Sags-id
 DocType: Salary Component,Variable Based On Taxable Salary,Variabel baseret på skattepligtig løn
@@ -6796,7 +6803,7 @@
 DocType: POS Profile,Account for Change Amount,Konto for returbeløb
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Tilslutning til QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Total gevinst / tab
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Invalid Company for Inter Company Invoice.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Invalid Company for Inter Company Invoice.
 DocType: Purchase Invoice,input service,input service
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Række {0}: Party / Konto matcher ikke med {1} / {2} i {3} {4}
 DocType: Employee Promotion,Employee Promotion,Medarbejderfremmende
@@ -6926,7 +6933,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Foretrukne område for overnatning
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analyser
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Indkøbskurv er tom
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Indstil venligst instruktørens navngivningssystem under Uddannelse&gt; Uddannelsesindstillinger
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Vare {0} har ingen serienummer. Kun seriliserede artikler \ kan have levering baseret på serienummer
 DocType: Vehicle,Model,Model
@@ -6956,7 +6962,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Intet at ændre
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Vælg en CSV-fil
 DocType: Holiday List,Total Holidays,Samlede helligdage
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Manglende email skabelon til afsendelse. Indstil venligst en i Leveringsindstillinger.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Manglende email skabelon til afsendelse. Indstil venligst en i Leveringsindstillinger.
 DocType: Student Leave Application,Mark as Present,Markér som tilstede
 DocType: Supplier Scorecard,Indicator Color,Indikator Farve
 DocType: Purchase Order,To Receive and Bill,Til at modtage og Bill
@@ -6965,7 +6971,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Vælg serienummer
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Skabelon til vilkår og betingelser
-DocType: Serial No,Delivery Details,Levering Detaljer
+DocType: Delivery Trip,Delivery Details,Levering Detaljer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Omkostningssted kræves i række {0} i Skattetabellen for type {1}
 DocType: Program,Program Code,programkode
 DocType: Terms and Conditions,Terms and Conditions Help,Hjælp til vilkår og betingelser
@@ -6989,7 +6995,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time dage
 DocType: Cash Flow Mapping,Is Income Tax Expense,Er indkomstskat udgift
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Din ordre er ude for levering!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Række # {0}: Bogføringsdato skal være den samme som købsdatoen {1} af aktivet {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Række # {0}: Bogføringsdato skal være den samme som købsdatoen {1} af aktivet {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Tjek dette, hvis den studerende er bosiddende på instituttets Hostel."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Indtast salgsordrer i ovenstående tabel
 ,Stock Summary,Stock Summary
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index f3d9faf..932742c 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Zeitraumname
 DocType: Employee,Salary Mode,Gehaltsmodus
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Neu registrieren
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Neu registrieren
 DocType: Patient,Divorced,Geschieden
 DocType: Support Settings,Post Route Key,Postweg-Schlüssel
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Zulassen, dass ein Artikel mehrfach in einer Transaktion hinzugefügt werden kann"
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Neuer Wechselkurs
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Währung für Preisliste {0} erforderlich
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Wird in der Transaktion berechnet.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Lieferant&gt; Lieferantentyp
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Kundenkontakt
 DocType: Patient Appointment,Check availability,Verfügbarkeit prüfen
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,zeigen open
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Nummernkreise erfolgreich geändert
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Auschecken
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} in Zeile {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} in Zeile {1}
 DocType: Asset Finance Book,Depreciation Start Date,Startdatum der Abschreibung
 DocType: Pricing Rule,Apply On,Anwenden auf
 DocType: Item Price,Multiple Item prices.,Mehrere verschiedene Artikelpreise
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Labor Rezept
 ,Delay Days,Verzögerungstage
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Dienstzeitaufwand
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Seriennummer: {0} wird bereits in der Verkaufsrechnung referenziert: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Seriennummer: {0} wird bereits in der Verkaufsrechnung referenziert: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Rechnung
 DocType: Purchase Invoice Item,Item Weight Details,Artikel Gewicht Details
 DocType: Asset Maintenance Log,Periodicity,Häufigkeit
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Buchhalter
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Verkaufspreisliste
 DocType: Patient,Tobacco Current Use,Tabakstrom Verwendung
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Start- und Enddatum überschneiden sich mit der Jobkarte <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Verkaufsrate
 DocType: Cost Center,Stock User,Lager-Benutzer
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Zugehörig
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Die Teilnahme Datum kann nicht kleiner sein als Verbindungsdatum des Mitarbeiters
 DocType: Grading Scale,Grading Scale Name,Notenskala Namen
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Fügen Sie Nutzer zum Marktplatz hinzu
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Fügen Sie Nutzer zum Marktplatz hinzu
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Dies ist ein Root-Konto und kann nicht bearbeitet werden.
 DocType: Sales Invoice,Company Address,Firmenanschrift
 DocType: BOM,Operations,Arbeitsvorbereitung
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Menge
 DocType: Production Plan,Material Request Detail,Materialanforderungsdetail
 DocType: Selling Settings,Default Quotation Validity Days,Standard-Angebotsgültigkeitstage
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Um Steuern im Artikelpreis in Zeile {0} einzubeziehen, müssen Steuern in den Zeilen {1} ebenfalls einbezogen sein"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Um Steuern im Artikelpreis in Zeile {0} einzubeziehen, müssen Steuern in den Zeilen {1} ebenfalls einbezogen sein"
 DocType: SMS Center,SMS Center,SMS-Center
 DocType: Payroll Entry,Validate Attendance,Teilnahme bestätigen
 DocType: Sales Invoice,Change Amount,Anzahl ändern
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Zeilenabstand für Betrag in Worten
 DocType: Vehicle,Additional Details,Weitere Details
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Keine Beschreibung angegeben
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Lieferant&gt; Lieferantengruppe
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Lieferantenanfrage
 DocType: POS Closing Voucher Details,Collected Amount,Gesammelte Menge
 DocType: Lab Test,Submitted Date,Eingeschriebenes Datum
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,Studenten Eintritt
 ,Terretory,Region
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Artikel {0} wird storniert
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Abschreibungszeile {0}: Das Abschreibungsstartdatum wird als hinteres Datum eingegeben
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Abschreibungszeile {0}: Das Abschreibungsstartdatum wird als hinteres Datum eingegeben
 DocType: Contract Template,Fulfilment Terms and Conditions,Erfüllungsbedingungen
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Materialanfrage
 DocType: Bank Reconciliation,Update Clearance Date,Abwicklungsdatum aktualisieren
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,Konteneinstellungen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Lieferantenrechnung existiert in Kauf Rechnung {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Baumstruktur der Vertriebsmitarbeiter verwalten
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Route kann nicht verarbeitet werden, da Google Maps-Einstellungen deaktiviert ist."
 DocType: Job Applicant,Cover Letter,Motivationsschreiben
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Ausstehende Schecks und Anzahlungen zum verbuchen
 DocType: Item,Synced With Hub,Synchronisiert mit Hub
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Neuer Anlagenwert
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Kurs, zu dem die Kundenwährung in die Basiswährung des Kunden umgerechnet wird"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kursplanung Werkzeug
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Zeile Nr. {0}: Die Eingangsrechnung kann nicht für den bestehenden Vermögenswert {1} erstellt werden.
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Zeile Nr. {0}: Die Eingangsrechnung kann nicht für den bestehenden Vermögenswert {1} erstellt werden.
 DocType: Crop Cycle,LInked Analysis,Verknüpfte Analyse
 DocType: POS Closing Voucher,POS Closing Voucher,POS-Abschlussgutschein
 DocType: Contract,Lapsed,Überschritten
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} ist nicht im Kurs {2} eingeschrieben
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Name des Studenten:
 DocType: POS Closing Voucher Details,Difference,Unterschied
+DocType: Delivery Settings,Delay between Delivery Stops,Verzögerung zwischen Auslieferungsstopps
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Seriennummer {0} gehört nicht zu Lieferschein {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Es scheint ein Problem mit der GoCardless-Konfiguration des Servers zu geben. Keine Sorge, im Falle eines Fehlers wird der Betrag Ihrem Konto gutgeschrieben."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -693,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Menge und Preis
 DocType: Delivery Note,% Installed,% installiert
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Die Klassenräume / Laboratorien usw., wo Vorträge können geplant werden."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Firmenwährungen beider Unternehmen sollten für Inter Company-Transaktionen übereinstimmen.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Firmenwährungen beider Unternehmen sollten für Inter Company-Transaktionen übereinstimmen.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Bitte zuerst den Firmennamen angeben
 DocType: Travel Itinerary,Non-Vegetarian,Kein Vegetarier
 DocType: Purchase Invoice,Supplier Name,Lieferantenname
@@ -778,7 +779,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Vermietet von Datum
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Genug Teile zu bauen
 DocType: POS Profile User,POS Profile User,POS-Profilbenutzer
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Zeile {0}: Das Abschreibungsstartdatum ist erforderlich
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Zeile {0}: Das Abschreibungsstartdatum ist erforderlich
 DocType: Purchase Invoice Item,Service Start Date,Service Startdatum
 DocType: Subscription Invoice,Subscription Invoice,Abonnementrechnung
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Direkte Erträge
@@ -845,7 +846,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Abkürzung bereits für ein anderes Unternehmen verwendet
 DocType: Selling Settings,Default Customer Group,Standardkundengruppe
 DocType: Employee,IFSC Code,IFSC-Code
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Start- und Enddatum überschneiden sich mit der Jobkarte <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Wenn deaktiviert, wird das Feld ""Gerundeter Gesamtbetrag"" in keiner Transaktion angezeigt"
 DocType: BOM,Operating Cost,Betriebskosten
 DocType: Crop,Produced Items,Produzierte Artikel
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,Vermeidung von Ausschreibungen
 DocType: Hub User,Hub User,Hubbenutzer
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Kundenauftrag erstellen
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Gehaltszettel für Zeitraum von {0} bis {1} eingereicht
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Gehaltszettel für Zeitraum von {0} bis {1} eingereicht
 DocType: Project Task,Project Task,Projektvorgang
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Eingelöste Punkte
 ,Lead Id,Lead-ID
@@ -1027,7 +1027,7 @@
 DocType: Fee Validity,Max number of visit,Maximaler Besuch
 ,Hotel Room Occupancy,Hotelzimmerbelegung
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet erstellt:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},"Bitte Standardeinstellungen für Kassen- oder Bankkonto in ""Zahlungsart"" {0} setzen"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},"Bitte Standardeinstellungen für Kassen- oder Bankkonto in ""Zahlungsart"" {0} setzen"
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Einschreiben
 DocType: GST Settings,GST Settings,GST-Einstellungen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Die Währung sollte mit der Währung der Preisliste übereinstimmen: {0}
@@ -1081,7 +1081,7 @@
 DocType: Vehicle Log,Service Details,Service Details
 DocType: Lab Test Template,Grouped,Gruppiert
 DocType: Selling Settings,Delivery Note Required,Lieferschein erforderlich
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Lohnzettel einreichen ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Lohnzettel einreichen ...
 DocType: Bank Guarantee,Bank Guarantee Number,Bankgarantie Nummer
 DocType: Assessment Criteria,Assessment Criteria,Beurteilungskriterien
 DocType: BOM Item,Basic Rate (Company Currency),Grundpreis (Firmenwährung)
@@ -1106,13 +1106,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Payment Eintrag bereits erstellt
 DocType: Request for Quotation,Get Suppliers,Holen Sie sich Lieferanten
 DocType: Purchase Receipt Item Supplied,Current Stock,Aktueller Lagerbestand
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Zeile Nr. {0}: Vermögenswert {1} nicht mit Artikel {2} verknüpft
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Zeile Nr. {0}: Vermögenswert {1} nicht mit Artikel {2} verknüpft
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Vorschau Gehaltsabrechnung
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Konto {0} wurde mehrmals eingegeben
 DocType: Account,Expenses Included In Valuation,In der Bewertung enthaltene Aufwendungen
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,"Sie können nur verlängern, wenn Ihre Mitgliedschaft innerhalb von 30 Tagen abläuft"
 DocType: Shopping Cart Settings,Show Stock Availability,Bestandsverfügbarkeit anzeigen
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Legen Sie {0} in der Anlagekategorie {1} oder in der Firma {2} fest.
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Legen Sie {0} in der Anlagekategorie {1} oder in der Firma {2} fest.
 DocType: Location,Longitude,Längengrad
 ,Absent Student Report,Bericht: Abwesende Studenten
 DocType: Crop,Crop Spacing UOM,Crop-Abstand UOM
@@ -1184,7 +1184,7 @@
 DocType: Soil Texture,Sand,Sand
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Chance von
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Zeile {0}: {1} Für den Eintrag {2} benötigte Seriennummern. Du hast {3} zur Verfügung gestellt.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Zeile {0}: {1} Für den Eintrag {2} benötigte Seriennummern. Du hast {3} zur Verfügung gestellt.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Bitte wählen Sie eine Tabelle
 DocType: BOM,Website Specifications,Webseiten-Spezifikationen
 DocType: Special Test Items,Particulars,Einzelheiten
@@ -1295,7 +1295,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Artikel mit höherem Gewicht werden weiter oben angezeigt
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Labortests und Lebenszeichen
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Ausführlicher Kontenabgleich
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Zeile Nr. {0}: Vermögenswert {1} muss eingereicht werden
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Zeile Nr. {0}: Vermögenswert {1} muss eingereicht werden
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Kein Mitarbeiter gefunden
 DocType: Item,If subcontracted to a vendor,Wenn an einen Zulieferer untervergeben
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentengruppe ist bereits aktualisiert.
@@ -1349,7 +1349,6 @@
 DocType: Loyalty Program Collection,Tier Name,Tiername
 DocType: HR Settings,Enter retirement age in years,Geben Sie das Rentenalter in Jahren
 DocType: Crop,Target Warehouse,Eingangslager
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stellen Sie die Namensreihe für {0} über Setup&gt; Einstellungen&gt; Namensreihe ein
 DocType: Payroll Employee Detail,Payroll Employee Detail,Personalabrechnung Mitarbeiter Detail
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Bitte wählen Sie ein Lager aus
 DocType: Cheque Print Template,Starting location from left edge,Startposition vom linken Rand
@@ -1439,7 +1438,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Materialplanung für Unterbaugruppen
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Vertriebspartner und Territorium
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,Stückliste {0} muss aktiv sein
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Keine Artikel zur Übertragung verfügbar
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Keine Artikel zur Übertragung verfügbar
 DocType: Employee Boarding Activity,Activity Name,Aktivitätsname
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Ändern Sie das Veröffentlichungsdatum
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Die Fertigproduktmenge <b>{0}</b> und die Menge <b>{1}</b> dürfen nicht unterschiedlich sein
@@ -1666,6 +1665,7 @@
 DocType: Project,First Email,Erste E-Mail
 DocType: Company,Exception Budget Approver Role,Ausnahmegenehmigerrolle
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Einmal eingestellt, wird diese Rechnung bis zum festgelegten Datum gehalten"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Lager im Kundenauftrag reserviert / Fertigwarenlager
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Verkaufsbetrag
 DocType: Repayment Schedule,Interest Amount,Zinsbetrag
@@ -1677,7 +1677,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Aufzeichnungen
 DocType: Asset,Scrapped,Entsorgt
 DocType: Item,Item Defaults,Artikelvorgaben
-DocType: Purchase Invoice,Returns,Retouren
+DocType: Cashier Closing,Returns,Retouren
 DocType: Job Card,WIP Warehouse,Fertigungslager
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Seriennummer {0} ist mit Wartungsvertrag versehen bis {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,Rekrutierung
@@ -1691,7 +1691,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Übertragungsart
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Vertriebskosten
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundengruppe&gt; Gebiet
 DocType: Diagnosis,Diagnosis,Diagnose
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standard-Kauf
 DocType: Attendance Request,Explanation,Erklärung
@@ -1704,7 +1703,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Bestellungen überfällig
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Postleitzahl
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Kundenauftrag {0} ist {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Wählen Sie das Zinsertragskonto im Darlehen {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Wählen Sie das Zinsertragskonto im Darlehen {0}
 DocType: Opportunity,Contact Info,Kontakt-Information
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Lagerbuchungen erstellen
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Mitarbeiter mit Status &quot;Links&quot; kann nicht gefördert werden
@@ -1716,7 +1715,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Die Rechnung kann nicht für die Null-Rechnungsstunde erstellt werden
 DocType: Company,Date of Commencement,Anfangsdatum
 DocType: Sales Person,Select company name first.,Zuerst den Firmennamen auswählen.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},E-Mail an {0} gesendet
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},E-Mail an {0} gesendet
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Angebote von Lieferanten
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Ersetzen Sie die Stückliste und aktualisieren Sie den aktuellen Preis in allen Stücklisten
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},An {0} | {1} {2}
@@ -1736,7 +1735,7 @@
 DocType: Asset Movement,From Employee,Von Mitarbeiter
 DocType: Driver,Cellphone Number,Handynummer
 DocType: Project,Monitor Progress,Überwachung der Fortschritte
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Achtung: Das System erkennt keine überhöhten Rechnungen, da der Betrag für Artikel {0} in {1} gleich Null ist"
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Achtung: Das System erkennt keine überhöhten Rechnungen, da der Betrag für Artikel {0} in {1} gleich Null ist"
 DocType: Journal Entry,Make Difference Entry,Differenzbuchung erstellen
 DocType: Supplier Quotation,Auto Repeat Section,Automatischer Wiederholungsabschnitt
 DocType: Upload Attendance,Attendance From Date,Anwesenheit von Datum
@@ -1839,7 +1838,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Zeile #{0}: Abgelehnte Menge kann nicht in Kaufrückgabe eingegeben werden
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Die Änderung der Kundengruppe für den ausgewählten Kunden ist nicht zulässig.
 ,Purchase Order Items To Be Billed,"Bei Lieferanten bestellte Artikel, die noch abgerechnet werden müssen"
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Aktualisierung der geschätzten Ankunftszeiten
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Aktualisierung der geschätzten Ankunftszeiten
 DocType: Program Enrollment Tool,Enrollment Details,Anmeldedetails
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Es können nicht mehrere Artikelstandards für ein Unternehmen festgelegt werden.
 DocType: Purchase Invoice Item,Net Rate,Nettopreis
@@ -1853,7 +1852,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Urlaubsart ist Pflicht
 DocType: Support Settings,Close Issue After Days,Vorfall schließen nach
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Sie müssen ein Benutzer mit System Manager- und Element-Manager-Rollen sein, um Benutzer zu Marketplace hinzuzufügen."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Sie müssen ein Benutzer mit System Manager- und Element-Manager-Rollen sein, um Benutzer zu Marketplace hinzuzufügen."
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Freilassen, wenn für alle Filialen gültig"
 DocType: Job Opening,Staffing Plan,Personalplanung
 DocType: Bank Guarantee,Validity in Days,Gültigkeit in Tagen
@@ -1873,7 +1872,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Dupliziere Zeile {0} mit demselben {1}
 DocType: Marketplace Settings,Disable Marketplace,Deaktivieren Sie den Marktplatz
 ,Trial Balance,Probebilanz
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Das Geschäftsjahr {0} nicht gefunden
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Das Geschäftsjahr {0} nicht gefunden
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Mitarbeiter anlegen
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotelreservierung Benutzer
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Bitte zuerst Präfix auswählen
@@ -1981,7 +1980,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Einloggen fehlgeschlagen
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Anlage {0} erstellt
 DocType: Special Test Items,Special Test Items,Spezielle Testartikel
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Sie müssen ein Benutzer mit System Manager- und Element-Manager-Rollen sein, um sich auf Marketplace registrieren zu können."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Sie müssen ein Benutzer mit System Manager- und Element-Manager-Rollen sein, um sich auf Marketplace registrieren zu können."
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Zahlungsweise
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Gemäß Ihrer zugewiesenen Gehaltsstruktur können Sie keine Leistungen beantragen
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Das Webseiten-Bild sollte eine öffentliche Datei oder eine Webseiten-URL sein
@@ -1993,7 +1992,7 @@
 DocType: Warehouse,Warehouse Contact Info,Kontaktinformation des Lager
 DocType: Payment Entry,Write Off Difference Amount,Differenzbetrag Abschreibung
 DocType: Volunteer,Volunteer Name,Freiwilliger Name
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Zeilen mit doppelten Fälligkeitsdaten in anderen Zeilen wurden gefunden: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Zeilen mit doppelten Fälligkeitsdaten in anderen Zeilen wurden gefunden: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: Mitarbeiter E-Mail nicht gefunden, E-Mail daher nicht gesendet"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Keine Gehaltsstruktur für Mitarbeiter {0} am angegebenen Datum {1} zugewiesen
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Versandregel gilt nicht für Land {0}
@@ -2082,6 +2081,7 @@
 DocType: Salary Component,Earning,Einkommen
 DocType: Supplier Scorecard,Scoring Criteria,Bewertungskriterien
 DocType: Purchase Invoice,Party Account Currency,Gruppenkonten-Währung
+DocType: Delivery Trip,Total Estimated Distance,Geschätzte Gesamtstrecke
 ,BOM Browser,Stücklisten-Browser
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Bitte aktualisieren Sie Ihren Status für diese Trainingsveranstaltung
 DocType: Item Barcode,EAN,EAN
@@ -2120,7 +2120,7 @@
 DocType: Activity Cost,Projects,Projekte
 DocType: Payment Request,Transaction Currency,Transaktionswährung
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Von {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Einige E-Mails sind ungültig
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Einige E-Mails sind ungültig
 DocType: Work Order Operation,Operation Description,Vorgangsbeschreibung
 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.,"Start- und Schlußdatum des Geschäftsjahres können nicht geändert werden, wenn das Geschäftsjahr gespeichert wurde."
 DocType: Quotation,Shopping Cart,Warenkorb
@@ -2144,7 +2144,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Nettoveränderung des Anlagevermögens
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Erforderliche Menge
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Freilassen, wenn für alle Einstufungen gültig"
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Kosten für den Typ ""real"" in Zeile {0} können nicht in den Artikelpreis mit eingeschlossen werden"
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Kosten für den Typ ""real"" in Zeile {0} können nicht in den Artikelpreis mit eingeschlossen werden"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Von Datum und Uhrzeit
 DocType: Shopify Settings,For Company,Für Firma
@@ -2158,7 +2158,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Beim Erstellen des Kursplans sind Fehler aufgetreten
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Der erste Ausgabengenehmiger in der Liste wird als standardmäßiger Ausgabengenehmiger festgelegt.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,Kann nicht größer als 100 sein
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Sie müssen ein anderer Benutzer als Administrator mit System Manager- und Element-Manager-Rollen sein, um sich auf Marketplace registrieren zu können."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Sie müssen ein anderer Benutzer als Administrator mit System Manager- und Element-Manager-Rollen sein, um sich auf Marketplace registrieren zu können."
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Artikel {0} ist kein Lagerartikel
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Außerplanmäßig
@@ -2187,7 +2187,7 @@
 DocType: HR Settings,Employee Settings,Mitarbeitereinstellungen
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Zahlungssystem wird geladen
 ,Batch-Wise Balance History,Chargenbezogener Bestandsverlauf
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Zeilennr. {0}: Die Rate kann nicht festgelegt werden, wenn der Betrag für Artikel {1} höher als der Rechnungsbetrag ist."
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Zeilennr. {0}: Die Rate kann nicht festgelegt werden, wenn der Betrag für Artikel {1} höher als der Rechnungsbetrag ist."
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Die Druckeinstellungen im jeweiligen Druckformat aktualisiert
 DocType: Package Code,Package Code,Paketnummer
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Auszubildende(r)
@@ -2420,7 +2420,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} offene Stellen und {1} Budget für {2} bereits geplant für Tochtergesellschaften von {3}. Sie können nur bis zu {4} freie Stellen und Budget {5} gemäß Personalplan {6} für die Muttergesellschaft {3} einplanen.
 DocType: HR Settings,Stop Birthday Reminders,Geburtstagserinnerungen ausschalten
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Bitte setzen Sie das Standardkonto für Verbindlichkeiten aus Lohn und Gehalt in Gesellschaft {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Bitte setzen Sie das Standardkonto für Verbindlichkeiten aus Lohn und Gehalt in Gesellschaft {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Erhalten Sie finanzielle Trennung von Steuern und Gebühren Daten von Amazon
 DocType: SMS Center,Receiver List,Empfängerliste
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Suche Artikel
@@ -2490,7 +2490,7 @@
 DocType: Vital Signs,Constipated,Verstopft
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Zu Eingangsrechnung {0} vom {1}
 DocType: Customer,Default Price List,Standardpreisliste
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Asset-Bewegung Datensatz {0} erstellt
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Asset-Bewegung Datensatz {0} erstellt
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Keine Elemente gefunden.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Sie können das Geschäftsjahr {0} nicht löschen. Das Geschäftsjahr {0} ist als Standard in den globalen Einstellungen festgelegt
 DocType: Share Transfer,Equity/Liability Account,Eigenkapital / Verbindlichkeitskonto
@@ -2627,6 +2627,7 @@
 DocType: Blanket Order,Order Type,Bestellart
 ,Item-wise Sales Register,Artikelbezogene Übersicht der Verkäufe
 DocType: Asset,Gross Purchase Amount,Bruttokaufbetrag
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgruppe&gt; Marke
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Eröffnungssalden
 DocType: Asset,Depreciation Method,Abschreibungsmethode
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ist diese Steuer im Basispreis enthalten?
@@ -2707,7 +2708,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,"Aktion, wenn das Jahresbudget für die Bestellung überschritten wurde"
 DocType: Student Leave Application,Student Leave Application,Student Urlaubsantrag
 DocType: Item,Will also apply for variants,Gilt auch für Varianten
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Vermögen kann nicht rückgängig gemacht werden, da es ohnehin schon {0} ist"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Vermögen kann nicht rückgängig gemacht werden, da es ohnehin schon {0} ist"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Mitarbeiter {0} am {1} nur halbtags anwesend
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Insgesamt Arbeitszeit sollte nicht größer sein als die maximale Arbeitszeit {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Am
@@ -2731,6 +2732,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Daten abrufen
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Der maximal zulässige Urlaub im Urlaubstyp {0} ist {1}
 DocType: SMS Center,Create Receiver List,Empfängerliste erstellen
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Das für die Verwendung verfügbare Datum sollte nach dem Kaufdatum liegen
 DocType: Vehicle,Wheels,Räder
 DocType: Packing Slip,To Package No.,Bis Paket Nr.
 DocType: Patient Relation,Family,Familie
@@ -2744,7 +2746,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Die Abrechnungswährung muss entweder der Währung der Standardfirma oder der Währung des Partnerkontos entsprechen
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Zeigt an, dass das Paket ein Teil dieser Lieferung ist (nur Entwurf)"
 DocType: Soil Texture,Loam,Lehm
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Zeile {0}: Fälligkeitsdatum darf nicht vor dem Buchungsdatum liegen
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Zeile {0}: Fälligkeitsdatum darf nicht vor dem Buchungsdatum liegen
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Zahlungsbuchung erstellen
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Menge für Artikel {0} muss kleiner sein als {1}
 ,Sales Invoice Trends,Ausgangsrechnung-Trendanalyse
@@ -2816,7 +2818,7 @@
 DocType: Guardian,Guardian Interests,Wächter Interessen
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Aktualisiere Kontoname / Nummer
 DocType: Naming Series,Current Value,Aktueller Wert
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Mehrere Geschäftsjahre existieren für das Datum {0}. Bitte setzen Unternehmen im Geschäftsjahr
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Mehrere Geschäftsjahre existieren für das Datum {0}. Bitte setzen Unternehmen im Geschäftsjahr
 DocType: Education Settings,Instructor Records to be created by,Instructor Records werden erstellt von
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} erstellt
 DocType: GST Account,GST Account,GST Konto
@@ -2833,7 +2835,7 @@
 DocType: Sales Person,Name and Employee ID,Name und Mitarbeiter-ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Fälligkeitsdatum kann nicht vor dem Buchungsdatum liegen
 DocType: Website Item Group,Website Item Group,Webseiten-Artikelgruppe
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Es wurde kein Lohnzettel für die oben ausgewählten Kriterien oder den bereits eingereichten Gehaltsbeleg gefunden
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Es wurde kein Lohnzettel für die oben ausgewählten Kriterien oder den bereits eingereichten Gehaltsbeleg gefunden
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Zölle und Steuern
 DocType: Projects Settings,Projects Settings,Projekteinstellungen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Bitte den Stichtag eingeben
@@ -2842,7 +2844,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Gelieferte Anzahl
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Materialanfrageartikel
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Bitte stornieren Sie zuerst den Kaufbeleg {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Bitte stornieren Sie zuerst den Kaufbeleg {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Artikelgruppenstruktur
 DocType: Production Plan,Total Produced Qty,Gesamtproduktionsmenge
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,"Für diese Berechnungsart kann keine Zeilennummern zugeschrieben werden, die größer oder gleich der aktuellen Zeilennummer ist"
@@ -2951,6 +2953,7 @@
 ,Vehicle Expenses,Fahrzeugkosten
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Lab-Test (e) auf Verkaufsrechnung erstellen erstellen
 DocType: Serial No,Invoice Details,Rechnungs-Details
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,"Aktivieren Sie die Google Maps-Einstellungen, um Routen zu schätzen und zu optimieren"
 DocType: Grant Application,Show on Website,Auf der Website anzeigen
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Beginnen am
 DocType: Hub Tracked Item,Hub Category,Hub-Kategorie
@@ -2990,7 +2993,7 @@
 DocType: Inpatient Record,B Positive,B Positiv
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Maximaler Vorteil von Mitarbeiter {0} übersteigt {1} um die Summe {2} des zuvor beanspruchten Betrags
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Zeile Nr. {0}: Menge muss 1 sein, da das Element Anlagevermögen ist. Bitte verwenden Sie eine separate Zeile für mehrere Einträge."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Zeile Nr. {0}: Menge muss 1 sein, da das Element Anlagevermögen ist. Bitte verwenden Sie eine separate Zeile für mehrere Einträge."
 DocType: Leave Block List Allow,Leave Block List Allow,Urlaubssperrenliste zulassen
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,"""Abbr"" kann nicht leer oder Space sein"
 DocType: Patient Medical Record,Patient Medical Record,Patient Medizinische Aufzeichnung
@@ -3024,7 +3027,7 @@
 DocType: Workstation,Wages per hour,Lohn pro Stunde
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Lagerbestand in Charge {0} wird für Artikel {2} im Lager {3} negativ {1}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Folgende Materialanfragen wurden automatisch auf der Grundlage der Nachbestellmenge des Artikels generiert
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Konto {0} ist ungültig. Kontenwährung muss {1} sein
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Konto {0} ist ungültig. Kontenwährung muss {1} sein
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Ab Datum {0} kann nicht nach dem Entlastungsdatum des Mitarbeiters sein {1}
 DocType: Supplier,Is Internal Supplier,Ist interner Lieferant
 DocType: Employee,Create User Permission,Erstellen Sie Benutzerberechtigungen
@@ -3168,7 +3171,7 @@
 DocType: Account,Fixed Asset,Anlagevermögen
 DocType: Amazon MWS Settings,After Date,Nach dem Datum
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Serialisierter Lagerbestand
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Ungültige {0} für Inter-Company-Rechnung
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Ungültige {0} für Inter-Company-Rechnung
 ,Department Analytics,Abteilung Analytics
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-Mail nicht im Standardkontakt gefunden
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Geheimnis erzeugen
@@ -3180,7 +3183,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Das Programm in der Gebührenstruktur und die Studentengruppe {0} unterscheiden sich.
 DocType: Bank Statement Transaction Entry,Receivable Account,Forderungskonto
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Gültig ab Datum muss kleiner sein als Gültig bis Datum.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Zeile Nr. {0}: Vermögenswert {1} ist bereits {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Zeile Nr. {0}: Vermögenswert {1} ist bereits {2}
 DocType: Quotation Item,Stock Balance,Lagerbestand
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Vom Kundenauftrag zum Zahlungseinang
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,CEO
@@ -3222,6 +3225,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Debit Um erforderlich
 DocType: Clinical Procedure,Inpatient Record,Stationäre Aufnahme
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Zeiterfassungen helfen den Überblick über Zeit, Kosten und Abrechnung für Aktivitäten von Ihrem Team getan"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Lieferant&gt; Lieferantentyp
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Einkaufspreisliste
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Datum der Transaktion
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Vorlagen der Lieferanten-Scorecard-Variablen.
@@ -3264,7 +3268,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Exchange-Gewinn / Verlust
 DocType: Opportunity,Lost Reason,Verlustgrund
 DocType: Amazon MWS Settings,Enable Amazon,Aktivieren Sie Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Zeile # {0}: Konto {1} gehört nicht zur Firma {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Zeile # {0}: Konto {1} gehört nicht zur Firma {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Kann DocType {0} nicht finden
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Neue Adresse
 DocType: Quality Inspection,Sample Size,Stichprobenumfang
@@ -3375,7 +3379,7 @@
 DocType: Water Analysis,Origin,Ursprung
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dieses Dokument ist über dem Limit von {0} {1} für item {4}. Machen Sie eine andere {3} gegen die gleiche {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Bitte setzen Sie wiederkehrende nach dem Speichern
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Wählen Sie Änderungsbetrag Konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Wählen Sie Änderungsbetrag Konto
 DocType: Purchase Invoice,Price List Currency,Preislistenwährung
 DocType: Naming Series,User must always select,Benutzer muss immer auswählen
 DocType: Stock Settings,Allow Negative Stock,Negativen Lagerbestand zulassen
@@ -3417,7 +3421,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,"Sind Sie sicher, dass Sie diesen Termin absagen möchten?"
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Preisangebot für das Hotelzimmer
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Vertriebspipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Bitte setzen Sie Standardkonto in Gehaltskomponente {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Bitte setzen Sie Standardkonto in Gehaltskomponente {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Benötigt am
 DocType: Rename Tool,File to Rename,"Datei, die umbenannt werden soll"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Bitte wählen Sie Stückliste für Artikel in Zeile {0}
@@ -3438,7 +3442,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Aufwendungen für bezogene Artikel
 DocType: Employee Separation,Employee Separation Template,Mitarbeiter Trennvorlage
 DocType: Selling Settings,Sales Order Required,Kundenauftrag erforderlich
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Werden Sie ein Verkäufer
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Werden Sie ein Verkäufer
 DocType: Purchase Invoice,Credit To,Gutschreiben auf
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Aktive Leads / Kunden
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,"Leer lassen, um das Standard-Lieferscheinformat zu verwenden"
@@ -3479,7 +3483,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Steuervorlage erstellen
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Benutzer-Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Rohmaterial kann nicht leer sein
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Zeilennr. {0} (Zahlungstabelle): Betrag muss negativ sein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Zeilennr. {0} (Zahlungstabelle): Betrag muss negativ sein
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Lager konnte nicht aktualisiert werden, Rechnung enthält Direktversand-Artikel."
 DocType: Contract,Fulfilment Status,Erfüllungsstatus
 DocType: Lab Test Sample,Lab Test Sample,Labortestprobe
@@ -3638,7 +3642,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Dokumenten Datum
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Gebühren-Aufzeichnungen erstellt - {0}
 DocType: Asset Category Account,Asset Category Account,Anlagekategorie Konto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Zeile # {0} (Zahlungstabelle): Betrag muss positiv sein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Zeile # {0} (Zahlungstabelle): Betrag muss positiv sein
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},"Es können nicht mehr Artikel {0} produziert werden, als die über Kundenaufträge bestellte Stückzahl {1}"
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Wählen Sie Attributwerte
 DocType: Purchase Invoice,Reason For Issuing document,Grund für das ausstellende Dokument
@@ -3693,7 +3697,7 @@
 DocType: Purchase Receipt,Time at which materials were received,"Zeitpunkt, zu dem Materialien empfangen wurden"
 DocType: Products Settings,Products per Page,Produkte pro Seite
 DocType: Stock Ledger Entry,Outgoing Rate,Verkaufspreis
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,oder
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,oder
 DocType: Sales Order,Billing Status,Abrechnungsstatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Einen Fall melden
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Versorgungsaufwendungen
@@ -3720,7 +3724,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Steuererklärung für Arbeitnehmer
 DocType: Payment Entry,Cheque/Reference Date,Scheck-/ Referenzdatum
 DocType: Purchase Invoice,Total Taxes and Charges,Gesamte Steuern und Gebühren
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Das Datum der Verwendung zum Gebrauch wird als vergangenes Datum eingegeben
 DocType: Employee,Emergency Contact,Notfallkontakt
 DocType: Bank Reconciliation Detail,Payment Entry,Zahlung
 ,sales-browser,Umsatz-Browser
@@ -3766,6 +3769,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),ist Rücklieferung (Gutschrift)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Job starten
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Für Vermögenswert {0} ist eine Seriennr. Erforderlich.
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stellen Sie die Namensreihe für {0} über Setup&gt; Einstellungen&gt; Namensreihe ein
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Deaktivierte Vorlage darf nicht Standardvorlage sein
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Für Zeile {0}: Geben Sie die geplante Menge ein
 DocType: Account,Income Account,Ertragskonto
@@ -3779,6 +3783,7 @@
 DocType: Loyalty Program,Help Section,Hilfe Abschnitt
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Vorherige
 DocType: Appraisal Goal,Key Responsibility Area,Entscheidender Verantwortungsbereich
+DocType: Delivery Trip,Distance UOM,Abstand UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Studenten Batches helfen Ihnen die Teilnahme, Einschätzungen und Gebühren für Studenten verfolgen"
 DocType: Payment Entry,Total Allocated Amount,Insgesamt zugewiesener Betrag
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Inventurkonto für permanente Inventur auswählen
@@ -3820,7 +3825,7 @@
 DocType: Item Supplier,Item Supplier,Artikellieferant
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Bitte die Artikelnummer eingeben um die Chargennummer zu erhalten
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Bitte einen Wert für {0} Angebot an {1} auswählen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Keine Elemente für die Übertragung ausgewählt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Keine Elemente für die Übertragung ausgewählt
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alle Adressen
 DocType: Company,Stock Settings,Lager-Einstellungen
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Zusammenführung ist nur möglich, wenn folgende Eigenschaften in beiden Datensätzen identisch sind:  Gruppe, Root-Typ, Firma"
@@ -4117,7 +4122,7 @@
 DocType: Patient,Personal and Social History,Persönliche und gesellschaftliche Geschichte
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Benutzer {0} erstellt
 DocType: Fee Schedule,Fee Breakup for each student,Fee Breakup für jeden Schüler
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Insgesamt Voraus ({0}) gegen Bestellen {1} kann nicht größer sein als die Gesamtsumme ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Insgesamt Voraus ({0}) gegen Bestellen {1} kann nicht größer sein als die Gesamtsumme ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,"Bitte ""Monatsweise Verteilung"" wählen, um Ziele ungleichmäßig über Monate zu verteilen."
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Code ändern
 DocType: Purchase Invoice Item,Valuation Rate,Wertansatz
@@ -4126,7 +4131,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Erreichte ITC Cess
 ,Student Monthly Attendance Sheet,Schülermonatsanwesenheits
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Versandregel gilt nur für den Verkauf
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Abschreibungszeile {0}: Das nächste Abschreibungsdatum darf nicht vor dem Kaufdatum liegen
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Abschreibungszeile {0}: Das nächste Abschreibungsdatum darf nicht vor dem Kaufdatum liegen
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Startdatum des Projekts
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Bis
 DocType: Rename Tool,Rename Log,Protokoll umbenennen
@@ -4143,12 +4148,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Wie oft sollten Projekt und Unternehmen basierend auf Verkaufstransaktionen aktualisiert werden?
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Verfällt am
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Schüler hinzufügen
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Bitte löschen Sie den Mitarbeiter <a href=""#Form/Employee/{0}"">{0}</a> \, um dieses Dokument abzubrechen"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Bitte {0} auswählen
 DocType: C-Form,C-Form No,Kontakt-Formular-Nr.
 DocType: BOM,Exploded_items,Aufgelöste Artikel
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Entfernung
+DocType: Delivery Stop,Distance,Entfernung
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Liste Ihrer Produkte oder Dienstleistungen, die Sie kaufen oder verkaufen."
 DocType: Water Analysis,Storage Temperature,Lagertemperatur
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4175,7 +4178,7 @@
 DocType: Homepage,Company Description for website homepage,Firmen-Beschreibung für Internet-Homepage
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Zum Vorteil für die Kunden, können diese Kodes in Druckformaten wie Rechnungen und Lieferscheinen verwendet werden"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Namen
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Informationen für {0} konnten nicht abgerufen werden.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Informationen für {0} konnten nicht abgerufen werden.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Eröffnungseintragsjournal
 DocType: Contract,Fulfilment Terms,Erfüllungsbedingungen
 DocType: Sales Invoice,Time Sheet List,Zeitblatt Liste
@@ -4355,7 +4358,7 @@
 DocType: Serial No,Warranty / AMC Details,Details der Garantie / des jährlichen Wartungsvertrags
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Wählen Sie die Schüler manuell für die aktivitätsbasierte Gruppe aus
 DocType: Journal Entry,User Remark,Benutzerbemerkung
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Routen optimieren
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Routen optimieren
 DocType: Travel Itinerary,Non Diary,Nicht Tagebuch
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Der Retentionsbonus für linke Mitarbeiter kann nicht erstellt werden
 DocType: Lead,Market Segment,Marktsegment
@@ -4385,7 +4388,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Treueprogramm
 DocType: Student Guardian,Father,Vater
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Support-Tickets
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,Beim Verkauf von Anlagevermögen darf 'Lagerbestand aktualisieren' nicht ausgewählt sein.
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,Beim Verkauf von Anlagevermögen darf 'Lagerbestand aktualisieren' nicht ausgewählt sein.
 DocType: Bank Reconciliation,Bank Reconciliation,Kontenabgleich
 DocType: Attendance,On Leave,Im Urlaub
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Updates abholen
@@ -4430,7 +4433,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Seriennummer und Chargen
 DocType: Warranty Claim,From Company,Von Firma
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Die Summe der Ergebnisse von Bewertungskriterien muss {0} sein.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Bitte setzen Sie Anzahl der Abschreibungen gebucht
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Bitte setzen Sie Anzahl der Abschreibungen gebucht
 DocType: Supplier Scorecard Period,Calculations,Berechnungen
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Wert oder Menge
 DocType: Payment Terms Template,Payment Terms,Zahlungsbedingungen
@@ -4449,7 +4452,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Rabatt (%) auf Preisliste Rate mit Margin
 DocType: Healthcare Service Unit Type,Rate / UOM,Rate / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Alle Lagerhäuser
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Keine {0} für Inter-Company-Transaktionen gefunden.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Keine {0} für Inter-Company-Transaktionen gefunden.
 DocType: Travel Itinerary,Rented Car,Gemietetes Auto
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Über Ihre Firma
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Habenkonto muss ein Bilanzkonto sein
@@ -4550,6 +4553,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Anlagenanalysekriterien
 DocType: Cheque Print Template,Cheque Height,Scheck Höhe
 DocType: Supplier,Supplier Details,Lieferantendetails
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Richten Sie die Nummerierungsserie für Anwesenheit über Setup&gt; Nummerierungsserie ein
 DocType: Setup Progress,Setup Progress,Setup Fortschritt
 DocType: Expense Claim,Approval Status,Genehmigungsstatus
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Von-Wert muss weniger sein als Bis-Wert in Zeile {0}
@@ -4642,7 +4646,6 @@
 DocType: Travel Request,Fully Sponsored,Vollständig gesponsert
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Journaleintrag umkehren
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Kunde {0} wird erstellt.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Bitte richten Sie das Personalbenennungssystem in Personalwesen&gt; HR-Einstellungen ein
 DocType: Stock Settings,Limit Percent,Limit-Prozent
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Derzeit ist kein Bestand in einem Lager verfügbar
 ,Payment Period Based On Invoice Date,Zahlungszeitraum basierend auf Rechnungsdatum
@@ -4701,7 +4704,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Ausgangslager
 DocType: Installation Note,Installation Date,Datum der Installation
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Aktienbuch
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Zeile Nr. {0}: Vermögenswert {1} gehört nicht zum Unternehmen {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Zeile Nr. {0}: Vermögenswert {1} gehört nicht zum Unternehmen {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Verkaufsrechnung {0} erstellt
 DocType: Employee,Confirmation Date,Datum bestätigen
 DocType: Inpatient Occupancy,Check Out,Auschecken
@@ -4721,6 +4724,7 @@
 DocType: Production Plan,Sales Orders Detail,Kundenauftragsdetails
 DocType: Bin,Requested Quantity,die angeforderte Menge
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Bitte richten Sie das Instructor Naming System in Education&gt; Education Settings ein
 DocType: Patient,Marital Status,Familienstand
 DocType: Stock Settings,Auto Material Request,Automatische Materialanfrage
 DocType: Woocommerce Settings,API consumer secret,API-Konsumentengeheimnis
@@ -4773,7 +4777,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Wählen Sie Tage
 DocType: Academic Term,Term Name,Semesterbezeichnung
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Guthaben ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Lohnzettel erstellen ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Lohnzettel erstellen ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Sie können den Stammknoten nicht bearbeiten.
 DocType: Buying Settings,Purchase Order Required,Lieferantenauftrag erforderlich
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Timer
@@ -4809,7 +4813,7 @@
 DocType: Account,Rate at which this tax is applied,"Kurs, zu dem dieser Steuersatz angewandt wird"
 DocType: Cash Flow Mapper,Section Name,Abteilungsname
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Nachbestellmenge
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Abschreibungszeile {0}: Der erwartete Wert nach der Nutzungsdauer muss größer oder gleich {1} sein
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Abschreibungszeile {0}: Der erwartete Wert nach der Nutzungsdauer muss größer oder gleich {1} sein
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Aktuelle Stellenangebote
 DocType: Company,Stock Adjustment Account,Bestandskorrektur-Konto
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Abschreiben
@@ -4856,7 +4860,7 @@
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Außerhalb des jährlichen Wartungsvertrags
 DocType: Opportunity,Opportunity Amount,Betrag der Chance
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Anzahl der Abschreibungen gebucht kann nicht größer sein als Gesamtzahl der abschreibungen
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Anzahl der Abschreibungen gebucht kann nicht größer sein als Gesamtzahl der abschreibungen
 DocType: Purchase Order,Order Confirmation Date,Auftragsbestätigungsdatum
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Wartungsbesuch erstellen
@@ -4897,7 +4901,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Stapel:
 DocType: Volunteer,Afternoon,Nachmittag
 DocType: Loyalty Program,Loyalty Program Help,Treueprogramm Hilfe
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' ist deaktiviert
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' ist deaktiviert
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,"Als ""geöffnet"" markieren"
 DocType: Cheque Print Template,Scanned Cheque,Gescannte Scheck
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Beim Ausführen von Transaktionen automatisch E-Mails an Kontakte senden.
@@ -4910,7 +4914,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Einzelheiten Artikel und Garantie
 DocType: Chapter,Chapter Members,Gruppen-Mitglieder
 DocType: Sales Team,Contribution (%),Beitrag (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Hinweis: Zahlungsbuchung wird nicht erstellt, da kein ""Kassen- oder Bankkonto"" angegeben wurde"
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Hinweis: Zahlungsbuchung wird nicht erstellt, da kein ""Kassen- oder Bankkonto"" angegeben wurde"
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Projekt {0} existiert bereits
 DocType: Clinical Procedure,Nursing User,Krankenpfleger
 DocType: Employee Benefit Application,Payroll Period,Abrechnungsperiode
@@ -4918,6 +4922,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Seriennr. {0} gehört nicht zu Batch {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Verantwortung
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Gültigkeitszeitraum dieses Angebots ist beendet.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Bitte löschen Sie den Mitarbeiter <a href=""#Form/Employee/{0}"">{0}</a> \, um dieses Dokument abzubrechen"
 DocType: Expense Claim Account,Expense Claim Account,Kostenabrechnung Konto
 DocType: Account,Capital Work in Progress,Capital Work in Progress
 DocType: Accounts Settings,Allow Stale Exchange Rates,Alte Wechselkurse zulassen
@@ -4998,7 +5004,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Material ausgeben
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Verbinden Sie Shopify mit ERPNext
 DocType: Material Request Item,For Warehouse,Für Lager
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Lieferhinweise {0} aktualisiert
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Lieferhinweise {0} aktualisiert
 DocType: Employee,Offer Date,Angebotsdatum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Angebote
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,"Sie befinden sich im Offline-Modus. Aktualisieren ist nicht möglich, bis Sie wieder online sind."
@@ -5048,7 +5054,7 @@
 DocType: Shipping Rule,Calculate Based On,Berechnen auf Grundlage von
 DocType: Contract,Unfulfilled,Unerfüllt
 DocType: Delivery Note Item,From Warehouse,Ab Lager
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Keine Mitarbeiter für die genannten Kriterien
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Keine Mitarbeiter für die genannten Kriterien
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Keine Elemente mit Bill of Materials zu Herstellung
 DocType: Shopify Settings,Default Customer,Standardkunde
 DocType: Sales Stage,Stage Name,Künstlername
@@ -5090,7 +5096,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Steuerbetrag nach Abzug von Rabatt
 DocType: Patient,Inpatient Status,Stationärer Status
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,tägliche Arbeitszusammenfassung-Einstellungen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Die ausgewählte Preisliste sollte die Kauf- und Verkaufsfelder überprüft haben.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Die ausgewählte Preisliste sollte die Kauf- und Verkaufsfelder überprüft haben.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Bitte geben Sie Requd by Date ein
 DocType: Payment Entry,Internal Transfer,Interner Transfer
 DocType: Asset Maintenance,Maintenance Tasks,Wartungsaufgaben
@@ -5126,7 +5132,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Gruppieren nach
 DocType: Guardian,Interests,Interessen
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Aktivieren / Deaktivieren der Währungen
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Es konnten keine Gehaltsabrechnungen eingereicht werden
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Es konnten keine Gehaltsabrechnungen eingereicht werden
 DocType: Exchange Rate Revaluation,Get Entries,Einträge erhalten
 DocType: Production Plan,Get Material Request,Get-Material anfordern
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Portoaufwendungen
@@ -5191,7 +5197,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py +89,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} zeigt an, dass {1} kein Angebot anbieten wird, aber alle Items wurden zitiert. Aktualisieren des RFQ-Angebotsstatus."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1290,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,Maximum Samples - {0} wurden bereits für Batch {1} und Artikel {2} in Batch {3} gespeichert.
-DocType: Manufacturing Settings,Update BOM Cost Automatically,Aktualisieren Sie die Stücklistenkosten automatisch
+DocType: Manufacturing Settings,Update BOM Cost Automatically,Stücklisten-Kosten automatisch aktualisieren
 DocType: Lab Test,Test Name,Testname
 DocType: Healthcare Settings,Clinical Procedure Consumable Item,Verbrauchsmaterial für klinische Verfahren
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,Benutzer erstellen
@@ -5210,7 +5216,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Aufwandskonto ist zwingend für Artikel {0}
 DocType: BOM,Website Description,Webseiten-Beschreibung
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Nettoveränderung des Eigenkapitals
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Bitte stornieren Einkaufsrechnung {0} zuerst
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Bitte stornieren Einkaufsrechnung {0} zuerst
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Nicht gestattet. Bitte deaktivieren Sie den Typ der Serviceeinheit
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-Mail-Adresse muss eindeutig sein, diese wird bereits für {0} verwendet"
 DocType: Serial No,AMC Expiry Date,Verfalldatum des jährlichen Wartungsvertrags
@@ -5250,7 +5256,7 @@
 DocType: Hotel Room,Hotel Room,Hotelzimmer
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Konto {0} gehört nicht zu Firma {1}
 DocType: Leave Type,Rounding,Rundung
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Seriennummern in Zeile {0} stimmt nicht mit der Lieferschein überein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Seriennummern in Zeile {0} stimmt nicht mit der Lieferschein überein
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Ausgabemenge (Pro-rated)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Dann werden die Preisregeln auf der Grundlage von Kunde, Kundengruppe, Gebiet, Lieferant, Lieferantengruppe, Kampagne, Vertriebspartner usw. herausgefiltert."
 DocType: Student,Guardian Details,Wächter-Details
@@ -5305,7 +5311,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Angabe des Lagers ist für den Lagerartikel {0} erforderlich
 DocType: Leave Allocation,Unused leaves,Ungenutzter Urlaub
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Machen Sie einen Rückzahlungseintrag
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Alle Abteilungen
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Alle Abteilungen
 DocType: Healthcare Service Unit,Vacant,Unbesetzt
 DocType: Patient,Alcohol Past Use,Vergangener Alkoholkonsum
 DocType: Fertilizer Content,Fertilizer Content,Dünger Inhalt
@@ -5316,7 +5322,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Der Arbeitsauftrag {0} muss vor dem Stornieren dieses Kundenauftrags storniert werden
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Abruf der aufgelösten Stückliste (einschließlich der Unterbaugruppen)
 DocType: Authorization Rule,Applicable To (Employee),Anwenden auf (Mitarbeiter)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Fälligkeitsdatum wird zwingend vorausgesetzt
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Fälligkeitsdatum wird zwingend vorausgesetzt
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Schrittweite für Attribut {0} kann nicht 0 sein
 DocType: Employee Benefit Claim,Benefit Type and Amount,Leistungsart und -betrag
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Zimmer gebucht
@@ -5460,7 +5466,7 @@
 DocType: Purchase Invoice Item,Total Weight,Gesamtgewicht
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Provision auf den Umsatz
 DocType: Job Offer Term,Value / Description,Wert / Beschreibung
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Zeile Nr. {0}: Vermögenswert {1} kann nicht vorgelegt werden, es ist bereits {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Zeile Nr. {0}: Vermögenswert {1} kann nicht vorgelegt werden, es ist bereits {2}"
 DocType: Tax Rule,Billing Country,Land laut Rechnungsadresse
 DocType: Purchase Order Item,Expected Delivery Date,Geplanter Liefertermin
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurantbestellung
@@ -5499,12 +5505,13 @@
 DocType: Maintenance Visit,Breakdown,Ausfall
 DocType: Travel Itinerary,Vegetarian,Vegetarier
 DocType: Patient Encounter,Encounter Date,Begegnung Datum
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Konto: {0} mit Währung: {1} kann nicht ausgewählt werden
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Konto: {0} mit Währung: {1} kann nicht ausgewählt werden
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bankdaten
 DocType: Purchase Receipt Item,Sample Quantity,Beispielmenge
 DocType: Bank Guarantee,Name of Beneficiary,Name des Begünstigten
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Aktualisieren Sie die Stücklistenkosten automatisch über den Scheduler, basierend auf dem aktuellen Bewertungspreis / Preisliste / letzter Kaufpreis der Rohstoffe."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Lieferant&gt; Lieferantengruppe
 DocType: Bank Reconciliation Detail,Cheque Date,Scheckdatum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Über-Konto {1} gehört nicht zur Firma: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Alle Transaktionen dieser Firma wurden erfolgreich gelöscht!
@@ -5532,7 +5539,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Kindknoten können nur unter Gruppenknoten erstellt werden.
 DocType: Attendance Request,Half Day Date,Halbtagesdatum
 DocType: Academic Year,Academic Year Name,Schuljahr-Bezeichnung
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} darf nicht mit {1} arbeiten. Bitte wählen Sie ein anderes Unternehmen.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} darf nicht mit {1} arbeiten. Bitte wählen Sie ein anderes Unternehmen.
 DocType: Sales Partner,Contact Desc,Kontakt-Beschr.
 DocType: Email Digest,Send regular summary reports via Email.,Regelmäßig zusammenfassende Berichte per E-Mail senden.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Bitte setzen Sie Standardkonto in Kostenabrechnung Typ {0}
@@ -5565,7 +5572,7 @@
 DocType: Hotel Room,Hotel Manager,Hotelmanager
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Steuerregel für Einkaufswagen einstellen
 DocType: Purchase Invoice,Taxes and Charges Added,Steuern und Gebühren hinzugefügt
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Abschreibungszeile {0}: Das nächste Abschreibungsdatum darf nicht vor dem Verfügbarkeitsdatum liegen
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Abschreibungszeile {0}: Das nächste Abschreibungsdatum darf nicht vor dem Verfügbarkeitsdatum liegen
 ,Sales Funnel,Verkaufstrichter
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Abkürzung ist zwingend erforderlich
 DocType: Project,Task Progress,Vorgangsentwicklung
@@ -5579,7 +5586,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Alle Kundengruppen
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,Monatlich akkumuliert
 DocType: Attendance Request,On Duty,Im Dienst
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ist zwingend erforderlich. Möglicherweise wurde der Datensatz für die Währungsumrechung für {1} bis {2} nicht erstellt.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ist zwingend erforderlich. Möglicherweise wurde der Datensatz für die Währungsumrechung für {1} bis {2} nicht erstellt.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Besetzungsplan {0} existiert bereits für Bezeichnung {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Steuer-Vorlage ist erforderlich.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Konto {0}: Hauptkonto {1} existiert nicht
@@ -5658,11 +5665,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Mindestens ein Lager ist zwingend erforderlich
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Konfigurieren Sie Artikelfelder wie UOM, Artikelgruppe, Beschreibung und Stundenanzahl."
 DocType: Certification Application,Certification Status,Zertifizierungsstatus
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Marktplatz
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Marktplatz
 DocType: Travel Itinerary,Travel Advance Required,Reisevorauszahlung erforderlich
 DocType: Subscriber,Subscriber Name,Name des Abonnenten
 DocType: Serial No,Out of Warranty,Außerhalb der Garantie
-DocType: Cashier Closing,Cashier-closing-,Kassenschließende-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Zugeordneter Datentyp
 DocType: BOM Update Tool,Replace,Ersetzen
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Keine Produkte gefunden
@@ -5749,7 +5755,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Standardsteuervorlagen für Verkauf und Einkauf werden erstellt.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Beurteilungsergebnis {0} existiert bereits.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Beispiel: ABCD. #####. Wenn die Serie gesetzt ist und die Chargennummer in den Transaktionen nicht erwähnt wird, wird die automatische Chargennummer basierend auf dieser Serie erstellt. Wenn Sie die Chargennummer für diesen Artikel immer explizit angeben möchten, lassen Sie dieses Feld leer. Hinweis: Diese Einstellung hat Vorrang vor dem Naming Series Prefix in den Stock Settings."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Richten Sie die Nummerierungsserie für Anwesenheit über Setup&gt; Nummerierungsserie ein
 DocType: BOM,Materials Required (Exploded),Benötigte Materialien (erweitert)
 DocType: Contract,Party User,Party Benutzer
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Bitte setzen Sie den Firmenfilter leer, wenn Group By &quot;Company&quot;"
@@ -5950,7 +5955,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Anzahl der Chancen
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Das Startdatum für die Testperiode und das Enddatum für die Testperiode müssen festgelegt werden
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Durchschnittsrate
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Der gesamte Zahlungsbetrag im Zahlungsplan muss gleich Groß / Abgerundet sein
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Der gesamte Zahlungsbetrag im Zahlungsplan muss gleich Groß / Abgerundet sein
 DocType: Subscription Plan Detail,Plan,Planen
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Kontoauszug Bilanz nach Hauptbuch
 DocType: Job Applicant,Applicant Name,Bewerbername
@@ -6019,7 +6024,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Reinigungsmittel
 DocType: BOM,Show Items,Elemente anzeigen
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,"Von Zeit sein kann, nicht größer ist als auf die Zeit."
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Möchten Sie alle Kunden per E-Mail benachrichtigen?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Möchten Sie alle Kunden per E-Mail benachrichtigen?
 DocType: Subscription Plan,Billing Interval,Abrechnungsintervall
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Film & Fernsehen
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestellt
@@ -6028,9 +6033,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Zeile {0}: {1} muss größer als 0 sein
 DocType: Assessment Criteria,Assessment Criteria Group,Beurteilungskriterien Gruppe
 DocType: Healthcare Settings,Patient Name By,Patientenname Von
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Abrechnungseintrag für Gehälter von {0} bis {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Abrechnungseintrag für Gehälter von {0} bis {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Aktivieren Sie den passiven Rechnungsabgrenzungsposten
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Kumulierte Abschreibungen Öffnungs muss kleiner sein als gleich {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Kumulierte Abschreibungen Öffnungs muss kleiner sein als gleich {0}
 DocType: Warehouse,Warehouse Name,Lagername
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Das tatsächliche Startdatum muss kleiner als das tatsächliche Enddatum sein
 DocType: Naming Series,Select Transaction,Bitte Transaktionen auswählen
@@ -6181,7 +6186,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Mitarbeiter {0} der Besoldungsgruppe {1} haben keine Standard-Abwesenheitsrichtlinie
 DocType: Salary Detail,Salary Detail,Gehalt Details
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Bitte zuerst {0} auswählen
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,{0} Benutzer hinzugefügt
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,{0} Benutzer hinzugefügt
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",Im Falle eines mehrstufigen Programms werden Kunden automatisch der betroffenen Ebene entsprechend ihrer Ausgaben zugewiesen
 DocType: Appointment Type,Physician,Arzt
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Charge {0} von Artikel {1} ist abgelaufen.
@@ -6325,7 +6330,7 @@
 DocType: Asset,Custodian,Depotbank
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Verkaufsstellen-Profil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} sollte ein Wert zwischen 0 und 100 sein
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Zahlung von {0} von {1} an {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Zahlung von {0} von {1} an {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Ungesicherte Kredite
 DocType: Cost Center,Cost Center Name,Kostenstellenbezeichnung
 DocType: Student,B+,B+
@@ -6357,6 +6362,7 @@
 DocType: Employee,Date of Issue,Ausstellungsdatum
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Nach den Kaufeinstellungen, wenn Kaufbedarf erforderlich == &#39;JA&#39;, dann für die Erstellung der Kauf-Rechnung, muss der Benutzer die Kaufbeleg zuerst für den Eintrag {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Zeile #{0}: Lieferanten für Artikel {1} einstellen
+DocType: Global Defaults,Default Distance Unit,Standardabstandseinheit
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Row {0}: Stunden-Wert muss größer als Null sein.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,"Das Webseiten-Bild {0}, das an Artikel {1} angehängt wurde, kann nicht gefunden werden"
 DocType: Issue,Content Type,Inhaltstyp
@@ -6412,7 +6418,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Sollkonto muss ein Bilanzkonto sein
 DocType: Asset,Naming Series,Nummernkreis
 DocType: Vital Signs,Coated,Beschichtet
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Zeile {0}: Erwarteter Wert nach Nutzungsdauer muss kleiner als Brutto Kaufbetrag sein
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Zeile {0}: Erwarteter Wert nach Nutzungsdauer muss kleiner als Brutto Kaufbetrag sein
 DocType: GoCardless Settings,GoCardless Settings,GoCardlose Einstellungen
 DocType: Leave Block List,Leave Block List Name,Name der Urlaubssperrenliste
 DocType: Certified Consultant,Certification Validity,Gültigkeit der Zertifizierung
@@ -6479,6 +6485,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Bank Kopfzeile
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Lab-Tests anzeigen
 DocType: Hub Users,Hub Users,Hub-Benutzer
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundengruppe&gt; Gebiet
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Wartungsdatum
 DocType: Purchase Invoice Item,Rejected Serial No,Abgelehnte Seriennummer
@@ -6494,7 +6501,7 @@
 DocType: SG Creation Tool Course,Max Strength,Max Kraft
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Voreinstellungen installieren
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Kein Lieferschein für den Kunden {} ausgewählt
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Kein Lieferschein für den Kunden {} ausgewählt
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Der Mitarbeiter {0} hat keinen maximalen Leistungsbetrag
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Wählen Sie die Positionen nach dem Lieferdatum aus
 DocType: Grant Application,Has any past Grant Record,Hat einen früheren Grant Record
@@ -6521,7 +6528,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Hotelzimmer Reservierung
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Kundenservice
 DocType: BOM,Thumbnail,Thumbnail
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Keine Kontakte mit E-Mail-IDs gefunden.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Keine Kontakte mit E-Mail-IDs gefunden.
 DocType: Item Customer Detail,Item Customer Detail,kundenspezifisches Artikeldetail
 DocType: Notification Control,Prompt for Email on Submission of,E-Mail anregen bei der Übertragung von
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Der maximale Leistungsbetrag von Mitarbeiter {0} übersteigt {1}
@@ -6776,7 +6783,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,"Kann nicht in keine Gruppe umgewandelt werden, weil Kontentyp ausgewählt ist."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} wurde geändert. Bitte aktualisieren.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,"Benutzer davon abhalten, Urlaubsanträge für folgende Tage einzureichen."
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgruppe&gt; Marke
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Wenn die Treuepunkte unbegrenzt ablaufen, lassen Sie die Ablaufdauer leer oder 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Mitglieder des Wartungsteams
 DocType: Loyalty Point Entry,Purchase Amount,Gesamtbetrag des Einkaufs
@@ -6784,7 +6790,7 @@
 											to fullfill Sales Order {2}","Die Seriennr. {0} des Artikels {1} kann nicht geliefert werden, da sie reserviert ist, um den Kundenauftrag {2} zu erfüllen."
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Lieferant Quotation {0} erstellt
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,End-Jahr kann nicht gleich oder kleiner dem Start-Jahr sein.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,End-Jahr kann nicht gleich oder kleiner dem Start-Jahr sein.
 DocType: Employee Benefit Application,Employee Benefits,Vergünstigungen an Mitarbeiter
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Verpackte Menge muss gleich der Menge des Artikel {0} in Zeile {1} sein
 DocType: Work Order,Manufactured Qty,Produzierte Menge
@@ -6800,6 +6806,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Wählen Sie Chargennummern aus
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Zu GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Rechnungen an Kunden
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Bitte richten Sie das Personalbenennungssystem in Human Resource&gt; HR-Einstellungen ein
 DocType: Healthcare Settings,Invoice Appointments Automatically,Rechnungstermine automatisch
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt-ID
 DocType: Salary Component,Variable Based On Taxable Salary,Variable basiert auf steuerbarem Gehalt
@@ -6848,7 +6855,7 @@
 DocType: POS Profile,Account for Change Amount,Konto für Änderungsbetrag
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Verbinden mit QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Gesamter Gewinn / Verlust
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Ungültige Firma für Inter-Company-Rechnung.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Ungültige Firma für Inter-Company-Rechnung.
 DocType: Purchase Invoice,input service,Eingabeservice
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Zeile {0}: Gruppe / Konto stimmt nicht mit {1} / {2} in {3} {4} überein
 DocType: Employee Promotion,Employee Promotion,Mitarbeiterförderung
@@ -6978,7 +6985,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Bevorzugte Wohngegend
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analysetools
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Der Warenkorb ist leer
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Bitte richten Sie das Instructor Naming System in Education&gt; Education Settings ein
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Artikel {0} hat keine Seriennummer. Nur serialisierte Artikel \ können auf Basis der Seriennr
 DocType: Vehicle,Model,Modell
@@ -7008,7 +7014,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Nichts zu ändern
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Bitte eine CSV-Datei auswählen.
 DocType: Holiday List,Total Holidays,Insgesamt Feiertage
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Fehlende E-Mail-Vorlage für den Versand. Bitte legen Sie einen in den Liefereinstellungen fest.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Fehlende E-Mail-Vorlage für den Versand. Bitte legen Sie einen in den Liefereinstellungen fest.
 DocType: Student Leave Application,Mark as Present,Als anwesend markieren
 DocType: Supplier Scorecard,Indicator Color,Indikatorfarbe
 DocType: Purchase Order,To Receive and Bill,Um zu empfangen und abzurechnen
@@ -7017,7 +7023,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Wählen Sie Seriennr
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Konstrukteur
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Vorlage für Allgemeine Geschäftsbedingungen
-DocType: Serial No,Delivery Details,Lieferdetails
+DocType: Delivery Trip,Delivery Details,Lieferdetails
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Kostenstelle wird in Zeile {0} der Steuertabelle für Typ {1} gebraucht
 DocType: Program,Program Code,Programmcode
 DocType: Terms and Conditions,Terms and Conditions Help,Allgemeine Geschäftsbedingungen Hilfe
@@ -7041,7 +7047,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lieferzeittage
 DocType: Cash Flow Mapping,Is Income Tax Expense,Ist Einkommensteueraufwand
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Ihre Bestellung ist versandbereit!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Zeile Nr. {0}: Datum der Veröffentlichung muss gleich dem Kaufdatum {1} des Vermögenswertes {2} sein
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Zeile Nr. {0}: Datum der Veröffentlichung muss gleich dem Kaufdatum {1} des Vermögenswertes {2} sein
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Überprüfen Sie dies, wenn der Student im Gasthaus des Instituts wohnt."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Bitte geben Sie Kundenaufträge in der obigen Tabelle
 ,Stock Summary,Lager-Zusammenfassung
diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv
index 13f7b1c..b70d7a9 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Όνομα περιόδου
 DocType: Employee,Salary Mode,Λειτουργία Μισθός
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Κανω ΕΓΓΡΑΦΗ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Κανω ΕΓΓΡΑΦΗ
 DocType: Patient,Divorced,Διαζευγμένος
 DocType: Support Settings,Post Route Key,Κλειδί διαδρομής μετά
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Επιτρέψτε στοιχείου να προστεθούν πολλές φορές σε μια συναλλαγή
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Νέος συναλλαγματικός συντελεστής
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Το νόμισμα είναι απαραίτητο για τον τιμοκατάλογο {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Θα υπολογίζεται στη συναλλαγή.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Επικοινωνία Πελατών
 DocType: Patient Appointment,Check availability,Ελέγξτε διαθεσιμότητα
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Εμφάνιση ανοιχτή
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Η σειρά ενημερώθηκε με επιτυχία
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Αποχώρηση
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} στη σειρά {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} στη σειρά {1}
 DocType: Asset Finance Book,Depreciation Start Date,Ημερομηνία έναρξης απόσβεσης
 DocType: Pricing Rule,Apply On,Εφάρμοσε σε
 DocType: Item Price,Multiple Item prices.,Πολλαπλές τιμές είδους.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Lab Συνταγή
 ,Delay Days,Ημέρες καθυστέρησης
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Δαπάνη παροχής υπηρεσιών
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Σειριακός αριθμός: {0} αναφέρεται ήδη στο Τιμολόγιο Πωλήσεων: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Σειριακός αριθμός: {0} αναφέρεται ήδη στο Τιμολόγιο Πωλήσεων: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Τιμολόγιο
 DocType: Purchase Invoice Item,Item Weight Details,Λεπτομέρειες βάρους στοιχείου
 DocType: Asset Maintenance Log,Periodicity,Περιοδικότητα
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Λογιστής
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Τιμοκατάλογος πώλησης
 DocType: Patient,Tobacco Current Use,Καπνός τρέχουσα χρήση
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Η ημερομηνία έναρξης και η ημερομηνία λήξης επικαλύπτονται με την κάρτα εργασίας <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Πωλήσεις
 DocType: Cost Center,Stock User,Χρήστης Αποθεματικού
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / Κ
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Συγγενεύων
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,ημερομηνία συμμετοχή δεν μπορεί να είναι μικρότερη από την ημερομηνία που ενώνει εργαζομένου
 DocType: Grading Scale,Grading Scale Name,Κλίμακα βαθμολόγησης Όνομα
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Προσθέστε χρήστες στο Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Προσθέστε χρήστες στο Marketplace
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Αυτό είναι ένας κύριος λογαριασμός και δεν μπορεί να επεξεργαστεί.
 DocType: Sales Invoice,Company Address,Διεύθυνση εταιρείας
 DocType: BOM,Operations,Λειτουργίες
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Διαφορά Ποσ
 DocType: Production Plan,Material Request Detail,Λεπτομέρειες αιτήματος υλικού
 DocType: Selling Settings,Default Quotation Validity Days,Προεπιλεγμένες ημέρες ισχύος της προσφοράς
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Για να περιληφθούν οι φόροι στη γραμμή {0} της τιμής είδους, οι φόροι στις γραμμές {1} πρέπει επίσης να συμπεριληφθούν"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Για να περιληφθούν οι φόροι στη γραμμή {0} της τιμής είδους, οι φόροι στις γραμμές {1} πρέπει επίσης να συμπεριληφθούν"
 DocType: SMS Center,SMS Center,Κέντρο SMS
 DocType: Payroll Entry,Validate Attendance,Επικύρωση συμμετοχής
 DocType: Sales Invoice,Change Amount,αλλαγή Ποσό
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,διάστιχο για ποσό ολογράφως
 DocType: Vehicle,Additional Details,Επιπλέον Λεπτομέρειες
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Δεν έχει δοθεί περιγραφή
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Προμηθευτής&gt; Ομάδα προμηθευτών
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Αίτηση αγοράς.
 DocType: POS Closing Voucher Details,Collected Amount,Συγκεντρωμένο ποσό
 DocType: Lab Test,Submitted Date,Ημερομηνία υποβολής
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,Η είσοδος φοιτητής
 ,Terretory,Περιοχή
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Γραμμή απόσβεσης {0}: Η ημερομηνία έναρξης απόσβεσης καταχωρείται ως ημερομηνία λήξης
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Γραμμή απόσβεσης {0}: Η ημερομηνία έναρξης απόσβεσης καταχωρείται ως ημερομηνία λήξης
 DocType: Contract Template,Fulfilment Terms and Conditions,Όροι και προϋποθέσεις εκπλήρωσης
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Αίτηση υλικού
 DocType: Bank Reconciliation,Update Clearance Date,Ενημέρωση ημερομηνίας εκκαθάρισης
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,Ρυθμίσεις για τους λογαριασμούς
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Προμηθευτής τιμολόγιο αριθ υπάρχει στην Αγορά Τιμολόγιο {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Διαχειριστείτε το δέντρο πωλητών.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Δεν είναι δυνατή η επεξεργασία της διαδρομής, αφού οι ρυθμίσεις των Χαρτών Google είναι απενεργοποιημένες."
 DocType: Job Applicant,Cover Letter,συνοδευτική επιστολή
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Εξαιρετική επιταγές και καταθέσεις για να καθαρίσετε
 DocType: Item,Synced With Hub,Συγχρονίστηκαν με το Hub
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Νέα αξία ενεργητικού
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Ισοτιμία με την οποία το νόμισμα του πελάτη μετατρέπεται στο βασικό νόμισμα του πελάτη
 DocType: Course Scheduling Tool,Course Scheduling Tool,Φυσικά εργαλείο προγραμματισμού
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Σειρά # {0}: Αγορά Τιμολόγιο δεν μπορεί να γίνει κατά ένα υπάρχον στοιχείο {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Σειρά # {0}: Αγορά Τιμολόγιο δεν μπορεί να γίνει κατά ένα υπάρχον στοιχείο {1}
 DocType: Crop Cycle,LInked Analysis,Αναλυτική ανάλυση
 DocType: POS Closing Voucher,POS Closing Voucher,Δελτίο κλεισίματος POS
 DocType: Contract,Lapsed,Ληξιπρόθεσμος
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} δεν είναι εγγεγραμμένος στο μάθημα {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Ονομα μαθητή:
 DocType: POS Closing Voucher Details,Difference,Διαφορά
+DocType: Delivery Settings,Delay between Delivery Stops,Καθυστέρηση μεταξύ των σταθμών παράδοσης
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Ο σειριακός αριθμός {0} δεν ανήκει στο δελτίο αποστολής {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Φαίνεται ότι υπάρχει ένα ζήτημα με τη διαμόρφωση GoCardless του διακομιστή. Μην ανησυχείτε, σε περίπτωση αποτυχίας, το ποσό θα επιστραφεί στο λογαριασμό σας."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -693,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Ποσότητα και τιμή
 DocType: Delivery Note,% Installed,% Εγκατεστημένο
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,Αίθουσες διδασκαλίας / εργαστήρια κ.λπ. όπου μπορεί να προγραμματιστεί διαλέξεις.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Τα νομίσματα των εταιρειών και των δύο εταιρειών θα πρέπει να αντιστοιχούν στις ενδοεταιρικές συναλλαγές.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Τα νομίσματα των εταιρειών και των δύο εταιρειών θα πρέπει να αντιστοιχούν στις ενδοεταιρικές συναλλαγές.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Παρακαλώ εισάγετε πρώτα το όνομα της εταιρείας
 DocType: Travel Itinerary,Non-Vegetarian,Μη χορτοφάγος
 DocType: Purchase Invoice,Supplier Name,Όνομα προμηθευτή
@@ -778,7 +779,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Ενοικίαση από την ημερομηνία
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Αρκετά τμήματα για να χτίσει
 DocType: POS Profile User,POS Profile User,Χρήστης προφίλ POS
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Γραμμή {0}: Απαιτείται η ημερομηνία έναρξης απόσβεσης
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Γραμμή {0}: Απαιτείται η ημερομηνία έναρξης απόσβεσης
 DocType: Purchase Invoice Item,Service Start Date,Ημερομηνία έναρξης υπηρεσίας
 DocType: Subscription Invoice,Subscription Invoice,Τιμολόγιο συνδρομής
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Άμεσα έσοδα
@@ -845,7 +846,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Σύντμηση που χρησιμοποιείται ήδη για μια άλλη εταιρεία
 DocType: Selling Settings,Default Customer Group,Προεπιλεγμένη ομάδα πελατών
 DocType: Employee,IFSC Code,Κωδικός IFSC
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Η ημερομηνία έναρξης και η ημερομηνία λήξης επικαλύπτονται με την κάρτα εργασίας <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Αν είναι απενεργοποιημένο, το πεδίο στρογγυλοποιημένο σύνολο δεν θα είναι ορατό σε καμμία συναλλαγή"
 DocType: BOM,Operating Cost,Λειτουργικό κόστος
 DocType: Crop,Produced Items,Παραγόμενα στοιχεία
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,Αποτρέψτε τις RFQ
 DocType: Hub User,Hub User,Χρήστης Hub
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Δημιούργησε παραγγελία πώλησης
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Το δελτίο αποδοχών που υποβλήθηκε για περίοδο από {0} έως {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Το δελτίο αποδοχών που υποβλήθηκε για περίοδο από {0} έως {1}
 DocType: Project Task,Project Task,Πρόγραμμα εργασιών
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Εξαργυρωμένα σημεία
 ,Lead Id,ID Σύστασης
@@ -1027,7 +1027,7 @@
 DocType: Fee Validity,Max number of visit,Μέγιστος αριθμός επισκέψεων
 ,Hotel Room Occupancy,Δωμάτια δωματίου στο ξενοδοχείο
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Φύλλο κατανομής χρόνου δημιουργήθηκε:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Παρακαλώ ορίστε τον προεπιλεγμένο λογιαριασμό μετρητών ή τραπέζης στον τρόπο πληρωμής {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Παρακαλώ ορίστε τον προεπιλεγμένο λογιαριασμό μετρητών ή τραπέζης στον τρόπο πληρωμής {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Εγγράφω
 DocType: GST Settings,GST Settings,Ρυθμίσεις GST
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Το νόμισμα θα πρέπει να είναι ίδιο με το Νόμισμα Τιμοκαταλόγου: {0}
@@ -1081,7 +1081,7 @@
 DocType: Vehicle Log,Service Details,Λεπτομέρειες υπηρεσιών
 DocType: Lab Test Template,Grouped,Ομαδοποιημένο
 DocType: Selling Settings,Delivery Note Required,Η σημείωση δελτίου αποστολής είναι απαραίτητη
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Υποβολή μισθών πληρωμών ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Υποβολή μισθών πληρωμών ...
 DocType: Bank Guarantee,Bank Guarantee Number,Αριθμός τραπεζικής εγγύησης
 DocType: Assessment Criteria,Assessment Criteria,Κριτήρια αξιολόγησης
 DocType: BOM Item,Basic Rate (Company Currency),Βασικό επιτόκιο (νόμισμα της εταιρείας)
@@ -1106,13 +1106,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Έναρξη Πληρωμής έχει ήδη δημιουργηθεί
 DocType: Request for Quotation,Get Suppliers,Αποκτήστε Προμηθευτές
 DocType: Purchase Receipt Item Supplied,Current Stock,Τρέχον απόθεμα
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Σειρά # {0}: Asset {1} δεν συνδέεται στη θέση {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Σειρά # {0}: Asset {1} δεν συνδέεται στη θέση {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Preview Μισθός Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Ο λογαριασμός {0} έχει τεθεί πολλές φορές
 DocType: Account,Expenses Included In Valuation,Δαπάνες που περιλαμβάνονται στην αποτίμηση
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Μπορείτε να το ανανεώσετε μόνο αν λήξει η ιδιότητά σας εντός 30 ημερών
 DocType: Shopping Cart Settings,Show Stock Availability,Εμφάνιση διαθεσιμότητας αποθεμάτων
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Ορίστε {0} στην κατηγορία στοιχείων {1} ή στην εταιρεία {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Ορίστε {0} στην κατηγορία στοιχείων {1} ή στην εταιρεία {2}
 DocType: Location,Longitude,Γεωγραφικό μήκος
 ,Absent Student Report,Απών Έκθεση Φοιτητών
 DocType: Crop,Crop Spacing UOM,Διόρθωση UOM διαχωρισμού
@@ -1184,7 +1184,7 @@
 DocType: Soil Texture,Sand,Αμμος
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Ενέργεια
 DocType: Opportunity,Opportunity From,Ευκαιρία από
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Σειρά {0}: {1} Σειριακοί αριθμοί που απαιτούνται για το στοιχείο {2}. Παρέχετε {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Σειρά {0}: {1} Σειριακοί αριθμοί που απαιτούνται για το στοιχείο {2}. Παρέχετε {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Επιλέξτε έναν πίνακα
 DocType: BOM,Website Specifications,Προδιαγραφές δικτυακού τόπου
 DocType: Special Test Items,Particulars,Λεπτομέρειες
@@ -1295,7 +1295,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Τα στοιχεία με υψηλότερες weightage θα δείξει υψηλότερη
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Εργαστηριακές εξετάσεις και ζωτικά σημάδια
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Λεπτομέρειες συμφωνίας τραπεζικού λογαριασμού
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Σειρά # {0}: Asset {1} πρέπει να υποβληθούν
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Σειρά # {0}: Asset {1} πρέπει να υποβληθούν
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Δεν βρέθηκε υπάλληλος
 DocType: Item,If subcontracted to a vendor,Αν υπεργολαβία σε έναν πωλητή
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Η ομάδα σπουδαστών έχει ήδη ενημερωθεί.
@@ -1349,7 +1349,6 @@
 DocType: Loyalty Program Collection,Tier Name,Όνομα επιπέδου
 DocType: HR Settings,Enter retirement age in years,Εισάγετε την ηλικία συνταξιοδότησης στα χρόνια
 DocType: Crop,Target Warehouse,Αποθήκη προορισμού
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ορίστε την Ονοματοδοσία για {0} μέσω του Setup&gt; Settings&gt; Naming Series
 DocType: Payroll Employee Detail,Payroll Employee Detail,Λεπτομέρειες προσωπικού μισθοδοσίας
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Επιλέξτε μια αποθήκη
 DocType: Cheque Print Template,Starting location from left edge,Ξεκινώντας τοποθεσία από το αριστερό άκρο
@@ -1439,7 +1438,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Υλικό σχεδίου για τα υποσυστήματα
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Συνεργάτες πωλήσεων και Επικράτεια
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,Η Λ.Υ. {0} πρέπει να είναι ενεργή
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Δεν υπάρχουν διαθέσιμα στοιχεία για μεταφορά
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Δεν υπάρχουν διαθέσιμα στοιχεία για μεταφορά
 DocType: Employee Boarding Activity,Activity Name,Όνομα δραστηριότητας
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Αλλαγή ημερομηνίας κυκλοφορίας
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Η ποσότητα τελικού προϊόντος <b>{0}</b> και η ποσότητα <b>{1}</b> δεν μπορεί να είναι διαφορετική
@@ -1666,6 +1665,7 @@
 DocType: Project,First Email,Το πρώτο μήνυμα ηλεκτρονικού ταχυδρομείου
 DocType: Company,Exception Budget Approver Role,Ρόλος προσέγγισης προϋπολογισμού εξαίρεσης
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Αφού οριστεί, αυτό το τιμολόγιο θα παραμείνει αναμμένο μέχρι την καθορισμένη ημερομηνία"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Αποθήκη δεσμευμένων στις παραγγελίες πωλησης/ αποθήκη έτοιμων προϊόντων
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Ποσό πώλησης
 DocType: Repayment Schedule,Interest Amount,Ποσό Τόκου
@@ -1677,7 +1677,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Εγγραφές
 DocType: Asset,Scrapped,αχρηστία
 DocType: Item,Item Defaults,Στοιχεία προεπιλογής
-DocType: Purchase Invoice,Returns,Επιστροφές
+DocType: Cashier Closing,Returns,Επιστροφές
 DocType: Job Card,WIP Warehouse,Αποθήκη εργασιών σε εξέλιξη
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Ο σειριακός αριθμός {0} έχει σύμβαση συντήρησης σε ισχύ μέχρι {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,Στρατολόγηση
@@ -1691,7 +1691,6 @@
 DocType: Student,A-,Α-
 DocType: Share Transfer,Transfer Type,Τύπος μεταφοράς
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Έξοδα πωλήσεων
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα πελατών&gt; Επικράτεια
 DocType: Diagnosis,Diagnosis,Διάγνωση
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Πρότυπες αγορές
 DocType: Attendance Request,Explanation,Εξήγηση
@@ -1704,7 +1703,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Στοιχεία παραγγελίας αγορών καθυστερημένα
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Ταχυδρομικός κώδικας
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Πωλήσεις Τάξης {0} είναι {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Επιλέξτε το λογαριασμό εσόδων από τόκους στο δάνειο {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Επιλέξτε το λογαριασμό εσόδων από τόκους στο δάνειο {0}
 DocType: Opportunity,Contact Info,Πληροφορίες επαφής
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Δημιουργία Εγγραφών Αποθεματικού
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Δεν είναι δυνατή η προώθηση του υπαλλήλου με κατάσταση αριστερά
@@ -1716,7 +1715,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Δεν είναι δυνατή η πραγματοποίηση τιμολογίου για μηδενική ώρα χρέωσης
 DocType: Company,Date of Commencement,Ημερομηνία έναρξης
 DocType: Sales Person,Select company name first.,Επιλέξτε το όνομα της εταιρείας πρώτα.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},Το email απεστάλη σε {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},Το email απεστάλη σε {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Προσφορές που λήφθηκαν από προμηθευτές.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Αντικαταστήστε το BOM και ενημερώστε την τελευταία τιμή σε όλα τα BOM
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Έως {0} | {1} {2}
@@ -1736,7 +1735,7 @@
 DocType: Asset Movement,From Employee,Από υπάλληλο
 DocType: Driver,Cellphone Number,αριθμός κινητού
 DocType: Project,Monitor Progress,Παρακολουθήστε την πρόοδο
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Προσοχή : το σύστημα δεν θα ελέγξει για υπερτιμολογήσεις εφόσον το ποσό για το είδος {0} {1} είναι μηδέν
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Προσοχή : το σύστημα δεν θα ελέγξει για υπερτιμολογήσεις εφόσον το ποσό για το είδος {0} {1} είναι μηδέν
 DocType: Journal Entry,Make Difference Entry,Δημιούργησε καταχώηρηση διαφοράς
 DocType: Supplier Quotation,Auto Repeat Section,Τμήμα αυτόματης επανάληψης
 DocType: Upload Attendance,Attendance From Date,Συμμετοχή από ημερομηνία
@@ -1839,7 +1838,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Σειρά # {0}: Απορρίφθηκε Ποσότητα δεν μπορούν να εισαχθούν στην Αγορά Επιστροφή
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Η αλλαγή της ομάδας πελατών για τον επιλεγμένο πελάτη δεν επιτρέπεται.
 ,Purchase Order Items To Be Billed,Είδη παραγγελίας αγοράς προς χρέωση
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Ενημέρωση των εκτιμώμενων χρόνων άφιξης.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Ενημέρωση των εκτιμώμενων χρόνων άφιξης.
 DocType: Program Enrollment Tool,Enrollment Details,Στοιχεία εγγραφής
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Δεν είναι δυνατή η ρύθμιση πολλών προεπιλογών στοιχείων για μια εταιρεία.
 DocType: Purchase Invoice Item,Net Rate,Καθαρή Τιμή
@@ -1853,7 +1852,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Ο τύπος άδειας είναι τερατώδης
 DocType: Support Settings,Close Issue After Days,Κλείστε θέμα μετά Ημέρες
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Πρέπει να είστε χρήστης με ρόλους διαχείρισης συστήματος και διαχειριστή στοιχείων για να προσθέσετε χρήστες στο Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Πρέπει να είστε χρήστης με ρόλους διαχείρισης συστήματος και διαχειριστή στοιχείων για να προσθέσετε χρήστες στο Marketplace.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Άφησε το κενό αν ισχύει για όλους τους κλάδους
 DocType: Job Opening,Staffing Plan,Προσωπικό Σχέδιο
 DocType: Bank Guarantee,Validity in Days,Ισχύς στις Ημέρες
@@ -1873,7 +1872,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Διπλότυπη γραμμή {0} με το ίδιο {1}
 DocType: Marketplace Settings,Disable Marketplace,Απενεργοποιήστε το Marketplace
 ,Trial Balance,Ισοζύγιο
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Φορολογικό Έτος {0} δεν βρέθηκε
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Φορολογικό Έτος {0} δεν βρέθηκε
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Ρύθμιση εργαζόμενοι
 DocType: Hotel Room Reservation,Hotel Reservation User,Χρήστης κράτησης ξενοδοχείων
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Παρακαλώ επιλέξτε πρόθεμα πρώτα
@@ -1981,7 +1980,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Αποτυχία σύνδεσης
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Το στοιχείο {0} δημιουργήθηκε
 DocType: Special Test Items,Special Test Items,Ειδικά στοιχεία δοκιμής
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Πρέπει να είστε χρήστης με ρόλους του Διαχειριστή Συστήματος και Στοιχεία διαχειριστή στοιχείων για να εγγραφείτε στο Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Πρέπει να είστε χρήστης με ρόλους του Διαχειριστή Συστήματος και Στοιχεία διαχειριστή στοιχείων για να εγγραφείτε στο Marketplace.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Τρόπος πληρωμής
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,"Σύμφωνα με τη δομή μισθοδοσίας σας, δεν μπορείτε να υποβάλετε αίτηση για παροχές"
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Ιστοσελίδα εικόνας θα πρέπει να είναι ένα δημόσιο αρχείο ή URL της ιστοσελίδας
@@ -1993,7 +1992,7 @@
 DocType: Warehouse,Warehouse Contact Info,Πληροφορίες επικοινωνίας για την αποθήκη
 DocType: Payment Entry,Write Off Difference Amount,Γράψτε Off Διαφορά Ποσό
 DocType: Volunteer,Volunteer Name,Όνομα εθελοντή
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Έχουν βρεθεί σειρές με διπλές ημερομηνίες λήξης σε άλλες σειρές: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Έχουν βρεθεί σειρές με διπλές ημερομηνίες λήξης σε άλλες σειρές: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: Η δ/ση email του υπάλλήλου δεν βρέθηκε,  το μυνημα δεν εστάλη"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Δεν δομή μισθοδοσίας για τον υπάλληλο {0} σε δεδομένη ημερομηνία {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Ο κανόνας αποστολής δεν ισχύει για τη χώρα {0}
@@ -2082,6 +2081,7 @@
 DocType: Salary Component,Earning,Κέρδος
 DocType: Supplier Scorecard,Scoring Criteria,Κριτήρια βαθμολόγησης
 DocType: Purchase Invoice,Party Account Currency,Κόμμα Λογαριασμού Νόμισμα
+DocType: Delivery Trip,Total Estimated Distance,Συνολική Εκτιμώμενη Απόσταση
 ,BOM Browser,BOM Browser
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Ενημερώστε την κατάστασή σας για αυτό το εκπαιδευτικό γεγονός
 DocType: Item Barcode,EAN,EAN
@@ -2120,7 +2120,7 @@
 DocType: Activity Cost,Projects,Έργα
 DocType: Payment Request,Transaction Currency,Νόμισμα συναλλαγής
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Από {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Ορισμένα μηνύματα ηλεκτρονικού ταχυδρομείου δεν είναι έγκυρα
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Ορισμένα μηνύματα ηλεκτρονικού ταχυδρομείου δεν είναι έγκυρα
 DocType: Work Order Operation,Operation Description,Περιγραφή λειτουργίας
 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.,Δεν μπορεί να αλλάξει ημερομηνία έναρξης και ημερομηνία λήξης φορολογικού έτους μετά την αποθήκευση του.
 DocType: Quotation,Shopping Cart,Καλάθι αγορών
@@ -2144,7 +2144,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Καθαρή Αλλαγή στο Παγίων
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Απ. Ποσ
 DocType: Leave Control Panel,Leave blank if considered for all designations,Άφησε το κενό αν ισχύει για όλες τις ονομασίες
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Η επιβάρυνση του τύπου 'πραγματική' στη γραμμή {0} δεν μπορεί να συμπεριληφθεί στην τιμή είδους
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Η επιβάρυνση του τύπου 'πραγματική' στη γραμμή {0} δεν μπορεί να συμπεριληφθεί στην τιμή είδους
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Μέγιστο: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Από ημερομηνία και ώρα
 DocType: Shopify Settings,For Company,Για την εταιρεία
@@ -2158,7 +2158,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Παρουσιάστηκαν σφάλματα κατά τη δημιουργία του προγράμματος μαθημάτων
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Ο πρώτος εξομοιωτής δαπανών στη λίστα θα οριστεί ως προεπιλεγμένος Εξομοιωτής Εξόδων.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,Δεν μπορεί να είναι μεγαλύτερη από 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Πρέπει να είστε χρήστης διαφορετικός από τον Διαχειριστή με τους Διαχειριστές Συστημάτων και τους ρόλους του Διαχειριστή είδους για να εγγραφείτε στο Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Πρέπει να είστε χρήστης διαφορετικός από τον Διαχειριστή με τους Διαχειριστές Συστημάτων και τους ρόλους του Διαχειριστή είδους για να εγγραφείτε στο Marketplace.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Έκτακτες
@@ -2187,7 +2187,7 @@
 DocType: HR Settings,Employee Settings,Ρυθμίσεις των υπαλλήλων
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Φόρτωση συστήματος πληρωμών
 ,Batch-Wise Balance History,Ιστορικό υπολοίπων παρτίδας
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Σειρά # {0}: Δεν είναι δυνατή η ρύθμιση Τιμή εάν το ποσό είναι μεγαλύτερο από το ποσό που χρεώθηκε για το στοιχείο {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Σειρά # {0}: Δεν είναι δυνατή η ρύθμιση Τιμή εάν το ποσό είναι μεγαλύτερο από το ποσό που χρεώθηκε για το στοιχείο {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,ρυθμίσεις εκτύπωσης ενημερώθηκε στις αντίστοιχες έντυπη μορφή
 DocType: Package Code,Package Code,Κωδικός πακέτου
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Μαθητευόμενος
@@ -2420,7 +2420,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",Οι {0} κενές θέσεις και ο {1} προϋπολογισμός για {2} έχουν ήδη προγραμματιστεί για θυγατρικές εταιρείες {3}. \ Μπορείτε να προγραμματίσετε μόνο για {4} κενές θέσεις και προϋπολογισμό {5} σύμφωνα με το σχέδιο προσωπικού {6} για τη μητρική εταιρεία {3}.
 DocType: HR Settings,Stop Birthday Reminders,Διακοπή υπενθυμίσεων γενεθλίων
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Παρακαλούμε να ορίσετε Προεπιλογή Μισθοδοσίας Πληρωτέο Λογαριασμού Εταιρείας {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Παρακαλούμε να ορίσετε Προεπιλογή Μισθοδοσίας Πληρωτέο Λογαριασμού Εταιρείας {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Αποκτήστε οικονομική κατανομή των δεδομένων Φόρων και χρεώσεων από την Amazon
 DocType: SMS Center,Receiver List,Λίστα παραλήπτη
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Αναζήτηση Είδους
@@ -2490,7 +2490,7 @@
 DocType: Vital Signs,Constipated,Δυσκοίλιος
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Κατά το τιμολόγιο προμηθευτή {0} της {1}
 DocType: Customer,Default Price List,Προεπιλεγμένος τιμοκατάλογος
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,ρεκόρ Κίνηση περιουσιακό στοιχείο {0} δημιουργήθηκε
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,ρεκόρ Κίνηση περιουσιακό στοιχείο {0} δημιουργήθηκε
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Δεν βρέθηκαν αντικείμενα.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Δεν μπορείτε να διαγράψετε Χρήσεως {0}. Φορολογικό Έτος {0} έχει οριστεί ως προεπιλογή στο Καθολικές ρυθμίσεις
 DocType: Share Transfer,Equity/Liability Account,Λογαριασμός Ιδίων Κεφαλαίων / Υποχρεώσεων
@@ -2627,6 +2627,7 @@
 DocType: Blanket Order,Order Type,Τύπος παραγγελίας
 ,Item-wise Sales Register,Ταμείο πωλήσεων ανά είδος
 DocType: Asset,Gross Purchase Amount,Ακαθάριστο Ποσό Αγορά
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Κωδικός στοιχείου&gt; Ομάδα στοιχείων&gt; Μάρκα
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Άνοιγμα υπολοίπων
 DocType: Asset,Depreciation Method,Μέθοδος απόσβεσης
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ο φόρος αυτός περιλαμβάνεται στη βασική τιμή;
@@ -2707,7 +2708,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Δράση εάν ο ετήσιος προϋπολογισμός υπερβαίνει την ΠΕ
 DocType: Student Leave Application,Student Leave Application,Φοιτητής Αφήστε Εφαρμογή
 DocType: Item,Will also apply for variants,Θα ισχύουν επίσης για τις παραλλαγές
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Περιουσιακό στοιχείο δεν μπορεί να ακυρωθεί, δεδομένου ότι είναι ήδη {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Περιουσιακό στοιχείο δεν μπορεί να ακυρωθεί, δεδομένου ότι είναι ήδη {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Υπάλληλος {0} για Μισή μέρα στο {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Οι συνολικές ώρες εργασίας δεν πρέπει να είναι μεγαλύτερη από το ωράριο εργασίας max {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Στις
@@ -2731,6 +2732,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Λήψη δεδομένων
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Η μέγιστη άδεια που επιτρέπεται στον τύπο άδειας {0} είναι {1}
 DocType: SMS Center,Create Receiver List,Δημιουργία λίστας παραλήπτη
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Η ημερομηνία που είναι διαθέσιμη για χρήση πρέπει να είναι μετά την ημερομηνία αγοράς
 DocType: Vehicle,Wheels,τροχοί
 DocType: Packing Slip,To Package No.,Για τον αρ. συσκευασίας
 DocType: Patient Relation,Family,Οικογένεια
@@ -2744,7 +2746,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Το νόμισμα χρέωσης πρέπει να είναι ίσο είτε με το νόμισμα της εταιρείας προεπιλογής είτε με το νόμισμα του λογαριασμού κόμματος
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Δηλώνει ότι το συσκευασία είναι ένα μέρος αυτής της παράδοσης (μόνο πρόχειρο)
 DocType: Soil Texture,Loam,Παχύ χώμα
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Γραμμή {0}: Η ημερομηνία λήξης δεν μπορεί να είναι πριν από την ημερομηνία δημοσίευσης
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Γραμμή {0}: Η ημερομηνία λήξης δεν μπορεί να είναι πριν από την ημερομηνία δημοσίευσης
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Δημιούργησε καταχώηρση πληρωμής
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Η ποσότητα για το είδος {0} πρέπει να είναι λιγότερη από {1}
 ,Sales Invoice Trends,Τάσεις τιμολογίου πώλησης
@@ -2816,7 +2818,7 @@
 DocType: Guardian,Guardian Interests,Guardian Ενδιαφέροντα
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Ενημέρωση ονόματος λογαριασμού / αριθμού
 DocType: Naming Series,Current Value,Τρέχουσα αξία
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Υπάρχουν πολλαπλές χρήσεις για την ημερομηνία {0}. Παρακαλούμε να ορίσετε την εταιρεία κατά το οικονομικό έτος
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Υπάρχουν πολλαπλές χρήσεις για την ημερομηνία {0}. Παρακαλούμε να ορίσετε την εταιρεία κατά το οικονομικό έτος
 DocType: Education Settings,Instructor Records to be created by,Εγγραφές εκπαιδευτών που θα δημιουργηθούν από το
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} Δημιουργήθηκε
 DocType: GST Account,GST Account,Λογαριασμός GST
@@ -2833,7 +2835,7 @@
 DocType: Sales Person,Name and Employee ID,Όνομα και ID υπαλλήλου
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Η ημερομηνία λήξης προθεσμίας δεν μπορεί να είναι πριν από την ημερομηνία αποστολής
 DocType: Website Item Group,Website Item Group,Ομάδα ειδών δικτυακού τόπου
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Δεν υποβλήθηκε κανένα δελτίο αποδοχών για τα παραπάνω επιλεγμένα κριτήρια Ή το φύλλο μισθοδοσίας που έχετε ήδη υποβάλει
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Δεν υποβλήθηκε κανένα δελτίο αποδοχών για τα παραπάνω επιλεγμένα κριτήρια Ή το φύλλο μισθοδοσίας που έχετε ήδη υποβάλει
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Δασμοί και φόροι
 DocType: Projects Settings,Projects Settings,Ρυθμίσεις έργων
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Παρακαλώ εισάγετε την ημερομηνία αναφοράς
@@ -2842,7 +2844,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Παρεχόμενα Ποσότητα
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Είδος αίτησης υλικού
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Ακυρώστε πρώτα την παραλαβή αγοράς {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Ακυρώστε πρώτα την παραλαβή αγοράς {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Δέντρο ομάδων ειδών.
 DocType: Production Plan,Total Produced Qty,Συνολική Ποσότητα Παραγωγής
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Δεν μπορεί να παραπέμψει τον αριθμό σειράς μεγαλύτερο ή ίσο με τον τρέχοντα αριθμό γραμμής για αυτόν τον τύπο επιβάρυνσης
@@ -2951,6 +2953,7 @@
 ,Vehicle Expenses,Έξοδα όχημα
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Δημιουργία δοκιμών εργαστηρίου για την υποβολή τιμολογίου πωλήσεων
 DocType: Serial No,Invoice Details,Λεπτομέρειες τιμολογίου
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Ενεργοποιήστε τις Ρυθμίσεις του Google Maps για να εκτιμήσετε και να βελτιστοποιήσετε τις διαδρομές
 DocType: Grant Application,Show on Website,Εμφάνιση στο δικτυακό τόπο
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Ξεκινήστε
 DocType: Hub Tracked Item,Hub Category,Κατηγορία Hub
@@ -2990,7 +2993,7 @@
 DocType: Inpatient Record,B Positive,Β Θετικό
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Το μέγιστο όφελος του υπαλλήλου {0} υπερβαίνει {1} το άθροισμα {2} του προηγούμενου ποσού που ζητήθηκε
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Σειρά # {0}: Ποσότητα πρέπει να είναι 1, ως στοιχείο αποτελεί πάγιο περιουσιακό στοιχείο. Παρακαλούμε χρησιμοποιήστε ξεχωριστή σειρά για πολλαπλές ποσότητα."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Σειρά # {0}: Ποσότητα πρέπει να είναι 1, ως στοιχείο αποτελεί πάγιο περιουσιακό στοιχείο. Παρακαλούμε χρησιμοποιήστε ξεχωριστή σειρά για πολλαπλές ποσότητα."
 DocType: Leave Block List Allow,Leave Block List Allow,Επίτρεψε λίστα αποκλεισμού ημερών άδειας
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Συντ δεν μπορεί να είναι κενό ή χώρος
 DocType: Patient Medical Record,Patient Medical Record,Ιατρικό αρχείο ασθενούς
@@ -3024,7 +3027,7 @@
 DocType: Workstation,Wages per hour,Μισθοί ανά ώρα
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Το ισοζύγιο αποθεμάτων στην παρτίδα {0} θα γίνει αρνητικό {1} για το είδος {2} στην αποθήκη {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Μετά από αιτήματα Υλικό έχουν τεθεί αυτόματα ανάλογα με το επίπεδο εκ νέου την τάξη αντικειμένου
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Ο Λογαριασμός {0} είναι άκυρος. Η Νομισματική Μονάδα πρέπει να είναι {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Ο Λογαριασμός {0} είναι άκυρος. Η Νομισματική Μονάδα πρέπει να είναι {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Από την ημερομηνία {0} δεν μπορεί να είναι μετά την ημερομηνία ανακούφισης του υπαλλήλου {1}
 DocType: Supplier,Is Internal Supplier,Είναι εσωτερικός προμηθευτής
 DocType: Employee,Create User Permission,Δημιουργία άδειας χρήστη
@@ -3168,7 +3171,7 @@
 DocType: Account,Fixed Asset,Πάγιο
 DocType: Amazon MWS Settings,After Date,Μετά την ημερομηνίαν ταυτήν
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Απογραφή συνέχειες
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Μη έγκυρο {0} για το τιμολόγιο της εταιρίας.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Μη έγκυρο {0} για το τιμολόγιο της εταιρίας.
 ,Department Analytics,Τμήμα Analytics
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Δεν βρέθηκε διεύθυνση ηλεκτρονικού ταχυδρομείου στην προεπιλεγμένη επαφή
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Δημιουργία μυστικού
@@ -3180,7 +3183,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Το πρόγραμμα στη δομή των αμοιβών και στην Ομάδα σπουδαστών {0} είναι διαφορετικό.
 DocType: Bank Statement Transaction Entry,Receivable Account,Εισπρακτέα λογαριασμού
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Η ισχύουσα από την ημερομηνία πρέπει να είναι μικρότερη από την έγκυρη μέχρι την ημερομηνία.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Σειρά # {0}: Asset {1} είναι ήδη {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Σειρά # {0}: Asset {1} είναι ήδη {2}
 DocType: Quotation Item,Stock Balance,Ισοζύγιο αποθέματος
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Πωλήσεις Τάξης να Πληρωμής
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,CEO
@@ -3222,6 +3225,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Χρεωστικό να απαιτείται
 DocType: Clinical Procedure,Inpatient Record,Εγγραφή στα νοσοκομεία
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Φύλλων βοηθήσει να παρακολουθείτε την ώρα, το κόστος και τη χρέωση για δραστηριότητες γίνεται από την ομάδα σας"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Τιμοκατάλογος αγορών
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Ημερομηνία συναλλαγής
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Πρότυπα των μεταβλητών βαθμολογίας του προμηθευτή.
@@ -3264,7 +3268,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Ανταλλαγή Κέρδος / Ζημιά
 DocType: Opportunity,Lost Reason,Αιτιολογία απώλειας
 DocType: Amazon MWS Settings,Enable Amazon,Ενεργοποιήστε το Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Σειρά # {0}: Ο λογαριασμός {1} δεν ανήκει στην εταιρεία {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Σειρά # {0}: Ο λογαριασμός {1} δεν ανήκει στην εταιρεία {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Δεν είναι δυνατή η εύρεση του DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Νέα Διεύθυνση
 DocType: Quality Inspection,Sample Size,Μέγεθος δείγματος
@@ -3375,7 +3379,7 @@
 DocType: Water Analysis,Origin,Προέλευση
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Το έγγραφο αυτό είναι πάνω από το όριο του {0} {1} για το στοιχείο {4}. Κάνετε μια άλλη {3} κατά την ίδια {2};
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Παρακαλούμε να ορίσετε επαναλαμβανόμενες μετά την αποθήκευση
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,υπόψη το ποσό Επιλέξτε αλλαγή
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,υπόψη το ποσό Επιλέξτε αλλαγή
 DocType: Purchase Invoice,Price List Currency,Νόμισμα τιμοκαταλόγου
 DocType: Naming Series,User must always select,Ο χρήστης πρέπει πάντα να επιλέγει
 DocType: Stock Settings,Allow Negative Stock,Επίτρεψε αρνητικό απόθεμα
@@ -3417,7 +3421,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Είστε βέβαιοι ότι θέλετε να ακυρώσετε αυτό το ραντεβού;
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Πακέτο τιμολόγησης δωματίων ξενοδοχείου
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Pipeline πωλήσεις
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Παρακαλούμε να ορίσετε προεπιλεγμένο λογαριασμό στο Μισθός Component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Παρακαλούμε να ορίσετε προεπιλεγμένο λογαριασμό στο Μισθός Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Απαιτείται στις
 DocType: Rename Tool,File to Rename,Αρχείο μετονομασίας
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Επιλέξτε BOM για τη θέση στη σειρά {0}
@@ -3438,7 +3442,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Το κόστος των αγορασθέντων ειδών
 DocType: Employee Separation,Employee Separation Template,Πρότυπο διαχωρισμού υπαλλήλων
 DocType: Selling Settings,Sales Order Required,Η παραγγελία πώλησης είναι απαραίτητη
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Γίνετε πωλητής
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Γίνετε πωλητής
 DocType: Purchase Invoice,Credit To,Πίστωση προς
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Ενεργές Συστάσεις / Πελάτες
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Αφήστε κενό για να χρησιμοποιήσετε την τυπική μορφή σημείωσης παράδοσης
@@ -3479,7 +3483,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Κάντε πρότυπο φόρου
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Φόρουμ Χρηστών
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Το πεδίο πρώτων ύλών δεν μπορεί να είναι κενό.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Σειρά # {0} (Πίνακας πληρωμών): Το ποσό πρέπει να είναι αρνητικό
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Σειρά # {0} (Πίνακας πληρωμών): Το ποσό πρέπει να είναι αρνητικό
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Δεν ήταν δυνατή η ενημέρωση των αποθεμάτων, τιμολόγιο περιέχει πτώση στέλνοντας στοιχείο."
 DocType: Contract,Fulfilment Status,Κατάσταση εκπλήρωσης
 DocType: Lab Test Sample,Lab Test Sample,Δοκιμαστικό δείγμα εργαστηρίου
@@ -3638,7 +3642,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Ημερομηνία εγγράφου
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Εγγραφές τέλους Δημιουργήθηκε - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Κατηγορία Λογαριασμού
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Σειρά # {0} (Πίνακας Πληρωμών): Το ποσό πρέπει να είναι θετικό
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Σειρά # {0} (Πίνακας Πληρωμών): Το ποσό πρέπει να είναι θετικό
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Δεν γίνεται να παραχθούν είδη {0} περισσότερα από την ποσότητα παραγγελίας πώλησης {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Επιλέξτε Τιμές Χαρακτηριστικών
 DocType: Purchase Invoice,Reason For Issuing document,Λόγος για το έγγραφο έκδοσης
@@ -3693,7 +3697,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Η χρονική στιγμή κατά την οποία παρελήφθησαν τα υλικά
 DocType: Products Settings,Products per Page,Προϊόντα ανά σελίδα
 DocType: Stock Ledger Entry,Outgoing Rate,Ο απερχόμενος Τιμή
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,ή
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,ή
 DocType: Sales Order,Billing Status,Κατάσταση χρέωσης
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Αναφορά Θέματος
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Έξοδα κοινής ωφέλειας
@@ -3720,7 +3724,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Δήλωση απαλλαγής ΦΠΑ
 DocType: Payment Entry,Cheque/Reference Date,Επιταγή / Ημερομηνία Αναφοράς
 DocType: Purchase Invoice,Total Taxes and Charges,Σύνολο φόρων και επιβαρύνσεων
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Η ημερομηνία που είναι διαθέσιμη για χρήση καταχωρείται ως ημερομηνία λήξης
 DocType: Employee,Emergency Contact,Επείγουσα επικοινωνία
 DocType: Bank Reconciliation Detail,Payment Entry,Έναρξη πληρωμής
 ,sales-browser,πωλήσεις-browser
@@ -3766,6 +3769,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Επιστροφή (Πιστωτική Σημείωση)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Ξεκινήστε την εργασία
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Απαιτείται σειριακό αριθμό για το στοιχείο {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ορίστε την Ονοματοδοσία για {0} μέσω του Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Άτομα με ειδικές ανάγκες προτύπου δεν πρέπει να είναι προεπιλεγμένο πρότυπο
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Για τη σειρά {0}: Εισάγετε προγραμματισμένη ποσότητα
 DocType: Account,Income Account,Λογαριασμός εσόδων
@@ -3779,6 +3783,7 @@
 DocType: Loyalty Program,Help Section,Τμήμα βοήθειας
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Προηγ
 DocType: Appraisal Goal,Key Responsibility Area,Βασικός τομέας ευθύνης
+DocType: Delivery Trip,Distance UOM,Απόσταση UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Παρτίδες φοιτητής να σας βοηθήσει να παρακολουθείτε φοίτηση, οι εκτιμήσεις και τα τέλη για τους φοιτητές"
 DocType: Payment Entry,Total Allocated Amount,Συνολικό ποσό που χορηγήθηκε
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Ορίστε τον προεπιλεγμένο λογαριασμό αποθέματος για διαρκή απογραφή
@@ -3820,7 +3825,7 @@
 DocType: Item Supplier,Item Supplier,Προμηθευτής είδους
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Παρακαλώ εισάγετε κωδικό είδους για να δείτε τον αρ. παρτίδας
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Παρακαλώ επιλέξτε μια τιμή για {0} προσφορά προς {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Δεν έχουν επιλεγεί στοιχεία για μεταφορά
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Δεν έχουν επιλεγεί στοιχεία για μεταφορά
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Όλες τις διευθύνσεις.
 DocType: Company,Stock Settings,Ρυθμίσεις αποθέματος
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Η συγχώνευση είναι δυνατή μόνο εάν οι ακόλουθες ιδιότητες ίδια στα δύο αρχεία. Είναι η Ομάδα, Τύπος Root, Company"
@@ -4117,7 +4122,7 @@
 DocType: Patient,Personal and Social History,Προσωπική και κοινωνική ιστορία
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Ο χρήστης {0} δημιουργήθηκε
 DocType: Fee Schedule,Fee Breakup for each student,Διάρθρωση τέλους για κάθε φοιτητή
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Σύνολο εκ των προτέρων ({0}) κατά Παραγγελία {1} δεν μπορεί να είναι μεγαλύτερη από το Γενικό σύνολο ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Σύνολο εκ των προτέρων ({0}) κατά Παραγγελία {1} δεν μπορεί να είναι μεγαλύτερη από το Γενικό σύνολο ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Επιλέξτε μηνιαία κατανομή για την άνιση κατανομή στόχων στους μήνες.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Αλλαγή κωδικού
 DocType: Purchase Invoice Item,Valuation Rate,Ποσοστό αποτίμησης
@@ -4126,7 +4131,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Επωφεληθεί ITC Cess
 ,Student Monthly Attendance Sheet,Φοιτητής Φύλλο Μηνιαία Συμμετοχή
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Κανονισμός αποστολής ισχύει μόνο για την πώληση
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Γραμμή απόσβεσης {0}: Η επόμενη ημερομηνία απόσβεσης δεν μπορεί να είναι πριν από την ημερομηνία αγοράς
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Γραμμή απόσβεσης {0}: Η επόμενη ημερομηνία απόσβεσης δεν μπορεί να είναι πριν από την ημερομηνία αγοράς
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Ημερομηνία έναρξης του έργου
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Μέχρι
 DocType: Rename Tool,Rename Log,Αρχείο καταγραφής μετονομασίας
@@ -4143,12 +4148,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Πόσο συχνά πρέπει να ενημερώνεται το έργο και η εταιρεία με βάση τις Συναλλαγές Πωλήσεων.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Λήγει στις
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Προσθέστε Φοιτητές
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Διαγράψτε τον υπάλληλο <a href=""#Form/Employee/{0}"">{0}</a> \ για να ακυρώσετε αυτό το έγγραφο"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Παρακαλώ επιλέξτε {0}
 DocType: C-Form,C-Form No,Αρ. C-Form
 DocType: BOM,Exploded_items,Είδη αναλυτικά
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Απόσταση
+DocType: Delivery Stop,Distance,Απόσταση
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Καταγράψτε τα προϊόντα ή τις υπηρεσίες σας που αγοράζετε ή πουλάτε.
 DocType: Water Analysis,Storage Temperature,Θερμοκρασία αποθήκευσης
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4175,7 +4178,7 @@
 DocType: Homepage,Company Description for website homepage,Περιγραφή Εταιρείας για την ιστοσελίδα αρχική σελίδα
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Για την εξυπηρέτηση των πελατών, οι κωδικοί αυτοί μπορούν να χρησιμοποιηθούν σε μορφές εκτύπωσης, όπως τιμολόγια και δελτία παράδοσης"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Όνομα suplier
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Δεν ήταν δυνατή η ανάκτηση πληροφοριών για το {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Δεν ήταν δυνατή η ανάκτηση πληροφοριών για το {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Άνοιγμα του περιοδικού εισόδου
 DocType: Contract,Fulfilment Terms,Όροι εκπλήρωσης
 DocType: Sales Invoice,Time Sheet List,Λίστα Φύλλο χρόνο
@@ -4355,7 +4358,7 @@
 DocType: Serial No,Warranty / AMC Details,Λεπτομέρειες εγγύησης / Ε.Σ.Υ.
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Επιλέξτε τους σπουδαστές με μη αυτόματο τρόπο για την ομάδα που βασίζεται στην δραστηριότητα
 DocType: Journal Entry,User Remark,Παρατήρηση χρήστη
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Βελτιστοποίηση διαδρομών.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Βελτιστοποίηση διαδρομών.
 DocType: Travel Itinerary,Non Diary,Μη ημερολόγιο
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Δεν είναι δυνατή η δημιουργία μπόνους διατήρησης για τους αριστερούς υπαλλήλους
 DocType: Lead,Market Segment,Τομέας της αγοράς
@@ -4385,7 +4388,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Πρόγραμμα αφοσίωσης
 DocType: Student Guardian,Father,Πατέρας
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Υποστήριξη εισιτηρίων
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,«Ενημέρωση Χρηματιστήριο» δεν μπορεί να ελεγχθεί για σταθερή την πώληση περιουσιακών στοιχείων
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,«Ενημέρωση Χρηματιστήριο» δεν μπορεί να ελεγχθεί για σταθερή την πώληση περιουσιακών στοιχείων
 DocType: Bank Reconciliation,Bank Reconciliation,Συμφωνία τραπεζικού λογαριασμού
 DocType: Attendance,On Leave,Σε ΑΔΕΙΑ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Λήψη ενημερώσεων
@@ -4430,7 +4433,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Αύξων αριθμός παρτίδας και
 DocType: Warranty Claim,From Company,Από την εταιρεία
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Άθροισμα Δεκάδες Κριτήρια αξιολόγησης πρέπει να είναι {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Παρακαλούμε να ορίσετε Αριθμός Αποσβέσεις κράτηση
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Παρακαλούμε να ορίσετε Αριθμός Αποσβέσεις κράτηση
 DocType: Supplier Scorecard Period,Calculations,Υπολογισμοί
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Αξία ή ποσ
 DocType: Payment Terms Template,Payment Terms,Οροι πληρωμής
@@ -4449,7 +4452,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Έκπτωση (%) στην Τιμοκατάλογο με Περιθώριο
 DocType: Healthcare Service Unit Type,Rate / UOM,Τιμή / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Όλες οι Αποθήκες
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Δεν βρέθηκε {0} για τις συναλλαγές μεταξύ εταιρειών.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Δεν βρέθηκε {0} για τις συναλλαγές μεταξύ εταιρειών.
 DocType: Travel Itinerary,Rented Car,Νοικιασμένο αυτοκίνητο
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Σχετικά με την εταιρεία σας
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Πίστωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
@@ -4550,6 +4553,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Κριτήρια ανάλυσης φυτών
 DocType: Cheque Print Template,Cheque Height,Επιταγή Ύψος
 DocType: Supplier,Supplier Details,Στοιχεία προμηθευτή
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Παρακαλούμε ρυθμίστε τη σειρά αρίθμησης για τη συμμετοχή μέσω του Setup&gt; Series Numbering
 DocType: Setup Progress,Setup Progress,Πρόοδος εγκατάστασης
 DocType: Expense Claim,Approval Status,Κατάσταση έγκρισης
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Η ΄από τιμή' πρέπει να είναι μικρότερη από την 'έως τιμή' στη γραμμή {0}
@@ -4642,7 +4646,6 @@
 DocType: Travel Request,Fully Sponsored,Πλήρης χορηγία
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Αντίστροφη εγγραφή ημερολογίου
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Ο πελάτης {0} δημιουργείται.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό&gt; Ρυθμίσεις HR
 DocType: Stock Settings,Limit Percent,όριο Ποσοστό
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Επί του παρόντος δεν υπάρχει διαθέσιμο απόθεμα σε καμία αποθήκη
 ,Payment Period Based On Invoice Date,Περίοδος πληρωμής με βάση την ημερομηνία τιμολογίου
@@ -4701,7 +4704,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Αποθήκη προέλευσης
 DocType: Installation Note,Installation Date,Ημερομηνία εγκατάστασης
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Λογαριασμός μετοχών
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Σειρά # {0}: Asset {1} δεν ανήκει στην εταιρεία {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Σειρά # {0}: Asset {1} δεν ανήκει στην εταιρεία {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Το τιμολόγιο πωλήσεων {0} δημιουργήθηκε
 DocType: Employee,Confirmation Date,Ημερομηνία επιβεβαίωσης
 DocType: Inpatient Occupancy,Check Out,Ολοκλήρωση αγοράς
@@ -4721,6 +4724,7 @@
 DocType: Production Plan,Sales Orders Detail,Λεπτομέρειες για τις παραγγελίες πωλήσεων
 DocType: Bin,Requested Quantity,ζήτησε Ποσότητα
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εκπαιδευτών στην Εκπαίδευση&gt; Ρυθμίσεις Εκπαίδευσης
 DocType: Patient,Marital Status,Οικογενειακή κατάσταση
 DocType: Stock Settings,Auto Material Request,Αυτόματη αίτηση υλικού
 DocType: Woocommerce Settings,API consumer secret,API καταναλωτικό απόρρητο
@@ -4773,7 +4777,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Επιλέξτε ημέρες
 DocType: Academic Term,Term Name,Term Όνομα
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Πιστωτική ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Δημιουργία μισθοδοσίας μισθών ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Δημιουργία μισθοδοσίας μισθών ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Δεν μπορείτε να επεξεργαστείτε τον κόμβο ρίζας.
 DocType: Buying Settings,Purchase Order Required,Απαιτείται παραγγελία αγοράς
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Μετρών την ώραν
@@ -4809,7 +4813,7 @@
 DocType: Account,Rate at which this tax is applied,Ποσοστό με το οποίο επιβάλλεται ο φόρος αυτός
 DocType: Cash Flow Mapper,Section Name,Όνομα τμήματος
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Αναδιάταξη ποσότητας
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Γραμμή απόσβεσης {0}: Η αναμενόμενη τιμή μετά την ωφέλιμη ζωή πρέπει να είναι μεγαλύτερη ή ίση με {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Γραμμή απόσβεσης {0}: Η αναμενόμενη τιμή μετά την ωφέλιμη ζωή πρέπει να είναι μεγαλύτερη ή ίση με {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Θέσεις Εργασίας
 DocType: Company,Stock Adjustment Account,Λογαριασμός διευθέτησης αποθέματος
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Διαγράφω
@@ -4856,7 +4860,7 @@
 DocType: Program Enrollment,School House,Σχολείο
 DocType: Serial No,Out of AMC,Εκτός Ε.Σ.Υ.
 DocType: Opportunity,Opportunity Amount,Ποσό ευκαιρίας
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Αριθμός Αποσβέσεις κράτηση δεν μπορεί να είναι μεγαλύτερη από Συνολικός αριθμός Αποσβέσεις
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Αριθμός Αποσβέσεις κράτηση δεν μπορεί να είναι μεγαλύτερη από Συνολικός αριθμός Αποσβέσεις
 DocType: Purchase Order,Order Confirmation Date,Ημερομηνία επιβεβαίωσης παραγγελίας
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Δημιούργησε επίσκεψη συντήρησης
@@ -4897,7 +4901,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Σύνολο παραγωγής:
 DocType: Volunteer,Afternoon,Απόγευμα
 DocType: Loyalty Program,Loyalty Program Help,Βοήθεια για το πρόγραμμα αφοσίωσης
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' Είναι απενεργοποιημένος
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' Είναι απενεργοποιημένος
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ορισμός ως Ανοικτό
 DocType: Cheque Print Template,Scanned Cheque,σαρωμένα Επιταγή
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Αυτόματη αποστολή email στις επαφές για την υποβολή των συναλλαγών.
@@ -4910,7 +4914,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Στοιχείο και εγγύηση Λεπτομέρειες
 DocType: Chapter,Chapter Members,Κεφάλαιο Μέλη
 DocType: Sales Team,Contribution (%),Συμβολή (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Σημείωση : η καταχώρηση πληρωμής δεν θα δημιουργηθεί γιατί δεν ορίστηκε λογαριασμός μετρητών ή τραπέζης
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Σημείωση : η καταχώρηση πληρωμής δεν θα δημιουργηθεί γιατί δεν ορίστηκε λογαριασμός μετρητών ή τραπέζης
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Το έργο {0} υπάρχει ήδη
 DocType: Clinical Procedure,Nursing User,Χρήστης νοσηλευτικής
 DocType: Employee Benefit Application,Payroll Period,Περίοδος μισθοδοσίας
@@ -4918,6 +4922,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Ο αριθμός σειράς {0} δεν ανήκει στην Παρτίδα {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Αρμοδιότητες
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Η περίοδος ισχύος αυτής της προσφοράς έχει λήξει.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Διαγράψτε τον υπάλληλο <a href=""#Form/Employee/{0}"">{0}</a> \ για να ακυρώσετε αυτό το έγγραφο"
 DocType: Expense Claim Account,Expense Claim Account,Λογαριασμός Εξόδων αξίωσης
 DocType: Account,Capital Work in Progress,Οι εργασίες κεφαλαίου σε εξέλιξη
 DocType: Accounts Settings,Allow Stale Exchange Rates,Να επιτρέπεται η μετατροπή σε Stale Exchange Rate
@@ -4998,7 +5004,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Υλικό θέματος
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Συνδέστε το Shopify με το ERPNext
 DocType: Material Request Item,For Warehouse,Για αποθήκη
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Οι σημειώσεις παράδοσης {0} ενημερώνονται
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Οι σημειώσεις παράδοσης {0} ενημερώνονται
 DocType: Employee,Offer Date,Ημερομηνία προσφοράς
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Προσφορές
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Βρίσκεστε σε λειτουργία χωρίς σύνδεση. Δεν θα είστε σε θέση να φορτώσετε εκ νέου έως ότου έχετε δίκτυο.
@@ -5048,7 +5054,7 @@
 DocType: Shipping Rule,Calculate Based On,Υπολογισμός με βάση:
 DocType: Contract,Unfulfilled,Ανεκπλήρωτος
 DocType: Delivery Note Item,From Warehouse,Από Αποθήκης
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Δεν υπάρχουν υπάλληλοι για τα προαναφερθέντα κριτήρια
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Δεν υπάρχουν υπάλληλοι για τα προαναφερθέντα κριτήρια
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Δεν Αντικείμενα με τον Bill Υλικών για Κατασκευή
 DocType: Shopify Settings,Default Customer,Προεπιλεγμένος πελάτης
 DocType: Sales Stage,Stage Name,Καλλιτεχνικό ψευδώνυμο
@@ -5090,7 +5096,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Ποσό φόρου μετά ποσού έκπτωσης
 DocType: Patient,Inpatient Status,Κατάσταση νοσηλευτή
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Καθημερινή Ρυθμίσεις Περίληψη εργασίας
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Ο Επιλεγμένος Τιμοκατάλογος θα πρέπει να ελέγξει τα πεδία αγοράς και πώλησης.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Ο Επιλεγμένος Τιμοκατάλογος θα πρέπει να ελέγξει τα πεδία αγοράς και πώλησης.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Πληκτρολογήστε Reqd by Date
 DocType: Payment Entry,Internal Transfer,εσωτερική Μεταφορά
 DocType: Asset Maintenance,Maintenance Tasks,Συνθήκες Συντήρησης
@@ -5126,7 +5132,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Ομαδοποίηση κατά
 DocType: Guardian,Interests,Ενδιαφέροντα
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Ενεργοποίηση / απενεργοποίηση νομισμάτων.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Δεν ήταν δυνατή η υποβολή ορισμένων μισθοδοτικών μισθών
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Δεν ήταν δυνατή η υποβολή ορισμένων μισθοδοτικών μισθών
 DocType: Exchange Rate Revaluation,Get Entries,Λάβετε καταχωρήσεις
 DocType: Production Plan,Get Material Request,Πάρτε Αίτημα Υλικό
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Ταχυδρομικές δαπάνες
@@ -5210,7 +5216,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Ο λογαριασμός δαπανών είναι υποχρεωτικός για το είδος {0}
 DocType: BOM,Website Description,Περιγραφή δικτυακού τόπου
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Καθαρή Μεταβολή Ιδίων Κεφαλαίων
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Παρακαλείστε να ακυρώσετε την αγορά Τιμολόγιο {0} πρώτο
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Παρακαλείστε να ακυρώσετε την αγορά Τιμολόγιο {0} πρώτο
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Δεν επιτρέπεται. Απενεργοποιήστε τον τύπο μονάδας υπηρεσίας
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Διεύθυνση e-mail πρέπει να είναι μοναδική, υπάρχει ήδη για {0}"
 DocType: Serial No,AMC Expiry Date,Ε.Σ.Υ. Ημερομηνία λήξης
@@ -5250,7 +5256,7 @@
 DocType: Hotel Room,Hotel Room,Δωμάτιο ξενοδοχείου
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Ο Λογαριασμός {0} δεν ανήκει στην εταιρεία {1}
 DocType: Leave Type,Rounding,Στρογγύλεμα
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Οι σειριακοί αριθμοί στη σειρά {0} δεν ταιριάζουν με τη Σημείωση Παραλαβής
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Οι σειριακοί αριθμοί στη σειρά {0} δεν ταιριάζουν με τη Σημείωση Παραλαβής
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Χορηγημένο Ποσό (Προ-Αξιολόγηση)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Στη συνέχεια, οι Κανόνες Τιμολόγησης φιλτράρονται με βάση τον Πελάτη, την Ομάδα Πελατών, την Περιοχή, τον Προμηθευτή, την Ομάδα Προμηθευτών, την Καμπάνια, τον Συνεργάτη Πωλήσεων κλπ"
 DocType: Student,Guardian Details,Guardian Λεπτομέρειες
@@ -5305,7 +5311,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Απαιτείται αποθήκη για το είδος αποθέματος {0}
 DocType: Leave Allocation,Unused leaves,Αχρησιμοποίητα φύλλα
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Κάντε την καταβολή αποπληρωμής
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Όλα τα Τμήματα
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Όλα τα Τμήματα
 DocType: Healthcare Service Unit,Vacant,Κενός
 DocType: Patient,Alcohol Past Use,Χρήση αλκοόλ στο παρελθόν
 DocType: Fertilizer Content,Fertilizer Content,Περιεκτικότητα σε λιπάσματα
@@ -5316,7 +5322,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Η εντολή εργασίας {0} πρέπει να ακυρωθεί πριν την ακύρωση αυτής της εντολής πώλησης
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Φέρε αναλυτική Λ.Υ. ( Συμπεριλαμβανομένων των υποσυνόλων )
 DocType: Authorization Rule,Applicable To (Employee),Εφαρμοστέα σε (υπάλληλος)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Due Date είναι υποχρεωτική
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Due Date είναι υποχρεωτική
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Προσαύξηση για Χαρακτηριστικό {0} δεν μπορεί να είναι 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Όφελος Τύπος και Ποσό
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Δωμάτια Κράτηση
@@ -5460,7 +5466,7 @@
 DocType: Purchase Invoice Item,Total Weight,Συνολικό βάρος
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Προμήθεια επί των πωλήσεων
 DocType: Job Offer Term,Value / Description,Αξία / Περιγραφή
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Σειρά # {0}: Asset {1} δεν μπορεί να υποβληθεί, είναι ήδη {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Σειρά # {0}: Asset {1} δεν μπορεί να υποβληθεί, είναι ήδη {2}"
 DocType: Tax Rule,Billing Country,Χρέωση Χώρα
 DocType: Purchase Order Item,Expected Delivery Date,Αναμενόμενη ημερομηνία παράδοσης
 DocType: Restaurant Order Entry,Restaurant Order Entry,Είσοδος Παραγγελίας Εστιατορίου
@@ -5499,12 +5505,13 @@
 DocType: Maintenance Visit,Breakdown,Ανάλυση
 DocType: Travel Itinerary,Vegetarian,Χορτοφάγος
 DocType: Patient Encounter,Encounter Date,Ημερομηνία συνάντησης
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Ο λογαριασμός: {0} με το νόμισμα: {1} δεν μπορεί να επιλεγεί
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Ο λογαριασμός: {0} με το νόμισμα: {1} δεν μπορεί να επιλεγεί
 DocType: Bank Statement Transaction Settings Item,Bank Data,Στοιχεία τράπεζας
 DocType: Purchase Receipt Item,Sample Quantity,Ποσότητα δείγματος
 DocType: Bank Guarantee,Name of Beneficiary,Όνομα δικαιούχου
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Ενημέρωση κόστους BOM αυτόματα μέσω Scheduler, με βάση το τελευταίο ποσοστό αποτίμησης / τιμοκαταλόγου / τελευταίο ποσοστό αγοράς πρώτων υλών."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Προμηθευτής&gt; Ομάδα προμηθευτών
 DocType: Bank Reconciliation Detail,Cheque Date,Ημερομηνία επιταγής
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Ο λογαριασμός {0}: γονικός λογαριασμός {1} δεν ανήκει στην εταιρεία: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Διαγράφηκε επιτυχώς όλες τις συναλλαγές που σχετίζονται με αυτή την εταιρεία!
@@ -5532,7 +5539,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,κόμβοι παιδί μπορεί να δημιουργηθεί μόνο με κόμβους τύπου «Όμιλος»
 DocType: Attendance Request,Half Day Date,Μισή Μέρα Ημερομηνία
 DocType: Academic Year,Academic Year Name,Όνομα Ακαδημαϊκού Έτους
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,Δεν επιτρέπεται η {0} συναλλαγή με {1}. Αλλάξτε την Εταιρεία.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,Δεν επιτρέπεται η {0} συναλλαγή με {1}. Αλλάξτε την Εταιρεία.
 DocType: Sales Partner,Contact Desc,Περιγραφή επαφής
 DocType: Email Digest,Send regular summary reports via Email.,"Αποστολή τακτικών συνοπτικών εκθέσεων, μέσω email."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Παρακαλούμε να ορίσετε προεπιλεγμένο λογαριασμό στο Εξόδων αξίωση Τύπος {0}
@@ -5565,7 +5572,7 @@
 DocType: Hotel Room,Hotel Manager,Διευθυντής ξενοδοχείου
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Ορισμός φορολογική Κανόνας για το καλάθι αγορών
 DocType: Purchase Invoice,Taxes and Charges Added,Φόροι και επιβαρύνσεις που προστέθηκαν
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Απόσβεση γραμμής {0}: Η επόμενη ημερομηνία απόσβεσης δεν μπορεί να γίνει πριν από την Ημερομηνία διαθέσιμης για χρήση
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Απόσβεση γραμμής {0}: Η επόμενη ημερομηνία απόσβεσης δεν μπορεί να γίνει πριν από την Ημερομηνία διαθέσιμης για χρήση
 ,Sales Funnel,Χοάνη πωλήσεων
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Σύντμηση είναι υποχρεωτική
 DocType: Project,Task Progress,Task Progress
@@ -5579,7 +5586,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Όλες οι ομάδες πελατών
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,συσσωρευμένες Μηνιαία
 DocType: Attendance Request,On Duty,Στο καθήκον
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,Η {0} είναι απαραίτητη. Ίσως δεν έχει δημιουργηθεί εγγραφή ισοτιμίας συναλλάγματος από {1} έως {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,Η {0} είναι απαραίτητη. Ίσως δεν έχει δημιουργηθεί εγγραφή ισοτιμίας συναλλάγματος από {1} έως {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Προσωπικό Σχέδιο {0} υπάρχει ήδη για τον προσδιορισμό {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Φόρος προτύπου είναι υποχρεωτική.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Ο λογαριασμός {0}: γονικός λογαριασμός {1} δεν υπάρχει
@@ -5659,11 +5666,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Τουλάχιστον μια αποθήκη είναι απαραίτητη
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Ρύθμιση πεδίων αντικειμένου όπως UOM, ομάδα στοιχείων, περιγραφή και αριθμός ωρών."
 DocType: Certification Application,Certification Status,Κατάσταση πιστοποίησης
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Αγορά
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Αγορά
 DocType: Travel Itinerary,Travel Advance Required,Απαιτείται Απαιτήσεις Ταξιδιού
 DocType: Subscriber,Subscriber Name,Όνομα συνδρομητή
 DocType: Serial No,Out of Warranty,Εκτός εγγύησης
-DocType: Cashier Closing,Cashier-closing-,Ταμείο-κλείσιμο-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Χαρτογραφημένο τύπος δεδομένων
 DocType: BOM Update Tool,Replace,Αντικατάσταση
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Δεν βρέθηκαν προϊόντα.
@@ -5750,7 +5756,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Προεπιλεγμένα πρότυπα φόρου για τις πωλήσεις και την αγορά δημιουργούνται.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Η καταγραφή Αποτέλεσμα Αξιολόγησης {0} υπάρχει ήδη.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Παράδειγμα: ABCD. #####. Εάν έχει οριστεί σειρά και η Παρτίδα αριθ. Δεν αναφέρεται στις συναλλαγές, τότε θα δημιουργηθεί αυτόματος αριθμός παρτίδας βάσει αυτής της σειράς. Εάν θέλετε πάντα να αναφέρετε ρητώς τον αριθμό παρτίδας για αυτό το στοιχείο, αφήστε το κενό. Σημείωση: αυτή η ρύθμιση θα έχει προτεραιότητα σε σχέση με το πρόθεμα σειράς ονομάτων στις ρυθμίσεις αποθεμάτων."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Παρακαλούμε ρυθμίστε τη σειρά αρίθμησης για τη συμμετοχή μέσω του Setup&gt; Series Numbering
 DocType: BOM,Materials Required (Exploded),Υλικά που απαιτούνται (αναλυτικά)
 DocType: Contract,Party User,Χρήστης κόμματος
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Ρυθμίστε το φίλτρο Εταιρεία κενό, εάν η ομάδα είναι &quot;Εταιρεία&quot;"
@@ -5951,7 +5956,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Αρίθμηση Opp
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Πρέπει να οριστεί τόσο η ημερομηνία έναρξης της δοκιμαστικής περιόδου όσο και η ημερομηνία λήξης της δοκιμαστικής περιόδου
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Μέσος όρος
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Το συνολικό ποσό πληρωμής στο Πρόγραμμα Πληρωμών πρέπει να είναι ίσο με το Μεγάλο / Στρογγυλεμένο Σύνολο
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Το συνολικό ποσό πληρωμής στο Πρόγραμμα Πληρωμών πρέπει να είναι ίσο με το Μεγάλο / Στρογγυλεμένο Σύνολο
 DocType: Subscription Plan Detail,Plan,Σχέδιο
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Δήλωση ισορροπία τραπεζών σύμφωνα με τη Γενική Λογιστική
 DocType: Job Applicant,Applicant Name,Όνομα αιτούντος
@@ -6020,7 +6025,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Σαπούνι & απορρυπαντικά
 DocType: BOM,Show Items,Εμφάνιση Είδη
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,"Από χρόνος δεν μπορεί να είναι μεγαλύτερη από ό, τι σε καιρό."
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Θέλετε να ενημερώσετε όλους τους πελάτες μέσω ηλεκτρονικού ταχυδρομείου;
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Θέλετε να ενημερώσετε όλους τους πελάτες μέσω ηλεκτρονικού ταχυδρομείου;
 DocType: Subscription Plan,Billing Interval,Διάρκεια χρέωσης
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion picture & βίντεο
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Έχουν παραγγελθεί
@@ -6029,9 +6034,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Η σειρά {0}: {1} πρέπει να είναι μεγαλύτερη από 0
 DocType: Assessment Criteria,Assessment Criteria Group,Κριτήρια Αξιολόγησης Ομάδα
 DocType: Healthcare Settings,Patient Name By,Όνομα ασθενούς από
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Εισαγωγή ημερολογίου εκκαθάρισης για τους μισθούς από {0} έως {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Εισαγωγή ημερολογίου εκκαθάρισης για τους μισθούς από {0} έως {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Ενεργοποίηση αναβαλλόμενων εσόδων
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Άνοιγμα Συσσωρευμένες Αποσβέσεις πρέπει να είναι μικρότερη από ίση με {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Άνοιγμα Συσσωρευμένες Αποσβέσεις πρέπει να είναι μικρότερη από ίση με {0}
 DocType: Warehouse,Warehouse Name,Όνομα αποθήκης
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Η πραγματική ημερομηνία έναρξης πρέπει να είναι μικρότερη από την πραγματική ημερομηνία λήξης
 DocType: Naming Series,Select Transaction,Επιλέξτε συναλλαγή
@@ -6182,7 +6187,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Ο υπάλληλος {0} βαθμού {1} δεν έχει πολιτική προεπιλογής
 DocType: Salary Detail,Salary Detail,μισθός Λεπτομέρειες
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Παρακαλώ επιλέξτε {0} πρώτα
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Προστέθηκαν {0} χρήστες
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Προστέθηκαν {0} χρήστες
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","Στην περίπτωση προγράμματος πολλαπλών βαθμίδων, οι Πελάτες θα αντιστοιχούν αυτόματα στη σχετική βαθμίδα σύμφωνα με το ποσό που δαπανώνται"
 DocType: Appointment Type,Physician,Γιατρός
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Παρτίδα {0} του σημείου {1} έχει λήξει.
@@ -6326,7 +6331,7 @@
 DocType: Asset,Custodian,Φύλακας
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Point-of-Sale Προφίλ
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} θα πρέπει να είναι μια τιμή μεταξύ 0 και 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Πληρωμή {0} από {1} έως {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Πληρωμή {0} από {1} έως {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Ακάλυπτά δάνεια
 DocType: Cost Center,Cost Center Name,Όνομα κέντρου κόστους
 DocType: Student,B+,B +
@@ -6358,6 +6363,7 @@
 DocType: Employee,Date of Issue,Ημερομηνία έκδοσης
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Σύμφωνα με τις Ρυθμίσεις Αγορών, εάν απαιτείται Απαιτούμενη Αγορά == &#39;ΝΑΙ&#39;, τότε για τη δημιουργία Τιμολογίου Αγοράς, ο χρήστης πρέπει να δημιουργήσει πρώτα την Παραλαβή Αγοράς για το στοιχείο {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Σειρά # {0}: Ορισμός Προμηθευτή για το στοιχείο {1}
+DocType: Global Defaults,Default Distance Unit,Προεπιλεγμένη απόσταση
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Σειρά {0}: Ώρες τιμή πρέπει να είναι μεγαλύτερη από το μηδέν.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Ιστοσελίδα Εικόνα {0} επισυνάπτεται στη θέση {1} δεν μπορεί να βρεθεί
 DocType: Issue,Content Type,Τύπος περιεχομένου
@@ -6413,7 +6419,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Χρέωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
 DocType: Asset,Naming Series,Σειρά ονομασίας
 DocType: Vital Signs,Coated,Επικαλυμμένα
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Σειρά {0}: Αναμενόμενη αξία μετά από την ωφέλιμη ζωή πρέπει να είναι μικρότερη από το ακαθάριστο ποσό αγοράς
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Σειρά {0}: Αναμενόμενη αξία μετά από την ωφέλιμη ζωή πρέπει να είναι μικρότερη από το ακαθάριστο ποσό αγοράς
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Ρυθμίσεις
 DocType: Leave Block List,Leave Block List Name,Όνομα λίστας αποκλεισμού ημερών άδειας
 DocType: Certified Consultant,Certification Validity,Πιστοποίηση ισχύος
@@ -6480,6 +6486,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Τράπεζα Header
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Προβολή εργαστηριακών δοκιμών
 DocType: Hub Users,Hub Users,Χρήστες Hub
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα πελατών&gt; Επικράτεια
 DocType: Purchase Invoice,Y,Υ
 DocType: Maintenance Visit,Maintenance Date,Ημερομηνία συντήρησης
 DocType: Purchase Invoice Item,Rejected Serial No,Σειριακός αριθμός που απορρίφθηκε
@@ -6494,7 +6501,7 @@
 DocType: SG Creation Tool Course,Max Strength,Μέγιστη Αντοχή
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Εγκατάσταση προρυθμίσεων
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Δεν έχει επιλεγεί καμία παραλαβή για τον πελάτη {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Δεν έχει επιλεγεί καμία παραλαβή για τον πελάτη {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Ο υπάλληλος {0} δεν έχει μέγιστο όφελος
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Επιλέξτε στοιχεία βάσει της ημερομηνίας παράδοσης
 DocType: Grant Application,Has any past Grant Record,Έχει κάποιο παρελθόν Grant Record
@@ -6521,7 +6528,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Κρατήσεις Ξενοδοχείων
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Εξυπηρέτηση πελατών
 DocType: BOM,Thumbnail,Μικρογραφία
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Δεν βρέθηκαν επαφές με τα αναγνωριστικά ηλεκτρονικού ταχυδρομείου.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Δεν βρέθηκαν επαφές με τα αναγνωριστικά ηλεκτρονικού ταχυδρομείου.
 DocType: Item Customer Detail,Item Customer Detail,Λεπτομέρειες πελατών είδους
 DocType: Notification Control,Prompt for Email on Submission of,Ερώτηση για email κατά την υποβολή του
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Το μέγιστο ποσό παροχών του υπαλλήλου {0} υπερβαίνει το {1}
@@ -6776,7 +6783,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,"Δεν μπορείτε να μετατρέψετε σε ομάδα, επειδή έχει επιλεγεί τύπος λογαριασμού"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} Έχει τροποποιηθεί. Παρακαλώ ανανεώστε.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Σταματήστε τους χρήστες από το να κάνουν αιτήσεις αδειών για τις επόμενες ημέρες.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Κωδικός στοιχείου&gt; Ομάδα στοιχείων&gt; Μάρκα
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Σε περίπτωση απεριόριστης λήξης για τους πόντους επιβράβευσης, κρατήστε τη διάρκεια λήξης κενή ή 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Μέλη της ομάδας συντήρησης
 DocType: Loyalty Point Entry,Purchase Amount,Ποσό αγορά
@@ -6784,7 +6790,7 @@
 											to fullfill Sales Order {2}",Δεν είναι δυνατή η παράδοση του σειριακού αριθμού {0} του στοιχείου {1} όπως είναι δεσμευμένο \ για την πλήρωση της εντολής πωλήσεων {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Προσφορά Προμηθευτής {0} δημιουργήθηκε
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Στο τέλος του έτους δεν μπορεί να είναι πριν από την έναρξη Έτος
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Στο τέλος του έτους δεν μπορεί να είναι πριν από την έναρξη Έτος
 DocType: Employee Benefit Application,Employee Benefits,Παροχές σε εργαζομένους
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Η συσκευασμένη ποσότητα πρέπει να ισούται με την ποσότητα για το είδος {0} στη γραμμή {1}
 DocType: Work Order,Manufactured Qty,Παραγόμενη ποσότητα
@@ -6800,6 +6806,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Επιλέξτε αριθμούς παρτίδων
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Για το GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Λογαριασμοί για πελάτες.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό&gt; Ρυθμίσεις HR
 DocType: Healthcare Settings,Invoice Appointments Automatically,Τιμολόγια αυτόματα
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id έργου
 DocType: Salary Component,Variable Based On Taxable Salary,Μεταβλητή βασισμένη στον φορολογητέο μισθό
@@ -6848,7 +6855,7 @@
 DocType: POS Profile,Account for Change Amount,Ο λογαριασμός για την Αλλαγή Ποσό
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Σύνδεση με το QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Συνολικό κέρδος / ζημιά
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Μη έγκυρη εταιρεία για το τιμολόγιο μεταξύ εταιρειών.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Μη έγκυρη εταιρεία για το τιμολόγιο μεταξύ εταιρειών.
 DocType: Purchase Invoice,input service,υπηρεσία εισόδου
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Σειρά {0}: Πάρτι / λογαριασμός δεν ταιριάζει με {1} / {2} στο {3} {4}
 DocType: Employee Promotion,Employee Promotion,Προώθηση εργαζομένων
@@ -6978,7 +6985,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Προτιμώμενη περιοχή για καταλύματα
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Το καλάθι είναι άδειο
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εκπαιδευτών στην Εκπαίδευση&gt; Ρυθμίσεις Εκπαίδευσης
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Το στοιχείο {0} δεν έχει σειριακό αριθμό. Μόνο εξυπηρετημένα αντικείμενα \ μπορεί να έχουν παράδοση με βάση τον αύξοντα αριθμό
 DocType: Vehicle,Model,Μοντέλο
@@ -7008,7 +7014,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Τίποτα να αλλάξει
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Επιλέξτε ένα αρχείο csv
 DocType: Holiday List,Total Holidays,Συνολικές διακοπές
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Δεν υπάρχει πρότυπο ηλεκτρονικού ταχυδρομείου για αποστολή. Ρυθμίστε μία από τις Ρυθμίσεις παράδοσης.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Δεν υπάρχει πρότυπο ηλεκτρονικού ταχυδρομείου για αποστολή. Ρυθμίστε μία από τις Ρυθμίσεις παράδοσης.
 DocType: Student Leave Application,Mark as Present,Επισήμανση ως Παρόν
 DocType: Supplier Scorecard,Indicator Color,Χρώμα δείκτη
 DocType: Purchase Order,To Receive and Bill,Για να λάβετε και Bill
@@ -7017,7 +7023,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Επιλέξτε σειριακό αριθμό
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Σχεδιαστής
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Πρότυπο όρων και προϋποθέσεων
-DocType: Serial No,Delivery Details,Λεπτομέρειες παράδοσης
+DocType: Delivery Trip,Delivery Details,Λεπτομέρειες παράδοσης
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Το κέντρο κόστους απαιτείται στη γραμμή {0} στον πίνακα πίνακα φόρων για τον τύπο {1}
 DocType: Program,Program Code,Κωδικός προγράμματος
 DocType: Terms and Conditions,Terms and Conditions Help,Όροι και προϋποθέσεις Βοήθεια
@@ -7041,7 +7047,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ημέρες ανοχής
 DocType: Cash Flow Mapping,Is Income Tax Expense,Είναι η δαπάνη φόρου εισοδήματος
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Η παραγγελία σας είναι εκτός παράδοσης!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Σειρά # {0}: Απόσπαση Ημερομηνία πρέπει να είναι ίδια με την ημερομηνία αγοράς {1} του περιουσιακού στοιχείου {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Σειρά # {0}: Απόσπαση Ημερομηνία πρέπει να είναι ίδια με την ημερομηνία αγοράς {1} του περιουσιακού στοιχείου {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Ελέγξτε αν ο φοιτητής διαμένει στο Hostel του Ινστιτούτου.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Παρακαλούμε, εισάγετε Παραγγελίες στον παραπάνω πίνακα"
 ,Stock Summary,Περίληψη Αποθεματικού
diff --git a/erpnext/translations/en-US.csv b/erpnext/translations/en-US.csv
index 7877c37..a27088e 100644
--- a/erpnext/translations/en-US.csv
+++ b/erpnext/translations/en-US.csv
@@ -28,7 +28,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +130,{0} {1} is cancelled so the action cannot be completed,{0} {1} is canceled so the action cannot be completed
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +297,Packing Slip(s) cancelled,Packing Slip(s) canceled
 DocType: Payment Entry,Cheque/Reference No,Check/Reference No
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Asset cannot be canceled, as it is already {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Asset cannot be canceled, as it is already {0}"
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Select account head of the bank where check was deposited.
 DocType: Cheque Print Template,Cheque Print Template,Check Print Template
 apps/erpnext/erpnext/controllers/buying_controller.py +491,{0} {1} is cancelled or closed,{0} {1} is canceled or closed
diff --git a/erpnext/translations/es-NI.csv b/erpnext/translations/es-NI.csv
index 257ed97..5319770 100644
--- a/erpnext/translations/es-NI.csv
+++ b/erpnext/translations/es-NI.csv
@@ -1,7 +1,7 @@
 DocType: Tax Rule,Tax Rule,Regla Fiscal
 DocType: POS Profile,Account for Change Amount,Cuenta para el Cambio de Monto
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +865,Bill of Materials,Lista de Materiales
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,"""Actualización de Existencia' no puede ser escogida para venta de activo fijo"
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,"""Actualización de Existencia' no puede ser escogida para venta de activo fijo"
 DocType: Purchase Invoice,Tax ID,RUC
 DocType: BOM Item,Basic Rate (Company Currency),Taza Base (Divisa de la Empresa)
 DocType: Timesheet Detail,Bill,Factura
diff --git a/erpnext/translations/es-PE.csv b/erpnext/translations/es-PE.csv
index bced59f..089934c 100644
--- a/erpnext/translations/es-PE.csv
+++ b/erpnext/translations/es-PE.csv
@@ -161,7 +161,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +110,The name of your company for which you are setting up this system.,El nombre de su empresa para la que va a configurar el sistema.
 DocType: Account,Frozen,Congelado
 DocType: Contract,HR Manager,Gerente de Recursos Humanos
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia : El sistema no comprobará sobrefacturación desde monto para el punto {0} en {1} es cero
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia : El sistema no comprobará sobrefacturación desde monto para el punto {0} en {1} es cero
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +17,Either target qty or target amount is mandatory.,Cualquiera Cantidad de destino o importe objetivo es obligatoria.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +79,Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: El artículo vuelto {1} no existe en {2} {3}
 DocType: Production Plan,Not Started,Sin comenzar
@@ -169,7 +169,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Esta es una cuenta raíz y no se puede editar .
 ,Requested Items To Be Transferred,Artículos solicitados para ser transferido
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +267,Purchase Receipt {0} is not submitted,Recibo de Compra {0} no se presenta
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con moneda: {1} no puede ser seleccionada
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con moneda: {1} no puede ser seleccionada
 DocType: Opening Invoice Creation Tool,Sales,Venta
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Monto adicional de descuento (Moneda de la compañía)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pago de Compra/Venta siempre debe estar marcado como anticipo
@@ -686,7 +686,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Primero la nota de entrega
 ,Monthly Attendance Sheet,Hoja de Asistencia Mensual
 DocType: Upload Attendance,Get Template,Verificar Plantilla
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto de la linea {0} los impuestos de las lineas {1} también deben ser incluidos
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto de la linea {0} los impuestos de las lineas {1} también deben ser incluidos
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Anticipadas
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Cantidad de elemento {0} debe ser menor de {1}
 DocType: Stock Ledger Entry,Stock Value Difference,Diferencia de Valor de Inventario
@@ -729,7 +729,7 @@
 DocType: Work Order Operation,Updated via 'Time Log',Actualizado a través de 'Hora de Registro'
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +408,{0} against Bill {1} dated {2},{0} contra Factura {1} de fecha {2}
 apps/erpnext/erpnext/utilities/user_progress.py +138,Your Products or Services,Sus productos o servicios
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Tal vez tipo de cambio no se ha creado para {1} en {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Tal vez tipo de cambio no se ha creado para {1} en {2}.
 DocType: Cashier Closing,To Time,Para Tiempo
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,No se ha añadido ninguna dirección todavía.
 ,Terretory,Territorios
@@ -748,7 +748,7 @@
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mostrar ""en la acción "" o "" No disponible "", basada en stock disponible en este almacén."
 DocType: Employee,Place of Issue,Lugar de emisión
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +263,Purchase Order {0} is not submitted,La órden de compra {0} no existe
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},La Cuenta {0} no es válida. La Moneda de la Cuenta debe de ser {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},La Cuenta {0} no es válida. La Moneda de la Cuenta debe de ser {1}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si este artículo tiene variantes, entonces no podrá ser seleccionado en los pedidos de venta, etc."
 DocType: Sales Invoice,Sales Team1,Team1 Ventas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +583,Stock Entry {0} is not submitted,Entrada de la {0} no se presenta
@@ -788,7 +788,7 @@
 DocType: GL Entry,Is Opening,Es apertura
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,Almacén {0} no existe
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,{0} is not a stock Item,{0} no es un producto de stock
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,La fecha de vencimiento es obligatorio
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,La fecha de vencimiento es obligatorio
 ,Sales Person-wise Transaction Summary,Resumen de Transacción por Vendedor
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Reordenar Cantidad
 DocType: BOM,Rate Of Materials Based On,Cambio de materiales basados en
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index 82ffb83..2174294 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Nombre del Período
 DocType: Employee,Salary Mode,Modo de pago
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Registro
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Registro
 DocType: Patient,Divorced,Divorciado
 DocType: Support Settings,Post Route Key,Publicar clave de ruta
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permitir añadir el artículo varias veces en una transacción
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Nueva Tasa de Cambio
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},La divisa/moneda es requerida para lista de precios {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado en la transacción.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Contacto del Cliente
 DocType: Patient Appointment,Check availability,Consultar disponibilidad
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Mostrar abiertos
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Secuencia actualizada correctamente
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Pedido
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} en la fila {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} en la fila {1}
 DocType: Asset Finance Book,Depreciation Start Date,Fecha de Inicio de la Depreciación
 DocType: Pricing Rule,Apply On,Aplicar en
 DocType: Item Price,Multiple Item prices.,Configuración de múltiples precios para los productos
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Prescripción de Laboratorio
 ,Delay Days,Días de Demora
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Gasto de Servicio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de serie: {0} ya se hace referencia en Factura de venta: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de serie: {0} ya se hace referencia en Factura de venta: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Factura
 DocType: Purchase Invoice Item,Item Weight Details,Detalles del Peso del Artículo
 DocType: Asset Maintenance Log,Periodicity,Periodo
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Contador
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Lista de Precios de Venta
 DocType: Patient,Tobacco Current Use,Consumo Actual de Tabaco
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","La fecha de inicio y la fecha de finalización se superponen con la tarjeta de trabajo <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Tasa de Ventas
 DocType: Cost Center,Stock User,Usuario de almacén
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Relacionado
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,La fecha de la asistencia no puede ser inferior a la fecha de ingreso de los empleados
 DocType: Grading Scale,Grading Scale Name,Nombre de  Escala de Calificación
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Agregar Usuarios al Mercado
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Agregar Usuarios al Mercado
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Esta es una cuenta raíz y no se puede editar.
 DocType: Sales Invoice,Company Address,Dirección de la Compañía
 DocType: BOM,Operations,Operaciones
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Dif. Cant.
 DocType: Production Plan,Material Request Detail,Detalle de Solicitud de Material
 DocType: Selling Settings,Default Quotation Validity Days,Días de Validez de Cotizaciones Predeterminados
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto en la línea {0} los impuestos de las lineas {1} tambien deben ser incluidos
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto en la línea {0} los impuestos de las lineas {1} tambien deben ser incluidos
 DocType: SMS Center,SMS Center,Centro SMS
 DocType: Payroll Entry,Validate Attendance,Validar la Asistencia
 DocType: Sales Invoice,Change Amount,Importe de Cambio
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,interlineado de la suma en palabras
 DocType: Vehicle,Additional Details,Detalles adicionales
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Ninguna descripción definida
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Proveedor&gt; Grupo de proveedores
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Solicitudes de compra.
 DocType: POS Closing Voucher Details,Collected Amount,Cantidad Cobrada
 DocType: Lab Test,Submitted Date,Fecha de Envío
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,Admisión de Estudiantes
 ,Terretory,Territorio
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,El producto {0} esta cancelado
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Fila de Depreciación {0}: Fecha de Inicio de Depreciación se ingresa como fecha pasada
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Fila de Depreciación {0}: Fecha de Inicio de Depreciación se ingresa como fecha pasada
 DocType: Contract Template,Fulfilment Terms and Conditions,Términos y Condiciones de Cumplimiento
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Solicitud de Materiales
 DocType: Bank Reconciliation,Update Clearance Date,Actualizar fecha de liquidación
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,Ajustes de contabilidad
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Factura de Proveedor no existe en la Factura de Compra {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Administrar las categoría de los socios de ventas
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","No se puede procesar la ruta, ya que la configuración de Google Maps está deshabilitada."
 DocType: Job Applicant,Cover Letter,Carta de presentación
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cheques pendientes y Depósitos para despejar
 DocType: Item,Synced With Hub,Sincronizado con Hub.
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Nuevo Valor de Activo
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tasa por la cual la divisa es convertida como moneda base del cliente
 DocType: Course Scheduling Tool,Course Scheduling Tool,Herramienta de Programación de Cursos
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Fila #{0}: Factura de compra no se puede hacer frente a un activo existente {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Fila #{0}: Factura de compra no se puede hacer frente a un activo existente {1}
 DocType: Crop Cycle,LInked Analysis,Análisis Vinculado
 DocType: POS Closing Voucher,POS Closing Voucher,Cupón de cierre de POS
 DocType: Contract,Lapsed,Transcurrido
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} no está inscrito en el Curso {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Nombre del Estudiante:
 DocType: POS Closing Voucher Details,Difference,Diferencia
+DocType: Delivery Settings,Delay between Delivery Stops,Retraso entre paradas de entrega
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},El número de serie {0} no pertenece a la nota de entrega {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Parece que hay un problema con la configuración del servidor GoCardless. No se preocupe, en caso de falla, la cantidad será reembolsada a su cuenta."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,Demostración ERPNext
@@ -693,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Cantidad y Precios
 DocType: Delivery Note,% Installed,% Instalado
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Aulas / laboratorios, etc., donde las clases se pueden programar."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Las monedas de la empresa de ambas compañías deben coincidir para las Transacciones entre empresas.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Las monedas de la empresa de ambas compañías deben coincidir para las Transacciones entre empresas.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,"Por favor, ingrese el nombre de la compañia"
 DocType: Travel Itinerary,Non-Vegetarian,No Vegetariano
 DocType: Purchase Invoice,Supplier Name,Nombre de proveedor
@@ -778,7 +779,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Alquilado Desde la Fecha
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Piezas suficiente para construir
 DocType: POS Profile User,POS Profile User,Usuario de Perfil POS
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Fila {0}: se requiere la fecha de inicio de depreciación
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Fila {0}: se requiere la fecha de inicio de depreciación
 DocType: Purchase Invoice Item,Service Start Date,Fecha de Inicio del Servicio
 DocType: Subscription Invoice,Subscription Invoice,Factura de Suscripción
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Ingreso directo
@@ -845,7 +846,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Abreviatura ya utilizada para otra empresa
 DocType: Selling Settings,Default Customer Group,Categoría de cliente predeterminada
 DocType: Employee,IFSC Code,Código IFSC
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","La fecha de inicio y la fecha de finalización se superponen con la tarjeta de trabajo <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","si es desactivado,  el campo 'Total redondeado' no será visible en ninguna transacción"
 DocType: BOM,Operating Cost,Costo de Operación
 DocType: Crop,Produced Items,Artículos Producidos
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,Evitar las Solicitudes de Presupuesto (RFQs)
 DocType: Hub User,Hub User,Usuario de Hub
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Crear Orden de Venta
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Recibo de Salario enviado para el período de {0} a {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Recibo de Salario enviado para el período de {0} a {1}
 DocType: Project Task,Project Task,Tareas del proyecto
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Puntos Redimidos
 ,Lead Id,ID de iniciativa
@@ -1027,7 +1027,7 @@
 DocType: Fee Validity,Max number of visit,Número máximo de visitas
 ,Hotel Room Occupancy,Ocupación de la Habitación del Hotel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Tabla de Tiempo creada:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}"
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Inscribirse
 DocType: GST Settings,GST Settings,Configuración de GST
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},La moneda debe ser la misma que la moneda de la Lista de Precios: {0}
@@ -1081,7 +1081,7 @@
 DocType: Vehicle Log,Service Details,Detalles del servicio
 DocType: Lab Test Template,Grouped,Agrupado
 DocType: Selling Settings,Delivery Note Required,Nota de entrega requerida
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Presentar resbalones salariales ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Presentar resbalones salariales ...
 DocType: Bank Guarantee,Bank Guarantee Number,Número de Garantía Bancaria
 DocType: Assessment Criteria,Assessment Criteria,Criterios de Evaluación
 DocType: BOM Item,Basic Rate (Company Currency),Precio base (Divisa por defecto)
@@ -1106,13 +1106,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Entrada de Pago ya creada
 DocType: Request for Quotation,Get Suppliers,Obtener Proveedores
 DocType: Purchase Receipt Item Supplied,Current Stock,Inventario Actual
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Fila #{0}:  Activo {1} no vinculado al elemento {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Fila #{0}:  Activo {1} no vinculado al elemento {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Previsualización de Nómina
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Cuenta {0} se ha introducido varias veces
 DocType: Account,Expenses Included In Valuation,GASTOS DE VALORACIÓN
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Solo puede renovar si su membresía vence dentro de los 30 días
 DocType: Shopping Cart Settings,Show Stock Availability,Mostrar Disponibilidad de Stock
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Establezca {0} en la categoría de activos {1} o en la empresa {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Establezca {0} en la categoría de activos {1} o en la empresa {2}
 DocType: Location,Longitude,Longitud
 ,Absent Student Report,Informe del alumno ausente
 DocType: Crop,Crop Spacing UOM,UOM de Separación de Cultivos
@@ -1184,7 +1184,7 @@
 DocType: Soil Texture,Sand,Arena
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energía
 DocType: Opportunity,Opportunity From,Oportunidad desde
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Fila {0}: {1} Números de serie necesarios para el elemento {2}. Ha proporcionado {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Fila {0}: {1} Números de serie necesarios para el elemento {2}. Ha proporcionado {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Por favor seleccione una mesa
 DocType: BOM,Website Specifications,Especificaciones del sitio web
 DocType: Special Test Items,Particulars,Datos Particulares
@@ -1276,7 +1276,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Los productos con mayor ponderación se mostraran arriba
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Pruebas de Laboratorio y Signos Vitales
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detalle de conciliación bancaria
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Fila  #{0}: Activo {1} debe ser presentado
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Fila  #{0}: Activo {1} debe ser presentado
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Empleado no encontrado
 DocType: Item,If subcontracted to a vendor,Si es sub-contratado a un proveedor
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,El grupo de estudiantes ya está actualizado.
@@ -1330,7 +1330,6 @@
 DocType: Loyalty Program Collection,Tier Name,Nombre de Nivel
 DocType: HR Settings,Enter retirement age in years,Introduzca la edad de jubilación en años
 DocType: Crop,Target Warehouse,Inventario estimado
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Configure la serie de nombres para {0} a través de Configuración&gt; Configuración&gt; Series de nombres
 DocType: Payroll Employee Detail,Payroll Employee Detail,Detalle de la Nómina del Empleado
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Por favor seleccione un almacén
 DocType: Cheque Print Template,Starting location from left edge,Posición inicial desde el borde izquierdo
@@ -1420,7 +1419,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Plan de materiales para los subconjuntos
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Socios Comerciales y Territorio
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,No hay Elementos disponibles para transferir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,No hay Elementos disponibles para transferir
 DocType: Employee Boarding Activity,Activity Name,Nombre de la Actividad
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Cambiar Fecha de Lanzamiento
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,La cantidad de productos terminados <b>{0}</b> y Por cantidad <b>{1}</b> no puede ser diferente
@@ -1647,6 +1646,7 @@
 DocType: Project,First Email,Primer Correo Electrónico
 DocType: Company,Exception Budget Approver Role,Rol de aprobación de presupuesto de excepción
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Una vez configurado, esta factura estará en espera hasta la fecha establecida"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,El almacén reservado en el Pedido de Ventas/Almacén de Productos terminados
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Cantidad de venta
 DocType: Repayment Schedule,Interest Amount,Cantidad de Interés
@@ -1658,7 +1658,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Registros
 DocType: Asset,Scrapped,Desechado
 DocType: Item,Item Defaults,Valores por Defecto del Artículo
-DocType: Purchase Invoice,Returns,Devoluciones
+DocType: Cashier Closing,Returns,Devoluciones
 DocType: Job Card,WIP Warehouse,Almacén de trabajos en proceso
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Número de serie {0} tiene un contrato de mantenimiento hasta {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,Reclutamiento
@@ -1672,7 +1672,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Tipo de Transferencia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Gastos de venta
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Territorio
 DocType: Diagnosis,Diagnosis,Diagnóstico
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Compra estándar
 DocType: Attendance Request,Explanation,Explicación
@@ -1685,7 +1684,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Órdenes de compra Artículos vencidos
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Código Postal
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Orden de Venta {0} es {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Seleccione la cuenta de ingresos por intereses en préstamo {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Seleccione la cuenta de ingresos por intereses en préstamo {0}
 DocType: Opportunity,Contact Info,Información de contacto
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Crear Asientos de Stock
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,No se puede promocionar Empleado con estado dejado
@@ -1697,7 +1696,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,No se puede facturar por cero horas de facturación
 DocType: Company,Date of Commencement,Fecha de Comienzo
 DocType: Sales Person,Select company name first.,Seleccione primero el nombre de la empresa.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},Correo electrónico enviado a {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},Correo electrónico enviado a {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Presupuestos recibidos de proveedores.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Sustituya la Lista de Materiales (BOM)  y actualice el último precio en todas las listas de materiales
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Para {0} | {1} {2}
@@ -1717,7 +1716,7 @@
 DocType: Asset Movement,From Employee,Desde Empleado
 DocType: Driver,Cellphone Number,Número Celular
 DocType: Project,Monitor Progress,Monitorear el Progreso
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia: El sistema no comprobará la sobrefacturación si la cantidad del producto {0} en {1} es cero
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia: El sistema no comprobará la sobrefacturación si la cantidad del producto {0} en {1} es cero
 DocType: Journal Entry,Make Difference Entry,Crear una entrada con una diferencia
 DocType: Supplier Quotation,Auto Repeat Section,Sección de Repetición Automática
 DocType: Upload Attendance,Attendance From Date,Asistencia desde fecha
@@ -1820,7 +1819,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila #{0}: La cantidad rechazada no se puede introducir en el campo 'retorno de compras'
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,No se permite cambiar el Grupo de Clientes para el Cliente seleccionado.
 ,Purchase Order Items To Be Billed,Ordenes de compra por pagar
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Actualizando tiempos estimados de llegada.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Actualizando tiempos estimados de llegada.
 DocType: Program Enrollment Tool,Enrollment Details,Detalles de Inscripción
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,No se pueden establecer varios valores predeterminados de artículos para una empresa.
 DocType: Purchase Invoice Item,Net Rate,Precio neto
@@ -1834,7 +1833,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Tipo de Licencia es obligatorio
 DocType: Support Settings,Close Issue After Days,Cerrar Problema Después Días
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Debe ser un usuario con funciones de Administrador del sistema y Administrador de artículos para agregar usuarios a Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Debe ser un usuario con funciones de Administrador del sistema y Administrador de artículos para agregar usuarios a Marketplace.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Dejar en blanco si se considera para todas las sucursales
 DocType: Job Opening,Staffing Plan,Plan de Personal
 DocType: Bank Guarantee,Validity in Days,Validez en Días
@@ -1854,7 +1853,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Línea {0} duplicada con igual {1}
 DocType: Marketplace Settings,Disable Marketplace,Deshabilitar Marketplace
 ,Trial Balance,Balanza de Comprobación
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Año fiscal {0} no encontrado
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Año fiscal {0} no encontrado
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Configuración de empleados
 DocType: Hotel Room Reservation,Hotel Reservation User,Usuario de Reserva de Hotel
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,"Por favor, seleccione primero el prefijo"
@@ -1962,7 +1961,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Error al iniciar sesión
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Activo {0} creado
 DocType: Special Test Items,Special Test Items,Artículos de Especiales de Prueba
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Debe ser un usuario con funciones de Administrador del sistema y Administrador de artículos para registrarse en Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Debe ser un usuario con funciones de Administrador del sistema y Administrador de artículos para registrarse en Marketplace.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Método de pago
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,De acuerdo con su estructura salarial asignada no puede solicitar beneficios
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Sitio web imagen debe ser un archivo público o URL del sitio web
@@ -1974,7 +1973,7 @@
 DocType: Warehouse,Warehouse Contact Info,Información del Contacto en el Almacén
 DocType: Payment Entry,Write Off Difference Amount,Amortizar importe de la diferencia
 DocType: Volunteer,Volunteer Name,Nombre del Voluntario
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Se encontraron filas con fechas de vencimiento duplicadas en otras filas: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Se encontraron filas con fechas de vencimiento duplicadas en otras filas: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: No se encontró el correo electrónico de los empleados, por lo tanto, no correo electrónico enviado"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Sin estructura salarial asignada para el empleado {0} en una fecha dada {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Regla de Envío no aplicable para el país {0}
@@ -2063,6 +2062,7 @@
 DocType: Salary Component,Earning,Ingresos
 DocType: Supplier Scorecard,Scoring Criteria,Criterios de Calificación
 DocType: Purchase Invoice,Party Account Currency,Divisa de la cuenta de tercero/s
+DocType: Delivery Trip,Total Estimated Distance,Distancia total estimada
 ,BOM Browser,Explorar listas de materiales (LdM)
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Actualice su estado para este evento de capacitación.
 DocType: Item Barcode,EAN,EAN
@@ -2101,7 +2101,7 @@
 DocType: Activity Cost,Projects,Proyectos
 DocType: Payment Request,Transaction Currency,moneda de la transacción
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Desde {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Algunos correos electrónicos no son válidos
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Algunos correos electrónicos no son válidos
 DocType: Work Order Operation,Operation Description,Descripción de la operación
 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.,No se puede cambiar la 'Fecha de Inicio' y la 'Fecha Final' del año fiscal una vez que ha sido guardado.
 DocType: Quotation,Shopping Cart,Carrito de compras
@@ -2125,7 +2125,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Cambio neto en activos fijos
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Cant. Requerida
 DocType: Leave Control Panel,Leave blank if considered for all designations,Dejar en blanco si es considerado para todos los puestos
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la línea {0} no puede ser incluido en el precio
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la línea {0} no puede ser incluido en el precio
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Máximo: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Desde Fecha y Hora
 DocType: Shopify Settings,For Company,Para la empresa
@@ -2139,7 +2139,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Hubo errores al crear el Programa del Curso
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,El primer Aprobador de Gastos en la lista se establecerá como el Aprobador de Gastos Predeterminado.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,No puede ser mayor de 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Para poder registrarse en Marketplace, debe ser un usuario que no sea Administrador con funciones de Administrador del Sistema y Administrador de Artículos."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Para poder registrarse en Marketplace, debe ser un usuario que no sea Administrador con funciones de Administrador del Sistema y Administrador de Artículos."
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,El producto {0} no es un producto de stock
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Sin programación
@@ -2168,7 +2168,7 @@
 DocType: HR Settings,Employee Settings,Configuración de Empleado
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Cargando el Sistema de Pago
 ,Batch-Wise Balance History,Historial de Saldo por Lotes
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Fila # {0}: no se puede establecer la tarifa si el monto es mayor que el importe facturado para el elemento {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Fila # {0}: no se puede establecer la tarifa si el monto es mayor que el importe facturado para el elemento {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Los ajustes de impresión actualizados en formato de impresión respectivo
 DocType: Package Code,Package Code,Código de Paquete
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Aprendiz
@@ -2401,7 +2401,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} vacantes y {1} presupuesto para {2} ya planeados para empresas subsidiarias de {3}. \ Solo puede planificar hasta {4} vacantes y el presupuesto {5} según el plan de personal {6} para la empresa matriz {3}.
 DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaños.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},"Por favor, defina la cuenta de pago de nómina predeterminada en la empresa {0}."
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},"Por favor, defina la cuenta de pago de nómina predeterminada en la empresa {0}."
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Obtener la desintegración financiera de los datos de impuestos y cargos por Amazon
 DocType: SMS Center,Receiver List,Lista de receptores
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Busca artículo
@@ -2471,7 +2471,7 @@
 DocType: Vital Signs,Constipated,Estreñido
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Contra factura de proveedor {0} con fecha{1}
 DocType: Customer,Default Price List,Lista de precios por defecto
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Movimiento de activo {0} creado
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Movimiento de activo {0} creado
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,No se Encontraron Artículos.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,No se puede eliminar el año fiscal {0}. Año fiscal {0} se establece por defecto en la configuración global
 DocType: Share Transfer,Equity/Liability Account,Cuenta de Patrimonio / Pasivo
@@ -2608,6 +2608,7 @@
 DocType: Blanket Order,Order Type,Tipo de orden
 ,Item-wise Sales Register,Detalle de Ventas
 DocType: Asset,Gross Purchase Amount,Importe Bruto de Compra
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Código del artículo&gt; Grupo de artículos&gt; Marca
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Balances de Apertura
 DocType: Asset,Depreciation Method,Método de depreciación
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,¿Está incluido este impuesto en el precio base?
@@ -2688,7 +2689,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Acción si se excedió el Presupuesto Anual en Orden de Compra
 DocType: Student Leave Application,Student Leave Application,Solicitud de Licencia para Estudiante
 DocType: Item,Will also apply for variants,También se aplicará para las variantes
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Activo no se puede cancelar, como ya es {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Activo no se puede cancelar, como ya es {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Empleado {0} del medio día del {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Total de horas de trabajo no deben ser mayores que las horas de trabajo max {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Encendido
@@ -2712,6 +2713,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Obtener Datos
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},La licencia máxima permitida en el tipo de permiso {0} es {1}
 DocType: SMS Center,Create Receiver List,Crear Lista de Receptores
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,La fecha de uso disponible debe ser posterior a la fecha de compra.
 DocType: Vehicle,Wheels,Ruedas
 DocType: Packing Slip,To Package No.,Al paquete No.
 DocType: Patient Relation,Family,Familia
@@ -2725,7 +2727,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,La moneda de facturación debe ser igual a la moneda de la compañía predeterminada o la moneda de la cuenta de la parte
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que el paquete es una parte de esta entrega (Sólo borradores)
 DocType: Soil Texture,Loam,Marga
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Fila {0}: Fecha de Vencimiento no puede ser anterior a la Fecha de Contabilización
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Fila {0}: Fecha de Vencimiento no puede ser anterior a la Fecha de Contabilización
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Crear Pago
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},La cantidad del producto {0} debe ser menor que {1}
 ,Sales Invoice Trends,Tendencias de ventas
@@ -2797,7 +2799,7 @@
 DocType: Guardian,Guardian Interests,Intereses del Tutor
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Actualizar el Nombre / Número  de la Cuenta
 DocType: Naming Series,Current Value,Valor actual
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Existen varios ejercicios para la fecha {0}. Por favor, establece la compañía en el año fiscal"
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Existen varios ejercicios para la fecha {0}. Por favor, establece la compañía en el año fiscal"
 DocType: Education Settings,Instructor Records to be created by,Registros del Instructor que serán creados por
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} creado
 DocType: GST Account,GST Account,Cuenta GST
@@ -2814,7 +2816,7 @@
 DocType: Sales Person,Name and Employee ID,Nombre y ID de empleado
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,La fecha de vencimiento no puede ser anterior a la fecha de contabilización
 DocType: Website Item Group,Website Item Group,Grupo de productos en el sitio web
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,No se ha presentado ningún comprobante de sueldo para los criterios seleccionados anteriormente O recibo de sueldo ya enviado
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,No se ha presentado ningún comprobante de sueldo para los criterios seleccionados anteriormente O recibo de sueldo ya enviado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,IMPUESTOS Y ARANCELES
 DocType: Projects Settings,Projects Settings,Configuración de Proyectos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
@@ -2823,7 +2825,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Cant. Suministrada
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Requisición de Materiales del Producto
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Por favor cancele el recibo de compra {0} primero
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Por favor cancele el recibo de compra {0} primero
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Árbol de las categorías de producto
 DocType: Production Plan,Total Produced Qty,Cantidad Total Producida
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,No se puede referenciar a una línea mayor o igual al numero de línea actual.
@@ -2932,6 +2934,7 @@
 ,Vehicle Expenses,Los gastos del vehículo
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Crear prueba (s) de laboratorio en el envío de factura de venta
 DocType: Serial No,Invoice Details,Detalles de la factura
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,"Por favor, habilite la configuración de Google Maps para estimar y optimizar rutas"
 DocType: Grant Application,Show on Website,Mostrar en el Sitio Web
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Comienza en
 DocType: Hub Tracked Item,Hub Category,Categoría de Hub
@@ -2971,7 +2974,7 @@
 DocType: Inpatient Record,B Positive,B Positivo
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",El beneficio máximo del empleado {0} excede {1} por la suma {2} del monto reclamado anterior \
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Fila #{0}: Cantidad debe ser 1, como elemento es un activo fijo. Por favor, use fila separada para cantidad múltiple."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Fila #{0}: Cantidad debe ser 1, como elemento es un activo fijo. Por favor, use fila separada para cantidad múltiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Permitir Lista de Bloqueo de Vacaciones
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
 DocType: Patient Medical Record,Patient Medical Record,Registro Médico del Paciente
@@ -3005,7 +3008,7 @@
 DocType: Workstation,Wages per hour,Salarios por hora
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},El balance de Inventario en el lote {0} se convertirá en negativo {1} para el producto {2} en el almacén {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Las Solicitudes de Materiales siguientes se han planteado de forma automática según el nivel de re-pedido del articulo
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},La cuenta {0} no es válida. La divisa de la cuenta debe ser {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},La cuenta {0} no es válida. La divisa de la cuenta debe ser {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Desde la fecha {0} no puede ser posterior a la fecha de liberación del empleado {1}
 DocType: Supplier,Is Internal Supplier,Es un Proveedor Interno
 DocType: Employee,Create User Permission,Crear Permiso de Usuario
@@ -3149,7 +3152,7 @@
 DocType: Account,Fixed Asset,Activo Fijo
 DocType: Amazon MWS Settings,After Date,Después de la Fecha
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Inventario Serializado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Inválido {0} no válido para la factura entre compañías.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Inválido {0} no válido para la factura entre compañías.
 ,Department Analytics,Departamento de Análisis
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Correo Electrónico no encontrado en contacto predeterminado
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generar Secret
@@ -3161,7 +3164,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,El programa en la estructura de tarifas y el grupo de estudiantes {0} son diferentes.
 DocType: Bank Statement Transaction Entry,Receivable Account,Cuenta por cobrar
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Fecha desde Válida ser menor que Válido hasta la Fecha
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Fila #{0}: Activo {1} ya es {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Fila #{0}: Activo {1} ya es {2}
 DocType: Quotation Item,Stock Balance,Balance de Inventarios.
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Órdenes de venta a pagar
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,CEO
@@ -3203,6 +3206,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Débito Para es requerido
 DocType: Clinical Procedure,Inpatient Record,Registro de pacientes hospitalizados
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Las Tablas de Tiempos ayudan a mantener la noción del tiempo, el coste y la facturación de actividades realizadas por su equipo"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Lista de precios para las compras
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Fecha de la Transacción
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Plantillas de variables de Calificación de Proveedores.
@@ -3245,7 +3249,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Ganancia/Pérdida en Cambio
 DocType: Opportunity,Lost Reason,Razón de la pérdida
 DocType: Amazon MWS Settings,Enable Amazon,Habilitar Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Fila # {0}: La Cuenta {1} no pertenece a la Empresa {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Fila # {0}: La Cuenta {1} no pertenece a la Empresa {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},No se puede encontrar DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nueva Dirección
 DocType: Quality Inspection,Sample Size,Tamaño de muestra
@@ -3356,7 +3360,7 @@
 DocType: Water Analysis,Origin,Origen
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Este documento está por encima del límite de {0} {1} para el elemento {4}. ¿Estás haciendo otra {3} contra el mismo {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Por favor configura recurrente después de guardar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Seleccione la cuenta de cambio
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Seleccione la cuenta de cambio
 DocType: Purchase Invoice,Price List Currency,Divisa de la lista de precios
 DocType: Naming Series,User must always select,El usuario deberá elegir siempre
 DocType: Stock Settings,Allow Negative Stock,Permitir Inventario Negativo
@@ -3398,7 +3402,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,¿Seguro que quieres cancelar esta cita?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Paquete de Precios de la habitación del hotel
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Flujo de ventas
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Por favor ajuste la cuenta por defecto en Componente Salarial {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Por favor ajuste la cuenta por defecto en Componente Salarial {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Solicitado el
 DocType: Rename Tool,File to Rename,Archivo a renombrar
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Por favor, seleccione la lista de materiales para el artículo en la fila {0}"
@@ -3419,7 +3423,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Costo de productos comprados
 DocType: Employee Separation,Employee Separation Template,Plantilla de Separación de Empleados
 DocType: Selling Settings,Sales Order Required,Orden de venta requerida
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Ser un Vendedor
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Ser un Vendedor
 DocType: Purchase Invoice,Credit To,Acreditar en
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Iniciativas / Clientes activos
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Deje en blanco para usar el formato estándar de Nota de entrega
@@ -3460,7 +3464,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Hacer una Plantilla de Impuestos
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Foro de Usuarios
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,'Materias primas' no puede estar en blanco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Fila # {0} (Tabla de pagos): la cantidad debe ser negativa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Fila # {0} (Tabla de pagos): la cantidad debe ser negativa
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","No se pudo actualizar valores, factura contiene los artículos con envío triangulado."
 DocType: Contract,Fulfilment Status,Estado de Cumplimiento
 DocType: Lab Test Sample,Lab Test Sample,Muestra de Prueba de Laboratorio
@@ -3599,7 +3603,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Fecha del Doc
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Registros de cuotas creados - {0}
 DocType: Asset Category Account,Asset Category Account,Cuenta de categoría de activos
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Fila # {0} (Tabla de Pagos): la Cantidad debe ser positiva
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Fila # {0} (Tabla de Pagos): la Cantidad debe ser positiva
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},No se puede producir una cantidad mayor del producto {0} que lo requerido en el pedido de venta {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Seleccionar Valores de Atributo
 DocType: Purchase Invoice,Reason For Issuing document,Motivo de la emisión del documento
@@ -3654,7 +3658,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Hora en que se recibieron los materiales
 DocType: Products Settings,Products per Page,Productos por Pagina
 DocType: Stock Ledger Entry,Outgoing Rate,Tasa saliente
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,ó
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,ó
 DocType: Sales Order,Billing Status,Estado de facturación
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Informar una Incidencia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Servicios públicos
@@ -3681,7 +3685,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Declaración de Exención Fiscal del Empleado
 DocType: Payment Entry,Cheque/Reference Date,Cheque / Fecha de referencia
 DocType: Purchase Invoice,Total Taxes and Charges,Total Impuestos y Cargos
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,La fecha disponible de uso se ingresa como fecha pasada
 DocType: Employee,Emergency Contact,Contacto de emergencia
 DocType: Bank Reconciliation Detail,Payment Entry,Entrada de pago
 ,sales-browser,sales-browser
@@ -3727,6 +3730,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Es Devolución (Nota de Crédito)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Comenzar Trabajo
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},No se requiere un Número de Serie para el Activo {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Configure la serie de nombres para {0} a través de Configuración&gt; Configuración&gt; Series de nombres
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Plantilla deshabilitada no debe ser la plantilla predeterminada
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Para la fila {0}: ingrese cantidad planificada
 DocType: Account,Income Account,Cuenta de ingresos
@@ -3740,6 +3744,7 @@
 DocType: Loyalty Program,Help Section,Sección de Ayuda
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Anterior
 DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidad Clave
+DocType: Delivery Trip,Distance UOM,Distancia UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Los Lotes de Estudiantes ayudan a realizar un seguimiento de asistencia, evaluaciones y cuotas para los estudiantes"
 DocType: Payment Entry,Total Allocated Amount,Monto Total Asignado
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Seleccionar la cuenta de inventario por defecto para el inventario perpetuo
@@ -3781,7 +3786,7 @@
 DocType: Item Supplier,Item Supplier,Proveedor del Producto
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el numero de lote"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},"Por favor, seleccione un valor para {0} quotation_to {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,No hay Elementos seleccionados para transferencia
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,No hay Elementos seleccionados para transferencia
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Todas las direcciones.
 DocType: Company,Stock Settings,Configuración de inventarios
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusión sólo es posible si las propiedades son las mismas en ambos registros. Es Grupo, Tipo Raíz, Compañía"
@@ -4078,7 +4083,7 @@
 DocType: Patient,Personal and Social History,Historia Personal y Social
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Usuario {0} creado
 DocType: Fee Schedule,Fee Breakup for each student,Disminución de la Cuota para cada Estudiante
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avance total ({0}) contra la Orden {1} no puede ser mayor que el Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avance total ({0}) contra la Orden {1} no puede ser mayor que el Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,"Seleccione la distribución mensual, para asignarla desigualmente en varios meses"
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Cambiar Código
 DocType: Purchase Invoice Item,Valuation Rate,Tasa de Valoración
@@ -4087,7 +4092,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Cess ITC disponible
 ,Student Monthly Attendance Sheet,Hoja de Asistencia Mensual de Estudiante
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Regla de Envío solo aplicable para Ventas
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Fila de depreciación {0}: la siguiente fecha de depreciación no puede ser anterior a la fecha de compra
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Fila de depreciación {0}: la siguiente fecha de depreciación no puede ser anterior a la fecha de compra
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Fecha de inicio del proyecto
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Hasta
 DocType: Rename Tool,Rename Log,Cambiar el nombre de sesión
@@ -4104,12 +4109,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,¿Con qué frecuencia deben actualizarse el proyecto y la empresa en función de las transacciones de venta?
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Expira el
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Añadir estudiantes
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Por favor elimine el empleado <a href=""#Form/Employee/{0}"">{0}</a> \ para cancelar este documento"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},"Por favor, seleccione {0}"
 DocType: C-Form,C-Form No,C -Form No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Distancia
+DocType: Delivery Stop,Distance,Distancia
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Lista de sus productos o servicios que usted compra o vende.
 DocType: Water Analysis,Storage Temperature,Temperatura de Almacenamiento
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4136,7 +4139,7 @@
 DocType: Homepage,Company Description for website homepage,Descripción de la empresa para la página de inicio página web
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para la comodidad de los clientes , estos códigos se pueden utilizar en formatos impresos como facturas y notas de entrega"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nombre suplier
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,No se pudo recuperar la información de {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,No se pudo recuperar la información de {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Diario de Inicio de Apertura
 DocType: Contract,Fulfilment Terms,Términos de Cumplimiento
 DocType: Sales Invoice,Time Sheet List,Lista de hojas de tiempo
@@ -4316,7 +4319,7 @@
 DocType: Serial No,Warranty / AMC Details,Garantía / Detalles de CMA
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Seleccionar a los estudiantes manualmente para el grupo basado en actividad
 DocType: Journal Entry,User Remark,Observaciones
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Optimizando Rutas.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Optimizando Rutas.
 DocType: Travel Itinerary,Non Diary,No diario
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,No se puede crear una bonificación de retención para los empleados dejados
 DocType: Lead,Market Segment,Sector de Mercado
@@ -4346,7 +4349,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Programa de fidelidad
 DocType: Student Guardian,Father,Padre
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Boletos de soporte
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,'Actualización de Inventario' no se puede comprobar en venta de activos fijos
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,'Actualización de Inventario' no se puede comprobar en venta de activos fijos
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliación bancaria
 DocType: Attendance,On Leave,De licencia
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obtener Actualizaciones
@@ -4391,7 +4394,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Número de serie y de lote
 DocType: Warranty Claim,From Company,Desde Compañía
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Suma de las puntuaciones de criterios de evaluación tiene que ser {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,"Por favor, ajuste el número de amortizaciones Reservados"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,"Por favor, ajuste el número de amortizaciones Reservados"
 DocType: Supplier Scorecard Period,Calculations,Cálculos
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Valor o Cantidad
 DocType: Payment Terms Template,Payment Terms,Términos de Pago
@@ -4410,7 +4413,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Descuento (%) en Tarifa de lista de precios con margen
 DocType: Healthcare Service Unit Type,Rate / UOM,Tasa / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Todos los Almacenes
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,No se ha encontrado {0} para Transacciones entre empresas.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,No se ha encontrado {0} para Transacciones entre empresas.
 DocType: Travel Itinerary,Rented Car,Auto Rentado
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Sobre su Compañía
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,La cuenta de crédito debe pertenecer a las cuentas de balance
@@ -4511,6 +4514,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Criterios de Análisis de Plantas
 DocType: Cheque Print Template,Cheque Height,Altura de Cheque
 DocType: Supplier,Supplier Details,Detalles del proveedor
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure las series de numeración para Asistencia a través de Configuración&gt; Series de numeración
 DocType: Setup Progress,Setup Progress,Progreso de la Configuración
 DocType: Expense Claim,Approval Status,Estado de Aprobación
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},El valor debe ser menor que el valor de la línea {0}
@@ -4603,7 +4607,6 @@
 DocType: Travel Request,Fully Sponsored,Totalmente Patrocinado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Invertir Entrada de Diario
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Se crea el Cliente {0}.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configure el Sistema de nombres de empleados en Recursos humanos&gt; Configuración de recursos humanos
 DocType: Stock Settings,Limit Percent,límite de porcentaje
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Actualmente no hay stock disponible en ningún almacén
 ,Payment Period Based On Invoice Date,Periodos de pago según facturas
@@ -4662,7 +4665,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Almacén de origen
 DocType: Installation Note,Installation Date,Fecha de Instalación
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Share Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Fila #{0}: Activo {1} no pertenece a la empresa {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Fila #{0}: Activo {1} no pertenece a la empresa {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Factura de Venta {0} creada
 DocType: Employee,Confirmation Date,Fecha de confirmación
 DocType: Inpatient Occupancy,Check Out,Check Out
@@ -4682,6 +4685,7 @@
 DocType: Production Plan,Sales Orders Detail,Detalle de Órdenes de Venta
 DocType: Bin,Requested Quantity,Cantidad requerida
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Configure el sistema de nombres de instructores en Educación&gt; Configuración de educación
 DocType: Patient,Marital Status,Estado Civil
 DocType: Stock Settings,Auto Material Request,Requisición de Materiales Automática
 DocType: Woocommerce Settings,API consumer secret,Clave Secreta de Consumidor API
@@ -4734,7 +4738,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Seleccionar Días
 DocType: Academic Term,Term Name,Nombre plazo
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Crédito ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Creando Recibos de Sueldo ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Creando Recibos de Sueldo ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,No puedes editar el nodo raíz.
 DocType: Buying Settings,Purchase Order Required,Orden de compra requerida
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Temporizador
@@ -4770,7 +4774,7 @@
 DocType: Account,Rate at which this tax is applied,Valor por el cual el impuesto es aplicado
 DocType: Cash Flow Mapper,Section Name,Nombre de la Sección
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Cantidad a reabastecer
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Fila de Depreciación {0}: el valor esperado después de la vida útil debe ser mayor o igual que {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Fila de Depreciación {0}: el valor esperado después de la vida útil debe ser mayor o igual que {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Ofertas de empleo actuales
 DocType: Company,Stock Adjustment Account,Cuenta de ajuste de existencias
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Desajuste
@@ -4817,7 +4821,7 @@
 DocType: Program Enrollment,School House,Casa Escolar
 DocType: Serial No,Out of AMC,Fuera de CMA (Contrato de mantenimiento anual)
 DocType: Opportunity,Opportunity Amount,Monto de Oportunidad
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Número de Depreciaciones Reservadas no puede ser mayor que el número total de Depreciaciones
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Número de Depreciaciones Reservadas no puede ser mayor que el número total de Depreciaciones
 DocType: Purchase Order,Order Confirmation Date,Fecha de Confirmación del Pedido
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Crear visita de mantenimiento
@@ -4858,7 +4862,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Lote:
 DocType: Volunteer,Afternoon,Tarde
 DocType: Loyalty Program,Loyalty Program Help,Ayuda del programa de lealtad
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' está deshabilitado
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' está deshabilitado
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Establecer como abierto/a
 DocType: Cheque Print Template,Scanned Cheque,Cheque Scaneado
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correos electrónicos automáticos a contactos al momento de registrase una transacción
@@ -4871,7 +4875,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Producto y detalles de garantía
 DocType: Chapter,Chapter Members,Miembros del Capítulo
 DocType: Sales Team,Contribution (%),Margen (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : El registro del pago no se creará hasta que la cuenta del tipo 'Banco o Cajas' sea definida
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : El registro del pago no se creará hasta que la cuenta del tipo 'Banco o Cajas' sea definida
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,El Proyecto {0} ya existe
 DocType: Clinical Procedure,Nursing User,Usuario de Enfermería
 DocType: Employee Benefit Application,Payroll Period,Período de Nómina
@@ -4879,6 +4883,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},El Número de serie {0} no pertenece al Lote {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Responsabilidades
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,El período de validez de esta cotización ha finalizado.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Por favor elimine el empleado <a href=""#Form/Employee/{0}"">{0}</a> \ para cancelar este documento"
 DocType: Expense Claim Account,Expense Claim Account,Cuenta de Gastos
 DocType: Account,Capital Work in Progress,Trabajo de capital en progreso
 DocType: Accounts Settings,Allow Stale Exchange Rates,Permitir Tipos de Cambio Obsoletos
@@ -4959,7 +4965,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Distribuir materiales
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Conecte Shopify con ERPNext
 DocType: Material Request Item,For Warehouse,Para el almacén
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Notas de Entrega {0} actualizadas
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Notas de Entrega {0} actualizadas
 DocType: Employee,Offer Date,Fecha de oferta
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Presupuestos
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Usted está en modo fuera de línea. Usted no será capaz de recargar hasta que tenga conexión a red.
@@ -5009,7 +5015,7 @@
 DocType: Shipping Rule,Calculate Based On,Calculo basado en
 DocType: Contract,Unfulfilled,Incumplido
 DocType: Delivery Note Item,From Warehouse,De Almacén
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Sin empleados por los criterios mencionados
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Sin empleados por los criterios mencionados
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,No hay artículos con la lista de materiales para la fabricación de
 DocType: Shopify Settings,Default Customer,Cliente predeterminado
 DocType: Sales Stage,Stage Name,Nombre del Escenario
@@ -5051,7 +5057,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total impuestos después del descuento
 DocType: Patient,Inpatient Status,Estado de paciente hospitalizado
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Ajustes de Resumen Diario de Trabajo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,La Lista de Precios seleccionada debe tener los campos de compra y venta marcados.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,La Lista de Precios seleccionada debe tener los campos de compra y venta marcados.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Ingrese Requerido por Fecha
 DocType: Payment Entry,Internal Transfer,Transferencia interna
 DocType: Asset Maintenance,Maintenance Tasks,Tareas de Mantenimiento
@@ -5087,7 +5093,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Agrupar por
 DocType: Guardian,Interests,Intereses
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Habilitar o deshabilitar el tipo de divisas
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,No se pudieron enviar algunos resúmenes salariales
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,No se pudieron enviar algunos resúmenes salariales
 DocType: Exchange Rate Revaluation,Get Entries,Obtener Entradas
 DocType: Production Plan,Get Material Request,Obtener Solicitud de materiales
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,GASTOS POSTALES
@@ -5171,7 +5177,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},La cuenta de gastos es obligatoria para el elemento {0}
 DocType: BOM,Website Description,Descripción del Sitio Web
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Cambio en el Patrimonio Neto
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Por favor primero cancele la Factura de Compra {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Por favor primero cancele la Factura de Compra {0}
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,No permitido. Deshabilite el tipo de unidad de servicio
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Dirección de correo electrónico debe ser única, ya existe para {0}"
 DocType: Serial No,AMC Expiry Date,Fecha de caducidad de CMA (Contrato de Mantenimiento Anual)
@@ -5211,7 +5217,7 @@
 DocType: Hotel Room,Hotel Room,Habitación de Hotel
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},La cuenta {0} no pertenece a la compañía {1}
 DocType: Leave Type,Rounding,Redondeo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Los números de serie en la fila {0} no coinciden con Nota de entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Los números de serie en la fila {0} no coinciden con Nota de entrega
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Cantidad Dispensada (Prorrateada)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Luego, las Reglas de fijación de Precios se filtran en función del Cliente, Grupo de Clientes, Territorio, Proveedor, Grupo de Proveedores, Campaña, Socio de Ventas, etc."
 DocType: Student,Guardian Details,Detalles del Tutor
@@ -5266,7 +5272,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},El almacén es requerido para el stock del producto {0}
 DocType: Leave Allocation,Unused leaves,Ausencias no utilizadas
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Hacer la Entrada de Reembolso
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Todos los Departamentos
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Todos los Departamentos
 DocType: Healthcare Service Unit,Vacant,Vacante
 DocType: Patient,Alcohol Past Use,Uso Pasado de Alcohol
 DocType: Fertilizer Content,Fertilizer Content,Contenido de Fertilizante
@@ -5277,7 +5283,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,La Órden de Trabajo {0} debe cancelarse antes de cancelar esta Órden de Venta
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Buscar lista de materiales (LdM) incluyendo subconjuntos
 DocType: Authorization Rule,Applicable To (Employee),Aplicable a ( Empleado )
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,La fecha de vencimiento es obligatoria
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,La fecha de vencimiento es obligatoria
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Incremento de Atributo {0} no puede ser 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Tipo de Beneficio y Cantidad
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Habitaciones Reservadas
@@ -5421,7 +5427,7 @@
 DocType: Purchase Invoice Item,Total Weight,Peso Total
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Comisiones sobre ventas
 DocType: Job Offer Term,Value / Description,Valor / Descripción
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Fila  #{0}: el elemento {1} no puede ser presentado, ya es {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Fila  #{0}: el elemento {1} no puede ser presentado, ya es {2}"
 DocType: Tax Rule,Billing Country,País de facturación
 DocType: Purchase Order Item,Expected Delivery Date,Fecha prevista de entrega
 DocType: Restaurant Order Entry,Restaurant Order Entry,Entrada de Orden de Restaurante
@@ -5460,12 +5466,13 @@
 DocType: Maintenance Visit,Breakdown,Desglose
 DocType: Travel Itinerary,Vegetarian,Vegetariano
 DocType: Patient Encounter,Encounter Date,Fecha de Encuentro
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con divisa: {1} no puede ser seleccionada
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con divisa: {1} no puede ser seleccionada
 DocType: Bank Statement Transaction Settings Item,Bank Data,Datos Bancarios
 DocType: Purchase Receipt Item,Sample Quantity,Cantidad de Muestra
 DocType: Bank Guarantee,Name of Beneficiary,Nombre del Beneficiario
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Actualizar el costo de la lista de materiales automáticamente a través de las tareas programadas, basado en la última tasa de valoración / tarifa de lista de precios / última tasa de compra de materias primas."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Proveedor&gt; Grupo de proveedores
 DocType: Bank Reconciliation Detail,Cheque Date,Fecha del cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: la cuenta padre {1} no pertenece a la empresa: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Todas las transacciones relacionadas con esta compañía han sido eliminadas correctamente.
@@ -5493,7 +5500,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Los nodos hijos sólo pueden ser creados bajo los nodos de tipo &quot;grupo&quot;
 DocType: Attendance Request,Half Day Date,Fecha de Medio Día
 DocType: Academic Year,Academic Year Name,Nombre Año Académico
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} no se permite realizar transacciones con {1}. Por favor cambia la Compañía.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} no se permite realizar transacciones con {1}. Por favor cambia la Compañía.
 DocType: Sales Partner,Contact Desc,Desc. de Contacto
 DocType: Email Digest,Send regular summary reports via Email.,Enviar informes resumidos periódicamente por correo electrónico.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Defina la cuenta predeterminada en Tipo de reclamación de gastos {0}.
@@ -5526,7 +5533,7 @@
 DocType: Hotel Room,Hotel Manager,Gerente del Hotel
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Establezca la regla fiscal (Impuestos) del carrito de compras
 DocType: Purchase Invoice,Taxes and Charges Added,Impuestos y cargos adicionales
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Fila de depreciación {0}: la siguiente fecha de depreciación no puede ser anterior Fecha disponible para usar
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Fila de depreciación {0}: la siguiente fecha de depreciación no puede ser anterior Fecha disponible para usar
 ,Sales Funnel,"""Embudo"" de ventas"
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,La abreviatura es obligatoria
 DocType: Project,Task Progress,Progreso de Tarea
@@ -5540,7 +5547,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Todas las categorías de clientes
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,acumulado Mensual
 DocType: Attendance Request,On Duty,En Servicio
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Posiblemente el registro de cambio de moneda no ha sido creado para {1} hasta {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Posiblemente el registro de cambio de moneda no ha sido creado para {1} hasta {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},El plan de dotación de personal {0} ya existe para la designación {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Plantilla de impuestos es obligatorio.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Cuenta {0}: la cuenta padre {1} no existe
@@ -5619,11 +5626,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Al menos un almacén es obligatorio
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Configure campos de elementos como UOM, Grupo de artículos, Descripción y Nº de horas."
 DocType: Certification Application,Certification Status,Estado de Certificación
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Mercado
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Mercado
 DocType: Travel Itinerary,Travel Advance Required,Se requiere avance de viaje
 DocType: Subscriber,Subscriber Name,Nombre del Suscriptor
 DocType: Serial No,Out of Warranty,Fuera de garantía
-DocType: Cashier Closing,Cashier-closing-,cierre-caja
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Tipo de Datos Asignados
 DocType: BOM Update Tool,Replace,Reemplazar
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,No se encuentran productos
@@ -5710,7 +5716,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Se crean plantillas de impuestos predeterminadas para ventas y compras.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,El registro de Resultados de la Evaluación {0} ya existe.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Ejemplo: ABCD. #####. Si se establece una serie y no se menciona el No de lote en las transacciones, se creará un número de lote automático basado en esta serie. Si siempre quiere mencionar explícitamente el No de lote para este artículo, déjelo en blanco. Nota: esta configuración tendrá prioridad sobre el Prefijo de denominación de serie en Configuración de stock."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure las series de numeración para Asistencia a través de Configuración&gt; Series de numeración
 DocType: BOM,Materials Required (Exploded),Materiales Necesarios (Despiece)
 DocType: Contract,Party User,Usuario Tercero
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Por favor, ponga el filtro de la Compañía en blanco si el Grupo Por es ' Empresa'."
@@ -5911,7 +5916,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Cant Oportunidad
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Se deben configurar tanto la fecha de inicio del Período de Prueba como la fecha de finalización del Período de Prueba
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Tasa Promedio
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,El monto total del pago en el cronograma de pago debe ser igual al total / Total Redondeado
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,El monto total del pago en el cronograma de pago debe ser igual al total / Total Redondeado
 DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Saldo de Extracto Bancario según Balance General
 DocType: Job Applicant,Applicant Name,Nombre del Solicitante
@@ -5980,7 +5985,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Jabón y detergente
 DocType: BOM,Show Items,Mostrar elementos
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Tiempo Desde no puede ser mayor Tiempo Hasta
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,¿Desea notificar a todos los clientes por correo electrónico?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,¿Desea notificar a todos los clientes por correo electrónico?
 DocType: Subscription Plan,Billing Interval,Intervalo de Facturación
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Imagén en movimiento y vídeo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenado/a
@@ -5989,9 +5994,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,La fila {0}: {1} debe ser mayor que 0
 DocType: Assessment Criteria,Assessment Criteria Group,Criterios de evaluación del Grupo
 DocType: Healthcare Settings,Patient Name By,Nombre del Paciente Por
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Entrada de Diario de Acumulación para Salarios de {0} a {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Entrada de Diario de Acumulación para Salarios de {0} a {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Habilitar Ingresos Diferidos
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},La apertura de la depreciación acumulada debe ser inferior o igual a {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},La apertura de la depreciación acumulada debe ser inferior o igual a {0}
 DocType: Warehouse,Warehouse Name,Nombre del Almacén
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,La fecha de inicio real debe ser menor que la fecha de finalización real
 DocType: Naming Series,Select Transaction,Seleccione el tipo de transacción
@@ -6142,7 +6147,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,El Empleado {0} de la calificación {1} no tiene una política de licencia predeterminada
 DocType: Salary Detail,Salary Detail,Detalle de Sueldos
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,"Por favor, seleccione primero {0}"
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Se agregaron {0} usuarios
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Se agregaron {0} usuarios
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","En el caso del programa de varios niveles, los Clientes se asignarán automáticamente al nivel correspondiente según su gasto"
 DocType: Appointment Type,Physician,Médico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,El lote {0} del producto {1} ha expirado.
@@ -6286,7 +6291,7 @@
 DocType: Asset,Custodian,Custodio
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Perfiles de punto de venta (POS)
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} debe ser un valor entre 0 y 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Pago de {0} desde {1} hasta {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Pago de {0} desde {1} hasta {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Prestamos sin garantía
 DocType: Cost Center,Cost Center Name,Nombre del centro de costos
 DocType: Student,B+,B +
@@ -6318,6 +6323,7 @@
 DocType: Employee,Date of Issue,Fecha de Emisión.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Según las Configuraciones de Compras si el Recibo de Compra es Obligatorio == 'Si', para crear la Factura de Compra el usuario necesita crear el Recibo de Compra primero para el item {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Fila #{0}: Asignar Proveedor para el elemento {1}
+DocType: Global Defaults,Default Distance Unit,Unidad de distancia predeterminada
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Fila {0}: valor Horas debe ser mayor que cero.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Sitio web Imagen {0} unido al artículo {1} no se puede encontrar
 DocType: Issue,Content Type,Tipo de contenido
@@ -6373,7 +6379,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,La cuenta de débito debe pertenecer a las cuentas de balance
 DocType: Asset,Naming Series,Secuencias e identificadores
 DocType: Vital Signs,Coated,Saburral
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Fila {0}: valor esperado después de la vida útil debe ser menor que el importe de compra bruta
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Fila {0}: valor esperado después de la vida útil debe ser menor que el importe de compra bruta
 DocType: GoCardless Settings,GoCardless Settings,Configuración de GoCardless
 DocType: Leave Block List,Leave Block List Name,Nombre de la Lista de Bloqueo de Vacaciones
 DocType: Certified Consultant,Certification Validity,Validez de Certificación
@@ -6440,6 +6446,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Encabezado del Banco
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Ver Pruebas de Laboratorio
 DocType: Hub Users,Hub Users,Usuarios de Hub
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Territorio
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Fecha de Mantenimiento
 DocType: Purchase Invoice Item,Rejected Serial No,No. de serie rechazado
@@ -6455,7 +6462,7 @@
 DocType: SG Creation Tool Course,Max Strength,Fuerza Máx
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Instalación de Presets
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},No se ha seleccionado ninguna Nota de Entrega para el Cliente {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},No se ha seleccionado ninguna Nota de Entrega para el Cliente {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,El Empleado {0} no tiene una cantidad de beneficio máximo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Seleccionar Elementos según la Fecha de Entrega
 DocType: Grant Application,Has any past Grant Record,Tiene algún registro de subvención anterior
@@ -6482,7 +6489,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Reserva de Habitación de Hotel
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Servicio al Cliente
 DocType: BOM,Thumbnail,Miniatura
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,No se encontraron contactos con ID de correo electrónico.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,No se encontraron contactos con ID de correo electrónico.
 DocType: Item Customer Detail,Item Customer Detail,Detalle del producto para el cliente
 DocType: Notification Control,Prompt for Email on Submission of,Consultar por el correo electrónico el envío de
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},La cantidad máxima de beneficios del empleado {0} excede de {1}
@@ -6737,7 +6744,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,No se puede convertir a 'Grupo' porque se seleccionó 'Tipo de Cuenta'.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} ha sido modificado. Por favor actualice.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,No permitir a los usuarios crear solicitudes de ausencia en los siguientes días.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Código del artículo&gt; Grupo de artículos&gt; Marca
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Si el vencimiento ilimitado para los puntos de fidelidad, mantenga la duración de vencimiento vacía o 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Miembros del Equipo de Mantenimiento
 DocType: Loyalty Point Entry,Purchase Amount,Monto de la Compra
@@ -6745,7 +6751,7 @@
 											to fullfill Sales Order {2}",No se puede entregar el número de serie {0} del artículo {1} ya que está reservado \ para completar el pedido de cliente {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Presupuesto de Proveedor {0} creado
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Año de finalización no puede ser anterior al ano de inicio
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Año de finalización no puede ser anterior al ano de inicio
 DocType: Employee Benefit Application,Employee Benefits,Beneficios de empleados
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elemento {0} en la línea {1}
 DocType: Work Order,Manufactured Qty,Cantidad Producida
@@ -6761,6 +6767,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Seleccionar Números de Lote
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Para GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Listado de facturas emitidas a los clientes.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configure el Sistema de nombres de empleados en Recursos humanos&gt; Configuración de recursos humanos
 DocType: Healthcare Settings,Invoice Appointments Automatically,Citas de factura automáticamente
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID del proyecto
 DocType: Salary Component,Variable Based On Taxable Salary,Variable basada en el Salario Imponible
@@ -6809,7 +6816,7 @@
 DocType: POS Profile,Account for Change Amount,Cuenta para Monto de Cambio
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Conectando a QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Ganancia / Pérdida Total
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Empresa no válida para la factura de la compañía inter.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Empresa no válida para la factura de la compañía inter.
 DocType: Purchase Invoice,input service,servicio de entrada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Línea {0}: Socio / Cuenta no coincide con {1} / {2} en {3} {4}
 DocType: Employee Promotion,Employee Promotion,Promoción del Empleado
@@ -6939,7 +6946,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Área preferida para alojamiento
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analítica
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,El carrito esta vacío.
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Configure el sistema de nombres de instructores en Educación&gt; Configuración de educación
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",El artículo {0} no tiene número de serie. Solo artículos seriados pueden tener entregas basadas en el número de serie.
 DocType: Vehicle,Model,Modelo
@@ -6969,7 +6975,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Nada para Cambiar
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,"Por favor, seleccione un archivo csv"
 DocType: Holiday List,Total Holidays,Vacaciones Totales
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,"Falta la plantilla de correo electrónico para el envío. Por favor, establezca uno en la configuración de entrega."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,"Falta la plantilla de correo electrónico para el envío. Por favor, establezca uno en la configuración de entrega."
 DocType: Student Leave Application,Mark as Present,Marcar como Presente
 DocType: Supplier Scorecard,Indicator Color,Color del Indicador
 DocType: Purchase Order,To Receive and Bill,Para recibir y pagar
@@ -6978,7 +6984,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Seleccione Nro de Serie
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Diseñador
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Plantillas de términos y condiciones
-DocType: Serial No,Delivery Details,Detalles de la entrega
+DocType: Delivery Trip,Delivery Details,Detalles de la entrega
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la línea {0} en la tabla Impuestos para el tipo {1}
 DocType: Program,Program Code,Código de programa
 DocType: Terms and Conditions,Terms and Conditions Help,Ayuda de Términos y Condiciones
@@ -7002,7 +7008,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Días de iniciativa
 DocType: Cash Flow Mapping,Is Income Tax Expense,Es el Gasto de Impuesto a la Renta
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,¡Su pedido está listo para la entrega!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Fila #{0}: Fecha de ingreso debe ser la misma que la fecha de compra {1} de activos {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Fila #{0}: Fecha de ingreso debe ser la misma que la fecha de compra {1} de activos {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Marque esto si el estudiante está residiendo en el albergue del Instituto.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Por favor, introduzca las Ordenes de Venta en la tabla anterior"
 ,Stock Summary,Resumen de Existencia
diff --git a/erpnext/translations/et.csv b/erpnext/translations/et.csv
index 2141385..304b82c 100644
--- a/erpnext/translations/et.csv
+++ b/erpnext/translations/et.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Perioodi nimi
 DocType: Employee,Salary Mode,Palk režiim
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Registreeru
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Registreeru
 DocType: Patient,Divorced,Lahutatud
 DocType: Support Settings,Post Route Key,Postitage marsruudi võti
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Luba toode, mis lisatakse mitu korda tehingu"
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Uus vahetuskurss
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Valuuta on vajalik Hinnakiri {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Kas arvestatakse tehingu.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Tarnija&gt; Tarnija tüüp
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Klienditeenindus Kontakt
 DocType: Patient Appointment,Check availability,Kontrollige saadavust
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Näita avatud
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Seeria edukalt uuendatud
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Minu tellimused
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} reas {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} reas {1}
 DocType: Asset Finance Book,Depreciation Start Date,Amortisatsiooni alguskuupäev
 DocType: Pricing Rule,Apply On,Kandke
 DocType: Item Price,Multiple Item prices.,Mitu punkti hindadega.
@@ -118,7 +117,7 @@
 DocType: Lab Prescription,Lab Prescription,Lab Prescription
 ,Delay Days,Viivituspäevad
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Teenuse kulu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Seerianumber: {0} on juba viidatud müügiarve: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Seerianumber: {0} on juba viidatud müügiarve: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Arve
 DocType: Purchase Invoice Item,Item Weight Details,Artikli kaal detailid
 DocType: Asset Maintenance Log,Periodicity,Perioodilisus
@@ -143,6 +142,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Raamatupidaja
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Müügi hinnakiri
 DocType: Patient,Tobacco Current Use,Tubaka praegune kasutamine
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Alguskuupäev ja lõppkuupäev kattuvad töökaardiga <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Müügihind
 DocType: Cost Center,Stock User,Stock Kasutaja
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -162,7 +162,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,seotud
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Osavõtjate kuupäev ei saa olla väiksem kui töötaja ühinemistähtaja
 DocType: Grading Scale,Grading Scale Name,Hindamisskaala Nimi
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Lisage kasutajaid turuplatsile
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Lisage kasutajaid turuplatsile
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,See on root ja seda ei saa muuta.
 DocType: Sales Invoice,Company Address,ettevõtte aadress
 DocType: BOM,Operations,Operations
@@ -319,7 +319,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Qty
 DocType: Production Plan,Material Request Detail,Materjali taotlus Detailid
 DocType: Selling Settings,Default Quotation Validity Days,Vaikimisi väärtpaberite kehtivuspäevad
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Et sisaldada makse järjest {0} Punkti kiirus, maksud ridadesse {1} peab olema ka"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Et sisaldada makse järjest {0} Punkti kiirus, maksud ridadesse {1} peab olema ka"
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Payroll Entry,Validate Attendance,Osalejate kinnitamine
 DocType: Sales Invoice,Change Amount,Muuda summa
@@ -438,7 +438,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Reavahe eest summa sõnadega
 DocType: Vehicle,Additional Details,Täiendavad detailid
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,No kirjeldusest
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Tarnija&gt; Tarnijagrupp
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Küsi osta.
 DocType: POS Closing Voucher Details,Collected Amount,Kogutud summa
 DocType: Lab Test,Submitted Date,Esitatud kuupäev
@@ -483,7 +482,7 @@
 DocType: Student Admission,Student Admission,üliõpilane
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Punkt {0} on tühistatud
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Amortisatsiooni rea {0}: amortisatsiooni alguskuupäev on kirjendatud varasemana
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Amortisatsiooni rea {0}: amortisatsiooni alguskuupäev on kirjendatud varasemana
 DocType: Contract Template,Fulfilment Terms and Conditions,Täitmise tingimused
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Materjal taotlus
 DocType: Bank Reconciliation,Update Clearance Date,Värskenda Kliirens kuupäev
@@ -540,6 +539,7 @@
 DocType: Accounts Settings,Settings for Accounts,Seaded konto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Tarnija Arve nr olemas ostuarve {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Manage Sales Person Tree.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Marsruut ei saa töödelda, kuna Google Mapsi seaded on keelatud."
 DocType: Job Applicant,Cover Letter,kaaskiri
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Tasumata tšekke ja hoiused selge
 DocType: Item,Synced With Hub,Sünkroniseerida Hub
@@ -598,7 +598,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Uus vara väärtus
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Hinda kus Klient Valuuta teisendatakse kliendi baasvaluuta
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kursuse planeerimine Tool
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rida # {0}: ostuarve ei saa vastu olemasoleva vara {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rida # {0}: ostuarve ei saa vastu olemasoleva vara {1}
 DocType: Crop Cycle,LInked Analysis,Lineeritud analüüs
 DocType: POS Closing Voucher,POS Closing Voucher,Posti sulgemiskviitung
 DocType: Contract,Lapsed,Kadunud
@@ -633,6 +633,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} ei kaasati Course {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Õpilase nimi:
 DocType: POS Closing Voucher Details,Difference,Erinevus
+DocType: Delivery Settings,Delay between Delivery Stops,Toimingu peatuste vaheline viivitus
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial No {0} ei kuulu saatelehele {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Seal näib olevat probleem serveri GoCardless konfiguratsiooniga. Ärge muretsege, ebaõnnestumise korral tagastatakse summa teie kontole."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -691,7 +692,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Kogus ja hind
 DocType: Delivery Note,% Installed,% Paigaldatud
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Klassiruumid / Laboratories jne, kus loenguid saab planeeritud."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Mõlema äriühingu äriühingute valuutad peaksid vastama äriühingutevahelistele tehingutele.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Mõlema äriühingu äriühingute valuutad peaksid vastama äriühingutevahelistele tehingutele.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Palun sisesta ettevõtte nimi esimene
 DocType: Travel Itinerary,Non-Vegetarian,Mitte-taimetoitlane
 DocType: Purchase Invoice,Supplier Name,Tarnija nimi
@@ -776,7 +777,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Üüritud alates kuupäevast
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Aitab Parts ehitada
 DocType: POS Profile User,POS Profile User,POS profiili kasutaja
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Rida {0}: kulumiaeg on vajalik
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Rida {0}: kulumiaeg on vajalik
 DocType: Purchase Invoice Item,Service Start Date,Teenuse alguskuupäev
 DocType: Subscription Invoice,Subscription Invoice,Märkimisarve
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Otsene tulu
@@ -843,7 +844,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Lühend kasutatakse juba teise firma
 DocType: Selling Settings,Default Customer Group,Vaikimisi Kliendi Group
 DocType: Employee,IFSC Code,IFSC kood
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Alguskuupäev ja lõppkuupäev kattuvad töökaardiga <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Kui keelata, &quot;Ümardatud Kokku väljale ei ole nähtav ühegi tehinguga"
 DocType: BOM,Operating Cost,Töökulud
 DocType: Crop,Produced Items,Toodetud esemed
@@ -895,7 +895,7 @@
 DocType: Supplier,Prevent RFQs,Ennetada RFQsid
 DocType: Hub User,Hub User,Hubi kasutaja
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Tee Sales Order
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Palkade slip esitatakse ajavahemikuks {0} kuni {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Palkade slip esitatakse ajavahemikuks {0} kuni {1}
 DocType: Project Task,Project Task,Projekti töörühma
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Lunastatud punktid
 ,Lead Id,Plii Id
@@ -1025,7 +1025,7 @@
 DocType: Fee Validity,Max number of visit,Maksimaalne külastuse arv
 ,Hotel Room Occupancy,Hotelli toa majutus
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Töögraafik on loodud:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Palun määra vaikimisi Raha või pangakonto makseviis {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Palun määra vaikimisi Raha või pangakonto makseviis {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,registreerima
 DocType: GST Settings,GST Settings,GST Seaded
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Valuuta peaks olema sama nagu hinnakiri Valuuta: {0}
@@ -1079,7 +1079,7 @@
 DocType: Vehicle Log,Service Details,Service detailid
 DocType: Lab Test Template,Grouped,Rühmitatud
 DocType: Selling Settings,Delivery Note Required,Toimetaja märkus Vajalikud
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Päevaraha esitamine ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Päevaraha esitamine ...
 DocType: Bank Guarantee,Bank Guarantee Number,Bank garantii arv
 DocType: Assessment Criteria,Assessment Criteria,Hindamiskriteeriumid
 DocType: BOM Item,Basic Rate (Company Currency),Basic Rate (firma Valuuta)
@@ -1104,13 +1104,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Makse Entry juba loodud
 DocType: Request for Quotation,Get Suppliers,Hankige tarnijaid
 DocType: Purchase Receipt Item Supplied,Current Stock,Laoseis
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Rida # {0}: Asset {1} ei ole seotud Punkt {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Rida # {0}: Asset {1} ei ole seotud Punkt {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Eelvaade palgatõend
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Konto {0} on sisestatud mitu korda
 DocType: Account,Expenses Included In Valuation,Kulud sisalduvad Hindamine
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,"Te saate uuendada ainult siis, kui teie liikmelisus lõpeb 30 päeva jooksul"
 DocType: Shopping Cart Settings,Show Stock Availability,Näita toote laost
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Määra {0} varakategoorias {1} või ettevõtte {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Määra {0} varakategoorias {1} või ettevõtte {2}
 DocType: Location,Longitude,Pikkuskraad
 ,Absent Student Report,Puudub Student Report
 DocType: Crop,Crop Spacing UOM,Crop Spacing UOM
@@ -1182,7 +1182,7 @@
 DocType: Soil Texture,Sand,Liiv
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Opportunity From
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rida {0}: {1} punkti {2} jaoks nõutavad seerianumbrid. Te olete esitanud {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rida {0}: {1} punkti {2} jaoks nõutavad seerianumbrid. Te olete esitanud {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Valige tabel
 DocType: BOM,Website Specifications,Koduleht erisused
 DocType: Special Test Items,Particulars,Üksikasjad
@@ -1274,7 +1274,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Esemed kõrgema weightage kuvatakse kõrgem
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Lab Testid ja elutähtsad märgid
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank leppimise Detail
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Rida # {0}: Asset {1} tuleb esitada
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Rida # {0}: Asset {1} tuleb esitada
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Ükski töötaja leitud
 DocType: Item,If subcontracted to a vendor,Kui alltöövõtjaks müüja
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Student Group on juba uuendatud.
@@ -1328,7 +1328,6 @@
 DocType: Loyalty Program Collection,Tier Name,Tase Nimi
 DocType: HR Settings,Enter retirement age in years,Sisesta pensioniiga aastat
 DocType: Crop,Target Warehouse,Target Warehouse
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Palun määrake seerianumbrite nime seeria {0} abil häälestus&gt; Seaded&gt; nime seeria
 DocType: Payroll Employee Detail,Payroll Employee Detail,Palgaarvestus Töötaja üksikasjad
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Palun valige laost
 DocType: Cheque Print Template,Starting location from left edge,Alustades asukoha vasakust servast
@@ -1418,7 +1417,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Plan materjali sõlmed
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Müük Partnerid ja territoorium
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,Bom {0} peab olema aktiivne
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Ülekandmiseks pole ühtegi eset
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Ülekandmiseks pole ühtegi eset
 DocType: Employee Boarding Activity,Activity Name,Tegevuse nimetus
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Muuda väljalaske kuupäev
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Valmis toodangu kogus <b>{0}</b> ja koguse <b>{1} jaoks</b> ei saa olla teistsugune
@@ -1645,6 +1644,7 @@
 DocType: Project,First Email,Esimene e-post
 DocType: Company,Exception Budget Approver Role,Erand eelarve kinnitamise roll
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date",Pärast seadistamist jääb see arve ootele kuni määratud kuupäevani
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserveeritud Warehouse Sales Order / valmistoodang Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Müügi summa
 DocType: Repayment Schedule,Interest Amount,Intressisummat
@@ -1656,7 +1656,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Rekordid
 DocType: Asset,Scrapped,lammutatakse
 DocType: Item,Item Defaults,Üksus Vaikeväärtused
-DocType: Purchase Invoice,Returns,tulu
+DocType: Cashier Closing,Returns,tulu
 DocType: Job Card,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serial No {0} on alla hooldusleping upto {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,värbamine
@@ -1670,7 +1670,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Ülekande tüüp
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Müügikulud
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klient&gt; Kliendi Grupp&gt; Territoorium
 DocType: Diagnosis,Diagnosis,Diagnoosimine
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standard ostmine
 DocType: Attendance Request,Explanation,Selgitus
@@ -1683,7 +1682,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Ostutellimused on tähtaja ületanud
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Postiindeks
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Sales Order {0} on {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Vali laenude intressitulu konto {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Vali laenude intressitulu konto {0}
 DocType: Opportunity,Contact Info,Kontaktinfo
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Making Stock kanded
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Ei saa edendada Töötajat staatusega Vasak
@@ -1695,7 +1694,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Arve ei saa teha arveldusnädala nullini
 DocType: Company,Date of Commencement,Alguskuupäev
 DocType: Sales Person,Select company name first.,Vali firma nimi esimesena.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},E-kiri saadetakse aadressile {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},E-kiri saadetakse aadressile {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Tsitaadid Hankijatelt.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Vahetage BOM ja värskendage viimast hinda kõikides BOM-i
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},{0} | {1} {2}
@@ -1715,7 +1714,7 @@
 DocType: Asset Movement,From Employee,Tööalasest
 DocType: Driver,Cellphone Number,Mobiiltelefoni number
 DocType: Project,Monitor Progress,Jälgida progressi
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Hoiatus: Süsteem ei kontrolli tegelikust suuremad arved, sest summa Punkt {0} on {1} on null"
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Hoiatus: Süsteem ei kontrolli tegelikust suuremad arved, sest summa Punkt {0} on {1} on null"
 DocType: Journal Entry,Make Difference Entry,Tee Difference Entry
 DocType: Supplier Quotation,Auto Repeat Section,Auto kordustage sektsioon
 DocType: Upload Attendance,Attendance From Date,Osavõtt From kuupäev
@@ -1818,7 +1817,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: lükata Kogus ei kanta Ostutagastus
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Valitud Kliendi kliendirühma vahetamine ei ole lubatud.
 ,Purchase Order Items To Be Billed,Ostutellimuse punkte arve
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Hinnangulise saabumisaja ajakohastamine
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Hinnangulise saabumisaja ajakohastamine
 DocType: Program Enrollment Tool,Enrollment Details,Registreerumise üksikasjad
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Ettevõte ei saa määrata mitu üksust Vaikeväärtused.
 DocType: Purchase Invoice Item,Net Rate,Efektiivne intressimäär
@@ -1832,7 +1831,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Jäta tüüp on aegunud
 DocType: Support Settings,Close Issue After Days,Sule Issue Pärast päevi
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Kasutajate lisamiseks turuplatsile peate olema kasutaja, kellel on System Manager ja Item Manager."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Kasutajate lisamiseks turuplatsile peate olema kasutaja, kellel on System Manager ja Item Manager."
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Jäta tühjaks, kui arvestada kõigis valdkondades"
 DocType: Job Opening,Staffing Plan,Personaliplaan
 DocType: Bank Guarantee,Validity in Days,Kehtivus Days
@@ -1852,7 +1851,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Duplicate rida {0} on sama {1}
 DocType: Marketplace Settings,Disable Marketplace,Keela turuplats
 ,Trial Balance,Proovibilanss
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Eelarveaastal {0} ei leitud
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Eelarveaastal {0} ei leitud
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Seadistamine Töötajad
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotelli broneeringu kasutaja
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Palun valige eesliide esimene
@@ -1960,7 +1959,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Sisselogimine ebaõnnestus
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Vara {0} loodud
 DocType: Special Test Items,Special Test Items,Spetsiaalsed katseüksused
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Turult registreerumiseks peate olema kasutaja, kellel on süsteemihaldur ja üksuste juhtide roll."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Turult registreerumiseks peate olema kasutaja, kellel on süsteemihaldur ja üksuste juhtide roll."
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Makseviis
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Teie määratud palgakorralduse järgi ei saa te taotleda hüvitisi
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Koduleht Pilt peaks olema avalik faili või veebilehe URL
@@ -1972,7 +1971,7 @@
 DocType: Warehouse,Warehouse Contact Info,Ladu Kontakt
 DocType: Payment Entry,Write Off Difference Amount,Kirjutage Off erinevuse koguse
 DocType: Volunteer,Volunteer Name,Vabatahtlike nimi
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Leiti lehtede kahes järjestikuses tähtajad teistes ridades: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Leiti lehtede kahes järjestikuses tähtajad teistes ridades: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: Töötaja e-posti ei leitud, seega e-posti ei saadeta"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Palkade struktuur määratud töötajatele {0} antud kuupäeval {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Saatmise reegel ei kehti riigile {0}
@@ -2061,6 +2060,7 @@
 DocType: Salary Component,Earning,Tulu
 DocType: Supplier Scorecard,Scoring Criteria,Hindamise kriteeriumid
 DocType: Purchase Invoice,Party Account Currency,Partei konto Valuuta
+DocType: Delivery Trip,Total Estimated Distance,Kogu prognoositud vahemaa
 ,BOM Browser,Bom Browser
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Palun uuendage seda koolitusüritust
 DocType: Item Barcode,EAN,EAN
@@ -2099,7 +2099,7 @@
 DocType: Activity Cost,Projects,Projektid
 DocType: Payment Request,Transaction Currency,tehing Valuuta
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Siit {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Mõned e-kirjad on kehtetud
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Mõned e-kirjad on kehtetud
 DocType: Work Order Operation,Operation Description,Tööpõhimõte
 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.,Ei saa muuta Fiscal Year Alguse kuupäev ja Fiscal Year End Date kui majandusaasta on salvestatud.
 DocType: Quotation,Shopping Cart,Ostukorv
@@ -2123,7 +2123,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Net Change põhivarade
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Jäta tühjaks, kui arvestada kõiki nimetusi"
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Laadige tüüp &quot;Tegelik&quot; in real {0} ei saa lisada Punkt Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Laadige tüüp &quot;Tegelik&quot; in real {0} ei saa lisada Punkt Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Siit Date
 DocType: Shopify Settings,For Company,Sest Company
@@ -2137,7 +2137,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Kurssiplaani loomine tekitas vigu
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Nimekirja esimene kulude kinnitaja määratakse vaikimisi kulude kinnitajana.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,ei saa olla üle 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Turult registreerumiseks peate olema administraator, kellel on System Manager ja Item Manager."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Turult registreerumiseks peate olema administraator, kellel on System Manager ja Item Manager."
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Punkt {0} ei ole laos toode
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-YYYYY.-
 DocType: Maintenance Visit,Unscheduled,Plaaniväline
@@ -2166,7 +2166,7 @@
 DocType: HR Settings,Employee Settings,Töötaja Seaded
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Maksesüsteemi laadimine
 ,Batch-Wise Balance History,Osakaupa Balance ajalugu
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Rida # {0}: ei saa määrata määra, kui summa on suurem kui punktis {1} arveldatav summa."
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Rida # {0}: ei saa määrata määra, kui summa on suurem kui punktis {1} arveldatav summa."
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Prindi seaded uuendatud vastava trükiformaadis
 DocType: Package Code,Package Code,pakendikood
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Praktikant
@@ -2398,7 +2398,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} vabade töökohtade ja {1} {3} eelarve juba {3} jaoks tütarettevõtete jaoks kavandatud. \ Saate plaanida kuni {4} vabade ja {5} eelarve (6) emaettevõtte {3} jaoks vastavalt personaliplaanile {6}.
 DocType: HR Settings,Stop Birthday Reminders,Stopp Sünnipäev meeldetuletused
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Palun määra Vaikimisi palgaarvestuse tasulised konto Company {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Palun määra Vaikimisi palgaarvestuse tasulised konto Company {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Hankige teavet Amazoni maksude ja maksete kohta
 DocType: SMS Center,Receiver List,Vastuvõtja loetelu
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Otsi toode
@@ -2468,7 +2468,7 @@
 DocType: Vital Signs,Constipated,Kõhukinnisus
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Vastu Tarnija Arve {0} dateeritud {1}
 DocType: Customer,Default Price List,Vaikimisi hinnakiri
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Asset Liikumine rekord {0} loodud
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Asset Liikumine rekord {0} loodud
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Ühtegi toodet pole leitud.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Sa ei saa kustutada eelarveaastal {0}. Eelarveaastal {0} on määratud vaikimisi Global Settings
 DocType: Share Transfer,Equity/Liability Account,Omakapitali / vastutuse konto
@@ -2605,6 +2605,7 @@
 DocType: Blanket Order,Order Type,Tellimus Type
 ,Item-wise Sales Register,Punkt tark Sales Registreeri
 DocType: Asset,Gross Purchase Amount,Gross ostusumma
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Tootekood&gt; Elemendi grupp&gt; Bränd
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Avamissaldod
 DocType: Asset,Depreciation Method,Amortisatsioonimeetod
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,See sisaldab käibemaksu Basic Rate?
@@ -2685,7 +2686,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,"Tegevus, kui aastaeelarve ületab PO"
 DocType: Student Leave Application,Student Leave Application,Student Jäta ostusoov
 DocType: Item,Will also apply for variants,Kehtib ka variandid
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Vara ei saa tühistada, sest see on juba {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Vara ei saa tühistada, sest see on juba {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Töötaja {0} on Half päeval {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Kokku tööaeg ei tohi olla suurem kui max tööaeg {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,edasi
@@ -2709,6 +2710,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Andmete hankimine
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Puhkerežiimis lubatud maksimaalne puhkus {0} on {1}
 DocType: SMS Center,Create Receiver List,Loo vastuvõtja loetelu
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Kasutatav kasutuskuupäev peaks toimuma pärast ostukuupäeva
 DocType: Vehicle,Wheels,rattad
 DocType: Packing Slip,To Package No.,Pakendada No.
 DocType: Patient Relation,Family,Perekond
@@ -2722,7 +2724,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Arveldusvaluuta peab olema võrdne kas ettevõtte vaikimisi valuuta või partei konto valuutaga
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Näitab, et pakend on osa sellest sünnitust (Ainult eelnõu)"
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Rida {0}: tähtaeg ei saa olla enne postitamise kuupäeva
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Rida {0}: tähtaeg ei saa olla enne postitamise kuupäeva
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Tee makse Entry
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Kogus Punkt {0} peab olema väiksem kui {1}
 ,Sales Invoice Trends,Müügiarve Trends
@@ -2794,7 +2796,7 @@
 DocType: Guardian,Guardian Interests,Guardian huvid
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Uuenda konto nime / numbrit
 DocType: Naming Series,Current Value,Praegune väärtus
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Mitu eelarve aastatel on olemas kuupäev {0}. Palun määra firma eelarveaastal
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Mitu eelarve aastatel on olemas kuupäev {0}. Palun määra firma eelarveaastal
 DocType: Education Settings,Instructor Records to be created by,"Juhendaja salvestised, mida peab looma"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} loodud
 DocType: GST Account,GST Account,GST konto
@@ -2811,7 +2813,7 @@
 DocType: Sales Person,Name and Employee ID,Nimi ja Töötaja ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Tähtaeg ei tohi olla enne postitamist kuupäev
 DocType: Website Item Group,Website Item Group,Koduleht Punkt Group
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Palkade libisemist ei leitud enam esitatud kriteeriumidele vastavaks esitamiseks või juba esitatud palgalehelt
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Palkade libisemist ei leitud enam esitatud kriteeriumidele vastavaks esitamiseks või juba esitatud palgalehelt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Lõivud ja maksud
 DocType: Projects Settings,Projects Settings,Projektide seaded
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Palun sisestage Viitekuupäev
@@ -2820,7 +2822,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Komplektis Kogus
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Materjal taotlus toode
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Esmalt tühjendage ostukviitung {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Esmalt tühjendage ostukviitung {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Tree of Punkt grupid.
 DocType: Production Plan,Total Produced Qty,Kogutoodang
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Kas ei viita rea number on suurem või võrdne praeguse rea number selle Charge tüübist
@@ -2929,6 +2931,7 @@
 ,Vehicle Expenses,Sõidukite kulud
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Loo Lab-testi (te) Müügiarve esitamine
 DocType: Serial No,Invoice Details,arve andmed
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Lubage marsruutide hindamiseks ja optimeerimiseks lubada Google Mapsi seaded
 DocType: Grant Application,Show on Website,Näita veebisaidil
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Alusta uuesti
 DocType: Hub Tracked Item,Hub Category,Rummu kategooria
@@ -2968,7 +2971,7 @@
 DocType: Inpatient Record,B Positive,B Positiivne
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Töötaja maksimaalne kasu {0} ületab {1} varasema nõutud summa kogusummaga {2}
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rida # {0}: Kogus peab olema 1, kui objekt on põhivarana. Palun kasutage eraldi rida mitu tk."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rida # {0}: Kogus peab olema 1, kui objekt on põhivarana. Palun kasutage eraldi rida mitu tk."
 DocType: Leave Block List Allow,Leave Block List Allow,Jäta Block loetelu Laske
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Lühend ei saa olla tühi või ruumi
 DocType: Patient Medical Record,Patient Medical Record,Patsiendi meditsiiniline aruanne
@@ -3002,7 +3005,7 @@
 DocType: Workstation,Wages per hour,Palk tunnis
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock tasakaalu Partii {0} halveneb {1} jaoks Punkt {2} lattu {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Pärast Material taotlused on tõstatatud automaatselt vastavalt objekti ümber korraldada tasemel
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Konto {0} on kehtetu. Konto Valuuta peab olema {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Konto {0} on kehtetu. Konto Valuuta peab olema {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Alates kuupäevast {0} ei saa olla pärast töötaja vabastamist Kuupäev {1}
 DocType: Supplier,Is Internal Supplier,Kas sisetarnija
 DocType: Employee,Create User Permission,Loo kasutaja luba
@@ -3146,7 +3149,7 @@
 DocType: Account,Fixed Asset,Põhivarade
 DocType: Amazon MWS Settings,After Date,Pärast kuupäeva
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,SERIALIZED Inventory
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Kehtib ettevõtte esindaja arvele {0}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Kehtib ettevõtte esindaja arvele {0}.
 ,Department Analytics,Osakonna analüüs
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-post ei leitud vaikekontaktis
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Loo saladus
@@ -3158,7 +3161,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Tasulise struktuuri ja õpilaste rühma programm {0} on erinevad.
 DocType: Bank Statement Transaction Entry,Receivable Account,Nõue konto
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Kehtiv alates kuupäevast peab olema väiksem kui kehtiva kuni kuupäevani.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Rida # {0}: Asset {1} on juba {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Rida # {0}: Asset {1} on juba {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Sales Order maksmine
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,tegevdirektor
@@ -3200,6 +3203,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Kanne on vajalik
 DocType: Clinical Procedure,Inpatient Record,Statsionaarne kirje
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets aitab jälgida aega, kulusid ja arveldamise aja veetmiseks teha oma meeskonda"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Tarnija&gt; Tarnija tüüp
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Ostu hinnakiri
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Tehingu kuupäev
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Pakkujate tulemuskaardi muutujate mallid.
@@ -3242,7 +3246,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Exchange kasum / kahjum
 DocType: Opportunity,Lost Reason,Kaotatud Reason
 DocType: Amazon MWS Settings,Enable Amazon,Luba Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Rida # {0}: konto {1} ei kuulu ettevõttele {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Rida # {0}: konto {1} ei kuulu ettevõttele {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType&#39;i leidmine nurjus {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,New Address
 DocType: Quality Inspection,Sample Size,Valimi suurus
@@ -3353,7 +3357,7 @@
 DocType: Water Analysis,Origin,Päritolu
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,See dokument on üle piiri {0} {1} artiklijärgse {4}. Kas tegemist teise {3} samade {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Palun määra korduvate pärast salvestamist
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Vali muutus summa kontole
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Vali muutus summa kontole
 DocType: Purchase Invoice,Price List Currency,Hinnakiri Valuuta
 DocType: Naming Series,User must always select,Kasutaja peab alati valida
 DocType: Stock Settings,Allow Negative Stock,Laske Negatiivne Stock
@@ -3395,7 +3399,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,"Kas olete kindel, et soovite selle koosoleku tühistada?"
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Hotelli toa hinna pakett
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,müügivõimaluste
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Palun määra vaikimisi konto palk Component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Palun määra vaikimisi konto palk Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nõutav
 DocType: Rename Tool,File to Rename,Fail Nimeta ümber
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Palun valige Bom Punkt reas {0}
@@ -3416,7 +3420,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kulud ostetud esemed
 DocType: Employee Separation,Employee Separation Template,Töötaja eraldamise mall
 DocType: Selling Settings,Sales Order Required,Sales Order Nõutav
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Hakka Müüja
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Hakka Müüja
 DocType: Purchase Invoice,Credit To,Krediidi
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Aktiivne Testrijuhtmed / Kliendid
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,"Jätke tühi, et kasutada standardset tarnetunnistuse vormi"
@@ -3457,7 +3461,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Tehke maksumall
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Kasutaja Foorum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Tooraine ei saa olla tühi.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Row # {0} (maksete tabel): summa peab olema negatiivne
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Row # {0} (maksete tabel): summa peab olema negatiivne
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Ei uuendada laos, arve sisaldab tilk laevandus objekt."
 DocType: Contract,Fulfilment Status,Täitmise olek
 DocType: Lab Test Sample,Lab Test Sample,Lab prooviproov
@@ -3596,7 +3600,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Dokumendi kuupäev
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Fee Records Loodud - {0}
 DocType: Asset Category Account,Asset Category Account,Põhivarakategoori konto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Row # {0} (maksetabel): summa peab olema positiivne
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Row # {0} (maksetabel): summa peab olema positiivne
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Ei suuda toota rohkem Punkt {0} kui Sales Order koguse {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Vali Atribuudi väärtused
 DocType: Purchase Invoice,Reason For Issuing document,Motivatsioon Dokumendi väljastamiseks
@@ -3651,7 +3655,7 @@
 DocType: Purchase Receipt,Time at which materials were received,"Aeg, mil materjale ei laekunud"
 DocType: Products Settings,Products per Page,Tooteid lehel
 DocType: Stock Ledger Entry,Outgoing Rate,Väljuv Rate
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,või
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,või
 DocType: Sales Order,Billing Status,Arved staatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Teata probleemist
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Utility kulud
@@ -3678,7 +3682,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Töötaja maksuvabastuse deklaratsioon
 DocType: Payment Entry,Cheque/Reference Date,Tšekk / Reference kuupäev
 DocType: Purchase Invoice,Total Taxes and Charges,Kokku maksud ja tasud
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Kättesaadav kuupäev on sisestatud eelmise kuupäevana
 DocType: Employee,Emergency Contact,Hädaabi kontaktinfo
 DocType: Bank Reconciliation Detail,Payment Entry,makse Entry
 ,sales-browser,müügi-brauser
@@ -3724,6 +3727,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Kas tagasipöördumine (krediit märge)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Alusta tööd
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Varade jaoks on vaja seerianumbrit {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Palun määrake seerianumbrite nime seeria {0} abil häälestus&gt; Seaded&gt; nime seeria
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Puudega template ei tohi olla vaikemalliga
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Rida {0}: sisestage kavandatud kogus
 DocType: Account,Income Account,Tulukonto
@@ -3737,6 +3741,7 @@
 DocType: Loyalty Program,Help Section,Abi sektsioon
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Eelmine
 DocType: Appraisal Goal,Key Responsibility Area,Key Vastutus Area
+DocType: Delivery Trip,Distance UOM,UUMi kaugus
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student Partiidele aitab teil jälgida käimist, hinnanguid ja tasude õpilased"
 DocType: Payment Entry,Total Allocated Amount,Eraldati kokku
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Määra vaikimisi laoseisu konto jooksva inventuuri
@@ -3778,7 +3783,7 @@
 DocType: Item Supplier,Item Supplier,Punkt Tarnija
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Palun sisestage Kood saada partii ei
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Palun valige väärtust {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Ülekandmiseks valitud üksused pole valitud
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Ülekandmiseks valitud üksused pole valitud
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Kõik aadressid.
 DocType: Company,Stock Settings,Stock Seaded
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Ühendamine on võimalik ainult siis, kui järgmised omadused on samad nii arvestust. Kas nimel, Root tüüp, Firmade"
@@ -4063,7 +4068,7 @@
 DocType: Patient,Personal and Social History,Isiklik ja sotsiaalne ajalugu
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Kasutaja {0} loodud
 DocType: Fee Schedule,Fee Breakup for each student,Tasu lõhe iga õpilase kohta
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Kokku eelnevalt ({0}) vastu Order {1} ei saa olla suurem kui Grand Kokku ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Kokku eelnevalt ({0}) vastu Order {1} ei saa olla suurem kui Grand Kokku ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vali Kuu jaotamine ebaühtlaselt jaotada eesmärkide üle kuu.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Muuda koodi
 DocType: Purchase Invoice Item,Valuation Rate,Hindamine Rate
@@ -4072,7 +4077,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Availed ITC Cess
 ,Student Monthly Attendance Sheet,Student Kuu osavõtt Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Müügi reegel kehtib ainult Müügi kohta
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Amortisatsiooni rea {0}: järgmine amortisatsiooniaeg ei saa olla enne Ostupäeva
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Amortisatsiooni rea {0}: järgmine amortisatsiooniaeg ei saa olla enne Ostupäeva
 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 +36,Until,Kuni
 DocType: Rename Tool,Rename Log,Nimeta Logi
@@ -4089,12 +4094,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Kui tihti peaks müügitehingute põhjal uuendama projekti ja ettevõtet.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Aegub
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Lisa Õpilased
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Palun kustuta töötaja <a href=""#Form/Employee/{0}"">{0}</a> \ selle dokumendi tühistamiseks"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Palun valige {0}
 DocType: C-Form,C-Form No,C-vorm pole
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Kaugus
+DocType: Delivery Stop,Distance,Kaugus
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Lisage oma tooteid või teenuseid, mida ostate või müüte."
 DocType: Water Analysis,Storage Temperature,Säilitustemperatuur
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4121,7 +4124,7 @@
 DocType: Homepage,Company Description for website homepage,Firma kirjeldus veebisaidi avalehel
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For mugavuse klientidele, neid koode saab kasutada print formaadid nagu arved ja Saatekirjad"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Nimi
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Informatsiooni ei õnnestunud {0} jaoks leida.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Informatsiooni ei õnnestunud {0} jaoks leida.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Ava sisenemise ajakiri
 DocType: Contract,Fulfilment Terms,Täitmise tingimused
 DocType: Sales Invoice,Time Sheet List,Aeg leheloend
@@ -4301,7 +4304,7 @@
 DocType: Serial No,Warranty / AMC Details,Garantii / AMC Üksikasjad
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Valige õpilast käsitsi tegevuspõhise Group
 DocType: Journal Entry,User Remark,Kasutaja Märkus
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Marsruudi optimeerimine.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Marsruudi optimeerimine.
 DocType: Travel Itinerary,Non Diary,Mitte päevikut
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Järelejäänud Töötajate jaoks ei saa luua retention bonus
 DocType: Lead,Market Segment,Turusegment
@@ -4331,7 +4334,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Lojaalsusprogramm
 DocType: Student Guardian,Father,isa
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Toetab pileteid
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&quot;Uuenda Stock&quot; ei saa kontrollida põhivara müügist
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&quot;Uuenda Stock&quot; ei saa kontrollida põhivara müügist
 DocType: Bank Reconciliation,Bank Reconciliation,Bank leppimise
 DocType: Attendance,On Leave,puhkusel
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Saada värskendusi
@@ -4376,7 +4379,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Järjekorra number ja partii
 DocType: Warranty Claim,From Company,Allikas: Company
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Summa hulgaliselt Hindamiskriteeriumid peab olema {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Palun määra arv Amortisatsiooniaruanne Broneeritud
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Palun määra arv Amortisatsiooniaruanne Broneeritud
 DocType: Supplier Scorecard Period,Calculations,Arvutused
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Väärtus või Kogus
 DocType: Payment Terms Template,Payment Terms,Maksetingimused
@@ -4395,7 +4398,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Soodustus (%) kohta Hinnakirja hind koos Margin
 DocType: Healthcare Service Unit Type,Rate / UOM,Rate / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Kõik Laod
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Firma Inter-tehingute jaoks ei leitud {0}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Firma Inter-tehingute jaoks ei leitud {0}.
 DocType: Travel Itinerary,Rented Car,Renditud auto
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Teie ettevõtte kohta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Krediidi konto peab olema bilansis
@@ -4496,6 +4499,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Plantanalüüsi kriteeriumid
 DocType: Cheque Print Template,Cheque Height,Tšekk Kõrgus
 DocType: Supplier,Supplier Details,Tarnija Üksikasjad
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Palun seadistage külastuse numbrite seeria seaded&gt; nummering seeria abil
 DocType: Setup Progress,Setup Progress,Seadistamine Progress
 DocType: Expense Claim,Approval Status,Kinnitamine Staatus
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Siit peab olema väiksem kui väärtus järjest {0}
@@ -4588,7 +4592,6 @@
 DocType: Travel Request,Fully Sponsored,Täielikult sponsor
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Pöördteadaande kande number
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Klient {0} on loodud.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Palun seadke töötaja nimesüsteem inimressurss&gt; HR-seaded
 DocType: Stock Settings,Limit Percent,Limit protsent
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Praegu pole ühtegi ladu saadaval
 ,Payment Period Based On Invoice Date,Makse kindlaksmääramisel tuginetakse Arve kuupäev
@@ -4647,7 +4650,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Allikas Warehouse
 DocType: Installation Note,Installation Date,Paigaldamise kuupäev
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Jaga Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Rida # {0}: Asset {1} ei kuulu firma {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Rida # {0}: Asset {1} ei kuulu firma {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Müügiarve {0} loodud
 DocType: Employee,Confirmation Date,Kinnitus kuupäev
 DocType: Inpatient Occupancy,Check Out,Check Out
@@ -4667,6 +4670,7 @@
 DocType: Production Plan,Sales Orders Detail,Müügitellimuste üksikasjad
 DocType: Bin,Requested Quantity,taotletud Kogus
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Palun seadke õpetaja nime sisestamine haridusse&gt; Hariduseseaded
 DocType: Patient,Marital Status,Perekonnaseis
 DocType: Stock Settings,Auto Material Request,Auto Material taotlus
 DocType: Woocommerce Settings,API consumer secret,API tarbija saladus
@@ -4719,7 +4723,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Valige Päevad
 DocType: Academic Term,Term Name,Term Nimi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Krediit ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Palkalendite loomine ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Palkalendite loomine ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Sa ei saa redigeerida juursõlme.
 DocType: Buying Settings,Purchase Order Required,Ostutellimuse Nõutav
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Taimer
@@ -4755,7 +4759,7 @@
 DocType: Account,Rate at which this tax is applied,Hinda kus see maks kohaldub
 DocType: Cash Flow Mapper,Section Name,Sektsiooni nimi
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Reorder Kogus
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Amortisatsiooni rea {0}: eeldatav väärtus pärast kasulikku eluea peab olema suurem kui {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Amortisatsiooni rea {0}: eeldatav väärtus pärast kasulikku eluea peab olema suurem kui {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Praegune noorele
 DocType: Company,Stock Adjustment Account,Stock korrigeerimine konto
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Maha kirjutama
@@ -4802,7 +4806,7 @@
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
 DocType: Opportunity,Opportunity Amount,Võimaluse summa
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Arv Amortisatsiooniaruanne Broneeritud ei saa olla suurem kui koguarv Amortisatsiooniaruanne
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Arv Amortisatsiooniaruanne Broneeritud ei saa olla suurem kui koguarv Amortisatsiooniaruanne
 DocType: Purchase Order,Order Confirmation Date,Tellimuse kinnitamise kuupäev
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Tee hooldus Külasta
@@ -4843,7 +4847,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Partii:
 DocType: Volunteer,Afternoon,Pärastlõunal
 DocType: Loyalty Program,Loyalty Program Help,Lojaalsusprogrammi abi
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} &quot;{1}&quot; on keelatud
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} &quot;{1}&quot; on keelatud
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Määra Open
 DocType: Cheque Print Template,Scanned Cheque,skaneeritud Tšekk
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Saada automaatne kirju Kontaktid esitamine tehinguid.
@@ -4856,7 +4860,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Punkt ja garantii detailid
 DocType: Chapter,Chapter Members,Peatükk Liikmed
 DocType: Sales Team,Contribution (%),Panus (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Märkus: Tasumine Entry ei loonud kuna &quot;Raha või pangakonto pole määratud
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Märkus: Tasumine Entry ei loonud kuna &quot;Raha või pangakonto pole määratud
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Projekt {0} on juba olemas
 DocType: Clinical Procedure,Nursing User,Õendusabi kasutaja
 DocType: Employee Benefit Application,Payroll Period,Palgaarvestusperiood
@@ -4864,6 +4868,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Seerianumber {0} ei kuulu Partii {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Vastutus
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Selle pakkumise kehtivusaeg on lõppenud.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Palun kustuta töötaja <a href=""#Form/Employee/{0}"">{0}</a> \ selle dokumendi tühistamiseks"
 DocType: Expense Claim Account,Expense Claim Account,Kuluhüvitussüsteeme konto
 DocType: Account,Capital Work in Progress,Käimasolev kapitalitöö
 DocType: Accounts Settings,Allow Stale Exchange Rates,Lubage vahetuskursi halvenemine
@@ -4944,7 +4950,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Väljaanne Material
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Ühenda Shopify ERPNextiga
 DocType: Material Request Item,For Warehouse,Sest Warehouse
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Tarne märkused {0} uuendatud
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Tarne märkused {0} uuendatud
 DocType: Employee,Offer Date,Pakkuda kuupäev
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Tsitaadid
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,"Olete võrguta režiimis. Sa ei saa uuesti enne, kui olete võrgus."
@@ -4994,7 +5000,7 @@
 DocType: Shipping Rule,Calculate Based On,Arvuta põhineb
 DocType: Contract,Unfulfilled,Täitmata
 DocType: Delivery Note Item,From Warehouse,Siit Warehouse
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Nendest kriteeriumidest töötajaid pole
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Nendest kriteeriumidest töötajaid pole
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Ei objektid Materjaliandmik et Tootmine
 DocType: Shopify Settings,Default Customer,Vaikimisi klient
 DocType: Sales Stage,Stage Name,Etapi nimi
@@ -5036,7 +5042,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Maksusumma Pärast Allahindluse summa
 DocType: Patient,Inpatient Status,Statsionaarne staatus
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Igapäevase töö kokkuvõte seaded
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Valitud hinnakirjas peaks olema kontrollitud ostu- ja müügipinda.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Valitud hinnakirjas peaks olema kontrollitud ostu- ja müügipinda.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Palun sisesta Reqd kuupäeva järgi
 DocType: Payment Entry,Internal Transfer,Siseülekandevormi
 DocType: Asset Maintenance,Maintenance Tasks,Hooldusülesanded
@@ -5072,7 +5078,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Group By
 DocType: Guardian,Interests,Huvid
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Võimalda / blokeeri valuutades.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Palkade lisadeta ei õnnestunud esitada
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Palkade lisadeta ei õnnestunud esitada
 DocType: Exchange Rate Revaluation,Get Entries,Hankige kanded
 DocType: Production Plan,Get Material Request,Saada Materjal taotlus
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Postikulude
@@ -5156,7 +5162,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Kulu konto on kohustuslik element {0}
 DocType: BOM,Website Description,Koduleht kirjeldus
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Net omakapitali
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Palun tühistada ostuarve {0} esimene
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Palun tühistada ostuarve {0} esimene
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Ei ole lubatud. Palun blokeerige teenuseüksuse tüüp
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-posti aadress peab olema unikaalne, juba olemas {0}"
 DocType: Serial No,AMC Expiry Date,AMC Aegumisaja
@@ -5196,7 +5202,7 @@
 DocType: Hotel Room,Hotel Room,Hotellituba
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Konto {0} ei kuuluv ettevõte {1}
 DocType: Leave Type,Rounding,Ümardamine
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Seerianumbrid järjest {0} ei ühti saateleht
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Seerianumbrid järjest {0} ei ühti saateleht
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Välja antud summa (hinnatud)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Siis filtreeritakse hinnakujunduse reeglid kliendi, kliendirühma, territooriumi, tarnija, tarnijate rühma, kampaania, müügipartneri jt alusel."
 DocType: Student,Guardian Details,Guardian detailid
@@ -5251,7 +5257,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Ladu vajalik varude Punkt {0}
 DocType: Leave Allocation,Unused leaves,Kasutamata lehed
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Tee tagasimakse kirje
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Kõik osakonnad
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Kõik osakonnad
 DocType: Healthcare Service Unit,Vacant,Vaba
 DocType: Patient,Alcohol Past Use,Alkoholi varasem kasutamine
 DocType: Fertilizer Content,Fertilizer Content,Väetise sisu
@@ -5262,7 +5268,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Enne müügikorralduse tühistamist tuleb töökorraldus {0} tühistada
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,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 +170,Due Date is mandatory,Tähtaeg on kohustuslik
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Tähtaeg on kohustuslik
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Juurdekasv Oskus {0} ei saa olla 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Kasu tüüp ja summa
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Broneeritud toad
@@ -5405,7 +5411,7 @@
 DocType: Purchase Invoice Item,Total Weight,Kogukaal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Müügiprovisjon
 DocType: Job Offer Term,Value / Description,Väärtus / Kirjeldus
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rida # {0}: Asset {1} ei saa esitada, siis on juba {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rida # {0}: Asset {1} ei saa esitada, siis on juba {2}"
 DocType: Tax Rule,Billing Country,Arved Riik
 DocType: Purchase Order Item,Expected Delivery Date,Oodatud Toimetaja kuupäev
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restorani korralduse sissekanne
@@ -5444,12 +5450,13 @@
 DocType: Maintenance Visit,Breakdown,Lagunema
 DocType: Travel Itinerary,Vegetarian,Taimetoitlane
 DocType: Patient Encounter,Encounter Date,Sündmuse kuupäev
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Konto: {0} valuuta: {1} ei saa valida
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Konto: {0} valuuta: {1} ei saa valida
 DocType: Bank Statement Transaction Settings Item,Bank Data,Pangaandmed
 DocType: Purchase Receipt Item,Sample Quantity,Proovi kogus
 DocType: Bank Guarantee,Name of Beneficiary,Abisaaja nimi
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Värskendage BOM-i automaatselt Scheduleri kaudu, tuginedes kõige värskemale hindamismäärale / hinnakirja hinnale / toorainete viimasele ostuhinnale."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Tarnija&gt; Tarnijagrupp
 DocType: Bank Reconciliation Detail,Cheque Date,Tšekk kuupäev
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Parent konto {1} ei kuulu firma: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,"Edukalt kustutatud kõik tehingud, mis on seotud selle firma!"
@@ -5477,7 +5484,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Tütartippu saab ainult alusel loodud töörühm tüüpi sõlmed
 DocType: Attendance Request,Half Day Date,Pool päeva kuupäev
 DocType: Academic Year,Academic Year Name,Õppeaasta Nimi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} ei saa tehinguga {1} teha. Muuda ettevõtet.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} ei saa tehinguga {1} teha. Muuda ettevõtet.
 DocType: Sales Partner,Contact Desc,Võta otsimiseks
 DocType: Email Digest,Send regular summary reports via Email.,Saada regulaarselt koondaruanded e-posti teel.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Palun määra vaikimisi konto kulu Nõude tüüp {0}
@@ -5510,7 +5517,7 @@
 DocType: Hotel Room,Hotel Manager,Hotellijuhataja
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Määra maksueeskiri ostukorv
 DocType: Purchase Invoice,Taxes and Charges Added,Maksude ja tasude lisatud
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Amortisatsiooni rea {0}: järgmine amortisatsiooni kuupäev ei saa olla enne kasutatavat kuupäeva
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Amortisatsiooni rea {0}: järgmine amortisatsiooni kuupäev ei saa olla enne kasutatavat kuupäeva
 ,Sales Funnel,Müügi lehtri
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Lühend on kohustuslik
 DocType: Project,Task Progress,ülesanne Progress
@@ -5524,7 +5531,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Kõik kliendigruppide
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,kogunenud Kuu
 DocType: Attendance Request,On Duty,Tööl
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} on kohustuslik. Ehk Valuutavahetus rekord ei ole loodud {1} on {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} on kohustuslik. Ehk Valuutavahetus rekord ei ole loodud {1} on {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Personaliplaan {0} on juba olemas määramiseks {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Maksu- vorm on kohustuslik.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Konto {0}: Parent konto {1} ei ole olemas
@@ -5603,11 +5610,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Atleast üks ladu on kohustuslik
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Seadista üksuste väljad, nagu UOM, üksuste grupp, kirjeldus ja tundide arv."
 DocType: Certification Application,Certification Status,Sertifitseerimise staatus
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Marketplace
 DocType: Travel Itinerary,Travel Advance Required,Reisi ettemaks on nõutav
 DocType: Subscriber,Subscriber Name,Abonendi nimi
 DocType: Serial No,Out of Warranty,Out of Garantii
-DocType: Cashier Closing,Cashier-closing-,Kassa sulgemine -
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Kopeeritud andmete tüüp
 DocType: BOM Update Tool,Replace,Vahetage
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Tooteid ei leidu.
@@ -5694,7 +5700,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Müügile ja ostule pääseb alla maksumallid.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Hindamise tulemuste register {0} on juba olemas.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Näide: ABCD. #####. Kui seeria on seatud ja partii number tehingutes ei mainita, luuakse selle seeria põhjal automaatne partii number. Kui soovite alati selgesõnaliselt märkida selle üksuse partii nr, jätke see tühjaks. Märkus: see seade eelistab nimeserveri eesliidet varu seadetes."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Palun seadistage külastuse numbrite seeria seaded&gt; nummering seeria abil
 DocType: BOM,Materials Required (Exploded),Vajalikud materjalid (Koostejoonis)
 DocType: Contract,Party User,Partei kasutaja
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Määrake Company filtreerida tühjaks, kui rühm Autor on &quot;Firma&quot;"
@@ -5895,7 +5900,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Krahv
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Tuleb määrata nii katseperioodi alguskuupäev kui ka katseperioodi lõppkuupäev
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Keskmine määr
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Maksete kogusumma maksegraafikus peab olema võrdne Suur / Ümardatud Kokku
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Maksete kogusumma maksegraafikus peab olema võrdne Suur / Ümardatud Kokku
 DocType: Subscription Plan Detail,Plan,Plaan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bank avaldus tasakaalu kohta pearaamat
 DocType: Job Applicant,Applicant Name,Taotleja nimi
@@ -5964,7 +5969,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Seep ja Detergent
 DocType: BOM,Show Items,Näita Esemed
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Time ei saa olla suurem kui ajalt.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Kas soovite teavitada kõiki kliente e-posti teel?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Kas soovite teavitada kõiki kliente e-posti teel?
 DocType: Subscription Plan,Billing Interval,Arveldusperiood
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Tellitud
@@ -5973,9 +5978,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Rida {0}: {1} peab olema suurem kui 0
 DocType: Assessment Criteria,Assessment Criteria Group,Hindamiskriteeriumid Group
 DocType: Healthcare Settings,Patient Name By,Patsiendi nimi
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Accrual Journal sissekanne palkade eest alates {0} kuni {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Accrual Journal sissekanne palkade eest alates {0} kuni {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Edasilükkunud tulu lubamine
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Avamine akumuleeritud kulum peab olema väiksem kui võrdne {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Avamine akumuleeritud kulum peab olema väiksem kui võrdne {0}
 DocType: Warehouse,Warehouse Name,Ladu nimi
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Tegelik alguskuupäev peab olema väiksem kui tegelik lõppkuupäev
 DocType: Naming Series,Select Transaction,Vali Tehing
@@ -6126,7 +6131,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Töötajal {0} palgaastmel {1} pole vaikimisi puhkusepoliitikat
 DocType: Salary Detail,Salary Detail,palk Detail
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Palun valige {0} Esimene
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Lisatud {0} kasutajat
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Lisatud {0} kasutajat
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",Mitmekordsete programmide korral määratakse Kliendid automaatselt asjaomasele tasemele vastavalt nende kasutatud kuludele
 DocType: Appointment Type,Physician,Arst
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Partii {0} Punkt {1} on aegunud.
@@ -6270,7 +6275,7 @@
 DocType: Asset,Custodian,Turvahoidja
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Point-of-Sale profiili
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} peaks olema väärtus vahemikus 0 kuni 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},{0} maksmine alates {1} kuni {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},{0} maksmine alates {1} kuni {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Tagatiseta laenud
 DocType: Cost Center,Cost Center Name,Kuluüksus nimi
 DocType: Student,B+,B +
@@ -6302,6 +6307,7 @@
 DocType: Employee,Date of Issue,Väljastamise kuupäev
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Nagu iga ostmine Seaded kui ost Olles kätte sobiv == &quot;JAH&quot;, siis luua ostuarve, kasutaja vaja luua ostutšekk esmalt toode {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Row # {0}: Vali Tarnija kirje {1}
+DocType: Global Defaults,Default Distance Unit,Vaikeseadme üksus
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Rida {0}: Tundi väärtus peab olema suurem kui null.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,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
@@ -6357,7 +6363,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Kanne konto peab olema bilansis
 DocType: Asset,Naming Series,Nimetades Series
 DocType: Vital Signs,Coated,Kaetud
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Rida {0}: eeldatav väärtus pärast kasulikku elu peab olema väiksem brutoosakogusest
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Rida {0}: eeldatav väärtus pärast kasulikku elu peab olema väiksem brutoosakogusest
 DocType: GoCardless Settings,GoCardless Settings,GoCardless seaded
 DocType: Leave Block List,Leave Block List Name,Jäta Block nimekiri nimi
 DocType: Certified Consultant,Certification Validity,Sertifitseerimine kehtivus
@@ -6424,6 +6430,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Panga päis
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Vaadake laboritestid
 DocType: Hub Users,Hub Users,Hubi kasutajad
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klient&gt; Kliendi Grupp&gt; Territoorium
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Hooldus kuupäev
 DocType: Purchase Invoice Item,Rejected Serial No,Tagasilükatud Järjekorranumber
@@ -6438,7 +6445,7 @@
 DocType: SG Creation Tool Course,Max Strength,max Strength
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Eelseadistuste installimine
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Kliendi jaoks pole valitud tarne märkust {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Kliendi jaoks pole valitud tarne märkust {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Töötaja {0} ei ole maksimaalse hüvitise suurust
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,"Valige üksused, mis põhinevad kohaletoimetamise kuupäeval"
 DocType: Grant Application,Has any past Grant Record,Kas on minevikus Grant Record
@@ -6465,7 +6472,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Hotelli toa reserveerimine
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Kasutajatugi
 DocType: BOM,Thumbnail,Pisipilt
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,E-posti ID-dega kontakte ei leitud.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,E-posti ID-dega kontakte ei leitud.
 DocType: Item Customer Detail,Item Customer Detail,Punkt Kliendi Detail
 DocType: Notification Control,Prompt for Email on Submission of,Küsiks Email esitamisel
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Töötaja maksimaalne hüvitise summa {0} ületab {1}
@@ -6720,7 +6727,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,"Ei varjatud rühma, sest Konto tüüp on valitud."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} on muudetud. Palun värskenda.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Peatus kasutajad tegemast Jäta Rakendused järgmistel päevadel.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Tootekood&gt; Elemendi grupp&gt; Bränd
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Kui lojaalsuspunktide piiramatu kehtivusaeg lõpeb, säilitage aegumistähtaeg tühi või 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Hooldus meeskonna liikmed
 DocType: Loyalty Point Entry,Purchase Amount,ostusummast
@@ -6728,7 +6734,7 @@
 											to fullfill Sales Order {2}","Ei saa esitada eseme {1} järjekorranumbrit {0}, kuna see on reserveeritud, et täita müügitellimust {2}"
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-YYYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Tarnija Tsitaat {0} loodud
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,End Aasta ei saa enne Start Aasta
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,End Aasta ei saa enne Start Aasta
 DocType: Employee Benefit Application,Employee Benefits,Töövõtjate hüvitised
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Pakitud kogus peab olema võrdne koguse Punkt {0} järjest {1}
 DocType: Work Order,Manufactured Qty,Toodetud Kogus
@@ -6744,6 +6750,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Valige partiinumbritele
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,GSTINile
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Arveid tõstetakse klientidele.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Palun seadke töötaja nimesüsteem inimressurss&gt; HR-seaded
 DocType: Healthcare Settings,Invoice Appointments Automatically,Arve määramine automaatselt
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
 DocType: Salary Component,Variable Based On Taxable Salary,Muutuja maksustatava palga alusel
@@ -6792,7 +6799,7 @@
 DocType: POS Profile,Account for Change Amount,Konto muutuste summa
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Ühendamine QuickBooksiga
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Kasumi / kahjumi kogusumma
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Ettevõtte arvele sobimatu ettevõte.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Ettevõtte arvele sobimatu ettevõte.
 DocType: Purchase Invoice,input service,sisendteenus
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Pidu / konto ei ühti {1} / {2} on {3} {4}
 DocType: Employee Promotion,Employee Promotion,Töötajate edendamine
@@ -6922,7 +6929,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Eelistatud ala majutamiseks
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Ostukorv on tühi
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Palun seadke õpetaja nime sisestamine haridusse&gt; Hariduseseaded
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No","Poolel {0} ei ole seerianumbrit. Ainult serilialised esemed \ võivad olla tarned, mis põhinevad seerianumbril"
 DocType: Vehicle,Model,mudel
@@ -6952,7 +6958,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Miski ei muutu
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Palun valige csv faili
 DocType: Holiday List,Total Holidays,Kogupäevad
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Saatmiseks puudub e-posti mall. Palun määrake see üksuse kohaletoimetamise seadetes.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Saatmiseks puudub e-posti mall. Palun määrake see üksuse kohaletoimetamise seadetes.
 DocType: Student Leave Application,Mark as Present,Märgi olevik
 DocType: Supplier Scorecard,Indicator Color,Indikaatori värv
 DocType: Purchase Order,To Receive and Bill,Saada ja Bill
@@ -6961,7 +6967,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Valige seerianumber
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Projekteerija
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Tingimused Mall
-DocType: Serial No,Delivery Details,Toimetaja detailid
+DocType: Delivery Trip,Delivery Details,Toimetaja detailid
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,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: Program,Program Code,programmi kood
 DocType: Terms and Conditions,Terms and Conditions Help,Tingimused Abi
@@ -6985,7 +6991,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ooteaeg päeva
 DocType: Cash Flow Mapping,Is Income Tax Expense,Kas tulumaksukulu
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Teie tellimus on kohaletoimetamiseks!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rida # {0}: Postitamise kuupäev peab olema sama ostu kuupäevast {1} vara {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rida # {0}: Postitamise kuupäev peab olema sama ostu kuupäevast {1} vara {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Märgi see, kui õpilane on elukoht instituudi Hostel."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Palun sisesta müügitellimuste ülaltoodud tabelis
 ,Stock Summary,Stock kokkuvõte
diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv
index 6271762..d763e71 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,نام دوره
 DocType: Employee,Salary Mode,حالت حقوق و دستمزد
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,ثبت نام
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,ثبت نام
 DocType: Patient,Divorced,طلاق
 DocType: Support Settings,Post Route Key,کلید مسیر پیام
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,اجازه می دهد مورد به چند بار در یک معامله اضافه شود
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,نرخ ارز جدید
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},برای اطلاع از قیمت ارز مورد نیاز است {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* * * * آیا می شود در معامله محاسبه می شود.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,تامین کننده&gt; نوع تامین کننده
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT- .YYYY.-
 DocType: Purchase Order,Customer Contact,مشتریان تماس با
 DocType: Patient Appointment,Check availability,بررسی در دسترس بودن
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,نشان می دهد باز
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,سری به روز رسانی با موفقیت
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,وارسی
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} در ردیف {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} در ردیف {1}
 DocType: Asset Finance Book,Depreciation Start Date,تاریخ شروع تخلیه
 DocType: Pricing Rule,Apply On,درخواست در
 DocType: Item Price,Multiple Item prices.,قیمت مورد چندگانه.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,نسخه آزمایشگاهی
 ,Delay Days,روزهای تأخیر
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,هزینه خدمات
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},شماره سریال: {0} در حال حاضر در فاکتور فروش اشاره: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},شماره سریال: {0} در حال حاضر در فاکتور فروش اشاره: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,فاکتور
 DocType: Purchase Invoice Item,Item Weight Details,مورد وزن جزئیات
 DocType: Asset Maintenance Log,Periodicity,تناوب
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,حسابدار
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,لیست قیمت فروش
 DocType: Patient,Tobacco Current Use,مصرف فعلی توتون و تنباکو
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","تاریخ شروع و تاریخ پایان با کار کارت همپوشانی است <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,قیمت فروش
 DocType: Cost Center,Stock User,سهام کاربر
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,مربوط
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,تاریخ حضور و غیاب نمی تواند کمتر از تاریخ پیوستن کارکنان
 DocType: Grading Scale,Grading Scale Name,درجه بندی نام مقیاس
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,افزودن کاربران به بازار
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,افزودن کاربران به بازار
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,این یک حساب ریشه است و نمی تواند ویرایش شود.
 DocType: Sales Invoice,Company Address,آدرس شرکت
 DocType: BOM,Operations,عملیات
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,تعداد مختلف
 DocType: Production Plan,Material Request Detail,جزئیات درخواست مواد
 DocType: Selling Settings,Default Quotation Validity Days,روز معتبر نقل قول
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",شامل مالیات در ردیف {0} در مورد نرخ، مالیات در ردیف {1} باید گنجانده شود
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",شامل مالیات در ردیف {0} در مورد نرخ، مالیات در ردیف {1} باید گنجانده شود
 DocType: SMS Center,SMS Center,مرکز SMS
 DocType: Payroll Entry,Validate Attendance,تأیید حضور
 DocType: Sales Invoice,Change Amount,تغییر مقدار
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,فاصله بین خطوط برای مبلغ به حروف
 DocType: Vehicle,Additional Details,توضیحات بیشتر
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,بدون شرح داده می شود
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,تامین کننده&gt; گروه تامین کننده
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,درخواست برای خرید.
 DocType: POS Closing Voucher Details,Collected Amount,مقدار جمع آوری شده
 DocType: Lab Test,Submitted Date,تاریخ ارسال شده
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,پذیرش دانشجو
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,مورد {0} لغو شود
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,مقدار خسارت ردیف {0}: تاریخ شروع خسارت وارد شده به عنوان تاریخ گذشته وارد شده است
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,مقدار خسارت ردیف {0}: تاریخ شروع خسارت وارد شده به عنوان تاریخ گذشته وارد شده است
 DocType: Contract Template,Fulfilment Terms and Conditions,شرایط و ضوابط اجرایی
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,درخواست مواد
 DocType: Bank Reconciliation,Update Clearance Date,به روز رسانی ترخیص کالا از تاریخ
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,تنظیمات برای حساب
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},کننده فاکتور بدون در خرید فاکتور وجود دارد {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,فروش شخص درخت را مدیریت کند.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.",می توانید مسیر را فرآوری نکنید، زیرا تنظیمات Google Maps غیرفعال است.
 DocType: Job Applicant,Cover Letter,جلد نامه
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,چک برجسته و سپرده برای روشن
 DocType: Item,Synced With Hub,همگام سازی شده با توپی
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,ارزش دارایی جدید
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,سرعت که در آن مشتریان ارز به ارز پایه مشتری تبدیل
 DocType: Course Scheduling Tool,Course Scheduling Tool,البته برنامه ریزی ابزار
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ردیف # {0}: خرید فاکتور می تواند در برابر یک دارایی موجود ساخته نمی شود {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ردیف # {0}: خرید فاکتور می تواند در برابر یک دارایی موجود ساخته نمی شود {1}
 DocType: Crop Cycle,LInked Analysis,تحلیل لاینک
 DocType: POS Closing Voucher,POS Closing Voucher,کوپن بسته شدن POS
 DocType: Contract,Lapsed,گم شده
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} در دوره ثبت نام نشده {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,نام دانش آموز:
 DocType: POS Closing Voucher Details,Difference,تفاوت
+DocType: Delivery Settings,Delay between Delivery Stops,تاخیر بین ایستگاه تحویل
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},سریال بدون {0} به تحویل توجه تعلق ندارد {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.",به نظر می رسد یک مشکل با تنظیمات GoCardless سرور وجود دارد. نگران نباشید، درصورت خرابی، مقدار به حساب شما بازپرداخت می شود.
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext نسخه ی نمایشی
@@ -693,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,مقدار و نرخ
 DocType: Delivery Note,% Installed,٪ نصب شد
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,کلاس های درس / آزمایشگاه و غیره که در آن سخنرانی می توان برنامه ریزی.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,ارزهای شرکت هر دو شرکت ها باید برای معاملات اینترانت مطابقت داشته باشد.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,ارزهای شرکت هر دو شرکت ها باید برای معاملات اینترانت مطابقت داشته باشد.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,لطفا ابتدا نام شرکت وارد
 DocType: Travel Itinerary,Non-Vegetarian,غیر گیاهی
 DocType: Purchase Invoice,Supplier Name,نام منبع
@@ -778,7 +779,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,اجاره از تاریخ
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,قطعات اندازه کافی برای ساخت
 DocType: POS Profile User,POS Profile User,کاربر پروفایل POS
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,ردیف {0}: تاریخ شروع تخلیه مورد نیاز است
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,ردیف {0}: تاریخ شروع تخلیه مورد نیاز است
 DocType: Purchase Invoice Item,Service Start Date,تاریخ شروع سرویس
 DocType: Subscription Invoice,Subscription Invoice,اشتراک فاکتور
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,درآمد مستقیم
@@ -845,7 +846,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,مخفف در حال حاضر برای یک شرکت دیگر مورد استفاده قرار گرفته است
 DocType: Selling Settings,Default Customer Group,گروه مشتری پیش فرض
 DocType: Employee,IFSC Code,کد IFSC
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","تاریخ شروع و تاریخ پایان با کار کارت همپوشانی است <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",اگر غیر فعال کردن، درست &quot;گرد مجموع خواهد در هر معامله قابل نمایش باشد
 DocType: BOM,Operating Cost,هزینه های عملیاتی
 DocType: Crop,Produced Items,آیتم های تولید شده
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,جلوگیری از RFQs
 DocType: Hub User,Hub User,کاربر هاب
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,را سفارش فروش
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},لغزش حقوق برای دوره ای از {0} تا {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},لغزش حقوق برای دوره ای از {0} تا {1}
 DocType: Project Task,Project Task,وظیفه پروژه
 DocType: Loyalty Point Entry Redemption,Redeemed Points,امتیازات بازخرید شده
 ,Lead Id,کد شناسایی راهبر
@@ -1027,7 +1027,7 @@
 DocType: Fee Validity,Max number of visit,حداکثر تعداد بازدید
 ,Hotel Room Occupancy,اتاق پذیرایی اتاق
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,برنامه زمانی ایجاد شده:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},لطفا نقدی پیش فرض و یا حساب بانکی در نحوه پرداخت را تعیین {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},لطفا نقدی پیش فرض و یا حساب بانکی در نحوه پرداخت را تعیین {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,ثبت نام کردن
 DocType: GST Settings,GST Settings,تنظیمات GST
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},ارز باید مشابه با لیست قیمت ارز باشد: {0}
@@ -1081,7 +1081,7 @@
 DocType: Vehicle Log,Service Details,جزئیات خدمات
 DocType: Lab Test Template,Grouped,گروه بندی شده
 DocType: Selling Settings,Delivery Note Required,تحویل توجه لازم
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,ارسال حقوق و دستمزد ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,ارسال حقوق و دستمزد ...
 DocType: Bank Guarantee,Bank Guarantee Number,بانک شماره گارانتی
 DocType: Assessment Criteria,Assessment Criteria,معیارهای ارزیابی
 DocType: BOM Item,Basic Rate (Company Currency),نرخ پایه (شرکت ارز)
@@ -1106,13 +1106,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,ورود پرداخت در حال حاضر ایجاد
 DocType: Request for Quotation,Get Suppliers,تهیه کنندگان
 DocType: Purchase Receipt Item Supplied,Current Stock,سهام کنونی
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},ردیف # {0}: دارایی {1} به مورد در ارتباط نیست {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},ردیف # {0}: دارایی {1} به مورد در ارتباط نیست {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,پیش نمایش لغزش حقوق
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,حساب {0} وارد شده است چندین بار
 DocType: Account,Expenses Included In Valuation,هزینه های موجود در ارزش گذاری
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,شما فقط می توانید تمدید کنید اگر عضویت شما در 30 روز منقضی شود
 DocType: Shopping Cart Settings,Show Stock Availability,نمایش موجودی
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},{0} را در دسته دارایی {1} یا شرکت {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},{0} را در دسته دارایی {1} یا شرکت {2}
 DocType: Location,Longitude,عرض جغرافیایی
 ,Absent Student Report,وجود ندارد گزارش دانشجو
 DocType: Crop,Crop Spacing UOM,فاصله کاشت UOM
@@ -1184,7 +1184,7 @@
 DocType: Soil Texture,Sand,شن
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,انرژی
 DocType: Opportunity,Opportunity From,فرصت از
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ردیف {0}: {1} شماره سریال مورد برای {2} مورد نیاز است. شما {3} را ارائه کرده اید.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ردیف {0}: {1} شماره سریال مورد برای {2} مورد نیاز است. شما {3} را ارائه کرده اید.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,لطفا یک جدول را انتخاب کنید
 DocType: BOM,Website Specifications,مشخصات وب سایت
 DocType: Special Test Items,Particulars,جزئيات
@@ -1276,7 +1276,7 @@
 DocType: Item,Items with higher weightage will be shown higher,پاسخ همراه با بین وزنها بالاتر خواهد بود بالاتر نشان داده شده است
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,آزمایشات آزمایشگاهی و علائم حیاتی
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,جزئیات مغایرت گیری بانک
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,ردیف # {0}: دارایی {1} باید ارائه شود
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,ردیف # {0}: دارایی {1} باید ارائه شود
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,بدون کارمند یافت
 DocType: Item,If subcontracted to a vendor,اگر به یک فروشنده واگذار شده
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,دانشجویی گروه در حال حاضر به روز شده است.
@@ -1330,7 +1330,6 @@
 DocType: Loyalty Program Collection,Tier Name,نام ردیف
 DocType: HR Settings,Enter retirement age in years,سن بازنشستگی را وارد کنید در سال های
 DocType: Crop,Target Warehouse,هدف انبار
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا مجموعه نامگذاری را برای {0} از طریق تنظیمات&gt; تنظیمات&gt; نامگذاری سری
 DocType: Payroll Employee Detail,Payroll Employee Detail,جزئیات کارمند حقوق و دستمزد
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,لطفا یک انبار را انتخاب کنید
 DocType: Cheque Print Template,Starting location from left edge,محل شروع از لبه سمت چپ
@@ -1420,7 +1419,7 @@
 DocType: Work Order,Plan material for sub-assemblies,مواد را برای طرح زیر مجموعه
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,شرکای فروش و منطقه
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} باید فعال باشد
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,هیچ موردی برای انتقال وجود ندارد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,هیچ موردی برای انتقال وجود ندارد
 DocType: Employee Boarding Activity,Activity Name,نام فعالیت
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,تغییر تاریخ انتشار
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,مقدار محصول نهایی <b>{0}</b> و برای مقدار <b>{1}</b> نمی تواند متفاوت باشد
@@ -1647,6 +1646,7 @@
 DocType: Project,First Email,اولین ایمیل
 DocType: Company,Exception Budget Approver Role,استثنا بودجه تأیید کننده نقش
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date",پس از تنظیم، این فاکتور تا تاریخ تعیین شده به تعویق افتاده است
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,انبار محفوظ در سفارش فروش / به پایان رسید کالا انبار
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,فروش مقدار
 DocType: Repayment Schedule,Interest Amount,مقدار بهره
@@ -1658,7 +1658,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,سوابق
 DocType: Asset,Scrapped,اوراق
 DocType: Item,Item Defaults,مورد پیش فرض
-DocType: Purchase Invoice,Returns,بازگشت
+DocType: Cashier Closing,Returns,بازگشت
 DocType: Job Card,WIP Warehouse,انبار WIP
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},سریال بدون {0} است تحت قرارداد تعمیر و نگهداری تا {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,استخدام
@@ -1672,7 +1672,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,نوع انتقال
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,هزینه فروش
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,مشتری&gt; گروه مشتری&gt; قلمرو
 DocType: Diagnosis,Diagnosis,تشخیص
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,خرید استاندارد
 DocType: Attendance Request,Explanation,توضیح
@@ -1685,7 +1684,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,اقلام سفارشات خرید عقب افتاده است
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,کد پستی
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},سفارش فروش {0} است {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},حساب سود را در وام انتخاب کنید {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},حساب سود را در وام انتخاب کنید {0}
 DocType: Opportunity,Contact Info,اطلاعات تماس
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,ساخت نوشته های سهام
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,کارمند با وضعیت چپ را نمیتوان ارتقا داد
@@ -1697,7 +1696,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,صورتحساب را نمی توان برای صفر صدور صورت حساب انجام داد
 DocType: Company,Date of Commencement,تاریخ شروع
 DocType: Sales Person,Select company name first.,انتخاب نام شرکت برای اولین بار.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},ایمیل فرستاده {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},ایمیل فرستاده {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,نقل قول از تولید کنندگان دریافت کرد.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,جایگزین BOM و به روز رسانی آخرین قیمت در تمام BOMs
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},به {0} | {1} {2}
@@ -1717,7 +1716,7 @@
 DocType: Asset Movement,From Employee,از کارمند
 DocType: Driver,Cellphone Number,شماره تلفن همراه
 DocType: Project,Monitor Progress,مانیتور پیشرفت
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,هشدار: سیستم خواهد overbilling از مقدار برای مورد بررسی نمی {0} در {1} صفر است
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,هشدار: سیستم خواهد overbilling از مقدار برای مورد بررسی نمی {0} در {1} صفر است
 DocType: Journal Entry,Make Difference Entry,ورود را تفاوت
 DocType: Supplier Quotation,Auto Repeat Section,بخش تکرار خودکار
 DocType: Upload Attendance,Attendance From Date,حضور و غیاب از تاریخ
@@ -1820,7 +1819,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,ردیف # {0}: رد تعداد می توانید در خرید بازگشت نمی شود وارد
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,تغییر گروه مشتری برای مشتری انتخاب شده مجاز نیست.
 ,Purchase Order Items To Be Billed,سفارش خرید گزینه هایی که صورتحساب
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,به روز رسانی زمان ورود برآورد شده
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,به روز رسانی زمان ورود برآورد شده
 DocType: Program Enrollment Tool,Enrollment Details,جزئیات ثبت نام
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,می توانید چندین مورد پیش فرض برای یک شرکت تنظیم کنید.
 DocType: Purchase Invoice Item,Net Rate,نرخ خالص
@@ -1834,7 +1833,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,نوع ترک تحصیل کرده است
 DocType: Support Settings,Close Issue After Days,بستن موضوع پس از روزها
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,شما باید کاربر با مدیران سیستم و نقش مدیر گروه باشید تا کاربران را به Marketplace اضافه کنید.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,شما باید کاربر با مدیران سیستم و نقش مدیر گروه باشید تا کاربران را به Marketplace اضافه کنید.
 DocType: Leave Control Panel,Leave blank if considered for all branches,خالی بگذارید اگر برای تمام شاخه های در نظر گرفته
 DocType: Job Opening,Staffing Plan,طرح کارکنان
 DocType: Bank Guarantee,Validity in Days,اعتبار در روز
@@ -1854,7 +1853,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},تکراری ردیف {0} را با همان {1}
 DocType: Marketplace Settings,Disable Marketplace,غیر فعال کردن بازار
 ,Trial Balance,آزمایش تعادل
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,سال مالی {0} یافت نشد
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,سال مالی {0} یافت نشد
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,راه اندازی کارکنان
 DocType: Hotel Room Reservation,Hotel Reservation User,کاربر رزرو هتل
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,لطفا ابتدا پیشوند انتخاب کنید
@@ -1962,7 +1961,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,ورود به سیستم ناموفق بود
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,دارایی {0} ایجاد شد
 DocType: Special Test Items,Special Test Items,آیتم های تست ویژه
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,برای ثبت نام در Marketplace، باید کاربر با مدیر سیستم مدیریت و نقش آیتم باشد.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,برای ثبت نام در Marketplace، باید کاربر با مدیر سیستم مدیریت و نقش آیتم باشد.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,نحوه پرداخت
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,همانطور که در ساختار حقوق شما تعیین شده است، نمی توانید برای مزایا درخواست دهید
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,وب سایت تصویر باید یک فایل عمومی و یا آدرس وب سایت می باشد
@@ -1974,7 +1973,7 @@
 DocType: Warehouse,Warehouse Contact Info,انبار اطلاعات تماس
 DocType: Payment Entry,Write Off Difference Amount,نوشتن کردن مقدار تفاوت
 DocType: Volunteer,Volunteer Name,نام داوطلب
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},ردیفهایی با تاریخ تکراری در سطرهای دیگر یافت شد: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},ردیفهایی با تاریخ تکراری در سطرهای دیگر یافت شد: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent",{0}: ایمیل کارمند یافت نشد، از این رو ایمیل ارسال نمی
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},بدون ساختار حقوق و دستمزد برای کارمندان {0} در تاریخ داده شده {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},قانون حمل و نقل برای کشور قابل اجرا نیست {0}
@@ -2063,6 +2062,7 @@
 DocType: Salary Component,Earning,سود
 DocType: Supplier Scorecard,Scoring Criteria,معیارهای ارزیابی
 DocType: Purchase Invoice,Party Account Currency,حزب حساب ارز
+DocType: Delivery Trip,Total Estimated Distance,مجموع تخمین زده شده
 ,BOM Browser,BOM مرورگر
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,لطفا وضعیت خود را برای این رویداد آموزشی به روز کنید
 DocType: Item Barcode,EAN,EAN
@@ -2101,7 +2101,7 @@
 DocType: Activity Cost,Projects,پروژه
 DocType: Payment Request,Transaction Currency,واحد ارز تراکنش
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},از {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,برخی از ایمیل ها نامعتبر است
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,برخی از ایمیل ها نامعتبر است
 DocType: Work Order Operation,Operation Description,عملیات توضیحات
 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.,آیا می توانم مالی سال تاریخ شروع و تاریخ پایان سال مالی تغییر نه یک بار سال مالی ذخیره شده است.
 DocType: Quotation,Shopping Cart,سبد خرید
@@ -2125,7 +2125,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,تغییر خالص دارائی های ثابت در
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,تعداد مجله
 DocType: Leave Control Panel,Leave blank if considered for all designations,خالی بگذارید اگر برای همه در نظر گرفته نامگذاریهای
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,شارژ از نوع &#39;واقعی&#39; در ردیف {0} نمی تواند در مورد نرخ شامل
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,شارژ از نوع &#39;واقعی&#39; در ردیف {0} نمی تواند در مورد نرخ شامل
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},حداکثر: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,از تاریخ ساعت
 DocType: Shopify Settings,For Company,برای شرکت
@@ -2139,7 +2139,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,اشتباهاتی در ایجاد برنامه درس وجود داشت
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,اولین تأیید کننده هزینه در لیست خواهد بود به عنوان پیش فرض هزینه گذار تنظیم شده است.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,نمی تواند بیشتر از ۱۰۰ باشد
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,برای ثبت نام در Marketplace، باید کاربر دیگری غیر از Administrator با مدیر سیستم و نقش Item باشد.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,برای ثبت نام در Marketplace، باید کاربر دیگری غیر از Administrator با مدیر سیستم و نقش Item باشد.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC- .YYYY.-
 DocType: Maintenance Visit,Unscheduled,برنامه ریزی
@@ -2168,7 +2168,7 @@
 DocType: HR Settings,Employee Settings,تنظیمات کارمند
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,سیستم پرداخت بارگیری
 ,Batch-Wise Balance History,دسته حکیم تاریخچه تعادل
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,ردیف # {0}: نمیتوان مقدار را تعیین کرد اگر مقدار برای مقدار Item {1} بیشتر از مقدار صورتحساب باشد.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,ردیف # {0}: نمیتوان مقدار را تعیین کرد اگر مقدار برای مقدار Item {1} بیشتر از مقدار صورتحساب باشد.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,تنظیمات چاپ به روز در قالب چاپ مربوطه
 DocType: Package Code,Package Code,کد بسته بندی
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,شاگرد
@@ -2401,7 +2401,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} جای خالی و {1} بودجه برای {2} برای شرکت های تابعه قبلا {3} برنامه ریزی شده است. شما فقط می توانید تا {4} جای خالی و بودجه {5} را به عنوان برنامۀ نیروی انسانی {6} برای شرکت والدین {3} برنامه ریزی کنید.
 DocType: HR Settings,Stop Birthday Reminders,توقف تولد یادآوری
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},لطفا پیش فرض حقوق و دستمزد پرداختنی حساب تعیین شده در شرکت {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},لطفا پیش فرض حقوق و دستمزد پرداختنی حساب تعیین شده در شرکت {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,دریافت مالیات از مالیات و اتهامات داده شده توسط آمازون
 DocType: SMS Center,Receiver List,فهرست گیرنده
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,جستجو مورد
@@ -2471,7 +2471,7 @@
 DocType: Vital Signs,Constipated,یبوست
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},در برابر تامین کننده فاکتور {0} تاریخ {1}
 DocType: Customer,Default Price List,به طور پیش فرض لیست قیمت
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,ضبط حرکت دارایی {0} ایجاد
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,ضبط حرکت دارایی {0} ایجاد
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,موردی یافت نشد.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,شما نمی توانید حذف سال مالی {0}. سال مالی {0} به عنوان پیش فرض در تنظیمات جهانی تنظیم
 DocType: Share Transfer,Equity/Liability Account,حساب سهام و مسئولیت
@@ -2607,6 +2607,7 @@
 DocType: Blanket Order,Order Type,نوع سفارش
 ,Item-wise Sales Register,مورد عاقلانه فروش ثبت نام
 DocType: Asset,Gross Purchase Amount,مبلغ خرید خالص
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,کد مورد&gt; گروه مورد&gt; نام تجاری
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,تعادل افتتاحیه
 DocType: Asset,Depreciation Method,روش استهلاک
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,آیا این مالیات شامل در نرخ پایه؟
@@ -2687,7 +2688,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,اقدام اگر بودجه سالانه بیش از PO باشد
 DocType: Student Leave Application,Student Leave Application,دانشجو مرخصی کاربرد
 DocType: Item,Will also apply for variants,همچنین برای انواع اعمال می شود
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}",دارایی نمی تواند لغو شود، آن است که در حال حاضر {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}",دارایی نمی تواند لغو شود، آن است که در حال حاضر {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},کارمند {0} در روز نیمه در {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},کل ساعات کار نباید از ساعات کار حداکثر است بیشتر {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,بر
@@ -2711,6 +2712,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,بارگیری دادههای
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},حداکثر مرخصی مجاز در نوع ترک {0} {1}
 DocType: SMS Center,Create Receiver List,ایجاد فهرست گیرنده
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,تاریخ قابل استفاده باید پس از تاریخ خرید باشد
 DocType: Vehicle,Wheels,چرخ ها
 DocType: Packing Slip,To Package No.,برای بسته بندی شماره
 DocType: Patient Relation,Family,خانواده
@@ -2724,7 +2726,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,پول صورتحساب باید برابر با پول یا حساب بانکی شرکت پیش فرض باشد
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),نشان می دهد که بسته به بخشی از این تحویل (فقط پیش نویس) است
 DocType: Soil Texture,Loam,لام
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,ردیف {0}: تاریخ تحویل قبل از تاریخ ارسال نمی تواند باشد
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,ردیف {0}: تاریخ تحویل قبل از تاریخ ارسال نمی تواند باشد
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,ورود را پرداخت
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},تعداد برای مورد {0} باید کمتر از است {1}
 ,Sales Invoice Trends,فروش روند فاکتور
@@ -2796,7 +2798,7 @@
 DocType: Guardian,Guardian Interests,نگهبان علاقه مندی ها
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,به روزرسانی نام حساب شماره
 DocType: Naming Series,Current Value,ارزش فعلی
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,سال مالی متعدد برای تاریخ {0} وجود داشته باشد. لطفا شرکت راه در سال مالی
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,سال مالی متعدد برای تاریخ {0} وجود داشته باشد. لطفا شرکت راه در سال مالی
 DocType: Education Settings,Instructor Records to be created by,اسناد مدرس توسط توسط
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} ایجاد شد
 DocType: GST Account,GST Account,حساب GST
@@ -2813,7 +2815,7 @@
 DocType: Sales Person,Name and Employee ID,نام و کارمند ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,تاریخ را نمی توان قبل از ارسال تاریخ
 DocType: Website Item Group,Website Item Group,وب سایت مورد گروه
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,هیچ لغزش حقوق و دستمزد برای ارائه معیارهای انتخاب شده یا معافیت حقوق و دستمزد در حال حاضر ارائه نشده است
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,هیچ لغزش حقوق و دستمزد برای ارائه معیارهای انتخاب شده یا معافیت حقوق و دستمزد در حال حاضر ارائه نشده است
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,وظایف و مالیات
 DocType: Projects Settings,Projects Settings,تنظیمات پروژه
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,لطفا تاریخ مرجع وارد
@@ -2822,7 +2824,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,عرضه تعداد
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR- .YYYY.-
 DocType: Purchase Order Item,Material Request Item,مورد درخواست مواد
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,لطفا ابتدا رسیدگی به خرید را لغو کنید {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,لطفا ابتدا رسیدگی به خرید را لغو کنید {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,درخت گروه مورد.
 DocType: Production Plan,Total Produced Qty,مجموع تولید شده
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,می توانید تعداد ردیف بزرگتر یا مساوی به تعداد سطر فعلی برای این نوع شارژ مراجعه نمی
@@ -2931,6 +2933,7 @@
 ,Vehicle Expenses,هزینه های خودرو
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,ایجاد تست آزمایشگاه (ها) در فروش فاکتور ارسال
 DocType: Serial No,Invoice Details,جزئیات فاکتور
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,لطفا تنظیمات Google Maps را برای تخمین و بهینه سازی مسیرها فعال کنید
 DocType: Grant Application,Show on Website,نمایش در وب سایت
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,شروع کن
 DocType: Hub Tracked Item,Hub Category,رده هاب
@@ -2970,7 +2973,7 @@
 DocType: Inpatient Record,B Positive,B مثبت
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",حداکثر سود کارمند {0} بیش از {1} از مقدار {2} مقدار پیشنهادی قبلی است
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",ردیف # {0}: تعداد باید 1 باشد، به عنوان مورد دارایی ثابت است. لطفا ردیف جداگانه برای تعداد متعدد استفاده کنید.
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",ردیف # {0}: تعداد باید 1 باشد، به عنوان مورد دارایی ثابت است. لطفا ردیف جداگانه برای تعداد متعدد استفاده کنید.
 DocType: Leave Block List Allow,Leave Block List Allow,ترک فهرست بلوک اجازه
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,مخفف نمیتواند خالی یا space باشد
 DocType: Patient Medical Record,Patient Medical Record,پرونده پزشکی بیمار
@@ -3004,7 +3007,7 @@
 DocType: Workstation,Wages per hour,دستمزد در ساعت
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},تعادل سهام در دسته {0} تبدیل خواهد شد منفی {1} برای مورد {2} در انبار {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,پس از درخواست های مواد به طور خودکار بر اساس سطح آیتم سفارش مجدد مطرح شده است
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},حساب {0} نامعتبر است. حساب ارزی باید {1} باشد
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},حساب {0} نامعتبر است. حساب ارزی باید {1} باشد
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},از تاریخ {0} نمیتواند پس از تخفیف کارمند تاریخ {1}
 DocType: Supplier,Is Internal Supplier,آیا تامین کننده داخلی است
 DocType: Employee,Create User Permission,ایجاد مجوز کاربر
@@ -3148,7 +3151,7 @@
 DocType: Account,Fixed Asset,دارائی های ثابت
 DocType: Amazon MWS Settings,After Date,بعد از تاریخ
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,پرسشنامه سریال
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,{0} نامعتبر برای صورتحساب شرکت اینتر است
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,{0} نامعتبر برای صورتحساب شرکت اینتر است
 ,Department Analytics,تجزیه و تحلیل گروه
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,ایمیل در ارتباط پیش فرض یافت نشد
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,ایجاد راز
@@ -3160,7 +3163,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,برنامه در ساختار هزینه و گروه دانشجویی {0} متفاوت است.
 DocType: Bank Statement Transaction Entry,Receivable Account,حساب دریافتنی
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Valid From Date باید کمتر از Valid Upto Date باشد.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},ردیف # {0}: دارایی {1} در حال حاضر {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},ردیف # {0}: دارایی {1} در حال حاضر {2}
 DocType: Quotation Item,Stock Balance,تعادل سهام
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,سفارش فروش به پرداخت
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,مدیر عامل
@@ -3202,6 +3205,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,بدهکاری به مورد نیاز است
 DocType: Clinical Procedure,Inpatient Record,ضبط بستری
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",برنامه های زمانی کمک به پیگیری از زمان، هزینه و صدور صورت حساب برای فعالیت های انجام شده توسط تیم خود را
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,تامین کننده&gt; نوع تامین کننده
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,خرید لیست قیمت
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,تاریخ معامله
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,الگوهای متغیرهای کارت امتیازی تامین کننده.
@@ -3244,7 +3248,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,تبادل کاهش / افزایش
 DocType: Opportunity,Lost Reason,از دست داده دلیل
 DocType: Amazon MWS Settings,Enable Amazon,آمازون را فعال کنید
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},ردیف # {0}: حساب {1} متعلق به شرکت {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},ردیف # {0}: حساب {1} متعلق به شرکت {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Unable to find DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,آدرس جدید
 DocType: Quality Inspection,Sample Size,اندازهی نمونه
@@ -3355,7 +3359,7 @@
 DocType: Water Analysis,Origin,اصل و نسب
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,این سند بیش از حد مجاز است {0} {1} برای آیتم {4}. آیا شما ساخت یکی دیگر از {3} در برابر همان {2}.
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,لطفا پس از ذخیره در محدوده زمانی معین
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,انتخاب تغییر حساب مقدار
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,انتخاب تغییر حساب مقدار
 DocType: Purchase Invoice,Price List Currency,لیست قیمت ارز
 DocType: Naming Series,User must always select,کاربر همیشه باید انتخاب کنید
 DocType: Stock Settings,Allow Negative Stock,اجازه می دهد بورس منفی
@@ -3397,7 +3401,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,آیا مطمئن هستید که می خواهید این انتصاب را لغو کنید؟
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,بسته بندی قیمت اتاق هتل
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,خط لوله فروش
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},لطفا به حساب پیش فرض تنظیم شده در حقوق و دستمزد و اجزای {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},لطفا به حساب پیش فرض تنظیم شده در حقوق و دستمزد و اجزای {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,مورد نیاز در
 DocType: Rename Tool,File to Rename,فایل برای تغییر نام
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},لطفا BOM در ردیف را انتخاب کنید برای مورد {0}
@@ -3418,7 +3422,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,هزینه اقلام خریداری شده
 DocType: Employee Separation,Employee Separation Template,قالب جداگانه کارمند
 DocType: Selling Settings,Sales Order Required,سفارش فروش مورد نیاز
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,تبدیل به یک فروشنده
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,تبدیل به یک فروشنده
 DocType: Purchase Invoice,Credit To,اعتبار به
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,آگهی فعال / مشتریان
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,برای استفاده از فرمت Standard Delivery Note خالی بگذارید
@@ -3459,7 +3463,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,قالب مالیاتی
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,انجمن کاربران
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,مواد اولیه نمی تواند خالی باشد.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,ردیف # {0} (جدول پرداخت): مقدار باید منفی باشد
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,ردیف # {0} (جدول پرداخت): مقدار باید منفی باشد
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.",می تواند سهام به روز رسانی نیست، فاکتور شامل آیتم افت حمل و نقل.
 DocType: Contract,Fulfilment Status,وضعیت تحقق
 DocType: Lab Test Sample,Lab Test Sample,آزمایش آزمایشی نمونه
@@ -3598,7 +3602,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,تاریخ داک
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},سوابق هزینه ایجاد شده - {0}
 DocType: Asset Category Account,Asset Category Account,حساب دارایی رده
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,ردیف # {0} (جدول پرداخت): مقدار باید مثبت باشد
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,ردیف # {0} (جدول پرداخت): مقدار باید مثبت باشد
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},می تواند مورد دیگر {0} از مقدار سفارش فروش تولید نمی {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,مقدار مشخصه را انتخاب کنید
 DocType: Purchase Invoice,Reason For Issuing document,دلیل برای صدور سند
@@ -3653,7 +3657,7 @@
 DocType: Purchase Receipt,Time at which materials were received,زمانی که در آن مواد دریافت شده
 DocType: Products Settings,Products per Page,محصولات در هر صفحه
 DocType: Stock Ledger Entry,Outgoing Rate,نرخ خروجی
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,یا
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,یا
 DocType: Sales Order,Billing Status,حسابداری وضعیت
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,گزارش یک مشکل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,هزینه آب و برق
@@ -3680,7 +3684,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,بیانیه مالیات بر ارزش افزوده کارمند
 DocType: Payment Entry,Cheque/Reference Date,چک / تاریخ مرجع
 DocType: Purchase Invoice,Total Taxes and Charges,مجموع مالیات و هزینه
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,تاریخ موجود بودن برای تاریخ وارد شده است
 DocType: Employee,Emergency Contact,تماس اضطراری
 DocType: Bank Reconciliation Detail,Payment Entry,ورود پرداخت
 ,sales-browser,فروش مرورگر
@@ -3726,6 +3729,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),آیا بازگشت (توجه توجه)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,شروع کار
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},شماره سریال برای دارایی مورد نیاز است {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا مجموعه نامگذاری را برای {0} از طریق تنظیمات&gt; تنظیمات&gt; نامگذاری سری
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,قالب غیر فعال نباید قالب پیش فرض
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,برای ردیف {0}: تعداد برنامه ریزی شده را وارد کنید
 DocType: Account,Income Account,حساب درآمد
@@ -3739,6 +3743,7 @@
 DocType: Loyalty Program,Help Section,بخش کمک
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,قبلی
 DocType: Appraisal Goal,Key Responsibility Area,منطقه مسئولیت های کلیدی
+DocType: Delivery Trip,Distance UOM,فاصله UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",دسته های دانشجویی شما کمک کند پیگیری حضور و غیاب، ارزیابی ها و هزینه های برای دانش آموزان
 DocType: Payment Entry,Total Allocated Amount,مجموع مقدار اختصاص داده شده
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,تنظیم حساب موجودی به طور پیش فرض برای موجودی دائمی
@@ -3780,7 +3785,7 @@
 DocType: Item Supplier,Item Supplier,تامین کننده مورد
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,لطفا کد مورد وارد کنید دسته ای هیچ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},لطفا یک ارزش برای {0} quotation_to انتخاب کنید {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,هیچ مورد برای انتقال انتخاب نشده است
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,هیچ مورد برای انتقال انتخاب نشده است
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,تمام آدرس.
 DocType: Company,Stock Settings,تنظیمات سهام
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",ادغام زمانی ممکن است که خواص زیر در هر دو پرونده می باشد. آیا گروه، نوع ریشه، شرکت
@@ -4065,7 +4070,7 @@
 DocType: Patient,Personal and Social History,تاریخچه شخصی و اجتماعی
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,کاربر {0} ایجاد شد
 DocType: Fee Schedule,Fee Breakup for each student,هزینه فوروارد برای هر دانش آموز
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),مجموع پیش ({0}) را در برابر سفارش {1} نمی تواند بیشتر از جمع کل ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),مجموع پیش ({0}) را در برابر سفارش {1} نمی تواند بیشتر از جمع کل ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,انتخاب توزیع ماهانه به طور یکنواخت توزیع در سراسر اهداف ماه می باشد.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,تغییر کد
 DocType: Purchase Invoice Item,Valuation Rate,نرخ گذاری
@@ -4074,7 +4079,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,ITC به سرقت رفته است
 ,Student Monthly Attendance Sheet,دانشجو جدول حضور ماهانه
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,قانون حمل و نقل فقط برای فروش قابل اجرا است
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,ردۀ تخریب {0}: تاریخ خرابی بعدی بعد از تاریخ خرید نمی تواند باشد
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,ردۀ تخریب {0}: تاریخ خرابی بعدی بعد از تاریخ خرید نمی تواند باشد
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,پروژه تاریخ شروع
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,تا
 DocType: Rename Tool,Rename Log,تغییر نام ورود
@@ -4091,12 +4096,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,چگونه باید پروژه و شرکت را براساس معاملات تجاری به روز کرد.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,منقضی در
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,اضافه کردن دانش آموزان
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","لطفا کارمند <a href=""#Form/Employee/{0}"">{0}</a> \ برای حذف این سند را حذف کنید"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},لطفا انتخاب کنید {0}
 DocType: C-Form,C-Form No,C-فرم بدون
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,فاصله
+DocType: Delivery Stop,Distance,فاصله
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,لیست محصولات یا خدمات خود را که خریداری یا فروش می کنید.
 DocType: Water Analysis,Storage Temperature,دمای ذخیره سازی
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD- .YYYY.-
@@ -4123,7 +4126,7 @@
 DocType: Homepage,Company Description for website homepage,شرکت برای صفحه اصلی وب سایت
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",برای راحتی مشتریان، این کدها می توان در فرمت چاپ مانند فاکتورها و تحویل یادداشت استفاده می شود
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,نام Suplier
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,اطلاعات برای {0} بازیابی نشد
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,اطلاعات برای {0} بازیابی نشد
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,افتتاح نشریه
 DocType: Contract,Fulfilment Terms,شرایط تکمیل
 DocType: Sales Invoice,Time Sheet List,زمان فهرست ورق
@@ -4303,7 +4306,7 @@
 DocType: Serial No,Warranty / AMC Details,گارانتی / AMC اطلاعات بیشتر
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,دانش آموزان به صورت دستی برای فعالیت بر اساس گروه انتخاب
 DocType: Journal Entry,User Remark,نکته کاربری
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,بهینه سازی مسیرها
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,بهینه سازی مسیرها
 DocType: Travel Itinerary,Non Diary,غیر رسمی
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,پاداش احتمالی برای کارکنان سمت چپ ایجاد نمی شود
 DocType: Lead,Market Segment,بخش بازار
@@ -4333,7 +4336,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,برنامه وفاداری
 DocType: Student Guardian,Father,پدر
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,بلیط های پشتیبانی
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,"""به روز رسانی انبار می تواند برای فروش دارایی ثابت شود چک"
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,"""به روز رسانی انبار می تواند برای فروش دارایی ثابت شود چک"
 DocType: Bank Reconciliation,Bank Reconciliation,مغایرت گیری بانک
 DocType: Attendance,On Leave,در مرخصی
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,دریافت به روز رسانی
@@ -4378,7 +4381,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,سریال نه و دسته ای
 DocType: Warranty Claim,From Company,از شرکت
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,مجموع نمرات از معیارهای ارزیابی نیاز به {0} باشد.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,لطفا تعداد مجموعه ای از Depreciations رزرو
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,لطفا تعداد مجموعه ای از Depreciations رزرو
 DocType: Supplier Scorecard Period,Calculations,محاسبات
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,ارزش و یا تعداد
 DocType: Payment Terms Template,Payment Terms,شرایط پرداخت
@@ -4397,7 +4400,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,تخفیف (٪) در لیست قیمت نرخ با حاشیه
 DocType: Healthcare Service Unit Type,Rate / UOM,نرخ / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,همه انبارها
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,هیچ {0} برای معاملات اینترانت یافت نشد.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,هیچ {0} برای معاملات اینترانت یافت نشد.
 DocType: Travel Itinerary,Rented Car,ماشین اجاره ای
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,درباره شرکت شما
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,اعتباری به حساب باید یک حساب ترازنامه شود
@@ -4498,6 +4501,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,معیارهای تجزیه و تحلیل کارخانه
 DocType: Cheque Print Template,Cheque Height,قد چک
 DocType: Supplier,Supplier Details,اطلاعات بیشتر تامین کننده
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا شماره سریال را برای شرکت کنندگان از طریق Setup&gt; Numbering Series نصب کنید
 DocType: Setup Progress,Setup Progress,پیشرفت راه اندازی
 DocType: Expense Claim,Approval Status,وضعیت تایید
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},از مقدار باید کمتر از ارزش در ردیف شود {0}
@@ -4590,7 +4594,6 @@
 DocType: Travel Request,Fully Sponsored,کاملا حمایت شده
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,ورودی مجله معکوس
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,مشتری {0} ایجاد شده است
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا سیستم نامگذاری کارمندان را در منابع انسانی تنظیم کنید&gt; تنظیمات HR
 DocType: Stock Settings,Limit Percent,درصد محدود
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,در حال حاضر هیچ کالایی در انبار وجود ندارد
 ,Payment Period Based On Invoice Date,دوره پرداخت بر اساس فاکتور عضویت
@@ -4649,7 +4652,7 @@
 DocType: BOM Explosion Item,Source Warehouse,انبار منبع
 DocType: Installation Note,Installation Date,نصب و راه اندازی تاریخ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,به اشتراک گذاشتن لجر
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},ردیف # {0}: دارایی {1} به شرکت تعلق ندارد {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},ردیف # {0}: دارایی {1} به شرکت تعلق ندارد {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,فاکتور فروش {0} ایجاد شد
 DocType: Employee,Confirmation Date,تایید عضویت
 DocType: Inpatient Occupancy,Check Out,وارسی
@@ -4669,6 +4672,7 @@
 DocType: Production Plan,Sales Orders Detail,جزئیات سفارش سفارشات فروش
 DocType: Bin,Requested Quantity,تعداد درخواست
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE- .YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,لطفا سیستم نامگذاری مربیان را در آموزش و پرورش&gt; تنظیمات تحصیلی تنظیم کنید
 DocType: Patient,Marital Status,وضعیت تاهل
 DocType: Stock Settings,Auto Material Request,درخواست مواد خودکار
 DocType: Woocommerce Settings,API consumer secret,مخفف API کاربر
@@ -4721,7 +4725,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,روزها را انتخاب کنید
 DocType: Academic Term,Term Name,نام مدت
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),اعتبار ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,ایجاد حقوق و دستمزد ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,ایجاد حقوق و دستمزد ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,نمی توانید گره ریشه را ویرایش کنید
 DocType: Buying Settings,Purchase Order Required,خرید سفارش مورد نیاز
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,تایمر
@@ -4757,7 +4761,7 @@
 DocType: Account,Rate at which this tax is applied,سرعت که در آن این مالیات اعمال می شود
 DocType: Cash Flow Mapper,Section Name,نام بخش
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,ترتیب مجدد تعداد
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},مقدار تخفیف ردیف {0}: ارزش انتظاری پس از عمر مفید باید بیشتر از {برابر} یا برابر باشد {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},مقدار تخفیف ردیف {0}: ارزش انتظاری پس از عمر مفید باید بیشتر از {برابر} یا برابر باشد {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,فرصت های شغلی فعلی
 DocType: Company,Stock Adjustment Account,حساب تنظیم سهام
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,کسر کردن
@@ -4804,7 +4808,7 @@
 DocType: Program Enrollment,School House,مدرسه خانه
 DocType: Serial No,Out of AMC,از AMC
 DocType: Opportunity,Opportunity Amount,مقدار فرصت
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,تعداد Depreciations رزرو نمی تواند بیشتر از تعداد کل Depreciations
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,تعداد Depreciations رزرو نمی تواند بیشتر از تعداد کل Depreciations
 DocType: Purchase Order,Order Confirmation Date,سفارش تایید تاریخ
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI- .YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,را نگهداری سایت
@@ -4845,7 +4849,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,دسته:
 DocType: Volunteer,Afternoon,بعد از ظهر
 DocType: Loyalty Program,Loyalty Program Help,راهنمای برنامه وفاداری
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}'  غیر فعال است
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}'  غیر فعال است
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,تنظیم به عنوان گسترش
 DocType: Cheque Print Template,Scanned Cheque,اسکن چک
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ارسال ایمیل خودکار به تماس در معاملات ارائه.
@@ -4858,7 +4862,7 @@
 DocType: Warranty Claim,Item and Warranty Details,آیتم و گارانتی اطلاعات
 DocType: Chapter,Chapter Members,اعضای گروه
 DocType: Sales Team,Contribution (%),سهم (٪)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,توجه: ورودی پرداخت خواهد از ایجاد شوند &quot;نقدی یا حساب بانکی &#39;مشخص نشده بود
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,توجه: ورودی پرداخت خواهد از ایجاد شوند &quot;نقدی یا حساب بانکی &#39;مشخص نشده بود
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,پروژه {0} در حال حاضر وجود دارد
 DocType: Clinical Procedure,Nursing User,پرستار کاربر
 DocType: Employee Benefit Application,Payroll Period,دوره حقوق و دستمزد
@@ -4866,6 +4870,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},شماره سریال {0} به دسته {1} تعلق ندارد
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,مسئولیت
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,دوره اعتبار این نقلقول به پایان رسیده است.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","لطفا کارمند <a href=""#Form/Employee/{0}"">{0}</a> \ برای حذف این سند را حذف کنید"
 DocType: Expense Claim Account,Expense Claim Account,حساب ادعای هزینه
 DocType: Account,Capital Work in Progress,سرمایه کار در حال پیشرفت است
 DocType: Accounts Settings,Allow Stale Exchange Rates,نرخ ارز ثابت
@@ -4946,7 +4952,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,مواد شماره
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Shopify را با ERPNext وصل کنید
 DocType: Material Request Item,For Warehouse,ذخیره سازی
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,یادداشتهای تحویل {0} به روز شد
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,یادداشتهای تحویل {0} به روز شد
 DocType: Employee,Offer Date,پیشنهاد عضویت
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,نقل قول
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,شما در حالت آفلاین می باشد. شما نمی قادر خواهد بود به بارگذاری مجدد تا زمانی که شما به شبکه وصل شوید.
@@ -4996,7 +5002,7 @@
 DocType: Shipping Rule,Calculate Based On,محاسبه بر اساس
 DocType: Contract,Unfulfilled,غیرممکن است
 DocType: Delivery Note Item,From Warehouse,از انبار
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,هیچ کارمند برای معیارهای ذکر شده
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,هیچ کارمند برای معیارهای ذکر شده
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,هیچ موردی با بیل از مواد برای تولید
 DocType: Shopify Settings,Default Customer,مشتری پیش فرض
 DocType: Sales Stage,Stage Name,نام مرحله
@@ -5038,7 +5044,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,مبلغ مالیات پس از تخفیف مبلغ
 DocType: Patient,Inpatient Status,وضعیت سرپایی
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,تنظیمات خلاصه کار روزانه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,لیست قیمت انتخابی باید زمینه های خرید و فروش را بررسی کند.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,لیست قیمت انتخابی باید زمینه های خرید و فروش را بررسی کند.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,لطفا Reqd را با تاریخ وارد کنید
 DocType: Payment Entry,Internal Transfer,انتقال داخلی
 DocType: Asset Maintenance,Maintenance Tasks,وظایف تعمیر و نگهداری
@@ -5074,7 +5080,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,گروه توسط
 DocType: Guardian,Interests,منافع
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,فعال / غیر فعال کردن ارز.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,نمیتوان برخی از لغزشهای حقوق را ارائه داد
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,نمیتوان برخی از لغزشهای حقوق را ارائه داد
 DocType: Exchange Rate Revaluation,Get Entries,دریافت مقالات
 DocType: Production Plan,Get Material Request,دریافت درخواست مواد
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,هزینه پستی
@@ -5158,7 +5164,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},حساب هزینه برای آیتم الزامی است {0}
 DocType: BOM,Website Description,وب سایت توضیحات
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,تغییر خالص در حقوق صاحبان سهام
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,لطفا لغو خرید فاکتور {0} برای اولین بار
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,لطفا لغو خرید فاکتور {0} برای اولین بار
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,غیر مجاز. لطفا نوع سرویس سرویس را غیرفعال کنید
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",آدرس ایمیل باید منحصر به فرد باشد، در حال حاضر برای {0} وجود دارد
 DocType: Serial No,AMC Expiry Date,AMC تاریخ انقضاء
@@ -5198,7 +5204,7 @@
 DocType: Hotel Room,Hotel Room,اتاق هتل
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},حساب {0} به شرکت {1} تعلق ندارد
 DocType: Leave Type,Rounding,گرد کردن
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,شماره سریال در ردیف {0} با تحویل توجه مطابقت ندارد
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,شماره سریال در ردیف {0} با تحویل توجه مطابقت ندارد
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),مقدار اعطا شده (امتیاز داده شده)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.",سپس قوانین قیمت گذاری بر اساس مشتری، گروه مشتری، قلمرو، تامین کننده، گروه تامین کننده، کمپین، شریک تجاری و غیره فیلتر می شوند.
 DocType: Student,Guardian Details,نگهبان جزییات
@@ -5253,7 +5259,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},انبار مورد نیاز برای سهام مورد {0}
 DocType: Leave Allocation,Unused leaves,برگ استفاده نشده
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,وارد حساب بازپرداخت شوید
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,همه گروه ها
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,همه گروه ها
 DocType: Healthcare Service Unit,Vacant,خالی
 DocType: Patient,Alcohol Past Use,مصرف الکل گذشته
 DocType: Fertilizer Content,Fertilizer Content,محتوای کود
@@ -5264,7 +5270,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,سفارش کار {0} باید قبل از لغو این سفارش فروش لغو شود
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),واکشی BOM منفجر شد (از جمله زیر مجموعه)
 DocType: Authorization Rule,Applicable To (Employee),به قابل اجرا (کارمند)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,تاریخ الزامی است
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,تاریخ الزامی است
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,افزایش برای صفت {0} نمی تواند 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,نوع مزایا و مبلغ
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,اتاق رزرو
@@ -5408,7 +5414,7 @@
 DocType: Purchase Invoice Item,Total Weight,وزن مجموع
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,کمیسیون فروش
 DocType: Job Offer Term,Value / Description,ارزش / توضیحات
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",ردیف # {0}: دارایی {1} نمی تواند ارائه شود، آن است که در حال حاضر {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",ردیف # {0}: دارایی {1} نمی تواند ارائه شود، آن است که در حال حاضر {2}
 DocType: Tax Rule,Billing Country,کشور صدور صورت حساب
 DocType: Purchase Order Item,Expected Delivery Date,انتظار می رود تاریخ تحویل
 DocType: Restaurant Order Entry,Restaurant Order Entry,ورود به رستوران
@@ -5447,12 +5453,13 @@
 DocType: Maintenance Visit,Breakdown,تفکیک
 DocType: Travel Itinerary,Vegetarian,گیاه خواری
 DocType: Patient Encounter,Encounter Date,تاریخ برخورد
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,حساب: {0} با ارز: {1} نمی تواند انتخاب شود
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,حساب: {0} با ارز: {1} نمی تواند انتخاب شود
 DocType: Bank Statement Transaction Settings Item,Bank Data,داده های بانکی
 DocType: Purchase Receipt Item,Sample Quantity,تعداد نمونه
 DocType: Bank Guarantee,Name of Beneficiary,نام كاربر
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",به روز رسانی BOM هزینه به طور خودکار از طریق زمانبند، بر اساس آخرین ارزش نرخ نرخ / نرخ قیمت / آخرین نرخ خرید مواد خام.
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,تامین کننده&gt; گروه تامین کننده
 DocType: Bank Reconciliation Detail,Cheque Date,چک تاریخ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},حساب {0}: حساب مرجع {1} به شرکت تعلق ندارد: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,با موفقیت حذف تمام معاملات مربوط به این شرکت!
@@ -5480,7 +5487,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,گره فرزند می تواند تنها تحت &#39;گروه&#39; نوع گره ایجاد
 DocType: Attendance Request,Half Day Date,تاریخ نیم روز
 DocType: Academic Year,Academic Year Name,نام سال تحصیلی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} مجاز به انجام معاملات با {1} نیست. لطفا شرکت را تغییر دهید
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} مجاز به انجام معاملات با {1} نیست. لطفا شرکت را تغییر دهید
 DocType: Sales Partner,Contact Desc,تماس با محصول،
 DocType: Email Digest,Send regular summary reports via Email.,ارسال گزارش خلاصه به طور منظم از طریق ایمیل.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},لطفا به حساب پیش فرض تنظیم شده در نوع ادعا هزینه {0}
@@ -5513,7 +5520,7 @@
 DocType: Hotel Room,Hotel Manager,مدیر هتل
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,مجموعه قوانین مالیاتی برای سبد خرید
 DocType: Purchase Invoice,Taxes and Charges Added,مالیات و هزینه اضافه شده
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,مقدار خسارت ردیف {0}: تاریخ بعد از انهدام بعدی قبل از موجود بودن برای تاریخ استفاده نمی شود
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,مقدار خسارت ردیف {0}: تاریخ بعد از انهدام بعدی قبل از موجود بودن برای تاریخ استفاده نمی شود
 ,Sales Funnel,قیف فروش
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,مخفف الزامی است
 DocType: Project,Task Progress,وظیفه پیشرفت
@@ -5527,7 +5534,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,همه گروه های مشتری
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,انباشته ماهانه
 DocType: Attendance Request,On Duty,در وظیفه
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} الزامی است. شاید سوابق تبادل ارز برای {1} به {2} ایجاد نشده است.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} الزامی است. شاید سوابق تبادل ارز برای {1} به {2} ایجاد نشده است.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},برنامه کارکنان {0} برای تعیین نام وجود دارد {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,قالب مالیات اجباری است.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,حساب {0}: حساب مرجع {1} وجود ندارد
@@ -5606,11 +5613,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,حداقل یک انبار الزامی است
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.",پیکربندی زمینه های مورد مانند UOM، گروه مورد، شرح و تعداد ساعت ها.
 DocType: Certification Application,Certification Status,وضعیت صدور گواهینامه
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,بازار
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,بازار
 DocType: Travel Itinerary,Travel Advance Required,پیش نیاز سفر
 DocType: Subscriber,Subscriber Name,نام مشترک
 DocType: Serial No,Out of Warranty,خارج از ضمانت
-DocType: Cashier Closing,Cashier-closing-,صندوقدار بسته شدن
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,نوع داده Mapped
 DocType: BOM Update Tool,Replace,جایگزین کردن
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,هیچ محصولی وجود ندارد پیدا شده است.
@@ -5697,7 +5703,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,قالب های پیش فرض مالی برای فروش و خرید ایجاد می شوند.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,ارزیابی نتیجه نتیجه {0} در حال حاضر وجود دارد.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",به عنوان مثال: ABCD. #####. اگر مجموعه ای تنظیم شده است و Batch No در معاملات ذکر شده است، سپس شماره بلاک اتوماتیک بر اساس این سری ایجاد می شود. اگر همیشه می خواهید بطور صریح بیتی را برای این آیتم ذکر کنید، این را خالی بگذارید. توجه: این تنظیم اولویت بیش از Prefix سری نامگذاری در تنظیمات سهام است.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا شماره سریال را برای شرکت کنندگان از طریق Setup&gt; Numbering Series نصب کنید
 DocType: BOM,Materials Required (Exploded),مواد مورد نیاز (منفجر شد)
 DocType: Contract,Party User,کاربر حزب
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',لطفا مجموعه شرکت فیلتر خالی اگر گروه توسط است شرکت &#39;
@@ -5898,7 +5903,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,تعداد روبروی
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,هر دو تاریخچه تاریخچه دادگاه و تاریخ پایان تاریخ پرونده باید تعیین شود
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,میانگین امتیازات
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,مجموع مبلغ پرداختی در برنامه پرداخت باید برابر با مقدار Grand / Rounded باشد
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,مجموع مبلغ پرداختی در برنامه پرداخت باید برابر با مقدار Grand / Rounded باشد
 DocType: Subscription Plan Detail,Plan,طرح
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,تعادل بیانیه بانک به عنوان در هر لجر عمومی
 DocType: Job Applicant,Applicant Name,نام متقاضی
@@ -5967,7 +5972,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,صابون و مواد شوینده
 DocType: BOM,Show Items,نمایش آیتم ها
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,از زمان نمی تواند بیشتر از به زمان.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,آیا می خواهید تمام ایمیل ها را به مشتریان اطلاع دهید؟
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,آیا می خواهید تمام ایمیل ها را به مشتریان اطلاع دهید؟
 DocType: Subscription Plan,Billing Interval,فاصله گفتگو
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,فیلم و ویدیو
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,مرتب
@@ -5976,9 +5981,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,ردیف {0}: {1} باید از 0 باشد
 DocType: Assessment Criteria,Assessment Criteria Group,معیارهای ارزیابی گروه
 DocType: Healthcare Settings,Patient Name By,نام بیمار توسط
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},ورود مجله Accruable برای حقوق از {0} به {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},ورود مجله Accruable برای حقوق از {0} به {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,درآمد معوق را فعال کنید
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},باز کردن استهلاک انباشته باید کمتر از برابر شود {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},باز کردن استهلاک انباشته باید کمتر از برابر شود {0}
 DocType: Warehouse,Warehouse Name,نام انبار
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,تاریخ شروع واقعی باید کمتر از تاریخ پایان واقعی باشد
 DocType: Naming Series,Select Transaction,انتخاب معامله
@@ -6129,7 +6134,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,کارمند {0} درجه {1} هیچ خط مشی پیش فرض ترک ندارد
 DocType: Salary Detail,Salary Detail,جزئیات حقوق و دستمزد
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,لطفا انتخاب کنید {0} برای اولین بار
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,اضافه شده {0} کاربران
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,اضافه شده {0} کاربران
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",در مورد برنامه چند لایه، مشتریان به صورت خودکار به سطر مربوطه اختصاص داده می شوند، همانطور که در هزینه های خود هستند
 DocType: Appointment Type,Physician,پزشک
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,دسته {0} از {1} مورد تمام شده است.
@@ -6273,7 +6278,7 @@
 DocType: Asset,Custodian,نگهبان
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,نقطه از فروش مشخصات
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} باید یک مقدار بین 0 تا 100 باشد
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},پرداخت {0} از {1} تا {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},پرداخت {0} از {1} تا {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,نا امن وام
 DocType: Cost Center,Cost Center Name,هزینه نام مرکز
 DocType: Student,B+,B +
@@ -6305,6 +6310,7 @@
 DocType: Employee,Date of Issue,تاریخ صدور
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",همانطور که در تنظیمات از خرید اگر خرید Reciept مورد نیاز == &quot;YES&quot;، پس از آن برای ایجاد خرید فاکتور، کاربر نیاز به ایجاد رسید خرید برای اولین بار در مورد {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},ردیف # {0}: تنظیم کننده برای آیتم {1}
+DocType: Global Defaults,Default Distance Unit,واحد پیش فرض فاصله
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,ردیف {0}: ارزش ساعت باید بزرگتر از صفر باشد.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,وب سایت تصویر {0} متصل به مورد {1} را نمی توان یافت
 DocType: Issue,Content Type,نوع محتوا
@@ -6360,7 +6366,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,بدهکاری به حساب کاربری باید یک حساب ترازنامه شود
 DocType: Asset,Naming Series,نامگذاری سری
 DocType: Vital Signs,Coated,پوشش داده شده
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,ردیف {0}: ارزش انتظاری پس از زندگی مفید باید کمتر از مقدار خرید ناخالص باشد
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,ردیف {0}: ارزش انتظاری پس از زندگی مفید باید کمتر از مقدار خرید ناخالص باشد
 DocType: GoCardless Settings,GoCardless Settings,تنظیمات GoCardless
 DocType: Leave Block List,Leave Block List Name,ترک نام فهرست بلوک
 DocType: Certified Consultant,Certification Validity,صدور گواهینامه
@@ -6427,6 +6433,7 @@
 DocType: Bank Statement Settings Item,Bank Header,سربرگ بانکی
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,آزمایشات آزمایشگاهی را مشاهده کنید
 DocType: Hub Users,Hub Users,کاربران هاب
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,مشتری&gt; گروه مشتری&gt; قلمرو
 DocType: Purchase Invoice,Y,ی
 DocType: Maintenance Visit,Maintenance Date,تاریخ نگهداری و تعمیرات
 DocType: Purchase Invoice Item,Rejected Serial No,رد سریال
@@ -6441,7 +6448,7 @@
 DocType: SG Creation Tool Course,Max Strength,حداکثر قدرت
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,نصب ایستگاه از پیش تنظیم
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH- .YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},هیچ ضمانت تحویل برای مشتری {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},هیچ ضمانت تحویل برای مشتری {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,کارمند {0} مقدار حداکثر سود ندارد
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,اقلام را براساس تاریخ تحویل انتخاب کنید
 DocType: Grant Application,Has any past Grant Record,هر رکورد قبلی Grant داشته است
@@ -6468,7 +6475,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,اتاق رزرو هتل
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,خدمات مشتریان
 DocType: BOM,Thumbnail,بند انگشتی
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,هیچ ارتباطی با شناسه های ایمیل یافت نشد
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,هیچ ارتباطی با شناسه های ایمیل یافت نشد
 DocType: Item Customer Detail,Item Customer Detail,مورد جزئیات و ضوابط
 DocType: Notification Control,Prompt for Email on Submission of,اعلان برای ایمیل در ارسال مقاله از
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},حداکثر مبلغ مزیت کارمند {0} بیش از {1}
@@ -6723,7 +6730,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,نمی توانید به گروه پنهانی به دلیل نوع کاربری انتخاب شده است.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} اصلاح شده است. لطفا بازخوانی کنید.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,توقف کاربران از ساخت نرم افزار مرخصی در روز بعد.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,کد مورد&gt; گروه مورد&gt; نام تجاری
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.",اگر مدت نامحدودی برای امتیازات وفاداری، مدت زمان انقضا خالی باشد یا 0.
 DocType: Asset Maintenance Team,Maintenance Team Members,اعضای تیم تعمیر و نگهداری
 DocType: Loyalty Point Entry,Purchase Amount,مبلغ خرید
@@ -6731,7 +6737,7 @@
 											to fullfill Sales Order {2}",می تواند شماره سریال {0} آیتم {1} را به عنوان محفوظ نگه دارد \ order to complete order {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN- .YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,کننده دیگر {0} ایجاد
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,پایان سال نمی تواند قبل از شروع سال می شود
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,پایان سال نمی تواند قبل از شروع سال می شود
 DocType: Employee Benefit Application,Employee Benefits,مزایای کارکنان
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},مقدار بسته بندی شده، باید مقدار برای مورد {0} در ردیف برابر {1}
 DocType: Work Order,Manufactured Qty,تولید تعداد
@@ -6747,6 +6753,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,تعداد دسته را انتخاب کنید
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,به GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,لوایح مطرح شده به مشتریان.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا سیستم نامگذاری کارمندان را در منابع انسانی تنظیم کنید&gt; تنظیمات HR
 DocType: Healthcare Settings,Invoice Appointments Automatically,مصاحبه های صورتحساب به صورت خودکار
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,پروژه کد
 DocType: Salary Component,Variable Based On Taxable Salary,متغیر بر اساس حقوق و دستمزد قابل پرداخت
@@ -6795,7 +6802,7 @@
 DocType: POS Profile,Account for Change Amount,حساب کاربری برای تغییر مقدار
 DocType: QuickBooks Migrator,Connecting to QuickBooks,اتصال به QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,مجموع افزایش / از دست دادن
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,شرکت نامعتبر برای صورتحساب شرکت اینتر
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,شرکت نامعتبر برای صورتحساب شرکت اینتر
 DocType: Purchase Invoice,input service,خدمات ورودی
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ردیف {0}: حزب / حساب با مطابقت ندارد {1} / {2} در {3} {4}
 DocType: Employee Promotion,Employee Promotion,ارتقاء کارکنان
@@ -6925,7 +6932,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,منطقه مورد نظر برای اسکان
 apps/erpnext/erpnext/config/selling.py +184,Analytics,تجزیه و تحلیل ترافیک
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,سبد خرید خالی است
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,لطفا سیستم نامگذاری مربیان را در آموزش و پرورش&gt; تنظیمات تحصیلی تنظیم کنید
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Item {0} شماره سریال ندارد فقط موارد سریالی \ می تواند تحویل براساس شماره سریال داشته باشد
 DocType: Vehicle,Model,مدل
@@ -6955,7 +6961,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,چیزی برای تغییر ندارد
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,لطفا یک فایل CSV را انتخاب کنید
 DocType: Holiday List,Total Holidays,کل تعطیلات
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,قالب ایمیل برای ارسال وجود ندارد لطفا یکی را در تنظیمات تحویل تنظیم کنید
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,قالب ایمیل برای ارسال وجود ندارد لطفا یکی را در تنظیمات تحویل تنظیم کنید
 DocType: Student Leave Application,Mark as Present,علامت گذاری به عنوان در حال حاضر
 DocType: Supplier Scorecard,Indicator Color,رنگ نشانگر
 DocType: Purchase Order,To Receive and Bill,برای دریافت و بیل
@@ -6964,7 +6970,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,شماره سریال را انتخاب کنید
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,طراح
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,شرایط و ضوابط الگو
-DocType: Serial No,Delivery Details,جزئیات تحویل
+DocType: Delivery Trip,Delivery Details,جزئیات تحویل
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},مرکز هزینه در ردیف مورد نیاز است {0} در مالیات جدول برای نوع {1}
 DocType: Program,Program Code,کد برنامه
 DocType: Terms and Conditions,Terms and Conditions Help,شرایط و ضوابط راهنما
@@ -6988,7 +6994,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,سرب زمان روز
 DocType: Cash Flow Mapping,Is Income Tax Expense,آیا هزینه مالیات بر درآمد است؟
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,سفارش شما برای تحویل دادن است!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ردیف # {0}: ارسال تاریخ باید همان تاریخ خرید می باشد {1} دارایی {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ردیف # {0}: ارسال تاریخ باید همان تاریخ خرید می باشد {1} دارایی {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,این بررسی در صورتی که دانشجو است ساکن در خوابگاه مؤسسه است.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,لطفا سفارشات فروش در جدول فوق را وارد کنید
 ,Stock Summary,خلاصه سهام
diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv
index 1eca7b3..aaa10ec 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Kauden nimi
 DocType: Employee,Salary Mode,Palkan tila
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Rekisteröidy
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Rekisteröidy
 DocType: Patient,Divorced,eronnut
 DocType: Support Settings,Post Route Key,Lähetä reitin avain
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Salli Kohta lisätään useita kertoja liiketoimi
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Uusi kurssi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},valuuttahinnasto vaaditaan {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* lasketaan tapahtumassa
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Toimittaja&gt; Toimittajan tyyppi
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Asiakaspalvelu Yhteystiedot
 DocType: Patient Appointment,Check availability,Tarkista saatavuus
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Näytä auki
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Sarja päivitetty onnistuneesti
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Tarkista
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} rivillä {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} rivillä {1}
 DocType: Asset Finance Book,Depreciation Start Date,Poistojen aloituspäivä
 DocType: Pricing Rule,Apply On,käytä
 DocType: Item Price,Multiple Item prices.,Useiden Item hinnat.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Lab Prescription
 ,Delay Days,Viivepäivät
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,palvelu Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Sarjanumero: {0} on jo viitattu myyntilasku: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Sarjanumero: {0} on jo viitattu myyntilasku: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,lasku
 DocType: Purchase Invoice Item,Item Weight Details,Kohde Painon tiedot
 DocType: Asset Maintenance Log,Periodicity,Jaksotus
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Kirjanpitäjä
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Myynnin hinnasto
 DocType: Patient,Tobacco Current Use,Tupakan nykyinen käyttö
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Aloituspäivä ja päättymispäivä ovat päällekkäisiä työnkortilla <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Myynnin määrä
 DocType: Cost Center,Stock User,Varaston peruskäyttäjä
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Asiaan liittyvää
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Läsnäolo päivämäärä ei voi olla pienempi kuin työntekijän tuloaan päivämäärä
 DocType: Grading Scale,Grading Scale Name,Arvosteluasteikko Name
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Lisää käyttäjiä Marketplacessa
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Lisää käyttäjiä Marketplacessa
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Tämä on kantatili eikä sitä voi muokata
 DocType: Sales Invoice,Company Address,yritys osoite
 DocType: BOM,Operations,Toiminnot
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Qty
 DocType: Production Plan,Material Request Detail,Materiaalipyynnön yksityiskohdat
 DocType: Selling Settings,Default Quotation Validity Days,Oletushakemusten voimassaoloajat
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"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/controllers/accounts_controller.py +877,"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ää"
 DocType: SMS Center,SMS Center,Tekstiviesti keskus
 DocType: Payroll Entry,Validate Attendance,Vahvista osallistuminen
 DocType: Sales Invoice,Change Amount,muutos Määrä
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Riviväli varten määrä kirjaimin
 DocType: Vehicle,Additional Details,Lisätiedot
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,ei annettua kuvausta
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Toimittaja&gt; Toimittaja Ryhmä
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Pyydä ostaa.
 DocType: POS Closing Voucher Details,Collected Amount,Kerätty määrä
 DocType: Lab Test,Submitted Date,Lähetetty päivämäärä
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,Opiskelijavalinta
 ,Terretory,Alue
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Nimike {0} on peruutettu
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Poistot Row {0}: Poistot Aloituspäivämäärä on merkitty aiempaan päivämäärään
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Poistot Row {0}: Poistot Aloituspäivämäärä on merkitty aiempaan päivämäärään
 DocType: Contract Template,Fulfilment Terms and Conditions,Täyttämisen ehdot
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Hankintapyyntö
 DocType: Bank Reconciliation,Update Clearance Date,Päivitä tilityspäivä
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,Tilien asetukset
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,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
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Reittiä ei voi käsitellä, koska Google Mapsin asetukset on poistettu käytöstä."
 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
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Uusi varallisuusarvo
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"taso, jolla asiakkaan valuutta muunnetaan asiakkaan käyttämäksi perusvaluutaksi"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Tietenkin ajoitustyökalun
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rivi # {0}: Ostolaskujen ei voi tehdä vastaan olemassaolevan hyödykkeen {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rivi # {0}: Ostolaskujen ei voi tehdä vastaan olemassaolevan hyödykkeen {1}
 DocType: Crop Cycle,LInked Analysis,LInked Analysis
 DocType: POS Closing Voucher,POS Closing Voucher,POS-sulkumaksu
 DocType: Contract,Lapsed,rauennut
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} ei ilmoittautunut Course {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Opiskelijan nimi:
 DocType: POS Closing Voucher Details,Difference,Ero
+DocType: Delivery Settings,Delay between Delivery Stops,Viivästys toimituksen lopettamisen välillä
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Sarjanumero {0} ei kuulu lähetteeseen {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Näyttää olevan ongelma palvelimen GoCardless-kokoonpanon kanssa. Älä huoli, jos vika epäonnistuu, summa palautetaan tilillesi."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -693,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Määrä ja hinta
 DocType: Delivery Note,% Installed,% asennettu
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Luokkahuoneet / Laboratories, johon käytetään luentoja voidaan ajoittaa."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Molempien yhtiöiden valuuttojen pitäisi vastata Inter Company Transactions -tapahtumia.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Molempien yhtiöiden valuuttojen pitäisi vastata Inter Company Transactions -tapahtumia.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Anna yrityksen nimi ensin
 DocType: Travel Itinerary,Non-Vegetarian,Ei-vegetaristi
 DocType: Purchase Invoice,Supplier Name,Toimittaja
@@ -778,7 +779,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Vuokrataan päivästä
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Tarpeeksi osat rakentaa
 DocType: POS Profile User,POS Profile User,POS-profiilin käyttäjä
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Rivi {0}: poistoaika alkaa
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Rivi {0}: poistoaika alkaa
 DocType: Purchase Invoice Item,Service Start Date,Palvelun alkamispäivä
 DocType: Subscription Invoice,Subscription Invoice,Tilauslaskutus
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,suorat tulot
@@ -845,7 +846,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Lyhenne on jo käytössä toisella yrityksellä
 DocType: Selling Settings,Default Customer Group,Oletusasiakasryhmä
 DocType: Employee,IFSC Code,IFSC-koodi
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Aloituspäivä ja päättymispäivä ovat päällekkäisiä työnkortilla <a href=""#Form/Job Card/{0}"">{1}</a>"
 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
 DocType: Crop,Produced Items,Tuotteita
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,Estä RFQ: t
 DocType: Hub User,Hub User,Hub-käyttäjä
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,tee myyntitilaus
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},"Palkkalipeä, joka toimitetaan ajanjaksolta {0} - {1}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},"Palkkalipeä, joka toimitetaan ajanjaksolta {0} - {1}"
 DocType: Project Task,Project Task,Projekti Tehtävä
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Lunastetut pisteet
 ,Lead Id,Liidin tunnus
@@ -1027,7 +1027,7 @@
 DocType: Fee Validity,Max number of visit,Vierailun enimmäismäärä
 ,Hotel Room Occupancy,Hotellihuoneisto
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Tuntilomake luotu:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Valitse oletusmaksutapa kassa- tai pankkitili maksulle {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Valitse oletusmaksutapa kassa- tai pankkitili maksulle {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,kirjoittautua
 DocType: GST Settings,GST Settings,GST Asetukset
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Valuutan tulee olla sama kuin hinnaston valuutta: {0}
@@ -1081,7 +1081,7 @@
 DocType: Vehicle Log,Service Details,palvelu Lisätiedot
 DocType: Lab Test Template,Grouped,ryhmitelty
 DocType: Selling Settings,Delivery Note Required,lähete vaaditaan
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Palkkaliikkeiden lähettäminen ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Palkkaliikkeiden lähettäminen ...
 DocType: Bank Guarantee,Bank Guarantee Number,Pankkitakauksen Numero
 DocType: Assessment Criteria,Assessment Criteria,Arviointikriteerit
 DocType: BOM Item,Basic Rate (Company Currency),perustaso (yrityksen valuutta)
@@ -1106,13 +1106,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Maksu käyttö on jo luotu
 DocType: Request for Quotation,Get Suppliers,Hanki toimittajat
 DocType: Purchase Receipt Item Supplied,Current Stock,nykyinen varasto
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Rivi # {0}: Asset {1} ei liity Tuote {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,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 +408,Preview Salary Slip,Preview Palkka Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Tili {0} on syötetty useita kertoja
 DocType: Account,Expenses Included In Valuation,Arvoon sisältyvät kustannukset
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,"Voit uusia vain, jos jäsenyytesi päättyy 30 päivän kuluessa"
 DocType: Shopping Cart Settings,Show Stock Availability,Saatavuus Varastossa
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Aseta {0} varallisuusluokkaan {1} tai yritys {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Aseta {0} varallisuusluokkaan {1} tai yritys {2}
 DocType: Location,Longitude,pituusaste
 ,Absent Student Report,Absent Student Report
 DocType: Crop,Crop Spacing UOM,Crop Spacing UOM
@@ -1184,7 +1184,7 @@
 DocType: Soil Texture,Sand,Hiekka
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,energia
 DocType: Opportunity,Opportunity From,tilaisuuteen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rivi {0}: {1} Sarjanumerot kohdasta {2}. Olet antanut {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rivi {0}: {1} Sarjanumerot kohdasta {2}. Olet antanut {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Valitse taulukko
 DocType: BOM,Website Specifications,Verkkosivuston tiedot
 DocType: Special Test Items,Particulars,tarkemmat tiedot
@@ -1276,7 +1276,7 @@
 DocType: Item,Items with higher weightage will be shown higher,tuotteet joilla on korkeampi painoarvo nätetään ylempänä
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Lab testit ja elinvoimaiset merkit
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,pankin täsmäytys lisätiedot
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Rivi # {0}: Asset {1} on esitettävä
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Rivi # {0}: Asset {1} on esitettävä
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Yhtään työntekijää ei löytynyt
 DocType: Item,If subcontracted to a vendor,alihankinta toimittajalle
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Opiskelijaryhmän on jo päivitetty.
@@ -1330,7 +1330,6 @@
 DocType: Loyalty Program Collection,Tier Name,Tier Name
 DocType: HR Settings,Enter retirement age in years,Anna eläkeikä vuosina
 DocType: Crop,Target Warehouse,Varastoon
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Aseta Naming-sarja {0} asetukseksi Setup&gt; Settings&gt; Naming Series
 DocType: Payroll Employee Detail,Payroll Employee Detail,Palkkahallinnon työntekijän tiedot
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Valitse varasto
 DocType: Cheque Print Template,Starting location from left edge,Alkaen sijainti vasemmasta reunasta
@@ -1420,7 +1419,7 @@
 DocType: Work 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 +623,BOM {0} must be active,BOM {0} tulee olla aktiivinen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Ei siirrettävissä olevia kohteita
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Ei siirrettävissä olevia kohteita
 DocType: Employee Boarding Activity,Activity Name,Toiminnon nimi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Muuta julkaisupäivää
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Valmiin tuotemäärän <b>{0}</b> ja Määrä <b>{1}</b> ei voi olla erilainen
@@ -1647,6 +1646,7 @@
 DocType: Project,First Email,Ensimmäinen sähköposti
 DocType: Company,Exception Budget Approver Role,Poikkeus talousarvion hyväksynnän roolista
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Kun tämä asetus on asetettu, tämä lasku on pidossa ja se on asetettu"
+DocType: Cashier Closing,POS-CLO-,POS-sulkeutuessa
 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ä
 DocType: Repayment Schedule,Interest Amount,Korko Arvo
@@ -1658,7 +1658,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,asiakirjat
 DocType: Asset,Scrapped,Romutettu
 DocType: Item,Item Defaults,Oletusasetukset
-DocType: Purchase Invoice,Returns,Palautukset
+DocType: Cashier Closing,Returns,Palautukset
 DocType: Job Card,WIP Warehouse,KET-varasto
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Sarjanumero {0} on huoltokannassa {1} asti
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,Rekrytointi
@@ -1672,7 +1672,6 @@
 DocType: Student,A-,A -
 DocType: Share Transfer,Transfer Type,Siirtymätyyppi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Myynnin kustannukset
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakasryhmä&gt; Alue
 DocType: Diagnosis,Diagnosis,Diagnoosi
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Perusosto
 DocType: Attendance Request,Explanation,Selitys
@@ -1685,7 +1684,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Ostotilaukset erääntyneet
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Postinumero
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Myyntitilaus {0} on {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Valitse korkotulojen tili lainaan {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Valitse korkotulojen tili lainaan {0}
 DocType: Opportunity,Contact Info,"yhteystiedot, info"
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Varastotapahtumien tekeminen
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Et voi edistää Työntekijän asemaa vasemmalla
@@ -1697,7 +1696,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Laskua ei voi tehdä nollaan laskutustunnilla
 DocType: Company,Date of Commencement,Alkamispäivä
 DocType: Sales Person,Select company name first.,Valitse yrityksen nimi ensin.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},sähköpostia lähetetään {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},sähköpostia lähetetään {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Toimittajilta saadut tarjoukset.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Korvaa BOM ja päivitä viimeisin hinta kaikkiin BOM-paketteihin
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Vastaanottajalle {0} | {1} {2}
@@ -1717,7 +1716,7 @@
 DocType: Asset Movement,From Employee,työntekijästä
 DocType: Driver,Cellphone Number,puhelinnumero
 DocType: Project,Monitor Progress,Seurata edistymistä
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Varoitus: Järjestelmä ei tarkista liikalaskutusta koska tuotteen {0} määrä kohdassa {1} on nolla
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Varoitus: Järjestelmä ei tarkista liikalaskutusta koska tuotteen {0} määrä kohdassa {1} on nolla
 DocType: Journal Entry,Make Difference Entry,tee erokirjaus
 DocType: Supplier Quotation,Auto Repeat Section,Automaattinen toisto jakso
 DocType: Upload Attendance,Attendance From Date,osallistuminen päivästä
@@ -1820,7 +1819,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,rivi # {0}: hylättyä yksikkömäärää ei voi merkitä oston palautukseksi
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Asiakasryhmän muuttaminen valitulle asiakkaalle ei ole sallittua.
 ,Purchase Order Items To Be Billed,Ostotilaus Items laskuttamat
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Arvioitu saapumisaikoja päivitetään.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Arvioitu saapumisaikoja päivitetään.
 DocType: Program Enrollment Tool,Enrollment Details,Ilmoittautumistiedot
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Yrityksesi ei voi asettaa useampia oletuksia asetuksille.
 DocType: Purchase Invoice Item,Net Rate,nettohinta
@@ -1834,7 +1833,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Jätteen tyyppi on vähäistä
 DocType: Support Settings,Close Issue After Days,Close Issue jälkeen Days
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Sinun on oltava käyttäjä, jolla on System Manager- ja Item Manager -roolit, jotta käyttäjät voidaan lisätä Marketplace-sivustoon."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Sinun on oltava käyttäjä, jolla on System Manager- ja Item Manager -roolit, jotta käyttäjät voidaan lisätä Marketplace-sivustoon."
 DocType: Leave Control Panel,Leave blank if considered for all branches,tyhjä mikäli se pidetään vaihtoehtona kaikissa toimialoissa
 DocType: Job Opening,Staffing Plan,Henkilöstösuunnitelma
 DocType: Bank Guarantee,Validity in Days,Voimassaolo päivissä
@@ -1854,7 +1853,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},monista rivi {0} sama kuin {1}
 DocType: Marketplace Settings,Disable Marketplace,Poista Marketplace käytöstä
 ,Trial Balance,Alustava tase
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Verovuoden {0} ei löytynyt
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Verovuoden {0} ei löytynyt
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Työntekijätietojen perustaminen
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotellin varaus käyttäjä
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Ole hyvä ja valitse etuliite ensin
@@ -1962,7 +1961,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Sisäänkirjautuminen epäonnistui
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Asetus {0} luotiin
 DocType: Special Test Items,Special Test Items,Erityiset testit
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Sinun on oltava käyttäjä, jolla System Manager- ja Item Manager -roolit ovat rekisteröityneet Marketplacessa."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Sinun on oltava käyttäjä, jolla System Manager- ja Item Manager -roolit ovat rekisteröityneet Marketplacessa."
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,maksutapa
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Etkä voi hakea etuja palkkaneuvon mukaan
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Sivuston kuvan tulee olla kuvatiedosto tai kuvan URL-osoite
@@ -1974,7 +1973,7 @@
 DocType: Warehouse,Warehouse Contact Info,Varaston yhteystiedot
 DocType: Payment Entry,Write Off Difference Amount,Kirjoita Off Ero Määrä
 DocType: Volunteer,Volunteer Name,Vapaaehtoinen nimi
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},"Rivejä, joiden päällekkäiset päivämäärät toisissa riveissä, löytyivät: {0}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},"Rivejä, joiden päällekkäiset päivämäärät toisissa riveissä, löytyivät: {0}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: Työntekijän sähköpostiosoitetta ei löytynyt, joten sähköpostia ei lähetetty"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Työntekijälle {0} annettuun palkkarakenteeseen ei annettu päivämäärää {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Toimitussääntö ei koske maata {0}
@@ -2063,6 +2062,7 @@
 DocType: Salary Component,Earning,ansio
 DocType: Supplier Scorecard,Scoring Criteria,Pisteytyskriteerit
 DocType: Purchase Invoice,Party Account Currency,Osapuolitilin valuutta
+DocType: Delivery Trip,Total Estimated Distance,Arvioitu kokonaismatka
 ,BOM Browser,BOM selain
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Päivitä tilasi tähän koulutustilaisuuteen
 DocType: Item Barcode,EAN,EAN
@@ -2101,7 +2101,7 @@
 DocType: Activity Cost,Projects,Projektit
 DocType: Payment Request,Transaction Currency,valuuttakoodi
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Keneltä {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Jotkut sähköpostit ovat virheellisiä
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Jotkut sähköpostit ovat virheellisiä
 DocType: Work Order Operation,Operation Description,toiminnon kuvaus
 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
@@ -2125,7 +2125,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Nettomuutos kiinteä omaisuus
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Määrä
 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 +876,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/controllers/accounts_controller.py +883,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/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Alkaen aikajana
 DocType: Shopify Settings,For Company,Yritykselle
@@ -2139,7 +2139,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Kurssin aikataulua luotiin virheitä
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Luettelon ensimmäinen kustannusmääritin asetetaan oletusluvuksi.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,ei voi olla suurempi kuin 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Sinun on oltava muu kuin Järjestelmänvalvoja ja System Manager- ja Item Manager -roolit, jotta voit rekisteröityä Marketplacessa."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Sinun on oltava muu kuin Järjestelmänvalvoja ja System Manager- ja Item Manager -roolit, jotta voit rekisteröityä Marketplacessa."
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Nimike {0} ei ole varastonimike
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Aikatauluttamaton
@@ -2168,7 +2168,7 @@
 DocType: HR Settings,Employee Settings,työntekijän asetukset
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Maksujärjestelmän lataaminen
 ,Batch-Wise Balance History,Eräkohtainen tasehistoria
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Rivi # {0}: Ei voi määrittää arvoa, jos summa on suurempi kuin laskennallinen summa kohtaan {1}."
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Rivi # {0}: Ei voi määrittää arvoa, jos summa on suurempi kuin laskennallinen summa kohtaan {1}."
 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
 DocType: Package Code,Package Code,Pakkaus Code
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,opettelu
@@ -2401,7 +2401,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.","{0} avoimia työpaikkoja ja {1} talousarviota {2}, jotka on jo suunniteltu tytäryhtiöille {3}. \ Voit suunnitella vain {4} vapaata työpaikkaa ja budjetin {5} emoyhtiön {3} henkilöstösuunnitelman {3} mukaisesti."
 DocType: HR Settings,Stop Birthday Reminders,lopeta syntymäpäivämuistutukset
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Aseta Default Payroll maksullisia tilin Yrityksen {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Aseta Default Payroll maksullisia tilin Yrityksen {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Hanki Verojen ja maksujen tietojen taloudellinen hajoaminen Amazonilta
 DocType: SMS Center,Receiver List,Vastaanotin List
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,haku Tuote
@@ -2471,7 +2471,7 @@
 DocType: Vital Signs,Constipated,Ummetusta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},toimittajan ostolaskun kohdistus {0} päiväys {1}
 DocType: Customer,Default Price List,oletus hinnasto
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Asset Movement record {0} luotu
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Asset Movement record {0} luotu
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Kohteita ei löytynyt.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Et voi poistaa tilikautta {0}. Tilikausi {0} on asetettu oletustilikaudeksi järjestelmäasetuksissa.
 DocType: Share Transfer,Equity/Liability Account,Oma pääoma / vastuu
@@ -2608,6 +2608,7 @@
 DocType: Blanket Order,Order Type,Tilaustyyppi
 ,Item-wise Sales Register,"tuote työkalu, myyntirekisteri"
 DocType: Asset,Gross Purchase Amount,Gross Osto Määrä
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Tuotemerkki
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Avauspalkkiot
 DocType: Asset,Depreciation Method,Poistot Menetelmä
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,kuuluuko tämä vero perustasoon?
@@ -2688,7 +2689,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,"Toimi, jos vuosibudjetti ylittyy PO: lla"
 DocType: Student Leave Application,Student Leave Application,Student Jätä Application
 DocType: Item,Will also apply for variants,Sovelletaan myös tuotemalleissa
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Asset ei voi peruuttaa, koska se on jo {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Asset ei voi peruuttaa, koska se on jo {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Työntekijän {0} Half päivä {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,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/templates/pages/task_info.html +90,On,Päällä
@@ -2712,6 +2713,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Hae tiedot
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Lepatyypissä {0} sallittu enimmäisloma on {1}
 DocType: SMS Center,Create Receiver List,tee vastaanottajalista
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Käytettävissä oleva päivämäärä on ostopäivästä lukien
 DocType: Vehicle,Wheels,Pyörät
 DocType: Packing Slip,To Package No.,Pakkausnumeroon
 DocType: Patient Relation,Family,Perhe
@@ -2725,7 +2727,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Laskutusvaluutan on vastattava joko yrityksen oletusvaluuttaa tai osapuolten tilin valuuttaa
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"osoittaa, pakkaus on vain osa tätä toimitusta (luonnos)"
 DocType: Soil Texture,Loam,savimaata
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Rivi {0}: eräpäivä ei voi olla ennen lähettämispäivää
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Rivi {0}: eräpäivä ei voi olla ennen lähettämispäivää
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,tee maksukirjaus
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Määrä alamomentille {0} on oltava pienempi kuin {1}
 ,Sales Invoice Trends,Myyntilaskujen kehitys
@@ -2797,7 +2799,7 @@
 DocType: Guardian,Guardian Interests,Guardian Harrastukset
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Päivitä tilin nimi / numero
 DocType: Naming Series,Current Value,Nykyinen arvo
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Useita verovuoden olemassa päivämäärän {0}. Määritä yritys verovuonna
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Useita verovuoden olemassa päivämäärän {0}. Määritä yritys verovuonna
 DocType: Education Settings,Instructor Records to be created by,Ohjaajan rekisterit luodaan
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,tehnyt {0}
 DocType: GST Account,GST Account,GST-tili
@@ -2814,7 +2816,7 @@
 DocType: Sales Person,Name and Employee ID,Nimi ja Työntekijän ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Eräpäivä voi olla ennen tositepäivää
 DocType: Website Item Group,Website Item Group,Tuoteryhmän verkkosivu
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"Mitään palkkalippua, jonka todettiin jättävän edellä mainittujen kriteerien tai palkkasumman perusteella"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"Mitään palkkalippua, jonka todettiin jättävän edellä mainittujen kriteerien tai palkkasumman perusteella"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,tullit ja verot
 DocType: Projects Settings,Projects Settings,Projektit-asetukset
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Anna Viiteajankohta
@@ -2823,7 +2825,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,yksikkömäärä toimitettu
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Hankintapyyntönimike
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Peruuta ostotilaus {0} ensin
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Peruuta ostotilaus {0} ensin
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,tuoteryhmien puu
 DocType: Production Plan,Total Produced Qty,Kokonaistuotanto
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,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ä"
@@ -2932,6 +2934,7 @@
 ,Vehicle Expenses,ajoneuvojen kulut
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Luo testi (t) myyntilaskujen lähettämiseen
 DocType: Serial No,Invoice Details,laskun tiedot
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Ota Google Mapsin asetukset arvioimaan ja optimoimaan reittejä
 DocType: Grant Application,Show on Website,Näytä verkkosivustolla
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Aloita
 DocType: Hub Tracked Item,Hub Category,Hub-luokka
@@ -2971,7 +2974,7 @@
 DocType: Inpatient Record,B Positive,B Positiivinen
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Työntekijän {0} suurin etu ylittää {1} summan {2} edellisellä vaatimuksella
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"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."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"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,Salli
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
 DocType: Patient Medical Record,Patient Medical Record,Potilaan lääketieteellinen tietue
@@ -3005,7 +3008,7 @@
 DocType: Workstation,Wages per hour,Tuntipalkat
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,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}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Seuraavat hankintapyynnöt luotu tilauspisteen mukaisesti
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Tili {0} ei kelpaa. Tilin valuutan on oltava {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Tili {0} ei kelpaa. Tilin valuutan on oltava {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},"Päivämäärästä {0} ei voi olla, kun työntekijän vapauttaminen päivämäärä {1}"
 DocType: Supplier,Is Internal Supplier,Onko sisäinen toimittaja
 DocType: Employee,Create User Permission,Luo käyttöoikeus
@@ -3149,7 +3152,7 @@
 DocType: Account,Fixed Asset,Pitkaikaiset vastaavat
 DocType: Amazon MWS Settings,After Date,Päivämäärän jälkeen
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Sarjanumeroitu varastonhallinta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Virheellinen {0} Inter Company -tilille.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Virheellinen {0} Inter Company -tilille.
 ,Department Analytics,Department Analytics
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Sähköpostiä ei löydy oletusyhteydellä
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Luo salaisuus
@@ -3161,7 +3164,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Palkkarakenteen ja opiskelijaryhmän ohjelma {0} eroavat toisistaan.
 DocType: Bank Statement Transaction Entry,Receivable Account,Saatava tili
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Voimassa päivästä tulee olla pienempi kuin voimassa oleva päivämäärä.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Rivi # {0}: Asset {1} on jo {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,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 +327,Sales Order to Payment,Myyntitilauksesta maksuun
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,toimitusjohtaja
@@ -3203,6 +3206,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Veloituksen tarvitaan
 DocType: Clinical Procedure,Inpatient Record,Potilashoito
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Tuntilomakkeet auttavat seuraamaan aikaa, kustannuksia ja laskutusta tiimisi toiminnasta."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Toimittaja&gt; Toimittajan tyyppi
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Ostohinta List
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Tapahtuman päivämäärä
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Toimittajan tuloskortin muuttujien mallipohjat.
@@ -3245,7 +3249,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Exchange voitto / tappio
 DocType: Opportunity,Lost Reason,Häviämissyy
 DocType: Amazon MWS Settings,Enable Amazon,Ota Amazon käyttöön
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Rivi # {0}: tili {1} ei kuulu yritykseen {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Rivi # {0}: tili {1} ei kuulu yritykseen {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType {0} ei löytynyt
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Uusi osoite
 DocType: Quality Inspection,Sample Size,Näytteen koko
@@ -3355,7 +3359,7 @@
 DocType: Water Analysis,Origin,alkuperä
 apps/erpnext/erpnext/controllers/status_updater.py +207,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 +1216,Please set recurring after saving,Ole hyvä ja aseta toistuvuustieto vasta lomakkeen tallentamisen jälkeen.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Valitse muutoksen suuruuden tili
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,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
@@ -3397,7 +3401,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Haluatko varmasti peruuttaa nimityksen?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Hotellihuoneen hinnoittelupaketti
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Sales Pipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Aseta oletus tilin palkanosa {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Aseta oletus tilin palkanosa {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,pyydetylle
 DocType: Rename Tool,File to Rename,Uudelleen nimettävä tiedosto
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Valitse BOM varten Tuote rivillä {0}
@@ -3418,7 +3422,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ostettujen tuotteiden kustannukset
 DocType: Employee Separation,Employee Separation Template,Työntekijöiden erotusmalli
 DocType: Selling Settings,Sales Order Required,Myyntitilaus vaaditaan
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Ryhdy Myyjäksi
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Ryhdy Myyjäksi
 DocType: Purchase Invoice,Credit To,kredittiin
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Aktiiviset liidit / asiakkaat
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,"Jätä tyhjäksi, jos haluat käyttää vakiotoimitusviestin muotoa"
@@ -3459,7 +3463,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Tee veromalli
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Keskustelupalsta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Raaka-aineet ei voi olla tyhjiä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Rivi # {0} (Maksutaulukko): Määrän on oltava negatiivinen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Rivi # {0} (Maksutaulukko): Määrän on oltava negatiivinen
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Ei voinut päivittää hyllyssä, lasku sisältää pudota merenkulku erä."
 DocType: Contract,Fulfilment Status,Täytäntöönpanon tila
 DocType: Lab Test Sample,Lab Test Sample,Lab Test -näyte
@@ -3598,7 +3602,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Doc Date
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Fee Records Luotu - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Luokka Account
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Rivi # {0} (Maksutaulukko): Määrän on oltava positiivinen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Rivi # {0} (Maksutaulukko): Määrän on oltava positiivinen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},ei voi valmistaa suurempaa määrää tuotteita {0} kuin myyntitilauksen määrä {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Valitse attribuuttiarvot
 DocType: Purchase Invoice,Reason For Issuing document,Asiakirjan myöntämisen syy
@@ -3653,7 +3657,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Saapumisaika
 DocType: Products Settings,Products per Page,Tuotteet per sivu
 DocType: Stock Ledger Entry,Outgoing Rate,lähtevä taso
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,tai
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,tai
 DocType: Sales Order,Billing Status,Laskutus tila
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Ilmoita ongelma
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Hyödykekulut
@@ -3680,7 +3684,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Työntekijöiden verovapauslauseke
 DocType: Payment Entry,Cheque/Reference Date,Sekki / Viitepäivä
 DocType: Purchase Invoice,Total Taxes and Charges,verot ja maksut yhteensä
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Käytettävissä oleva päivämäärä merkitään aikaisempana päivämääränä
 DocType: Employee,Emergency Contact,hätäyhteydenotto
 DocType: Bank Reconciliation Detail,Payment Entry,Payment Entry
 ,sales-browser,Myynti-selain
@@ -3726,6 +3729,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),On paluu (luottotieto)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Aloita työ
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Sarjanumeroa tarvitaan {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Aseta Naming-sarja {0} asetukseksi Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Vammaiset mallia saa olla oletuspohja
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Rivi {0}: Syötä suunniteltu määrä
 DocType: Account,Income Account,tulotili
@@ -3739,6 +3743,7 @@
 DocType: Loyalty Program,Help Section,Ohje-osio
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Taaksepäin
 DocType: Appraisal Goal,Key Responsibility Area,Key Vastuu Area
+DocType: Delivery Trip,Distance UOM,Etäisyys UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student Erät avulla voit seurata läsnäoloa, arvioinnit ja palkkiot opiskelijoille"
 DocType: Payment Entry,Total Allocated Amount,Yhteensä osuutensa
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Aseta oletus varaston osuus investointikertymämenetelmän
@@ -3780,7 +3785,7 @@
 DocType: Item Supplier,Item Supplier,tuote toimittaja
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Syötä tuotekoodi saadaksesi eränumeron
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Syötä arvot tarjouksesta {0} tarjoukseen {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Siirrettäviä kohteita ei ole valittu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Siirrettäviä kohteita ei ole valittu
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,kaikki osoitteet
 DocType: Company,Stock Settings,varastoasetukset
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"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"
@@ -4065,7 +4070,7 @@
 DocType: Patient,Personal and Social History,Henkilökohtainen ja sosiaalinen historia
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Käyttäjä {0} luotiin
 DocType: Fee Schedule,Fee Breakup for each student,Palkkioerot kunkin opiskelijan osalta
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,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})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,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
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Vaihda koodi
 DocType: Purchase Invoice Item,Valuation Rate,Arvostustaso
@@ -4074,7 +4079,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Käytti ITC Cessia
 ,Student Monthly Attendance Sheet,Student Kuukauden Läsnäolo Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Myyntiin sovellettava toimitussääntö
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Poisto Rivi {0}: Seuraava Poistoaika ei voi olla ennen ostopäivää
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Poisto Rivi {0}: Seuraava Poistoaika ei voi olla ennen ostopäivää
 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_receivable/accounts_receivable.html +36,Until,Asti
 DocType: Rename Tool,Rename Log,Nimeä Loki
@@ -4091,12 +4096,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Kuinka usein projektin ja yrityksen tulee päivittää myyntitapahtumien perusteella.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Vanhemee
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Lisää Opiskelijat
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Poista tämä työntekijä <a href=""#Form/Employee/{0}"">{0}</a> \ peruuttaaksesi tämän asiakirjan"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Ole hyvä ja valitse {0}
 DocType: C-Form,C-Form No,C-muoto nro
 DocType: BOM,Exploded_items,räjäytetyt_tuotteet
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Etäisyys
+DocType: Delivery Stop,Distance,Etäisyys
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Luetteloi tuotteet tai palvelut, joita ostetaan tai myydään."
 DocType: Water Analysis,Storage Temperature,Säilytyslämpötila
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-CHI-.YYYY.-
@@ -4123,7 +4126,7 @@
 DocType: Homepage,Company Description for website homepage,Verkkosivuston etusivulle sijoitettava yrityksen kuvaus
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",voit tulostaa nämä koodit tulostusmuodoissa asiakirjoihin kuten laskut ja lähetteet asiakkaiden työn helpottamiseksi
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Name
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Tietoja {0} ei löytynyt.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Tietoja {0} ei löytynyt.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Avauspäiväkirja
 DocType: Contract,Fulfilment Terms,Täytäntöönpanoehdot
 DocType: Sales Invoice,Time Sheet List,Tuntilistaluettelo
@@ -4303,7 +4306,7 @@
 DocType: Serial No,Warranty / AMC Details,Takuun / ylläpidon lisätiedot
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Valitse opiskelijat manuaalisesti Toiminto perustuu ryhmän
 DocType: Journal Entry,User Remark,Käyttäjä huomautus
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Reittien optimointi.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Reittien optimointi.
 DocType: Travel Itinerary,Non Diary,Ei päiväkirjaa
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Työntekijöiden säilyttämisbonusta ei voi luoda
 DocType: Lead,Market Segment,Market Segment
@@ -4333,7 +4336,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Kanta-asiakasohjelma
 DocType: Student Guardian,Father,Isä
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Tuki lipuille
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,'Päivitä varasto' ei voida valita käyttöomaisuuden myynteihin
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,'Päivitä varasto' ei voida valita käyttöomaisuuden myynteihin
 DocType: Bank Reconciliation,Bank Reconciliation,pankin täsmäytys
 DocType: Attendance,On Leave,lomalla
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Liity sähköpostilistalle
@@ -4378,7 +4381,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Sarjanumero ja erä
 DocType: Warranty Claim,From Company,Yrityksestä
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Summa Kymmeniä Arviointikriteerit on oltava {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Aseta varattujen poistojen määrä
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Aseta varattujen poistojen määrä
 DocType: Supplier Scorecard Period,Calculations,Laskelmat
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Arvo tai yksikkömäärä
 DocType: Payment Terms Template,Payment Terms,Maksuehdot
@@ -4397,7 +4400,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Alennus (%) on Hinnasto Hinta kanssa marginaali
 DocType: Healthcare Service Unit Type,Rate / UOM,Rate / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,kaikki kaupalliset
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Ei {0} löytyi Inter Company -tapahtumista.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Ei {0} löytyi Inter Company -tapahtumista.
 DocType: Travel Itinerary,Rented Car,Vuokra-auto
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Tietoja yrityksestänne
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Kredit tilin on oltava tase tili
@@ -4498,6 +4501,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Kasvien analyysikriteerit
 DocType: Cheque Print Template,Cheque Height,Shekki Korkeus
 DocType: Supplier,Supplier Details,toimittajan lisätiedot
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Aseta numeerinen sarja osallistumiselle Setup&gt; Numerosarjan kautta
 DocType: Setup Progress,Setup Progress,Asennuksen edistyminen
 DocType: Expense Claim,Approval Status,hyväksynnän tila
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},arvosta täytyy olla pienempi kuin arvo rivillä {0}
@@ -4590,7 +4594,6 @@
 DocType: Travel Request,Fully Sponsored,Täysin sponsoroidut
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Asiakas {0} luodaan.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Aseta henkilöstön nimeämisjärjestelmä henkilöresursseihin&gt; HR-asetukset
 DocType: Stock Settings,Limit Percent,raja Prosenttia
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,"Tällä hetkellä ei varastossa,"
 ,Payment Period Based On Invoice Date,Maksuaikaa perustuu laskun päiväykseen
@@ -4649,7 +4652,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Varastosta
 DocType: Installation Note,Installation Date,asennuspäivä
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Osakekirja
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Rivi # {0}: Asset {1} ei kuulu yhtiön {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Rivi # {0}: Asset {1} ei kuulu yhtiön {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Myynti lasku {0} luotiin
 DocType: Employee,Confirmation Date,Työsopimuksen vahvistamispäivä
 DocType: Inpatient Occupancy,Check Out,Tarkista
@@ -4669,6 +4672,7 @@
 DocType: Production Plan,Sales Orders Detail,Myyntitilaukset
 DocType: Bin,Requested Quantity,pyydetty määrä
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-fee-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Aseta Instructor Naming System in Education&gt; Koulutusasetukset
 DocType: Patient,Marital Status,Siviilisääty
 DocType: Stock Settings,Auto Material Request,Automaattinen hankintapyyntö
 DocType: Woocommerce Settings,API consumer secret,API-kuluttajasala
@@ -4721,7 +4725,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Valitse päivät
 DocType: Academic Term,Term Name,Term Name
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Luotto ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Palkkaliikkeiden luominen ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Palkkaliikkeiden luominen ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Et voi muokata juurisolmua.
 DocType: Buying Settings,Purchase Order Required,Ostotilaus vaaditaan
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Ajastin
@@ -4757,7 +4761,7 @@
 DocType: Account,Rate at which this tax is applied,taso jolla tätä veroa sovelletaan
 DocType: Cash Flow Mapper,Section Name,Osaston nimi
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Täydennystilauksen yksikkömäärä
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Poistotaso {0}: odotettu arvo käyttöiän jälkeen on oltava suurempi tai yhtä suuri kuin {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Poistotaso {0}: odotettu arvo käyttöiän jälkeen on oltava suurempi tai yhtä suuri kuin {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Avoimet työpaikat
 DocType: Company,Stock Adjustment Account,Varastonsäätötili
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Poisto
@@ -4804,7 +4808,7 @@
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Ylläpitosopimus ei ole voimassa
 DocType: Opportunity,Opportunity Amount,Mahdollisuusmäärä
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Määrä Poistot varatut ei voi olla suurempi kuin kokonaismäärä Poistot
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Määrä Poistot varatut ei voi olla suurempi kuin kokonaismäärä Poistot
 DocType: Purchase Order,Order Confirmation Date,Tilauksen vahvistuspäivä
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,tee huoltokäynti
@@ -4845,7 +4849,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,erä:
 DocType: Volunteer,Afternoon,Iltapäivällä
 DocType: Loyalty Program,Loyalty Program Help,Loyalty-ohjelman ohje
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' on poistettu käytöstä
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' on poistettu käytöstä
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Aseta avoimeksi
 DocType: Cheque Print Template,Scanned Cheque,Skannattu Shekki
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Lähetä sähköposti yhteyshenkilöille kun tapahtuma vahvistetaan.
@@ -4858,7 +4862,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Kohta ja takuu Tietoja
 DocType: Chapter,Chapter Members,Lukujäsenet
 DocType: Sales Team,Contribution (%),panostus (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,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/controllers/accounts_controller.py +140,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/projects/doctype/project/project.py +79,Project {0} already exists,Hanke {0} on jo olemassa
 DocType: Clinical Procedure,Nursing User,Hoitotyöntekijä
 DocType: Employee Benefit Application,Payroll Period,Palkkausjakso
@@ -4866,6 +4870,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Sarjanumero {0} ei kuulu erään {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Vastuut
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Tämän noteerauksen voimassaoloaika on päättynyt.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Poista tämä työntekijä <a href=""#Form/Employee/{0}"">{0}</a> \ peruuttaaksesi tämän asiakirjan"
 DocType: Expense Claim Account,Expense Claim Account,Matkakorvauslomakkeet Account
 DocType: Account,Capital Work in Progress,Pääomaa työtä eteenpäin
 DocType: Accounts Settings,Allow Stale Exchange Rates,Salli vanhentuneet kurssit
@@ -4946,7 +4952,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Varasto-otto
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Yhdistä Shopify ERP: n kanssa
 DocType: Material Request Item,For Warehouse,Varastoon
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Toimitustiedot {0} päivitetty
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Toimitustiedot {0} päivitetty
 DocType: Employee,Offer Date,Työsopimusehdotuksen päivämäärä
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Lainaukset
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,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.
@@ -4996,7 +5002,7 @@
 DocType: Shipping Rule,Calculate Based On,Laskenta perustuen
 DocType: Contract,Unfulfilled,täyttymätön
 DocType: Delivery Note Item,From Warehouse,Varastosta
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Ei työntekijöitä mainituilla kriteereillä
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Ei työntekijöitä mainituilla kriteereillä
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Kohteita ei Bill materiaalien valmistus
 DocType: Shopify Settings,Default Customer,Oletusasiakas
 DocType: Sales Stage,Stage Name,Taiteilijanimi
@@ -5038,7 +5044,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Veron arvomäärä alennuksen jälkeen
 DocType: Patient,Inpatient Status,Lääkärin tila
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Päivittäinen työ Yhteenveto Asetukset
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Valitussa hinnastossa olisi oltava osto- ja myyntikyltit.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Valitussa hinnastossa olisi oltava osto- ja myyntikyltit.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Anna Reqd päivämäärän mukaan
 DocType: Payment Entry,Internal Transfer,sisäinen siirto
 DocType: Asset Maintenance,Maintenance Tasks,Huoltotoimet
@@ -5074,7 +5080,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,ryhmän
 DocType: Guardian,Interests,etu
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,"aktivoi / poista käytöstä, valuutat"
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Ei voitu lähettää palkkalippuja
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Ei voitu lähettää palkkalippuja
 DocType: Exchange Rate Revaluation,Get Entries,Hanki merkinnät
 DocType: Production Plan,Get Material Request,Hae hankintapyyntö
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Postituskulut
@@ -5158,7 +5164,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Kustannustili on vaaditaan tuotteelle {0}
 DocType: BOM,Website Description,Verkkosivuston kuvaus
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Nettomuutos Equity
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Peru ostolasku {0} ensin
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Peru ostolasku {0} ensin
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Ei sallittu. Katkaise huoltoyksikön tyyppi käytöstä
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Sähköpostiosoite täytyy olla yksilöllinen, on jo olemassa {0}"
 DocType: Serial No,AMC Expiry Date,Ylläpidon umpeutumispäivä
@@ -5198,7 +5204,7 @@
 DocType: Hotel Room,Hotel Room,Hotellihuone
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Tili {0} ei kuulu yritykselle {1}
 DocType: Leave Type,Rounding,pyöristys
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Sarjanumeroita peräkkäin {0} ei vastaa lähetysluettelon
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Sarjanumeroita peräkkäin {0} ei vastaa lähetysluettelon
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Annetusta summasta (pro-luokiteltu)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Sitten hinnoittelusäännöt suodatetaan asiakkaan, asiakkaan ryhmän, alueen, toimittajan, toimittajaryhmän, kampanjan, myyntikumppanin jne. Perusteella."
 DocType: Student,Guardian Details,Guardian Tietoja
@@ -5253,7 +5259,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Varasto vaaditaan varastotuotteelle {0}
 DocType: Leave Allocation,Unused leaves,Käyttämättömät lehdet
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Tee takaisinmaksu
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Kaikki osastot
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Kaikki osastot
 DocType: Healthcare Service Unit,Vacant,vapaa
 DocType: Patient,Alcohol Past Use,Alkoholin aiempi käyttö
 DocType: Fertilizer Content,Fertilizer Content,Lannoitteen sisältö
@@ -5264,7 +5270,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Työjärjestys {0} on peruutettava ennen myyntitilauksen peruuttamista
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,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 +170,Due Date is mandatory,eräpäivä vaaditaan
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,eräpäivä vaaditaan
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Puuston Taito {0} ei voi olla 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Hyödyketyyppi ja määrä
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Huoneita varattu
@@ -5408,7 +5414,7 @@
 DocType: Purchase Invoice Item,Total Weight,Kokonaispaino
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,provisio myynti
 DocType: Job Offer Term,Value / Description,Arvo / Kuvaus
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rivi # {0}: Asset {1} ei voida antaa, se on jo {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rivi # {0}: Asset {1} ei voida antaa, se on jo {2}"
 DocType: Tax Rule,Billing Country,Laskutusmaa
 DocType: Purchase Order Item,Expected Delivery Date,odotettu toimituspäivä
 DocType: Restaurant Order Entry,Restaurant Order Entry,Ravintola Tilaus Entry
@@ -5447,12 +5453,13 @@
 DocType: Maintenance Visit,Breakdown,hajoitus
 DocType: Travel Itinerary,Vegetarian,Kasvissyöjä
 DocType: Patient Encounter,Encounter Date,Kohtaamispäivä
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Tili: {0} kanssa valuutta: {1} ei voi valita
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Tili: {0} kanssa valuutta: {1} ei voi valita
 DocType: Bank Statement Transaction Settings Item,Bank Data,Pankkitiedot
 DocType: Purchase Receipt Item,Sample Quantity,Näytteen määrä
 DocType: Bank Guarantee,Name of Beneficiary,Edunsaajan nimi
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Päivitys BOM maksaa automaattisesti Scheduler-ohjelman avulla, joka perustuu viimeisimpään arvostusnopeuteen / hinnastonopeuteen / raaka-aineiden viimeiseen ostohintaan."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Toimittaja&gt; Toimittaja Ryhmä
 DocType: Bank Reconciliation Detail,Cheque Date,takaus/shekki päivä
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Tili {0}: emotili {1} ei kuulu yritykselle: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,kaikki tähän yritykseen liittyvät tapahtumat on poistettu
@@ -5480,7 +5487,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Child solmut voidaan ainoastaan perustettu &quot;ryhmä&quot; tyyppi solmuja
 DocType: Attendance Request,Half Day Date,Half Day Date
 DocType: Academic Year,Academic Year Name,Lukuvuosi Name
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} ei saa käydä kauppaa {1}. Muuta yritystä.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} ei saa käydä kauppaa {1}. Muuta yritystä.
 DocType: Sales Partner,Contact Desc,"yhteystiedot, kuvailu"
 DocType: Email Digest,Send regular summary reports via Email.,Lähetä yhteenvetoraportteja säännöllisesti sähköpostitse
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Aseta oletus tilin Matkakorvauslomakkeet tyyppi {0}
@@ -5513,7 +5520,7 @@
 DocType: Hotel Room,Hotel Manager,Hotelli manageri
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Aseta Tax Rule ostoskoriin
 DocType: Purchase Invoice,Taxes and Charges Added,Lisätyt verot ja maksut
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Poistojauhe {0}: Seuraava Poistoaika ei voi olla ennen Käytettävissä olevaa päivämäärää
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Poistojauhe {0}: Seuraava Poistoaika ei voi olla ennen Käytettävissä olevaa päivämäärää
 ,Sales Funnel,Myyntihankekantaan
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Lyhenne on pakollinen
 DocType: Project,Task Progress,tehtävä Progress
@@ -5527,7 +5534,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,kaikki asiakasryhmät
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,kertyneet Kuukauden
 DocType: Attendance Request,On Duty,Virantoimituksessa
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} on pakollinen. Valuutanvaihtotietue on mahdollisesti luomatta {1} --&gt; {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} on pakollinen. Valuutanvaihtotietue on mahdollisesti luomatta {1} --&gt; {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Henkilöstösuunnitelma {0} on jo olemassa nimeämisessä {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Vero malli on pakollinen.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,tili {0}: emotili {1} ei ole olemassa
@@ -5606,11 +5613,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Ainakin yksi varasto on pakollinen
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Määritä kohdekentät, kuten UOM, ryhmä, kuvaus ja työtunnit."
 DocType: Certification Application,Certification Status,Sertifikaatin tila
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,markkinat
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,markkinat
 DocType: Travel Itinerary,Travel Advance Required,Matka-Advance vaaditaan
 DocType: Subscriber,Subscriber Name,Tilaajan nimi
 DocType: Serial No,Out of Warranty,Out of Takuu
-DocType: Cashier Closing,Cashier-closing-,Kassanhoitaja-lopettamalla
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Kartoitetun tietotyypin
 DocType: BOM Update Tool,Replace,Vaihda
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Ei löytynyt tuotteita.
@@ -5697,7 +5703,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Myynnin ja ostoksen oletusmaksumalleja luodaan.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Arviointi Tulosrekisteri {0} on jo olemassa.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Esimerkki: ABCD. #####. Jos sarja on asetettu ja eränumeroa ei ole mainittu liiketoimissa, automaattinen eränumero luodaan tämän sarjan perusteella. Jos haluat aina mainita erikseen tämän erän erät, jätä tämä tyhjäksi. Huomaa: tämä asetus on etusijalla Naming-sarjan etuliitteen asetuksissa."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Aseta numeerinen sarja osallistumiselle Setup&gt; Numerosarjan kautta
 DocType: BOM,Materials Required (Exploded),Materiaalitarve (avattu)
 DocType: Contract,Party User,Party-käyttäjä
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Aseta Yritysfiltteri tyhjäksi jos Ryhmittelyperuste on &#39;yritys&#39;
@@ -5898,7 +5903,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,OPP Count
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Molempien kokeilujaksojen alkamispäivä ja koeajan päättymispäivä on asetettava
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Keskimääräinen hinta
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Maksun kokonaissumman summan on vastattava suurta / pyöristettyä summaa
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Maksun kokonaissumman summan on vastattava suurta / pyöristettyä summaa
 DocType: Subscription Plan Detail,Plan,Suunnitelma
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Tiliote tasapaino kohti Pääkirja
 DocType: Job Applicant,Applicant Name,hakijan nimi
@@ -5973,7 +5978,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Saippua & pesuaine
 DocType: BOM,Show Items,Näytä kohteet
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,From Time ei voi olla suurempi kuin ajoin.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Haluatko ilmoittaa kaikille asiakkaille sähköpostilla?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Haluatko ilmoittaa kaikille asiakkaille sähköpostilla?
 DocType: Subscription Plan,Billing Interval,Laskutusväli
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,tilattu
@@ -5982,9 +5987,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Rivi {0}: {1} on oltava suurempi kuin 0
 DocType: Assessment Criteria,Assessment Criteria Group,Arviointikriteerit Group
 DocType: Healthcare Settings,Patient Name By,Potilaan nimi
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Tuloslaskelulomake palkkoihin {0} - {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Tuloslaskelulomake palkkoihin {0} - {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Ota käyttöön laskennallinen tulo
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Avaaminen Kertyneet poistot on oltava pienempi tai yhtä suuri kuin {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,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
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Todellisen alkamispäivän on oltava pienempi kuin todellinen päättymispäivä
 DocType: Naming Series,Select Transaction,Valitse tapahtuma
@@ -6135,7 +6140,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Työntekijä {0} palkkaluokkaan {1} ei ole oletuslupapolitiikkaa
 DocType: Salary Detail,Salary Detail,Palkka Detail
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Ole hyvä ja valitse {0} Ensimmäinen
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Lisätty {0} käyttäjää
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Lisätty {0} käyttäjää
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",Monitasoisen ohjelman tapauksessa asiakkaat määräytyvät automaattisesti kyseiselle tasolle niiden kulutuksen mukaan
 DocType: Appointment Type,Physician,Lääkäri
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Erä {0} tuotteesta {1} on vanhentunut.
@@ -6279,7 +6284,7 @@
 DocType: Asset,Custodian,hoitaja
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Point-of-Sale Profile
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} pitäisi olla arvo välillä 0 ja 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},{0} maksaminen {1} - {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},{0} maksaminen {1} - {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Vakuudettomat lainat
 DocType: Cost Center,Cost Center Name,kustannuspaikan nimi
 DocType: Student,B+,B +
@@ -6311,6 +6316,7 @@
 DocType: Employee,Date of Issue,Kirjauksen päiväys
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Kuten kohti ostaminen Asetukset, jos hankinta Reciept Pakollinen == KYLLÄ, sitten luoda Ostolasku, käyttäjän täytyy luoda Ostokuitti ensin kohteen {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Rivi # {0}: Aseta toimittaja kohteen {1}
+DocType: Global Defaults,Default Distance Unit,Oletusetäisyysyksikkö
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +211,Website Image {0} attached to Item {1} cannot be found,Sivuston kuvaa {0} kohteelle {1} ei löydy
 DocType: Issue,Content Type,sisällön tyyppi
@@ -6366,7 +6372,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Debit tilin on oltava tase tili
 DocType: Asset,Naming Series,Nimeä sarjat
 DocType: Vital Signs,Coated,Päällystetty
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Rivi {0}: odotettu arvo hyödyllisen elämän jälkeen on oltava pienempi kuin bruttovoiton määrä
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Rivi {0}: odotettu arvo hyödyllisen elämän jälkeen on oltava pienempi kuin bruttovoiton määrä
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Settings
 DocType: Leave Block List,Leave Block List Name,nimi
 DocType: Certified Consultant,Certification Validity,Sertifikaatin voimassaolo
@@ -6433,6 +6439,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Pankin otsikko
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Näytä laboratoriotestit
 DocType: Hub Users,Hub Users,Hub-käyttäjät
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakasryhmä&gt; Alue
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,"huolto, päivä"
 DocType: Purchase Invoice Item,Rejected Serial No,Hylätty sarjanumero
@@ -6447,7 +6454,7 @@
 DocType: SG Creation Tool Course,Max Strength,max Strength
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Esiasetusten asennus
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Ei toimitustiedostoa valittu asiakkaalle {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Ei toimitustiedostoa valittu asiakkaalle {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Työntekijä {0} ei ole enimmäishyvää
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Valitse kohteet toimituspäivän perusteella
 DocType: Grant Application,Has any past Grant Record,Onko jokin mennyt Grant Record
@@ -6474,7 +6481,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Hotellihuoneen varaaminen
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Asiakaspalvelu
 DocType: BOM,Thumbnail,Pikkukuva
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Ei löytynyt yhteystietoja sähköpostin tunnuksilla.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Ei löytynyt yhteystietoja sähköpostin tunnuksilla.
 DocType: Item Customer Detail,Item Customer Detail,tuote asiakas lisätyedot
 DocType: Notification Control,Prompt for Email on Submission of,Kysyy Sähköposti esitettäessä
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Työntekijän {0} enimmäisetuuksien määrä ylittää {1}
@@ -6729,7 +6736,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,ei voi kääntää ryhmiin sillä tilin tyyppi on valittu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} on muuttunut. Lataa uudelleen.
 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/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Tuotemerkki
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Jos uskollisuuspisteiden voimassaolo päättyy rajoittamattomasti, pidä voimassaolon päättymispäivä tyhjä tai 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Huoltoryhmän jäsenet
 DocType: Loyalty Point Entry,Purchase Amount,Osto Määrä
@@ -6737,7 +6743,7 @@
 											to fullfill Sales Order {2}","Lähetyksen {1} sarjanumero {0} ei voida antaa, koska se on varattu \ täyttääksesi myyntitilauksen {2}"
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Toimittaja noteeraus {0} luotu
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Loppu vuosi voi olla ennen Aloitusvuosi
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Loppu vuosi voi olla ennen Aloitusvuosi
 DocType: Employee Benefit Application,Employee Benefits,työntekijä etuudet
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Pakattujen määrä tulee olla kuin tuotteen {0} määrä rivillä {1}
 DocType: Work Order,Manufactured Qty,valmistettu yksikkömäärä
@@ -6753,6 +6759,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Valitse eränumerot
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,GSTINiin
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Laskut nostetaan asiakkaille.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Aseta henkilöstön nimeämisjärjestelmä henkilöresursseihin&gt; HR-asetukset
 DocType: Healthcare Settings,Invoice Appointments Automatically,Laskujen nimittäminen automaattisesti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekti Id
 DocType: Salary Component,Variable Based On Taxable Salary,Muuttuja perustuu verolliseen palkkaan
@@ -6801,7 +6808,7 @@
 DocType: POS Profile,Account for Change Amount,Vaihtotilin summa
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Yhteyden muodostaminen QuickBooksiin
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Yhteensä voitto / tappio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Virheellinen yritys Inter Company -tilille.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Virheellinen yritys Inter Company -tilille.
 DocType: Purchase Invoice,input service,syöttöpalvelu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rivi {0}: Party / Tili ei vastaa {1} / {2} ja {3} {4}
 DocType: Employee Promotion,Employee Promotion,Työntekijöiden edistäminen
@@ -6931,7 +6938,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Edullinen majoitusalue
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analytiikka
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Ostoskori on tyhjä
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Aseta Instructor Naming System in Education&gt; Koulutusasetukset
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Kohde {0} ei ole sarjanumeroa. Vain serilialoituja \ voidaan toimittaa sarjanumeroon
 DocType: Vehicle,Model,Malli
@@ -6961,7 +6967,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Mikään ei muutu
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Valitse csv tiedosto
 DocType: Holiday List,Total Holidays,Yhteensä lomat
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Lähettämättömät sähköpostimallit puuttuvat. Aseta yksi Toimitusasetuksissa.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Lähettämättömät sähköpostimallit puuttuvat. Aseta yksi Toimitusasetuksissa.
 DocType: Student Leave Application,Mark as Present,Merkitse Present
 DocType: Supplier Scorecard,Indicator Color,Indikaattorin väri
 DocType: Purchase Order,To Receive and Bill,Saavuta ja laskuta
@@ -6970,7 +6976,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Valitse sarjanumero
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,suunnittelija
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Ehdot ja säännöt mallipohja
-DocType: Serial No,Delivery Details,"toimitus, lisätiedot"
+DocType: Delivery Trip,Delivery Details,"toimitus, lisätiedot"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Kustannuspaikka tarvitsee rivin {0} verokannan {1}
 DocType: Program,Program Code,Program Code
 DocType: Terms and Conditions,Terms and Conditions Help,Ehdot Ohje
@@ -6994,7 +7000,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,"virtausaika, päivää"
 DocType: Cash Flow Mapping,Is Income Tax Expense,Onko tuloveroa
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Tilauksesi on loppu!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,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/controllers/accounts_controller.py +684,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}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Valitse tämä jos opiskelija oleskelee instituutin Hostel.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Syötä Myyntitilaukset edellä olevasta taulukosta
 ,Stock Summary,Stock Yhteenveto
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index f843a77..7492b2f 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Nom de période
 DocType: Employee,Salary Mode,Mode de Rémunération
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Registre
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Registre
 DocType: Patient,Divorced,Divorcé
 DocType: Support Settings,Post Route Key,Clé du lien du message
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Autoriser un article à être ajouté plusieurs fois dans une transaction
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Nouveau taux de change
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Devise est nécessaire pour la liste de prix {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sera calculé lors de la transaction.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Contact Client
 DocType: Patient Appointment,Check availability,Voir les Disponibilités
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Afficher ouverte
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Mise à jour des Séries Réussie
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Règlement
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} dans la ligne {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} dans la ligne {1}
 DocType: Asset Finance Book,Depreciation Start Date,Date de début de l&#39;amortissement
 DocType: Pricing Rule,Apply On,Appliquer Sur
 DocType: Item Price,Multiple Item prices.,Plusieurs Prix d'Articles.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Prescription de laboratoire
 ,Delay Days,Jours de retard
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Frais de Service
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Numéro de Série: {0} est déjà référencé dans la Facture de Vente: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Numéro de Série: {0} est déjà référencé dans la Facture de Vente: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Facture
 DocType: Purchase Invoice Item,Item Weight Details,Détails du poids de l&#39;article
 DocType: Asset Maintenance Log,Periodicity,Périodicité
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Comptable
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Liste de prix de vente
 DocType: Patient,Tobacco Current Use,Consommation actuelle de tabac
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","La date de début et la date de fin se chevauchent avec la carte de travail <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Prix de vente
 DocType: Cost Center,Stock User,Chargé des Stocks
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,En Relation
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Date de présence ne peut pas être antérieure à la date d'embauche de l'employé
 DocType: Grading Scale,Grading Scale Name,Nom de l'Échelle de Notation
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Ajouter des utilisateurs à la Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Ajouter des utilisateurs à la Marketplace
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Il s'agit d'un compte racine qui ne peut être modifié.
 DocType: Sales Invoice,Company Address,Adresse de la Société
 DocType: BOM,Operations,Opérations
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Qté
 DocType: Production Plan,Material Request Detail,Détail de la demande de matériel
 DocType: Selling Settings,Default Quotation Validity Days,Jours de validité par défaut pour les devis
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Pour inclure la taxe de la ligne {0} dans le prix de l'Article, les taxes des lignes {1} doivent également être incluses"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Pour inclure la taxe de la ligne {0} dans le prix de l'Article, les taxes des lignes {1} doivent également être incluses"
 DocType: SMS Center,SMS Center,Centre des SMS
 DocType: Payroll Entry,Validate Attendance,Valider la présence
 DocType: Sales Invoice,Change Amount,Changer le Montant
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Espacement des lignes pour le montant en lettres
 DocType: Vehicle,Additional Details,Détails Supplémentaires
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Aucune Description
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Fournisseur&gt; Groupe de fournisseurs
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Demande d'Achat.
 DocType: POS Closing Voucher Details,Collected Amount,Montant collecté
 DocType: Lab Test,Submitted Date,Date Soumise
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,Admission des Étudiants
 ,Terretory,Territoire
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Article {0} est annulé
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Ligne de d'amortissement {0}: La date de début de l'amortissement est dans le passé
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Ligne de d'amortissement {0}: La date de début de l'amortissement est dans le passé
 DocType: Contract Template,Fulfilment Terms and Conditions,Termes et conditions d&#39;exécution
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Demande de Matériel
 DocType: Bank Reconciliation,Update Clearance Date,Mettre à Jour la Date de Compensation
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,Paramètres des Comptes
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},N° de la Facture du Fournisseur existe dans la Facture d'Achat {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Gérer l'Arborescence des Vendeurs.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Impossible de traiter l&#39;itinéraire, car les paramètres de Google Maps sont désactivés."
 DocType: Job Applicant,Cover Letter,Lettre de Motivation
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Chèques et Dépôts en suspens à compenser
 DocType: Item,Synced With Hub,Synchronisé avec le Hub
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Nouvelle valeur de l&#39;actif
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Taux auquel la Devise Client est convertie en devise client de base
 DocType: Course Scheduling Tool,Course Scheduling Tool,Outil de Planification des Cours
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ligne #{0} : La Facture d'Achat ne peut être faite pour un actif existant {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ligne #{0} : La Facture d'Achat ne peut être faite pour un actif existant {1}
 DocType: Crop Cycle,LInked Analysis,Analyse reliée
 DocType: POS Closing Voucher,POS Closing Voucher,Bon de clotûre du PDV
 DocType: Contract,Lapsed,Caduc
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} n'est pas inscrit dans le Cours {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Nom d&#39;étudiant:
 DocType: POS Closing Voucher Details,Difference,Différence
+DocType: Delivery Settings,Delay between Delivery Stops,Délai entre les arrêts de livraison
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},N° de Série {0} ne fait pas partie du Bon de Livraison {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Il semble y avoir un problème avec la configuration de GoCardless sur le serveur. Ne vous inquiétez pas, en cas d'échec, le montant sera remboursé sur votre compte."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,Demo ERPNext
@@ -693,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Quantité et Taux
 DocType: Delivery Note,% Installed,% Installé
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,Les Salles de Classe / Laboratoires etc. où des conférences peuvent être programmées.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Les devises des deux sociétés doivent correspondre pour les transactions inter-sociétés.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Les devises des deux sociétés doivent correspondre pour les transactions inter-sociétés.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Veuillez d’abord entrer le nom de l'entreprise
 DocType: Travel Itinerary,Non-Vegetarian,Non végétarien
 DocType: Purchase Invoice,Supplier Name,Nom du Fournisseur
@@ -779,7 +780,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Loué à partir du
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Pièces Suffisantes pour Construire
 DocType: POS Profile User,POS Profile User,Utilisateur du profil PDV
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Ligne {0}: la date de début de l&#39;amortissement est obligatoire
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Ligne {0}: la date de début de l&#39;amortissement est obligatoire
 DocType: Purchase Invoice Item,Service Start Date,Date de début du service
 DocType: Subscription Invoice,Subscription Invoice,Facture d&#39;abonnement
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Revenu Direct
@@ -846,7 +847,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Abréviation déjà utilisée pour une autre société
 DocType: Selling Settings,Default Customer Group,Groupe de Clients par Défaut
 DocType: Employee,IFSC Code,Code IFSC
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","La date de début et la date de fin se chevauchent avec la carte de travail <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Si coché, le champ 'Total Arrondi' ne sera visible dans aucune transaction."
 DocType: BOM,Operating Cost,Coût d'Exploitation
 DocType: Crop,Produced Items,Articles produits
@@ -898,7 +898,7 @@
 DocType: Supplier,Prevent RFQs,Interdire les Appels d'Offres
 DocType: Hub User,Hub User,Utilisateur du hub
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Créer une Commande Client
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Fiche de paie soumise pour la période du {0} au {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Fiche de paie soumise pour la période du {0} au {1}
 DocType: Project Task,Project Task,Tâche du Projet
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Points échangés
 ,Lead Id,Id du Prospect
@@ -1028,7 +1028,7 @@
 DocType: Fee Validity,Max number of visit,Nombre maximum de visites
 ,Hotel Room Occupancy,Occupation de la chambre d'hôtel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Feuille de Temps créée :
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Veuillez définir un compte de Caisse ou de Banque par défaut pour le Mode de Paiement {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Veuillez définir un compte de Caisse ou de Banque par défaut pour le Mode de Paiement {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Inscrire
 DocType: GST Settings,GST Settings,Paramètres GST
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},La devise doit être la même que la devise de la liste de prix: {0}
@@ -1082,7 +1082,7 @@
 DocType: Vehicle Log,Service Details,Détails du Service
 DocType: Lab Test Template,Grouped,Groupé
 DocType: Selling Settings,Delivery Note Required,Bon de Livraison Requis
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Soumission des bulletins de salaire ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Soumission des bulletins de salaire ...
 DocType: Bank Guarantee,Bank Guarantee Number,Numéro de Garantie Bancaire
 DocType: Assessment Criteria,Assessment Criteria,Critères d'Évaluation
 DocType: BOM Item,Basic Rate (Company Currency),Taux de Base (Devise de la Société )
@@ -1107,13 +1107,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,L’Écriture de Paiement est déjà créée
 DocType: Request for Quotation,Get Suppliers,Obtenir des Fournisseurs
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock Actuel
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Ligne #{0} : L’Actif {1} n’est pas lié à l'Article {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Ligne #{0} : L’Actif {1} n’est pas lié à l'Article {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Aperçu de la fiche de paie
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Le compte {0} a été entré plusieurs fois
 DocType: Account,Expenses Included In Valuation,Charges Incluses dans la Valorisation
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Vous ne pouvez renouveler que si votre abonnement expire dans les 30 jours
 DocType: Shopping Cart Settings,Show Stock Availability,Afficher la disponibilité du stock
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Définissez {0} dans la catégorie d&#39;actifs {1} ou la société {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Définissez {0} dans la catégorie d&#39;actifs {1} ou la société {2}
 DocType: Location,Longitude,Longitude
 ,Absent Student Report,Rapport des Absences
 DocType: Crop,Crop Spacing UOM,UOM d&#39;espacement des cultures
@@ -1185,7 +1185,7 @@
 DocType: Soil Texture,Sand,Le sable
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Énergie
 DocType: Opportunity,Opportunity From,Opportunité De
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ligne {0}: {1} Numéros de série requis pour l'article {2}. Vous en avez fourni {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ligne {0}: {1} Numéros de série requis pour l'article {2}. Vous en avez fourni {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Veuillez sélectionner une table
 DocType: BOM,Website Specifications,Spécifications du Site Web
 DocType: Special Test Items,Particulars,Particularités
@@ -1297,7 +1297,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Articles avec poids supérieur seront affichés en haut
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Tests de laboratoire et signes vitaux
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Détail de la Réconciliation Bancaire
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Ligne #{0} : L’Article {1} doit être soumis
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Ligne #{0} : L’Article {1} doit être soumis
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Aucun employé trouvé
 DocType: Item,If subcontracted to a vendor,Si sous-traité à un fournisseur
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Le Groupe d'Étudiants est déjà mis à jour.
@@ -1351,7 +1351,6 @@
 DocType: Loyalty Program Collection,Tier Name,Nom de l'échelon
 DocType: HR Settings,Enter retirement age in years,Entrez l'âge de la retraite en années
 DocType: Crop,Target Warehouse,Entrepôt Cible
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Définissez la série de noms pour {0} via Configuration&gt; Paramètres&gt; Série de noms.
 DocType: Payroll Employee Detail,Payroll Employee Detail,Détails de la paie de l'employé
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Veuillez sélectionner un entrepôt
 DocType: Cheque Print Template,Starting location from left edge,Position initiale depuis bord gauche
@@ -1441,7 +1440,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Plan de matériaux pour les sous-ensembles
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partenaires Commerciaux et Régions
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,LDM {0} doit être active
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Aucun article disponible pour le transfert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Aucun article disponible pour le transfert
 DocType: Employee Boarding Activity,Activity Name,Nom de l&#39;activité
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Modifier la date de fin de mise en attente
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,La quantité de produit fini <b>{0}</b> et Pour la quantité <b>{1}</b> ne peut pas être différente
@@ -1668,6 +1667,7 @@
 DocType: Project,First Email,Premier Email
 DocType: Company,Exception Budget Approver Role,Rôle d'approbateur de budget exceptionnel
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Une fois définie, cette facture sera mise en attente jusqu'à la date fixée"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Entrepôt Réservé aux Commandes Clients / Entrepôt de Produits Finis
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Montant de Vente
 DocType: Repayment Schedule,Interest Amount,Montant d'Intérêts
@@ -1679,7 +1679,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Dossiers
 DocType: Asset,Scrapped,Mis au Rebut
 DocType: Item,Item Defaults,Paramètres par défaut de l'article
-DocType: Purchase Invoice,Returns,Retours
+DocType: Cashier Closing,Returns,Retours
 DocType: Job Card,WIP Warehouse,Entrepôt (Travaux en Cours)
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},N° de Série {0} est sous contrat de maintenance jusqu'à {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,Recrutement
@@ -1693,7 +1693,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Type de transfert
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Frais de Vente
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe de clients&gt; Territoire
 DocType: Diagnosis,Diagnosis,Diagnostique
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Achat Standard
 DocType: Attendance Request,Explanation,Explication
@@ -1706,7 +1705,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Articles de commandes d&#39;achat en retard
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Code Postal
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Commande Client {0} est {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Veuillez sélectionner le compte de revenus d'intérêts dans le prêt {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Veuillez sélectionner le compte de revenus d'intérêts dans le prêt {0}
 DocType: Opportunity,Contact Info,Information du Contact
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Faire des Écritures de Stock
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,"Impossible de promouvoir  un employé avec le statut ""Parti"""
@@ -1718,7 +1717,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,La facture ne peut pas être faite pour une heure facturée à zéro
 DocType: Company,Date of Commencement,Date de démarrage
 DocType: Sales Person,Select company name first.,Sélectionner d'abord le nom de la société.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},Email envoyé à {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},Email envoyé à {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Devis reçus des Fournisseurs.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Remplacer la LDM et actualiser les prix les plus récents dans toutes les LDMs
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},À {0} | {1} {2}
@@ -1738,7 +1737,7 @@
 DocType: Asset Movement,From Employee,De l'Employé
 DocType: Driver,Cellphone Number,Numéro de téléphone portable
 DocType: Project,Monitor Progress,Suivre l'avancement
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Attention : Le système ne vérifie pas la surfacturation car le montant pour l'Article {0} dans {1} est nul
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Attention : Le système ne vérifie pas la surfacturation car le montant pour l'Article {0} dans {1} est nul
 DocType: Journal Entry,Make Difference Entry,Créer l'Écriture par Différence
 DocType: Supplier Quotation,Auto Repeat Section,Répétition Automatique
 DocType: Upload Attendance,Attendance From Date,Présence Depuis
@@ -1841,7 +1840,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ligne #{0} : Qté Rejetée ne peut pas être entrée dans le Retour d’Achat
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Le changement de Groupe de Clients n'est pas autorisé pour le Client sélectionné.
 ,Purchase Order Items To Be Billed,Articles à Facturer du Bon de Commande
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Mise à jour des heures d&#39;arrivée estimées.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Mise à jour des heures d&#39;arrivée estimées.
 DocType: Program Enrollment Tool,Enrollment Details,Détails d&#39;inscription
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Impossible de définir plusieurs valeurs par défaut pour une entreprise.
 DocType: Purchase Invoice Item,Net Rate,Taux Net
@@ -1855,7 +1854,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Le type de congé est obligatoire
 DocType: Support Settings,Close Issue After Days,Nbre de jours avant de fermer le ticket
 ,Eway Bill,Facture Eway
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Vous devez être un utilisateur doté de rôles System Manager et Item Manager pour ajouter des utilisateurs à Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Vous devez être un utilisateur doté de rôles System Manager et Item Manager pour ajouter des utilisateurs à Marketplace.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Laisser vide pour toutes les branches
 DocType: Job Opening,Staffing Plan,Plan de dotation
 DocType: Bank Guarantee,Validity in Days,Validité en Jours
@@ -1875,7 +1874,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Ligne {0} en double avec le même {1}
 DocType: Marketplace Settings,Disable Marketplace,Désactiver le marché
 ,Trial Balance,Balance Générale
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Exercice Fiscal {0} introuvable
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Exercice Fiscal {0} introuvable
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Configuration des Employés
 DocType: Hotel Room Reservation,Hotel Reservation User,Utilisateur chargé des réservations d'hôtel
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Veuillez d’abord sélectionner un préfixe
@@ -1983,7 +1982,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Échec de la connexion
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Actif {0} créé
 DocType: Special Test Items,Special Test Items,Articles de Test Spécial
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Vous devez être un utilisateur avec des rôles System Manager et Item Manager pour vous inscrire sur Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Vous devez être un utilisateur avec des rôles System Manager et Item Manager pour vous inscrire sur Marketplace.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Mode de Paiement
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,La struture salariale qui vous a été assignée ne vous permet pas de demander des avantages sociaux
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,L'Image du Site Web doit être un fichier public ou l'URL d'un site web
@@ -1995,7 +1994,7 @@
 DocType: Warehouse,Warehouse Contact Info,Info de Contact de l'Entrepôt
 DocType: Payment Entry,Write Off Difference Amount,Montant de la Différence de la Reprise
 DocType: Volunteer,Volunteer Name,Nom du bénévole
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Des lignes avec des dates d&#39;échéance en double dans les autres lignes ont été trouvées: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Des lignes avec des dates d&#39;échéance en double dans les autres lignes ont été trouvées: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent",{0} : Adresse email de l'employé introuvable : l’email n'a pas été envoyé
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Aucune structure de salaire attribuée à l&#39;employé {0} à la date donnée {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Règle d&#39;expédition non applicable pour le pays {0}
@@ -2084,6 +2083,7 @@
 DocType: Salary Component,Earning,Revenus
 DocType: Supplier Scorecard,Scoring Criteria,Critères de Notation
 DocType: Purchase Invoice,Party Account Currency,Devise du Compte de Tiers
+DocType: Delivery Trip,Total Estimated Distance,Distance totale estimée
 ,BOM Browser,Explorateur LDM
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Veuillez mettre à jour votre statut pour cet événement de formation
 DocType: Item Barcode,EAN,EAN
@@ -2122,7 +2122,7 @@
 DocType: Activity Cost,Projects,Projets
 DocType: Payment Request,Transaction Currency,Devise de la Transaction
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Du {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Certains emails sont invalides
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Certains emails sont invalides
 DocType: Work Order Operation,Operation Description,Description de l'Opération
 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.,Impossible de modifier les dates de début et de fin d'exercice une fois que l'exercice est enregistré.
 DocType: Quotation,Shopping Cart,Panier
@@ -2146,7 +2146,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Variation Nette des Actifs Immobilisés
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Qté obligatoire
 DocType: Leave Control Panel,Leave blank if considered for all designations,Laisser vide pour toutes les désignations
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge de type ' réel ' à la ligne {0} ne peut pas être inclus dans le prix de l'article
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge de type ' réel ' à la ligne {0} ne peut pas être inclus dans le prix de l'article
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max : {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,A partir du (Date et Heure)
 DocType: Shopify Settings,For Company,Pour la Société
@@ -2160,7 +2160,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Des erreurs se sont produites lors de la création du programme
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Le premier approbateur de notes de frais de la liste sera défini comme approbateur de notes de frais par défaut.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,ne peut pas être supérieure à 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Vous devez être un utilisateur autre que l&#39;administrateur avec les rôles System Manager et Item Manager pour vous inscrire sur Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Vous devez être un utilisateur autre que l&#39;administrateur avec les rôles System Manager et Item Manager pour vous inscrire sur Marketplace.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Article {0} n'est pas un article stocké
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Non programmé
@@ -2189,7 +2189,7 @@
 DocType: HR Settings,Employee Settings,Paramètres des Employés
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Chargement du système de paiement
 ,Batch-Wise Balance History,Historique de Balance des Lots
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Ligne n ° {0}: impossible de définir le tarif si le montant est supérieur au montant facturé pour l&#39;élément {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Ligne n ° {0}: impossible de définir le tarif si le montant est supérieur au montant facturé pour l&#39;élément {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Paramètres d'impression mis à jour avec le format d'impression indiqué
 DocType: Package Code,Package Code,Code du Paquet
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Apprenti
@@ -2422,7 +2422,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} postes vacants et budget {1} pour {2} déjà prévus pour les filiales de {3}. \ Vous ne pouvez planifier que jusqu'à {4} postes vacants et un budget de {5} d'après le plan de dotation en personnel {6} pour la société mère {3}.
 DocType: HR Settings,Stop Birthday Reminders,Arrêter les Rappels d'Anniversaire
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Veuillez définir le Compte Créditeur de Paie par Défaut pour la Société {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Veuillez définir le Compte Créditeur de Paie par Défaut pour la Société {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Obtenez la répartition financière des taxes et des données de facturation par Amazon
 DocType: SMS Center,Receiver List,Liste de Destinataires
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Rechercher Article
@@ -2492,7 +2492,7 @@
 DocType: Vital Signs,Constipated,Constipé
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Pour la Facture Fournisseur {0} datée {1}
 DocType: Customer,Default Price List,Liste des Prix par Défaut
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Registre de Mouvement de l'Actif {0} créé
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Registre de Mouvement de l'Actif {0} créé
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Aucun article trouvé.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Vous ne pouvez pas supprimer l'exercice fiscal {0}. L'exercice fiscal {0} est défini par défaut dans les Paramètres Globaux
 DocType: Share Transfer,Equity/Liability Account,Compte de capitaux propres / passif
@@ -2629,6 +2629,7 @@
 DocType: Blanket Order,Order Type,Type de Commande
 ,Item-wise Sales Register,Registre des Ventes par Article
 DocType: Asset,Gross Purchase Amount,Montant d'Achat Brut
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Code d&#39;article&gt; Groupe d&#39;articles&gt; Marque
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Balances d'Ouverture
 DocType: Asset,Depreciation Method,Méthode d'Amortissement
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Cette Taxe est-elle incluse dans le Taux de Base ?
@@ -2709,7 +2710,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Action si le budget annuel a été dépassé avec les bons de commande d'achat
 DocType: Student Leave Application,Student Leave Application,Demande de Congé d'Étudiant
 DocType: Item,Will also apply for variants,S'appliquera également pour les variantes
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","L'actif ne peut être annulé, car il est déjà {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","L'actif ne peut être annulé, car il est déjà {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Employé {0} sur une demi-journée sur {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Le nombre total d'heures travaillées ne doit pas être supérieur à la durée maximale du travail {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Sur
@@ -2733,6 +2734,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Récupérer des données
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},La durée maximale autorisée pour le type de congé {0} est {1}
 DocType: SMS Center,Create Receiver List,Créer une Liste de Réception
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,La date de disponibilité devrait être postérieure à la date d&#39;achat
 DocType: Vehicle,Wheels,Roues
 DocType: Packing Slip,To Package No.,Au N° de Paquet
 DocType: Patient Relation,Family,Famille
@@ -2746,7 +2748,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,La devise de facturation doit être égale à la devise de la société par défaut ou à la devise du compte du partenaire
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indique que le paquet est une partie de cette livraison (Brouillons Seulement)
 DocType: Soil Texture,Loam,Terreau
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Ligne {0}: la date d&#39;échéance ne peut pas être antérieure à la date d&#39;envoi
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Ligne {0}: la date d&#39;échéance ne peut pas être antérieure à la date d&#39;envoi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Faire une Écriture de Paiement
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Quantité de l'article {0} doit être inférieure à {1}
 ,Sales Invoice Trends,Tendances des Factures de Vente
@@ -2818,7 +2820,7 @@
 DocType: Guardian,Guardian Interests,Part du Tuteur
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Mettre à jour le nom / numéro du compte
 DocType: Naming Series,Current Value,Valeur actuelle
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Plusieurs Exercices existent pour la date {0}. Veuillez définir la société dans l'Exercice
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Plusieurs Exercices existent pour la date {0}. Veuillez définir la société dans l'Exercice
 DocType: Education Settings,Instructor Records to be created by,Les Enregistrements de l'Instructeur seront créés par
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} créé
 DocType: GST Account,GST Account,Compte GST
@@ -2836,7 +2838,7 @@
 DocType: Sales Person,Name and Employee ID,Nom et ID de l’Employé
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,La Date d'Échéance ne peut être antérieure à la Date de Comptabilisation
 DocType: Website Item Group,Website Item Group,Groupe d'Articles du Site Web
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Aucune fiche de paie ne peut être soumise pour les critères sélectionnés ci-dessus OU la fiche de paie est déjà soumise
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Aucune fiche de paie ne peut être soumise pour les critères sélectionnés ci-dessus OU la fiche de paie est déjà soumise
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Droits de Douane et Taxes
 DocType: Projects Settings,Projects Settings,Paramètres des Projets
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Veuillez entrer la date de Référence
@@ -2845,7 +2847,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Qté Fournie
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Article de Demande de Matériel
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Veuillez annuler le reçu d&#39;achat {0} en premier
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Veuillez annuler le reçu d&#39;achat {0} en premier
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Arbre de Groupes d’Articles .
 DocType: Production Plan,Total Produced Qty,Quantité totale produite
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Impossible de se référer au numéro de la ligne supérieure ou égale au numéro de la ligne courante pour ce type de Charge
@@ -2954,6 +2956,7 @@
 ,Vehicle Expenses,Frais de Véhicule
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Créer des tests de laboratoire sur la facture de vente
 DocType: Serial No,Invoice Details,Détails de la Facture
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Activez les paramètres de Google Maps pour évaluer et optimiser les itinéraires.
 DocType: Grant Application,Show on Website,Afficher sur le site Web
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Démarrer
 DocType: Hub Tracked Item,Hub Category,Catégorie du Hub
@@ -2993,7 +2996,7 @@
 DocType: Inpatient Record,B Positive,B Positif
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",La prestation sociale maximum de l'employé {0} dépasse {1} par la somme {2} du montant précédemment réclamé
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ligne #{0} : Qté doit égale à 1, car l’Article est un actif immobilisé. Veuillez utiliser une ligne distincte pour une qté multiple."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ligne #{0} : Qté doit égale à 1, car l’Article est un actif immobilisé. Veuillez utiliser une ligne distincte pour une qté multiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Autoriser la Liste de Blocage des Congés
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abré. ne peut être vide ou contenir un espace
 DocType: Patient Medical Record,Patient Medical Record,Registre médical du patient
@@ -3027,7 +3030,7 @@
 DocType: Workstation,Wages per hour,Salaires par heure
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Solde du stock dans le Lot {0} deviendra négatif {1} pour l'Article {2} à l'Entrepôt {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Les Demandes de Matériel suivantes ont été créées automatiquement sur la base du niveau de réapprovisionnement de l’Article
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Le compte {0} est invalide. La Devise du Compte doit être {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Le compte {0} est invalide. La Devise du Compte doit être {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},La date de début {0} ne peut pas être après la date de départ de l'employé {1}
 DocType: Supplier,Is Internal Supplier,Est un fournisseur interne
 DocType: Employee,Create User Permission,Créer une autorisation utilisateur
@@ -3171,7 +3174,7 @@
 DocType: Account,Fixed Asset,Actif Immobilisé
 DocType: Amazon MWS Settings,After Date,Après la date
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Inventaire Sérialisé
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,{0} non valide pour la facture inter-sociétés.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,{0} non valide pour la facture inter-sociétés.
 ,Department Analytics,Analyse RH par département
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Email non trouvé dans le contact par défaut
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Générer une clé secrète
@@ -3183,7 +3186,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Le programme dans la structure d'honoraires et le groupe d'étudiants {0} sont différents.
 DocType: Bank Statement Transaction Entry,Receivable Account,Compte Débiteur
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,La date de début de validité doit être inférieure à la date de mise en service valide.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Ligne #{0} : L’Actif {1} est déjà {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Ligne #{0} : L’Actif {1} est déjà {2}
 DocType: Quotation Item,Stock Balance,Solde du Stock
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,De la Commande Client au Paiement
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,PDG
@@ -3225,6 +3228,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Compte de Débit Requis
 DocType: Clinical Procedure,Inpatient Record,Dossier d&#39;hospitalisation
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Les Feuilles de Temps aident au suivi du temps, coût et facturation des activités effectuées par votre équipe"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Liste des Prix d'Achat
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Date de transaction
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Modèles des Variables de  Fiche d'Évaluation Fournisseur.
@@ -3267,7 +3271,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Profits / Pertes sur Change
 DocType: Opportunity,Lost Reason,Raison de la Perte
 DocType: Amazon MWS Settings,Enable Amazon,Activer Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Ligne # {0}: le compte {1} n&#39;appartient pas à la société {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Ligne # {0}: le compte {1} n&#39;appartient pas à la société {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Impossible de trouver le DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nouvelle Adresse
 DocType: Quality Inspection,Sample Size,Taille de l'Échantillon
@@ -3378,7 +3382,7 @@
 DocType: Water Analysis,Origin,Origine
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ce document excède la limite de {0} {1} pour l’article {4}. Faites-vous un autre {3} contre le même {2} ?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Veuillez définir la récurrence après avoir sauvegardé
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Sélectionner le compte de change
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Sélectionner le compte de change
 DocType: Purchase Invoice,Price List Currency,Devise de la Liste de Prix
 DocType: Naming Series,User must always select,L'utilisateur doit toujours sélectionner
 DocType: Stock Settings,Allow Negative Stock,Autoriser un Stock Négatif
@@ -3420,7 +3424,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Êtes-vous sûr de vouloir annuler ce rendez-vous?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Forfait de prix de la chambre d'hôtel
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Pipeline de Ventes
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Veuillez définir le compte par défaut dans la Composante Salariale {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Veuillez définir le compte par défaut dans la Composante Salariale {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Requis Pour
 DocType: Rename Tool,File to Rename,Fichier à Renommer
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Veuillez sélectionnez une LDM pour l’Article à la Ligne {0}
@@ -3441,7 +3445,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Coût des Articles Achetés
 DocType: Employee Separation,Employee Separation Template,Modèle de départ des employés
 DocType: Selling Settings,Sales Order Required,Commande Client Requise
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Devenir vendeur
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Devenir vendeur
 DocType: Purchase Invoice,Credit To,À Créditer
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Prospects / Clients Actifs
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Laissez vide pour utiliser le format de bon de livraison standard
@@ -3482,7 +3486,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Créer un modèle d&#39;imposition
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum de l'Utilisateur
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Matières Premières ne peuvent pas être vides.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Row # {0} (Table de paiement): le montant doit être négatif
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Row # {0} (Table de paiement): le montant doit être négatif
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Impossible de mettre à jour de stock, facture contient un élément en livraison directe."
 DocType: Contract,Fulfilment Status,Statut de l'exécution
 DocType: Lab Test Sample,Lab Test Sample,Échantillon de test de laboratoire
@@ -3641,7 +3645,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Date du document
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Archive d'Honoraires Créée - {0}
 DocType: Asset Category Account,Asset Category Account,Compte de Catégorie d'Actif
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Ligne #{0} (Table de paiement): Le montant doit être positif
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Ligne #{0} (Table de paiement): Le montant doit être positif
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Impossible de produire plus d'Article {0} que la quantité {1} du Bon de Commande
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Sélectionner les valeurs d&#39;attribut
 DocType: Purchase Invoice,Reason For Issuing document,Motif de l'émission du document
@@ -3696,7 +3700,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Heure à laquelle les matériaux ont été reçus
 DocType: Products Settings,Products per Page,Produits par page
 DocType: Stock Ledger Entry,Outgoing Rate,Taux Sortant
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,ou
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,ou
 DocType: Sales Order,Billing Status,Statut de la Facturation
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Signaler un Problème
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Frais de Services d'Utilité Publique
@@ -3723,7 +3727,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Déclaration d'exemption de taxe
 DocType: Payment Entry,Cheque/Reference Date,Chèque/Date de Référence
 DocType: Purchase Invoice,Total Taxes and Charges,Total des Taxes et Frais
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,La date de mise en service est dans le passé
 DocType: Employee,Emergency Contact,Contact en cas d'Urgence
 DocType: Bank Reconciliation Detail,Payment Entry,Écriture de Paiement
 ,sales-browser,navigateur-ventes
@@ -3769,6 +3772,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Est un avoir (note de crédit)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Démarrer le travail
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Le numéro de série est requis pour l&#39;actif {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Définissez la série de noms pour {0} via Configuration&gt; Paramètres&gt; Série de noms.
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Un Modèle Désactivé ne doit pas être un Modèle par Défaut
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Pour la ligne {0}: entrez la quantité planifiée
 DocType: Account,Income Account,Compte de Produits
@@ -3782,6 +3786,7 @@
 DocType: Loyalty Program,Help Section,Section d&#39;aide
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Précédent
 DocType: Appraisal Goal,Key Responsibility Area,Domaine de Responsabilités Principal
+DocType: Delivery Trip,Distance UOM,Distance UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Les Lots d'Étudiants vous aide à suivre la présence, les évaluations et les frais pour les étudiants"
 DocType: Payment Entry,Total Allocated Amount,Montant Total Alloué
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Configurer le compte d'inventaire par défaut pour l'inventaire perpétuel
@@ -3823,7 +3828,7 @@
 DocType: Item Supplier,Item Supplier,Fournisseur de l'Article
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Veuillez entrer le Code d'Article pour obtenir n° de lot
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Veuillez sélectionner une valeur pour {0} devis à {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Aucun article sélectionné pour le transfert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Aucun article sélectionné pour le transfert
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Toutes les Adresses.
 DocType: Company,Stock Settings,Paramètres du Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La combinaison est possible seulement si les propriétés suivantes sont les mêmes dans les deux dossiers. Est Groupe, Type de Racine, Société"
@@ -4120,7 +4125,7 @@
 DocType: Patient,Personal and Social History,Antécédents Personnels et Sociaux
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Utilisateur {0} créé
 DocType: Fee Schedule,Fee Breakup for each student,Répartition des Honoraires pour chaque élève
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avance totale ({0}) pour la Commande {1} ne peut pas être supérieure au Total Général ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avance totale ({0}) pour la Commande {1} ne peut pas être supérieure au Total Général ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Sélectionner une Répartition Mensuelle afin de repartir uniformément les objectifs sur le mois.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Modifier le Code
 DocType: Purchase Invoice Item,Valuation Rate,Taux de Valorisation
@@ -4129,7 +4134,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,ITC Cess utilisé
 ,Student Monthly Attendance Sheet,Feuille de Présence Mensuelle des Étudiants
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Règle d&#39;expédition applicable uniquement pour la vente
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Ligne d&#39;amortissement {0}: La date d&#39;amortissement suivante ne peut pas être antérieure à la date d&#39;achat
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Ligne d&#39;amortissement {0}: La date d&#39;amortissement suivante ne peut pas être antérieure à la date d&#39;achat
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Date de Début du Projet
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Jusqu'à
 DocType: Rename Tool,Rename Log,Journal des Renommages
@@ -4146,12 +4151,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,À quelle fréquence le projet et la société doivent-ils être mis à jour sur la base des transactions de vente?
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Expire Le
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Ajouter des Étudiants
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Supprimez l’employé <a href=""#Form/Employee/{0}"">{0}</a> \ pour annuler ce document."
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Veuillez sélectionner {0}
 DocType: C-Form,C-Form No,Formulaire-C Nº
 DocType: BOM,Exploded_items,Articles-éclatés
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Distance
+DocType: Delivery Stop,Distance,Distance
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Listez les produits ou services que vous achetez ou vendez.
 DocType: Water Analysis,Storage Temperature,Température de stockage
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.AAAA.-
@@ -4178,7 +4181,7 @@
 DocType: Homepage,Company Description for website homepage,Description de la Société pour la page d'accueil du site web
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pour la commodité des clients, ces codes peuvent être utilisés dans des formats d'impression comme les Factures et les Bons de Livraison"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nom du Fournisseur
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Impossible de récupérer les informations pour {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Impossible de récupérer les informations pour {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Ecriture de journal d'ouverture
 DocType: Contract,Fulfilment Terms,Conditions d&#39;exécution
 DocType: Sales Invoice,Time Sheet List,Liste de Feuille de Temps
@@ -4358,7 +4361,7 @@
 DocType: Serial No,Warranty / AMC Details,Garantie / Détails AMC
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Sélectionner les élèves manuellement pour un Groupe basé sur l'Activité
 DocType: Journal Entry,User Remark,Remarque de l'Utilisateur
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Optimisation des itinéraires.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Optimisation des itinéraires.
 DocType: Travel Itinerary,Non Diary,Sans produits laitiers
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Impossible de créer une prime de fidélisation pour les employés ayant quitté l'entreprise
 DocType: Lead,Market Segment,Part de Marché
@@ -4388,7 +4391,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Programme de fidélité
 DocType: Student Guardian,Father,Père
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Billets de Support
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,'Mettre à Jour Le Stock’ ne peut pas être coché pour la vente d'actifs immobilisés
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,'Mettre à Jour Le Stock’ ne peut pas être coché pour la vente d'actifs immobilisés
 DocType: Bank Reconciliation,Bank Reconciliation,Réconciliation Bancaire
 DocType: Attendance,On Leave,En Congé
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obtenir les Mises à jour
@@ -4433,7 +4436,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,N° de Série et lot
 DocType: Warranty Claim,From Company,De la Société
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Somme des Scores de Critères d'Évaluation doit être {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Veuillez définir le Nombre d’Amortissements Comptabilisés
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Veuillez définir le Nombre d’Amortissements Comptabilisés
 DocType: Supplier Scorecard Period,Calculations,Calculs
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Valeur ou Qté
 DocType: Payment Terms Template,Payment Terms,Termes de paiement
@@ -4452,7 +4455,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Remise (%) sur le Tarif de la Liste de Prix avec la Marge
 DocType: Healthcare Service Unit Type,Rate / UOM,Taux / UM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Tous les Entrepôts
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Aucun {0} n&#39;a été trouvé pour les transactions inter-sociétés.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Aucun {0} n&#39;a été trouvé pour les transactions inter-sociétés.
 DocType: Travel Itinerary,Rented Car,Voiture de location
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,À propos de votre entreprise
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Le compte À Créditer doit être un compte de Bilan
@@ -4553,6 +4556,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Critères d&#39;analyse des plantes
 DocType: Cheque Print Template,Cheque Height,Hauteur du Chèque
 DocType: Supplier,Supplier Details,Détails du Fournisseur
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Veuillez configurer les séries de numérotation pour la participation via Configuration&gt; Série de numérotation
 DocType: Setup Progress,Setup Progress,Progression de l'Installation
 DocType: Expense Claim,Approval Status,Statut d'Approbation
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},De la Valeur doit être inférieure à la valeur de la ligne {0}
@@ -4645,7 +4649,6 @@
 DocType: Travel Request,Fully Sponsored,Entièrement commandité
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Ecriture de journal de contre-passation
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Le client {0} est créé.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Veuillez configurer le système de nommage des employés dans Ressources humaines&gt; Paramètres RH
 DocType: Stock Settings,Limit Percent,Pourcentage Limite
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,"Actuellement, aucun stock disponible dans aucun entrepôt"
 ,Payment Period Based On Invoice Date,Période de Paiement basée sur la Date de la Facture
@@ -4704,7 +4707,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Entrepôt Source
 DocType: Installation Note,Installation Date,Date d'Installation
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Registre des actions
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Ligne #{0} : L’Actif {1} n’appartient pas à la société {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Ligne #{0} : L’Actif {1} n’appartient pas à la société {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Facture de Vente {0} créée
 DocType: Employee,Confirmation Date,Date de Confirmation
 DocType: Inpatient Occupancy,Check Out,Départ
@@ -4724,6 +4727,7 @@
 DocType: Production Plan,Sales Orders Detail,Détail des bons de commandes client
 DocType: Bin,Requested Quantity,Quantité Demandée
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Veuillez configurer le système de nommage des instructeurs dans Education&gt; Paramètres de formation
 DocType: Patient,Marital Status,État Civil
 DocType: Stock Settings,Auto Material Request,Demande de Matériel Automatique
 DocType: Woocommerce Settings,API consumer secret,Secret de consommateur API
@@ -4776,7 +4780,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Choisissez des jours
 DocType: Academic Term,Term Name,Nom du Terme
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Crédit ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Création des fiches de paie en cours...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Création des fiches de paie en cours...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Vous ne pouvez pas modifier le noeud racine.
 DocType: Buying Settings,Purchase Order Required,Bon de Commande Requis
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Minuteur
@@ -4812,7 +4816,7 @@
 DocType: Account,Rate at which this tax is applied,Taux auquel cette taxe est appliquée
 DocType: Cash Flow Mapper,Section Name,Nom de la section
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Qté de Réapprovisionnement
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Ligne d&#39;amortissement {0}: la valeur attendue après la durée de vie utile doit être supérieure ou égale à {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Ligne d&#39;amortissement {0}: la valeur attendue après la durée de vie utile doit être supérieure ou égale à {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Offres d'Emploi Actuelles
 DocType: Company,Stock Adjustment Account,Compte d'Ajustement du Stock
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Reprise
@@ -4859,7 +4863,7 @@
 DocType: Program Enrollment,School House,Maison de l'École
 DocType: Serial No,Out of AMC,Sur AMC
 DocType: Opportunity,Opportunity Amount,Montant de l&#39;opportunité
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Nombre d’Amortissements Comptabilisés ne peut pas être supérieur à Nombre Total d'Amortissements
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Nombre d’Amortissements Comptabilisés ne peut pas être supérieur à Nombre Total d'Amortissements
 DocType: Purchase Order,Order Confirmation Date,Date de confirmation de la commande
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Effectuer une Visite d'Entretien
@@ -4900,7 +4904,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Lot:
 DocType: Volunteer,Afternoon,Après-midi
 DocType: Loyalty Program,Loyalty Program Help,Aide au programme de fidélité
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' est désactivé(e)
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' est désactivé(e)
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Définir comme Ouvert
 DocType: Cheque Print Template,Scanned Cheque,Chèque Numérisé
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Envoyer des emails automatiques aux Contacts sur les Transactions soumises.
@@ -4913,7 +4917,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Détails de l'Article et de la Garantie
 DocType: Chapter,Chapter Members,Membres du chapitre
 DocType: Sales Team,Contribution (%),Contribution (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Remarque : Écriture de Paiement ne sera pas créée car le compte 'Compte Bancaire ou de Caisse' n'a pas été spécifié
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Remarque : Écriture de Paiement ne sera pas créée car le compte 'Compte Bancaire ou de Caisse' n'a pas été spécifié
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Le projet {0} existe déjà
 DocType: Clinical Procedure,Nursing User,Utilisateur Infirmier
 DocType: Employee Benefit Application,Payroll Period,Période de paie
@@ -4921,6 +4925,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Le numéro de série {0} n&#39;appartient pas au lot {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Responsabilités
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,La période de validité de ce devis a pris fin.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Supprimez l’employé <a href=""#Form/Employee/{0}"">{0}</a> \ pour annuler ce document."
 DocType: Expense Claim Account,Expense Claim Account,Compte de Note de Frais
 DocType: Account,Capital Work in Progress,Immobilisation en cours
 DocType: Accounts Settings,Allow Stale Exchange Rates,Autoriser les Taux de Change Existants
@@ -5001,7 +5007,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Problème Matériel
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Connectez Shopify avec ERPNext
 DocType: Material Request Item,For Warehouse,Pour l’Entrepôt
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Notes de livraison {0} mises à jour
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Notes de livraison {0} mises à jour
 DocType: Employee,Offer Date,Date de la Proposition
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Devis
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Vous êtes en mode hors connexion. Vous ne serez pas en mesure de recharger jusqu'à ce que vous ayez du réseau.
@@ -5051,7 +5057,7 @@
 DocType: Shipping Rule,Calculate Based On,Calculer en fonction de
 DocType: Contract,Unfulfilled,Non-rempli
 DocType: Delivery Note Item,From Warehouse,De l'Entrepôt
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Aucun employé pour les critères mentionnés
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Aucun employé pour les critères mentionnés
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Aucun Article avec une Liste de Matériel à Produire
 DocType: Shopify Settings,Default Customer,Client par Défaut
 DocType: Sales Stage,Stage Name,Nom de scène
@@ -5093,7 +5099,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Montant de la Taxe après Remise
 DocType: Patient,Inpatient Status,Statut d&#39;hospitalisation
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Paramètres du Récapitulatif Quotidien
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,La liste de prix sélectionnée doit avoir les champs d'achat et de vente cochés.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,La liste de prix sélectionnée doit avoir les champs d'achat et de vente cochés.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Veuillez entrer Reqd par date
 DocType: Payment Entry,Internal Transfer,Transfert Interne
 DocType: Asset Maintenance,Maintenance Tasks,Tâches de maintenance
@@ -5129,7 +5135,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Grouper Par
 DocType: Guardian,Interests,Intérêts
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Activer / Désactiver les devises
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Les fiches de paie n'ont pas pu être soumises
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Les fiches de paie n'ont pas pu être soumises
 DocType: Exchange Rate Revaluation,Get Entries,Obtenir des entrées
 DocType: Production Plan,Get Material Request,Obtenir la Demande de Matériel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Frais Postaux
@@ -5213,7 +5219,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Compte de charge est obligatoire pour l'article {0}
 DocType: BOM,Website Description,Description du Site Web
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Variation Nette de Capitaux Propres
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Veuillez d’abord annuler la Facture d'Achat {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Veuillez d’abord annuler la Facture d'Achat {0}
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Pas permis. Veuillez désactiver le type d&#39;unité de service
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adresse Email doit être unique, existe déjà pour {0}"
 DocType: Serial No,AMC Expiry Date,Date d'Expiration CMA
@@ -5253,7 +5259,7 @@
 DocType: Hotel Room,Hotel Room,Chambre d&#39;hôtel
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Le compte {0} n'appartient pas à la société {1}
 DocType: Leave Type,Rounding,Arrondi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Les Numéros de Série dans la ligne {0} ne correspondent pas au Bon de Livraison
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Les Numéros de Série dans la ligne {0} ne correspondent pas au Bon de Livraison
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Montant distribué (au prorata)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Les règles de tarification sont ensuite filtrées en fonction du client, du groupe de clients, du territoire, du fournisseur, du groupe de fournisseurs, de la campagne, du partenaire commercial, etc."
 DocType: Student,Guardian Details,Détails du Tuteur
@@ -5308,7 +5314,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},L’entrepôt est obligatoire pour l'article du stock {0}
 DocType: Leave Allocation,Unused leaves,Congés non utilisés
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Faire une écriture de remboursement
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Tous les départements
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Tous les départements
 DocType: Healthcare Service Unit,Vacant,Vacant
 DocType: Patient,Alcohol Past Use,Consommation Passée d'Alcool
 DocType: Fertilizer Content,Fertilizer Content,Contenu d&#39;engrais
@@ -5319,7 +5325,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,L'ordre de travail {0} doit être annulé avant d'annuler cette commande client
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Récupérer la LDM éclatée (y compris les sous-ensembles)
 DocType: Authorization Rule,Applicable To (Employee),Applicable À (Employé)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,La Date d’Échéance est obligatoire
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,La Date d’Échéance est obligatoire
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Incrément pour l'Attribut {0} ne peut pas être 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Type de prestation et montant
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Chambres réservées
@@ -5463,7 +5469,7 @@
 DocType: Purchase Invoice Item,Total Weight,Poids total
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Commission sur les Ventes
 DocType: Job Offer Term,Value / Description,Valeur / Description
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ligne #{0} : L’Actif {1} ne peut pas être soumis, il est déjà {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ligne #{0} : L’Actif {1} ne peut pas être soumis, il est déjà {2}"
 DocType: Tax Rule,Billing Country,Pays de Facturation
 DocType: Purchase Order Item,Expected Delivery Date,Date de Livraison Prévue
 DocType: Restaurant Order Entry,Restaurant Order Entry,Entrée de commande de restaurant
@@ -5502,12 +5508,13 @@
 DocType: Maintenance Visit,Breakdown,Panne
 DocType: Travel Itinerary,Vegetarian,Végétarien
 DocType: Patient Encounter,Encounter Date,Date de consultation
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Compte : {0} avec la devise : {1} ne peut pas être sélectionné
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Compte : {0} avec la devise : {1} ne peut pas être sélectionné
 DocType: Bank Statement Transaction Settings Item,Bank Data,Données bancaires
 DocType: Purchase Receipt Item,Sample Quantity,Quantité d&#39;échantillon
 DocType: Bank Guarantee,Name of Beneficiary,Nom du bénéficiaire
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Mettre à jour le coût de la LDM automatiquement via le Planificateur, en fonction du dernier taux de valorisation / tarif de la liste de prix / dernier prix d'achat des matières premières."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Fournisseur&gt; Groupe de fournisseurs
 DocType: Bank Reconciliation Detail,Cheque Date,Date du Chèque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Compte {0}: Le Compte parent {1} n'appartient pas à l'entreprise: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Suppression de toutes les transactions liées à cette société avec succès !
@@ -5535,7 +5542,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Les noeuds enfants peuvent être créés uniquement dans les nœuds de type &#39;Groupe&#39;
 DocType: Attendance Request,Half Day Date,Date de Demi-Journée
 DocType: Academic Year,Academic Year Name,Nom de l'Année Académique
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} n'est pas autorisé à traiter avec {1}. Veuillez changer la société.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} n'est pas autorisé à traiter avec {1}. Veuillez changer la société.
 DocType: Sales Partner,Contact Desc,Desc. du Contact
 DocType: Email Digest,Send regular summary reports via Email.,Envoyer régulièrement des rapports de synthèse par Email.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Veuillez définir le compte par défaut dans le Type de Note de Frais {0}
@@ -5568,7 +5575,7 @@
 DocType: Hotel Room,Hotel Manager,Directeur de l&#39;hôtel
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Définir la Règle d'Impôt pour le panier
 DocType: Purchase Invoice,Taxes and Charges Added,Taxes et Frais Additionnels
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Ligne d'amortissement {0}: La date d'amortissement suivante ne peut pas être antérieure à la date de mise en service
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Ligne d'amortissement {0}: La date d'amortissement suivante ne peut pas être antérieure à la date de mise en service
 ,Sales Funnel,Entonnoir de Vente
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Abréviation est obligatoire
 DocType: Project,Task Progress,Progression de la Tâche
@@ -5582,7 +5589,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Tous les Groupes Client
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,Cumul Mensuel
 DocType: Attendance Request,On Duty,Permanence
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} est obligatoire. Peut-être qu’un enregistrement de Taux de Change n'est pas créé pour {1} et {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} est obligatoire. Peut-être qu’un enregistrement de Taux de Change n'est pas créé pour {1} et {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Le plan de dotation en personnel {0} existe déjà pour la désignation {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Un Modèle de Taxe est obligatoire.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Compte {0}: Le Compte parent {1} n'existe pas
@@ -5661,11 +5668,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Au moins un entrepôt est obligatoire
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Configurez les champs d&#39;élément tels que UOM, groupe d&#39;articles, description et nombre d&#39;heures."
 DocType: Certification Application,Certification Status,Statut de la certification
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Marché
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Marché
 DocType: Travel Itinerary,Travel Advance Required,Avance de déplacement requise
 DocType: Subscriber,Subscriber Name,Nom de l&#39;abonné
 DocType: Serial No,Out of Warranty,Hors Garantie
-DocType: Cashier Closing,Cashier-closing-,Fermeture de caisse
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Type de données mappées
 DocType: BOM Update Tool,Replace,Remplacer
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Aucun Produit trouvé.
@@ -5752,7 +5758,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Les modèles de taxe par défaut pour les ventes et les achats sont créés.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Le Résultat d'Évaluation {0} existe déjà.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Exemple: ABCD. #####. Si la série est définie et que le numéro de lot n'est pas mentionné dans les transactions, un numéro de lot sera automatiquement créé en avec cette série. Si vous préferez mentionner explicitement et systématiquement le numéro de lot pour cet article, laissez ce champ vide. Remarque: ce paramètre aura la priorité sur le préfixe de la série dans les paramètres de stock."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Veuillez configurer les séries de numérotation pour la participation via Configuration&gt; Série de numérotation
 DocType: BOM,Materials Required (Exploded),Matériel Requis (Éclaté)
 DocType: Contract,Party User,Utilisateur tiers
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Veuillez laisser le filtre de la Société vide si Group By est 'Société'
@@ -5953,7 +5958,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Compte d'Opportunités
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,La date de début de la période d&#39;essai et la date de fin de la période d&#39;essai doivent être définies
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Prix moyen
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Le montant total du paiement dans l'échéancier doit être égal au Total Général / Total Arrondi
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Le montant total du paiement dans l'échéancier doit être égal au Total Général / Total Arrondi
 DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Solde du Relevé Bancaire d’après le Grand Livre
 DocType: Job Applicant,Applicant Name,Nom du Candidat
@@ -6023,7 +6028,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Savons & Détergents
 DocType: BOM,Show Items,Afficher les Articles
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,L’Horaire Initial ne peut pas être postérieur à l’Horaire Final
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Voulez-vous informer tous les clients par courriel?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Voulez-vous informer tous les clients par courriel?
 DocType: Subscription Plan,Billing Interval,Intervalle de facturation
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Cinéma & Vidéo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Commandé
@@ -6032,9 +6037,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Ligne {0}: {1} doit être supérieure à 0
 DocType: Assessment Criteria,Assessment Criteria Group,Groupe de Critère d'Évaluation
 DocType: Healthcare Settings,Patient Name By,Nom du patient par
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Ecritures de journal de provisions pour les salaires de {0} à {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Ecritures de journal de provisions pour les salaires de {0} à {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Activer les produits comptabilisés d'avance
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Amortissement Cumulé d'Ouverture doit être inférieur ou égal à {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Amortissement Cumulé d'Ouverture doit être inférieur ou égal à {0}
 DocType: Warehouse,Warehouse Name,Nom de l'Entrepôt
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,La date de début réelle doit être inférieure à la date de fin réelle
 DocType: Naming Series,Select Transaction,Sélectionner la Transaction
@@ -6185,7 +6190,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,L'employé {0} avec l'échelon {1} n'a pas de politique de congé par défaut
 DocType: Salary Detail,Salary Detail,Détails du Salaire
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Veuillez d’abord sélectionner {0}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,{0} utilisateurs ajoutés
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,{0} utilisateurs ajoutés
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","Dans le cas d'un programme à plusieurs échelons, les clients seront automatiquement affectés au niveau approprié en fonction de leurs dépenses"
 DocType: Appointment Type,Physician,Médecin
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Lot {0} de l'Article {1} a expiré.
@@ -6329,7 +6334,7 @@
 DocType: Asset,Custodian,Responsable
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Profil de Point-De-Vente
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} devrait être une valeur comprise entre 0 et 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Paiement de {0} de {1} à {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Paiement de {0} de {1} à {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Prêts Non Garantis
 DocType: Cost Center,Cost Center Name,Nom du centre de coûts
 DocType: Student,B+,B +
@@ -6361,6 +6366,7 @@
 DocType: Employee,Date of Issue,Date d'Émission
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","D'après les Paramètres d'Achat, si Reçu d'Achat Requis == 'OUI', alors l'utilisateur doit d'abord créer un Reçu d'Achat pour l'article {0} pour pouvoir créer une Facture d'Achat"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Ligne #{0} : Définir Fournisseur pour l’article {1}
+DocType: Global Defaults,Default Distance Unit,Unité de distance par défaut
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Ligne {0} : La valeur des heures doit être supérieure à zéro.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Image pour le Site Web {0} attachée à l'Article {1} ne peut pas être trouvée
 DocType: Issue,Content Type,Type de Contenu
@@ -6416,7 +6422,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Le compte de débit doit être un compte de Bilan
 DocType: Asset,Naming Series,Nom de série
 DocType: Vital Signs,Coated,Pâteuse
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Ligne {0}: la valeur attendue après la durée de vie utile doit être inférieure au montant brut de l'achat
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Ligne {0}: la valeur attendue après la durée de vie utile doit être inférieure au montant brut de l'achat
 DocType: GoCardless Settings,GoCardless Settings,Paramètres GoCardless
 DocType: Leave Block List,Leave Block List Name,Nom de la Liste de Blocage des Congés
 DocType: Certified Consultant,Certification Validity,Validité de la certification
@@ -6483,6 +6489,7 @@
 DocType: Bank Statement Settings Item,Bank Header,En-tête de la banque
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Afficher les tests de laboratoire
 DocType: Hub Users,Hub Users,Utilisateurs du Hub
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe de clients&gt; Territoire
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Date de l'Entretien
 DocType: Purchase Invoice Item,Rejected Serial No,N° de Série Rejeté
@@ -6497,7 +6504,7 @@
 DocType: SG Creation Tool Course,Max Strength,Force Max
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Installation des réglages
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.AAAA.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Aucun bon de livraison sélectionné pour le client {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Aucun bon de livraison sélectionné pour le client {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,L'employé {0} n'a pas de montant maximal d'avantages sociaux
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Sélectionnez les articles en fonction de la Date de Livraison
 DocType: Grant Application,Has any past Grant Record,A obtenu des bourses par le passé
@@ -6524,7 +6531,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Réservation de la chambre d'hôtel
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Service Client
 DocType: BOM,Thumbnail,Vignette
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Aucun contact avec des identifiants de messagerie trouvés.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Aucun contact avec des identifiants de messagerie trouvés.
 DocType: Item Customer Detail,Item Customer Detail,Détail de l'Article Client
 DocType: Notification Control,Prompt for Email on Submission of,Demander l’Email lors de la Soumission de
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Le montant maximal des prestations sociales de l'employé {0} dépasse {1}
@@ -6779,7 +6786,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,Conversion impossible en Groupe car le Type de Compte est sélectionné.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} a été modifié. Veuillez actualiser.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Empêcher les utilisateurs de faire des Demandes de Congé les jours suivants.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Code d&#39;article&gt; Groupe d&#39;articles&gt; Marque
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Si vous souhaitez ne pas mettre de date d'expiration pour les points de fidélité, laissez la durée d'expiration vide ou mettez 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Membres de l&#39;équipe de maintenance
 DocType: Loyalty Point Entry,Purchase Amount,Montant de l'Achat
@@ -6787,7 +6793,7 @@
 											to fullfill Sales Order {2}",Ne peut pas livrer le numéro de série {0} de l&#39;article {1} car il est réservé \ à la commande client complète {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-. AAAA.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Devis Fournisseur {0} créé
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,L'Année de Fin ne peut pas être avant l'Année de Début
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,L'Année de Fin ne peut pas être avant l'Année de Début
 DocType: Employee Benefit Application,Employee Benefits,Avantages de l'Employé
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},La quantité emballée doit être égale à la quantité pour l'Article {0} à la ligne {1}
 DocType: Work Order,Manufactured Qty,Qté Produite
@@ -6803,6 +6809,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Sélectionnez les Numéros de Lot
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,GSTIN (Destination)
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Factures émises pour des Clients.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Veuillez configurer le système de nommage des employés dans Ressources humaines&gt; Paramètres RH
 DocType: Healthcare Settings,Invoice Appointments Automatically,Rendez-vous sur facture automatiquement
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID du Projet
 DocType: Salary Component,Variable Based On Taxable Salary,Variable basée sur le salaire imposable
@@ -6851,7 +6858,7 @@
 DocType: POS Profile,Account for Change Amount,Compte pour le Rendu de Monnaie
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Connexion à QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Total des profits/pertes
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Société non valide pour la facture inter-sociétés.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Société non valide pour la facture inter-sociétés.
 DocType: Purchase Invoice,input service,service d'intrant
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ligne {0} : Tiers / Compte ne correspond pas à {1} / {2} en {3} {4}
 DocType: Employee Promotion,Employee Promotion,Promotion des employés
@@ -6981,7 +6988,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Zone préférée pour l&#39;hébergement
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analytique
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Le panier est Vide
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Veuillez configurer le système de nommage des instructeurs dans Education&gt; Paramètres de formation
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",L&#39;article {0} n&#39;a pas de numéro de série. Seuls les articles sérilisés peuvent être livrés en fonction du numéro de série.
 DocType: Vehicle,Model,Modèle
@@ -7011,7 +7017,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Rien à changer
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Veuillez sélectionner un fichier csv
 DocType: Holiday List,Total Holidays,Total des vacances
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Modèle de courrier électronique manquant pour l&#39;envoi. Veuillez en définir un dans les paramètres de livraison.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Modèle de courrier électronique manquant pour l&#39;envoi. Veuillez en définir un dans les paramètres de livraison.
 DocType: Student Leave Application,Mark as Present,Marquer comme Présent
 DocType: Supplier Scorecard,Indicator Color,Couleur de l'Indicateur
 DocType: Purchase Order,To Receive and Bill,À Recevoir et Facturer
@@ -7020,7 +7026,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Veuillez sélectionner le numéro de série
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Modèle des Termes et Conditions
-DocType: Serial No,Delivery Details,Détails de la Livraison
+DocType: Delivery Trip,Delivery Details,Détails de la Livraison
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Le Centre de Coûts est requis à la ligne {0} dans le tableau des Taxes pour le type {1}
 DocType: Program,Program Code,Code du Programme
 DocType: Terms and Conditions,Terms and Conditions Help,Aide des Termes et Conditions
@@ -7044,7 +7050,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Jours de Délai
 DocType: Cash Flow Mapping,Is Income Tax Expense,Est une dépense d'impôt sur le revenu
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Votre commande est livrée!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ligne #{0} : La Date de Comptabilisation doit être la même que la date d'achat {1} de l’actif {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ligne #{0} : La Date de Comptabilisation doit être la même que la date d'achat {1} de l’actif {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Vérifiez si l'Étudiant réside à la Résidence de l'Institut.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Veuillez entrer des Commandes Clients dans le tableau ci-dessus
 ,Stock Summary,Résumé du Stock
diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv
index c18d0e3..47fb6a8 100644
--- a/erpnext/translations/gu.csv
+++ b/erpnext/translations/gu.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,પીરિયડ નામ
 DocType: Employee,Salary Mode,પગાર સ્થિતિ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,નોંધણી કરો
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,નોંધણી કરો
 DocType: Patient,Divorced,છુટાછેડા લીધેલ
 DocType: Support Settings,Post Route Key,પોસ્ટ રૂટ કી
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,વસ્તુ વ્યવહાર ઘણી વખત ઉમેરી શકાય માટે પરવાનગી આપે છે
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,ન્યૂ એક્સચેન્જ રેટ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},કરન્સી ભાવ યાદી માટે જરૂરી છે {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* પરિવહનમાં ગણતરી કરવામાં આવશે.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,સપ્લાયર&gt; સપ્લાયર પ્રકાર
 DocType: Delivery Trip,MAT-DT-.YYYY.-,મેટ-ડીટી-. વાયવાયવાય.-
 DocType: Purchase Order,Customer Contact,ગ્રાહક સંપર્ક
 DocType: Patient Appointment,Check availability,ઉપલબ્ધતા તપાસો
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,ઓપન બતાવો
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,સિરીઝ સફળતાપૂર્વક અપડેટ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,ચેકઆઉટ
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{1} પંક્તિ {1} માં
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{1} પંક્તિ {1} માં
 DocType: Asset Finance Book,Depreciation Start Date,અવમૂલ્યન પ્રારંભ તારીખ
 DocType: Pricing Rule,Apply On,પર લાગુ પડે છે
 DocType: Item Price,Multiple Item prices.,મલ્ટીપલ વસ્તુ ભાવ.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,લેબ પ્રિસ્ક્રિપ્શન
 ,Delay Days,વિલંબ દિવસો
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,સેવા ખર્ચ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},શૃંખલા ક્રમાંક: {0} પહેલાથી સેલ્સ ઇન્વોઇસ સંદર્ભ થયેલ છે: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},શૃંખલા ક્રમાંક: {0} પહેલાથી સેલ્સ ઇન્વોઇસ સંદર્ભ થયેલ છે: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,ભરતિયું
 DocType: Purchase Invoice Item,Item Weight Details,આઇટમ વજન વિગતો
 DocType: Asset Maintenance Log,Periodicity,સમયગાળાના
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,એકાઉન્ટન્ટ
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,વેચાણ કિંમત યાદી
 DocType: Patient,Tobacco Current Use,તમાકુ વર્તમાન ઉપયોગ
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","પ્રારંભ તારીખ અને સમાપ્તિ તારીખ જોબ કાર્ડ સાથે ઓવરલેપ થઈ રહી છે <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,વેચાણ દર
 DocType: Cost Center,Stock User,સ્ટોક વપરાશકર્તા
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,સંબંધિત
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,એટેન્ડન્સ તારીખ કર્મચારીની જોડાયા તારીખ કરતાં ઓછી હોઇ શકે નહીં
 DocType: Grading Scale,Grading Scale Name,ગ્રેડીંગ સ્કેલ નામ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,વપરાશકર્તાઓને માર્કેટપ્લેસમાં ઉમેરો
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,વપરાશકર્તાઓને માર્કેટપ્લેસમાં ઉમેરો
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,આ રુટ ખાતુ અને સંપાદિત કરી શકતા નથી.
 DocType: Sales Invoice,Company Address,કંપનીનું સરનામું
 DocType: BOM,Operations,ઓપરેશન્સ
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,ડફ Qty
 DocType: Production Plan,Material Request Detail,વપરાયેલો વિનંતી વિગત
 DocType: Selling Settings,Default Quotation Validity Days,ડિફોલ્ટ ક્વોટેશન વેલિડિટી ડેઝ
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","આઇટમ રેટ પંક્તિ {0} કર સમાવેશ કરવા માટે, પંક્તિઓ કર {1} પણ સમાવેશ કરવો જ જોઈએ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","આઇટમ રેટ પંક્તિ {0} કર સમાવેશ કરવા માટે, પંક્તિઓ કર {1} પણ સમાવેશ કરવો જ જોઈએ"
 DocType: SMS Center,SMS Center,એસએમએસ કેન્દ્ર
 DocType: Payroll Entry,Validate Attendance,હાજરી માન્ય કરો
 DocType: Sales Invoice,Change Amount,જથ્થો બદલી
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,શબ્દોમાં રકમ માટે લાઇન અંતર
 DocType: Vehicle,Additional Details,વધારાની વિગતો
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,આપવામાં કોઈ વર્ણન
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,સપ્લાયર&gt; સપ્લાયર જૂથ
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ખરીદી માટે વિનંતી.
 DocType: POS Closing Voucher Details,Collected Amount,એકત્રિત રકમ
 DocType: Lab Test,Submitted Date,સબમિટ કરેલી તારીખ
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,વિદ્યાર્થી પ્રવેશ
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,{0} વસ્તુ રદ કરવામાં આવે છે
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,અવમૂલ્યન રો {0}: અવમૂલ્યન પ્રારંભ તારીખ પાછલી તારીખ તરીકે દાખલ કરવામાં આવી છે
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,અવમૂલ્યન રો {0}: અવમૂલ્યન પ્રારંભ તારીખ પાછલી તારીખ તરીકે દાખલ કરવામાં આવી છે
 DocType: Contract Template,Fulfilment Terms and Conditions,પરિપૂર્ણતા શરતો અને નિયમો
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,સામગ્રી વિનંતી
 DocType: Bank Reconciliation,Update Clearance Date,સુધારા ક્લિયરન્સ તારીખ
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,એકાઉન્ટ્સ માટે સુયોજનો
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},પુરવઠોકર્તા ભરતિયું બોલ પર કોઈ ખરીદી ભરતિયું અસ્તિત્વમાં {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,વેચાણ વ્યક્તિ વૃક્ષ મેનેજ કરો.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","માર્ગ પ્રક્રિયા કરી શકાતી નથી, કારણ કે Google નકશા સેટિંગ્સ અક્ષમ છે."
 DocType: Job Applicant,Cover Letter,પરબિડીયુ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ઉત્કૃષ્ટ Cheques અને સાફ ડિપોઝિટ
 DocType: Item,Synced With Hub,હબ સાથે સમન્વયિત
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,નવી એસેટ વેલ્યુ
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"ગ્રાહક કરન્સી ગ્રાહક આધાર ચલણ ફેરવાય છે, જે અંતે દર"
 DocType: Course Scheduling Tool,Course Scheduling Tool,કોર્સ સુનિશ્ચિત સાધન
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},રો # {0} ખરીદી ભરતિયું હાલની એસેટ સામે નથી કરી શકાય છે {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},રો # {0} ખરીદી ભરતિયું હાલની એસેટ સામે નથી કરી શકાય છે {1}
 DocType: Crop Cycle,LInked Analysis,લિન્ક્ડ એનાલિસિસ
 DocType: POS Closing Voucher,POS Closing Voucher,POS બંધ વાઉચર
 DocType: Contract,Lapsed,રદ થયું
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} કોર્સ પ્રવેશ નથી {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,વિદ્યાર્થીનું નામ:
 DocType: POS Closing Voucher Details,Difference,તફાવત
+DocType: Delivery Settings,Delay between Delivery Stops,ડિલિવરી સ્ટોપ્સ વચ્ચે વિલંબ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},સીરીયલ કોઈ {0} બોલ પર કોઈ નોંધ સંબંધ નથી {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","સર્વરના GoCardless રૂપરેખાંકન સાથે કોઈ સમસ્યા લાગે છે. નિષ્ફળતાના કિસ્સામાં ચિંતા કરશો નહીં, તમારા એકાઉન્ટમાં રકમ પાછો મળશે."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext ડેમો
@@ -693,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,જથ્થો અને દર
 DocType: Delivery Note,% Installed,% ઇન્સ્ટોલ
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,વર્ગખંડો / લેબોરેટરીઝ વગેરે જ્યાં પ્રવચનો સુનિશ્ચિત કરી શકાય છે.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,બંને કંપનીઓની કંપની ચલણો ઇન્ટર કંપની ટ્રાન્ઝેક્શન માટે મેચ થવી જોઈએ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,બંને કંપનીઓની કંપની ચલણો ઇન્ટર કંપની ટ્રાન્ઝેક્શન માટે મેચ થવી જોઈએ.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,પ્રથમ કંપની નામ દાખલ કરો
 DocType: Travel Itinerary,Non-Vegetarian,નોન-શાકાહારી
 DocType: Purchase Invoice,Supplier Name,પુરવઠોકર્તા નામ
@@ -778,7 +779,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,તારીખથી ભાડેથી
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,પૂરતી ભાગો બિલ્ડ કરવા માટે
 DocType: POS Profile User,POS Profile User,POS પ્રોફાઇલ વપરાશકર્તા
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,રો {0}: અવમૂલ્યન પ્રારંભ તારીખ જરૂરી છે
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,રો {0}: અવમૂલ્યન પ્રારંભ તારીખ જરૂરી છે
 DocType: Purchase Invoice Item,Service Start Date,સેવા પ્રારંભ તારીખ
 DocType: Subscription Invoice,Subscription Invoice,સબ્સ્ક્રિપ્શન ભરતિયું
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,સીધી આવક
@@ -845,7 +846,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,સંક્ષેપનો પહેલેથી બીજી કંપની માટે વપરાય
 DocType: Selling Settings,Default Customer Group,મૂળભૂત ગ્રાહક જૂથ
 DocType: Employee,IFSC Code,આઈએફએસસી કોડ
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","પ્રારંભ તારીખ અને સમાપ્તિ તારીખ જોબ કાર્ડ સાથે ઓવરલેપ થઈ રહી છે <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","અક્ષમ કરો છો, &#39;ગોળાકાર કુલ&#39; ક્ષેત્ર કોઈપણ વ્યવહાર માં દૃશ્યમાન હશે નહિં"
 DocType: BOM,Operating Cost,સંચાલન ખર્ચ
 DocType: Crop,Produced Items,ઉત્પાદિત આઈટમ્સ
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,RFQs અટકાવો
 DocType: Hub User,Hub User,હબ વપરાશકર્તા
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,વેચાણ ઓર્ડર બનાવો
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},{0} થી {1} સુધીના સમયગાળા માટે પગાર કાપલી
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},{0} થી {1} સુધીના સમયગાળા માટે પગાર કાપલી
 DocType: Project Task,Project Task,પ્રોજેક્ટ ટાસ્ક
 DocType: Loyalty Point Entry Redemption,Redeemed Points,રિડિમ કરેલ પોઇંટ્સ
 ,Lead Id,લીડ આઈડી
@@ -1027,7 +1027,7 @@
 DocType: Fee Validity,Max number of visit,મુલાકાતની મહત્તમ સંખ્યા
 ,Hotel Room Occupancy,હોટેલ રૂમ વ્યવસ્થિત
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet બનાવવામાં:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},ચૂકવણીની પદ્ધતિ મૂળભૂત કેશ અથવા બેન્ક એકાઉન્ટ સેટ કરો {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},ચૂકવણીની પદ્ધતિ મૂળભૂત કેશ અથવા બેન્ક એકાઉન્ટ સેટ કરો {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,નોંધણી
 DocType: GST Settings,GST Settings,જીએસટી સેટિંગ્સ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},ચલણ કિંમત યાદી તરીકે જ હોવું જોઈએ ચલણ: {0}
@@ -1081,7 +1081,7 @@
 DocType: Vehicle Log,Service Details,સેવા વિગતો
 DocType: Lab Test Template,Grouped,ગ્રુપ કરેલું
 DocType: Selling Settings,Delivery Note Required,ડ લવર નોંધ જરૂરી
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,પગાર સ્લિપ્સ સબમિટ કરી રહ્યાં છે ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,પગાર સ્લિપ્સ સબમિટ કરી રહ્યાં છે ...
 DocType: Bank Guarantee,Bank Guarantee Number,બેંક ગેરંટી સંખ્યા
 DocType: Assessment Criteria,Assessment Criteria,આકારણી માપદંડ
 DocType: BOM Item,Basic Rate (Company Currency),મૂળભૂત દર (કંપની ચલણ)
@@ -1106,13 +1106,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,ચુકવણી એન્ટ્રી પહેલાથી જ બનાવવામાં આવે છે
 DocType: Request for Quotation,Get Suppliers,સપ્લાયર્સ મેળવો
 DocType: Purchase Receipt Item Supplied,Current Stock,વર્તમાન સ્ટોક
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},રો # {0}: એસેટ {1} વસ્તુ કડી નથી {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},રો # {0}: એસેટ {1} વસ્તુ કડી નથી {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,પૂર્વદર્શન પગાર કાપલી
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,એકાઉન્ટ {0} ઘણી વખત દાખલ કરવામાં આવી છે
 DocType: Account,Expenses Included In Valuation,ખર્ચ વેલ્યુએશનમાં સમાવાયેલ
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,જો તમારી સદસ્યતા 30 દિવસની અંદર સમાપ્ત થઈ જાય તો તમે માત્ર રિન્યુ કરી શકો છો
 DocType: Shopping Cart Settings,Show Stock Availability,સ્ટોક ઉપલબ્ધતા બતાવો
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},એસેટ કેટેગરી {1} અથવા કંપનીમાં {0} સેટ કરો {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},એસેટ કેટેગરી {1} અથવા કંપનીમાં {0} સેટ કરો {2}
 DocType: Location,Longitude,રેખાંશ
 ,Absent Student Report,ગેરહાજર વિદ્યાર્થી રિપોર્ટ
 DocType: Crop,Crop Spacing UOM,ક્રોપ સ્પેસિંગ UOM
@@ -1184,7 +1184,7 @@
 DocType: Soil Texture,Sand,રેતી
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,એનર્જી
 DocType: Opportunity,Opportunity From,પ્રતિ તક
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,પંક્તિ {0}: {1} વસ્તુ {2} માટે આવશ્યક ક્રમાંક ક્રમાંક. તમે {3} પ્રદાન કરેલ છે
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,પંક્તિ {0}: {1} વસ્તુ {2} માટે આવશ્યક ક્રમાંક ક્રમાંક. તમે {3} પ્રદાન કરેલ છે
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,કોષ્ટક પસંદ કરો
 DocType: BOM,Website Specifications,વેબસાઇટ તરફથી
 DocType: Special Test Items,Particulars,વિગત
@@ -1276,7 +1276,7 @@
 DocType: Item,Items with higher weightage will be shown higher,ઉચ્ચ ભારાંક સાથે વસ્તુઓ વધારે બતાવવામાં આવશે
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,લેબ ટેસ્ટ અને મહત્વપૂર્ણ ચિહ્નો
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,બેન્ક રિકંસીલેશન વિગતવાર
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,રો # {0}: એસેટ {1} સબમિટ હોવું જ જોઈએ
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,રો # {0}: એસેટ {1} સબમિટ હોવું જ જોઈએ
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,કોઈ કર્મચારી મળી
 DocType: Item,If subcontracted to a vendor,એક વિક્રેતા subcontracted તો
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,વિદ્યાર્થી જૂથ પહેલેથી અપડેટ થયેલ છે.
@@ -1330,7 +1330,6 @@
 DocType: Loyalty Program Collection,Tier Name,ટાયર નામ
 DocType: HR Settings,Enter retirement age in years,વર્ષમાં નિવૃત્તિ વય દાખલ
 DocType: Crop,Target Warehouse,લક્ષ્યાંક વેરહાઉસ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,કૃપા કરીને {0} સેટઅપ&gt; સેટિંગ્સ&gt; નામકરણ શ્રેણી દ્વારા નામકરણ સીરીઝ સેટ કરો
 DocType: Payroll Employee Detail,Payroll Employee Detail,પગારપત્રક કર્મચારીનું વિગતવાર
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,કૃપા કરીને એક વેરહાઉસ પસંદ
 DocType: Cheque Print Template,Starting location from left edge,ડાબી ધાર થી સ્થાન શરૂ કરી રહ્યા છીએ
@@ -1420,7 +1419,7 @@
 DocType: Work Order,Plan material for sub-assemblies,પેટા-સ્થળોના માટે યોજના સામગ્રી
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,સેલ્સ પાર્ટનર્સ અને પ્રદેશ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} સક્રિય હોવા જ જોઈએ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,ટ્રાન્સફર માટે કોઈ આઇટમ્સ ઉપલબ્ધ નથી
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,ટ્રાન્સફર માટે કોઈ આઇટમ્સ ઉપલબ્ધ નથી
 DocType: Employee Boarding Activity,Activity Name,પ્રવૃત્તિનું નામ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,રીલિઝ તારીખ બદલો
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,સમાપ્ત ઉત્પાદન જથ્થો <b>{0}</b> અને જથ્થા માટે <b>{1}</b> અલગ અલગ હોઈ શકતી નથી
@@ -1647,6 +1646,7 @@
 DocType: Project,First Email,પ્રથમ ઇમેઇલ
 DocType: Company,Exception Budget Approver Role,અપવાદ બજેટ અભિનેતા ભૂમિકા
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","સેટ થઈ ગયા પછી, આ ભરતિયું સેટ તારીખ સુધી પકડવામાં આવશે"
+DocType: Cashier Closing,POS-CLO-,પોસ-સીએલઓ-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,સેલ્સ ઓર્ડર / ફિનિશ્ડ ગૂડ્સ વેરહાઉસ માં અનામત વેરહાઉસ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,વેચાણ રકમ
 DocType: Repayment Schedule,Interest Amount,વ્યાજ રકમ
@@ -1658,7 +1658,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,રેકોર્ડ્સ
 DocType: Asset,Scrapped,રદ
 DocType: Item,Item Defaults,આઇટમ ડિફૉલ્ટ્સ
-DocType: Purchase Invoice,Returns,રિટર્ન્સ
+DocType: Cashier Closing,Returns,રિટર્ન્સ
 DocType: Job Card,WIP Warehouse,WIP વેરહાઉસ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},સીરીયલ કોઈ {0} સુધી જાળવણી કરાર હેઠળ છે {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,ભરતી
@@ -1672,7 +1672,6 @@
 DocType: Student,A-,એ
 DocType: Share Transfer,Transfer Type,ટ્રાન્સફર ટાઇપ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,સેલ્સ ખર્ચ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; પ્રદેશ
 DocType: Diagnosis,Diagnosis,નિદાન
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,સ્ટાન્ડર્ડ ખરીદી
 DocType: Attendance Request,Explanation,સમજૂતી
@@ -1685,7 +1684,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,ખરીદી ઓર્ડર આઈટમ્સ ઓવરડ્યુ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,પિન કોડ
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},વેચાણ ઓર્ડર {0} છે {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},લોનમાં વ્યાજની આવકનું એકાઉન્ટ પસંદ કરો {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},લોનમાં વ્યાજની આવકનું એકાઉન્ટ પસંદ કરો {0}
 DocType: Opportunity,Contact Info,સંપર્ક માહિતી
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,સ્ટોક પ્રવેશો બનાવે
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,કર્મચારીને દરજ્જા સાથે બઢતી ન આપી શકે
@@ -1697,7 +1696,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,શૂન્ય બિલિંગ કલાક માટે ભરતિયું ન કરી શકાય
 DocType: Company,Date of Commencement,પ્રારંભની તારીખ
 DocType: Sales Person,Select company name first.,પ્રથમ પસંદ કંપની નામ.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},ઇમેઇલ {0} ને મોકલવામાં આવી છે
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},ઇમેઇલ {0} ને મોકલવામાં આવી છે
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,સુવાકયો સપ્લાયરો પાસેથી પ્રાપ્ત થઈ છે.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOM ને બદલો અને તમામ BOM માં નવીનતમ ભાવ અપડેટ કરો
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},માટે {0} | {1} {2}
@@ -1717,7 +1716,7 @@
 DocType: Asset Movement,From Employee,કર્મચારી
 DocType: Driver,Cellphone Number,સેલ ફોન નંબર
 DocType: Project,Monitor Progress,મોનિટર પ્રગતિ
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ચેતવણી: સિસ્ટમ વસ્તુ માટે રકમ કારણ overbilling તપાસ કરશે નહીં {0} માં {1} શૂન્ય છે
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ચેતવણી: સિસ્ટમ વસ્તુ માટે રકમ કારણ overbilling તપાસ કરશે નહીં {0} માં {1} શૂન્ય છે
 DocType: Journal Entry,Make Difference Entry,તફાવત પ્રવેશ કરો
 DocType: Supplier Quotation,Auto Repeat Section,ઓટો પુનરાવર્તન વિભાગ
 DocType: Upload Attendance,Attendance From Date,તારીખ થી એટેન્ડન્સ
@@ -1820,7 +1819,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,ROW # {0}: Qty ખરીદી રીટર્ન દાખલ કરી શકાતા નથી નકારેલું
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,પસંદ કરેલ ગ્રાહક માટે કસ્ટમર ગ્રુપ બદલવાની મંજૂરી નથી.
 ,Purchase Order Items To Be Billed,ખરીદી ક્રમમાં વસ્તુઓ બિલ કરવા
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,અનુમાનિત આગમન સમયે અપડેટ કરવું
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,અનુમાનિત આગમન સમયે અપડેટ કરવું
 DocType: Program Enrollment Tool,Enrollment Details,નોંધણી વિગતો
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,કોઈ કંપની માટે બહુવિધ આઇટમ ડિફોલ્ટ્સ સેટ કરી શકતા નથી.
 DocType: Purchase Invoice Item,Net Rate,નેટ દર
@@ -1834,7 +1833,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,છોડો પ્રકાર મદુરાઈ છે
 DocType: Support Settings,Close Issue After Days,બંધ અંક દિવસો પછી
 ,Eway Bill,ઇવે બિલ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,માર્કેટપ્લેસમાં વપરાશકર્તાઓ ઉમેરવા માટે તમારે સિસ્ટમ મેનેજર અને આઇટમ મેનેજર ભૂમિકાઓ સાથે વપરાશકર્તા બનવાની જરૂર છે.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,માર્કેટપ્લેસમાં વપરાશકર્તાઓ ઉમેરવા માટે તમારે સિસ્ટમ મેનેજર અને આઇટમ મેનેજર ભૂમિકાઓ સાથે વપરાશકર્તા બનવાની જરૂર છે.
 DocType: Leave Control Panel,Leave blank if considered for all branches,બધી જ શાખાઓ માટે વિચારણા તો ખાલી છોડી દો
 DocType: Job Opening,Staffing Plan,સ્ટાફિંગ પ્લાન
 DocType: Bank Guarantee,Validity in Days,દિવસો વૈધતાને
@@ -1854,7 +1853,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},સાથે નકલી પંક્તિ {0} જ {1}
 DocType: Marketplace Settings,Disable Marketplace,માર્કેટપ્લેસ અક્ષમ કરો
 ,Trial Balance,ટ્રાયલ બેલેન્સ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,ફિસ્કલ વર્ષ {0} મળી નથી
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,ફિસ્કલ વર્ષ {0} મળી નથી
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,કર્મચારીઓ સુયોજિત કરી રહ્યા છે
 DocType: Hotel Room Reservation,Hotel Reservation User,હોટેલ રિઝર્વેશન યુઝર
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,પ્રથમ ઉપસર્ગ પસંદ કરો
@@ -1962,7 +1961,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,લૉગિન કરવામાં નિષ્ફળ
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,સંપત્તિ {0} બનાવી
 DocType: Special Test Items,Special Test Items,ખાસ ટેસ્ટ આઈટમ્સ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,તમે બજાર પર રજીસ્ટર કરવા માટે સિસ્ટમ મેનેજર અને આઇટમ મેનેજર ભૂમિકાઓ સાથે વપરાશકર્તા બનવાની જરૂર છે.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,તમે બજાર પર રજીસ્ટર કરવા માટે સિસ્ટમ મેનેજર અને આઇટમ મેનેજર ભૂમિકાઓ સાથે વપરાશકર્તા બનવાની જરૂર છે.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,ચૂકવણીની પદ્ધતિ
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,તમારા સોંપાયેલ પગાર માળખું મુજબ તમે લાભ માટે અરજી કરી શકતા નથી
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,વેબસાઇટ છબી જાહેર ફાઈલ અથવા વેબસાઇટ URL હોવો જોઈએ
@@ -1974,7 +1973,7 @@
 DocType: Warehouse,Warehouse Contact Info,વેરહાઉસ સંપર્ક માહિતી
 DocType: Payment Entry,Write Off Difference Amount,માંડવાળ તફાવત રકમ
 DocType: Volunteer,Volunteer Name,સ્વયંસેવક નામ
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},અન્ય પંક્તિઓમાં ડુપ્લિકેટ બાકી તારીખો સાથેની પંક્તિઓ મળી: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},અન્ય પંક્તિઓમાં ડુપ્લિકેટ બાકી તારીખો સાથેની પંક્તિઓ મળી: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: કર્મચારીનું ઇમેઇલ મળી નથી, તેથી નથી મોકલવામાં ઇમેઇલ"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},આપેલ તારીખ {1} પર કર્મચારી {0} માટે કોઈ પગાર માળખું નથી.
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},શીપીંગ નિયમ દેશ {0} માટે લાગુ નથી
@@ -2063,6 +2062,7 @@
 DocType: Salary Component,Earning,અર્નિંગ
 DocType: Supplier Scorecard,Scoring Criteria,સ્કોરિંગ માપદંડ
 DocType: Purchase Invoice,Party Account Currency,પક્ષ એકાઉન્ટ કરન્સી
+DocType: Delivery Trip,Total Estimated Distance,કુલ અનુમાનિત અંતર
 ,BOM Browser,BOM બ્રાઉઝર
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,કૃપા કરીને આ તાલીમ ઇવેન્ટ માટે તમારી સ્થિતિ અપડેટ કરો
 DocType: Item Barcode,EAN,EAN
@@ -2101,7 +2101,7 @@
 DocType: Activity Cost,Projects,પ્રોજેક્ટ્સ
 DocType: Payment Request,Transaction Currency,ટ્રાન્ઝેક્શન કરન્સી
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},પ્રતિ {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,કેટલીક ઇમેઇલ્સ અમાન્ય છે
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,કેટલીક ઇમેઇલ્સ અમાન્ય છે
 DocType: Work Order Operation,Operation Description,ઓપરેશન વર્ણન
 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.,નાણાકીય વર્ષ સેવ થઈ જાય ફિસ્કલ વર્ષ શરૂઆત તારીખ અને ફિસ્કલ વર્ષ અંતે તારીખ બદલી શકતા નથી.
 DocType: Quotation,Shopping Cart,શોપિંગ કાર્ટ
@@ -2125,7 +2125,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,સ્થિર એસેટ કુલ ફેરફાર
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,રેક્યુડ જથ્થો
 DocType: Leave Control Panel,Leave blank if considered for all designations,બધા ડેઝીગ્નેશન્સ માટે વિચારણા તો ખાલી છોડી દો
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,પ્રકાર &#39;વાસ્તવિક&#39; પંક્તિ માં ચાર્જ {0} આઇટમ રેટ સમાવેશ કરવામાં નથી કરી શકો છો
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,પ્રકાર &#39;વાસ્તવિક&#39; પંક્તિ માં ચાર્જ {0} આઇટમ રેટ સમાવેશ કરવામાં નથી કરી શકો છો
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},મહત્તમ: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,તારીખ સમય પ્રતિ
 DocType: Shopify Settings,For Company,કંપની માટે
@@ -2139,7 +2139,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,કોર્સ શેડ્યૂલ બનાવતી ભૂલો હતી
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,સૂચિમાં પ્રથમ ખર્ચના આધારે ડિફોલ્ટ ખર્ચ ઉપકારક તરીકે સેટ કરવામાં આવશે.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,100 કરતા વધારે ન હોઈ શકે
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,માર્કેટમેન પર નોંધણી કરવા માટે તમે સિસ્ટમ વ્યવસ્થાપક અને આઇટમ મેનેજર ભૂમિકાઓ સાથે એડમિનિસ્ટ્રેટર સિવાયના એક વપરાશકર્તા બનવાની જરૂર છે.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,માર્કેટમેન પર નોંધણી કરવા માટે તમે સિસ્ટમ વ્યવસ્થાપક અને આઇટમ મેનેજર ભૂમિકાઓ સાથે એડમિનિસ્ટ્રેટર સિવાયના એક વપરાશકર્તા બનવાની જરૂર છે.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,{0} વસ્તુ સ્ટોક વસ્તુ નથી
 DocType: Packing Slip,MAT-PAC-.YYYY.-,એમએટી-પી.સી.સી.- વાય.વાય.વાય.-
 DocType: Maintenance Visit,Unscheduled,અનિશ્ચિત
@@ -2168,7 +2168,7 @@
 DocType: HR Settings,Employee Settings,કર્મચારીનું સેટિંગ્સ
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,ચુકવણી સિસ્ટમ લોડ કરી રહ્યું છે
 ,Batch-Wise Balance History,બેચ વાઈસ બેલેન્સ ઇતિહાસ
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,પંક્તિ # {0}: આઇટમ {1} માટે રકમની બિલ કરતાં વધુ રકમ હોય તો દર સેટ કરી શકાતી નથી.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,પંક્તિ # {0}: આઇટમ {1} માટે રકમની બિલ કરતાં વધુ રકમ હોય તો દર સેટ કરી શકાતી નથી.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,પ્રિંટ સેટિંગ્સને સંબંધિત પ્રિન્ટ બંધારણમાં સુધારાશે
 DocType: Package Code,Package Code,પેકેજ કોડ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,એપ્રેન્ટિસ
@@ -2399,7 +2399,7 @@
 DocType: Delivery Trip,Optimize Route,રૂટ ઑપ્ટિમાઇઝ કરો
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,અગાઉથી X દિવસ માટે કામગીરી આયોજન કરવાનો પ્રયાસ કરો.
 DocType: HR Settings,Stop Birthday Reminders,સ્ટોપ જન્મદિવસ રિમાઇન્ડર્સ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},કંપની મૂળભૂત પગારપત્રક ચૂકવવાપાત્ર એકાઉન્ટ સેટ કૃપા કરીને {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},કંપની મૂળભૂત પગારપત્રક ચૂકવવાપાત્ર એકાઉન્ટ સેટ કૃપા કરીને {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,એમેઝોન દ્વારા કરવેરા અને ચાર્જીસના નાણાકીય ભંગાણ મેળવો
 DocType: SMS Center,Receiver List,રીસીવર યાદી
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,શોધ વસ્તુ
@@ -2469,7 +2469,7 @@
 DocType: Vital Signs,Constipated,કબજિયાત
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},પુરવઠોકર્તા સામે ભરતિયું {0} ના રોજ {1}
 DocType: Customer,Default Price List,ડિફૉલ્ટ ભાવ યાદી
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,એસેટ ચળવળ રેકોર્ડ {0} બનાવવામાં
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,એસેટ ચળવળ રેકોર્ડ {0} બનાવવામાં
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,કોઈ આઇટમ્સ મળી નથી
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,તમે કાઢી શકતા નથી ફિસ્કલ વર્ષ {0}. ફિસ્કલ વર્ષ {0} વૈશ્વિક સેટિંગ્સ મૂળભૂત તરીકે સુયોજિત છે
 DocType: Share Transfer,Equity/Liability Account,ઇક્વિટી / જવાબદારી એકાઉન્ટ
@@ -2606,6 +2606,7 @@
 DocType: Blanket Order,Order Type,ઓર્ડર પ્રકાર
 ,Item-wise Sales Register,વસ્તુ મુજબના સેલ્સ રજિસ્ટર
 DocType: Asset,Gross Purchase Amount,કુલ ખરીદી જથ્થો
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,આઇટમ કોડ&gt; આઇટમ જૂથ&gt; બ્રાન્ડ
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,ખુલવાનો બેલેન્સ
 DocType: Asset,Depreciation Method,અવમૂલ્યન પદ્ધતિ
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,મૂળભૂત દર માં સમાવેલ આ કર છે?
@@ -2684,7 +2685,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,જો વાર્ષિક બજેટ PO પર ઓળંગી જાય તો ક્રિયા
 DocType: Student Leave Application,Student Leave Application,વિદ્યાર્થી છોડો અરજી
 DocType: Item,Will also apply for variants,પણ ચલો માટે લાગુ પડશે
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}",એસેટ રદ કરી શકાતી નથી કારણ કે તે પહેલેથી જ છે {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}",એસેટ રદ કરી શકાતી નથી કારણ કે તે પહેલેથી જ છે {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},કર્મચારીનું {0} પર અડધા દિવસ પર {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},કુલ કામના કલાકો મેક્સ કામના કલાકો કરતાં વધારે ન હોવી જોઈએ {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,પર
@@ -2708,6 +2709,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,માહિતી મેળવો
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},રજાના પ્રકાર {0} માં મંજૂર મહત્તમ રજા {1} છે
 DocType: SMS Center,Create Receiver List,રીસીવર યાદી બનાવો
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,વપરાશ માટે ઉપલબ્ધ તારીખ ખરીદી તારીખ પછી હોવી જોઈએ
 DocType: Vehicle,Wheels,વ્હિલ્સ
 DocType: Packing Slip,To Package No.,નં પેકેજ
 DocType: Patient Relation,Family,કૌટુંબિક
@@ -2721,7 +2723,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,બિલિંગ ચલણ કાં તો ડિફોલ્ટ કંપનીના ચલણ અથવા પક્ષ એકાઉન્ટ ચલણની સમાન હોવા જોઈએ
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),પેકેજ આ બોલ (ફક્ત ડ્રાફ્ટ) ના એક ભાગ છે કે જે સૂચવે
 DocType: Soil Texture,Loam,લોમ
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,રો {0}: તારીખ પોસ્ટ તારીખ પહેલાં ન હોઈ શકે
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,રો {0}: તારીખ પોસ્ટ તારીખ પહેલાં ન હોઈ શકે
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,ચુકવણી પ્રવેશ કરો
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},વસ્તુ માટે જથ્થો {0} કરતાં ઓછી હોવી જોઈએ {1}
 ,Sales Invoice Trends,સેલ્સ ભરતિયું પ્રવાહો
@@ -2793,7 +2795,7 @@
 DocType: Guardian,Guardian Interests,ગાર્ડિયન રૂચિ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,એકાઉન્ટ નામ / સંખ્યાને અપડેટ કરો
 DocType: Naming Series,Current Value,વર્તમાન કિંમત
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,મલ્ટીપલ નાણાકીય વર્ષ તારીખ {0} માટે અસ્તિત્વ ધરાવે છે. નાણાકીય વર્ષ કંપની સુયોજિત કરો
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,મલ્ટીપલ નાણાકીય વર્ષ તારીખ {0} માટે અસ્તિત્વ ધરાવે છે. નાણાકીય વર્ષ કંપની સુયોજિત કરો
 DocType: Education Settings,Instructor Records to be created by,દ્વારા બનાવવામાં આવશે પ્રશિક્ષક રેકોર્ડ્સ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} બનાવવામાં
 DocType: GST Account,GST Account,જીએસટી એકાઉન્ટ
@@ -2810,7 +2812,7 @@
 DocType: Sales Person,Name and Employee ID,નામ અને કર્મચારી ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,કારણે તારીખ તારીખ પોસ્ટ કરતા પહેલા ન હોઈ શકે
 DocType: Website Item Group,Website Item Group,વેબસાઇટ વસ્તુ ગ્રુપ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ઉપરોક્ત પસંદ કરેલ માપદંડો અથવા પહેલેથી સબમિટ કરેલી પગાર સ્લિપ માટે કોઈ પગાર કાપલી મળી નથી
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ઉપરોક્ત પસંદ કરેલ માપદંડો અથવા પહેલેથી સબમિટ કરેલી પગાર સ્લિપ માટે કોઈ પગાર કાપલી મળી નથી
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,કર અને વેરામાંથી
 DocType: Projects Settings,Projects Settings,પ્રોજેક્ટ્સ સેટિંગ્સ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,સંદર્ભ તારીખ દાખલ કરો
@@ -2819,7 +2821,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,પૂરી પાડવામાં Qty
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,એચએલસી-સીપીઆર-. વાયવાયવાય.-
 DocType: Purchase Order Item,Material Request Item,સામગ્રી વિનંતી વસ્તુ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,કૃપા કરીને પહેલાં ખરીદ રસીદ {0} રદ કરો
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,કૃપા કરીને પહેલાં ખરીદ રસીદ {0} રદ કરો
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,વસ્તુ જૂથો વૃક્ષ.
 DocType: Production Plan,Total Produced Qty,કુલ ઉત્પાદન જથ્થો
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,આ ચાર્જ પ્રકાર માટે વર્તમાન પંક્તિ નંબર એક કરતાં વધારે અથવા સમાન પંક્તિ નંબર નો સંદર્ભ લો નથી કરી શકો છો
@@ -2928,6 +2930,7 @@
 ,Vehicle Expenses,વાહન ખર્ચ
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,વેચાણ ભરતિયું પર લેબ પરીક્ષણ (ઓ) બનાવો
 DocType: Serial No,Invoice Details,ઇન્વૉઇસ વિગતો
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,કૃપા કરીને રસ્તાઓનો અંદાજ કાઢવા અને ઑપ્ટિમાઇઝ કરવા માટે Google નકશા સેટિંગ્સને સક્ષમ કરો
 DocType: Grant Application,Show on Website,વેબસાઇટ પર બતાવો
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,પ્રારંભ કરો
 DocType: Hub Tracked Item,Hub Category,હબ કેટેગરી
@@ -2967,7 +2970,7 @@
 DocType: Inpatient Record,B Positive,બી હકારાત્મક
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",કર્મચારી {0} નું મહત્તમ લાભ {1} પહેલાંની દાવો કરેલ રકમ \ સરવાળો {2} કરતાં વધી ગયો છે
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","રો # {0}: Qty, 1 હોવું જ જોઈએ, કારણ કે આઇટમ એક સ્થિર એસેટ છે. બહુવિધ Qty માટે અલગ પંક્તિ ઉપયોગ કરો."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","રો # {0}: Qty, 1 હોવું જ જોઈએ, કારણ કે આઇટમ એક સ્થિર એસેટ છે. બહુવિધ Qty માટે અલગ પંક્તિ ઉપયોગ કરો."
 DocType: Leave Block List Allow,Leave Block List Allow,બ્લોક પરવાનગી સૂચિ છોડો
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,સંક્ષિપ્ત ખાલી અથવા જગ્યા ન હોઈ શકે
 DocType: Patient Medical Record,Patient Medical Record,પેશન્ટ મેડિકલ રેકોર્ડ
@@ -3001,7 +3004,7 @@
 DocType: Workstation,Wages per hour,કલાક દીઠ વેતન
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},બેચ સ્ટોક બેલેન્સ {0} બનશે નકારાત્મક {1} વેરહાઉસ ખાતે વસ્તુ {2} માટે {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,સામગ્રી અરજીઓ નીચેની આઇટમ ફરીથી ક્રમમાં સ્તર પર આધારિત આપોઆપ ઊભા કરવામાં આવ્યા છે
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},એકાઉન્ટ {0} અમાન્ય છે. એકાઉન્ટ કરન્સી હોવા જ જોઈએ {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},એકાઉન્ટ {0} અમાન્ય છે. એકાઉન્ટ કરન્સી હોવા જ જોઈએ {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},{0} તારીખથી કર્મચારીની રાહતની તારીખ {1} પછી ન હોઈ શકે
 DocType: Supplier,Is Internal Supplier,આંતરિક પુરવઠોકર્તા છે
 DocType: Employee,Create User Permission,વપરાશકર્તા પરવાનગી બનાવો
@@ -3145,7 +3148,7 @@
 DocType: Account,Fixed Asset,સ્થિર એસેટ
 DocType: Amazon MWS Settings,After Date,તારીખ પછી
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,શ્રેણીબદ્ધ ઈન્વેન્ટરી
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,આંતર કંપની ઇન્વોઇસ માટે અમાન્ય {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,આંતર કંપની ઇન્વોઇસ માટે અમાન્ય {0}
 ,Department Analytics,વિભાગ ઍનલિટિક્સ
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,ઇમેઇલ ડિફોલ્ટ સંપર્કમાં નથી મળ્યો
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,સિક્રેટ જનરેટ કરો
@@ -3157,7 +3160,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,ફી સ્ટ્રક્ચર અને સ્ટુડન્ટ ગ્રૂપ {0} માં પ્રોગ્રામ અલગ છે.
 DocType: Bank Statement Transaction Entry,Receivable Account,પ્રાપ્ત એકાઉન્ટ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,માન્ય પ્રતિ તારીખ માન્ય સુધી તારીખથી ઓછો હોવો આવશ્યક છે.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},રો # {0}: એસેટ {1} પહેલેથી જ છે {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},રો # {0}: એસેટ {1} પહેલેથી જ છે {2}
 DocType: Quotation Item,Stock Balance,સ્ટોક બેલેન્સ
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,ચુકવણી માટે વેચાણ ઓર્ડર
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,સીઇઓ
@@ -3199,6 +3202,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,ડેબિટ કરવા માટે જરૂરી છે
 DocType: Clinical Procedure,Inpatient Record,ઇનપેશન્ટ રેકોર્ડ
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets મદદ તમારી ટીમ દ્વારા કરવામાં activites માટે સમય, ખર્ચ અને બિલિંગ ટ્રેક રાખવા"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,સપ્લાયર&gt; સપ્લાયર પ્રકાર
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,ખરીદી ભાવ યાદી
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,ટ્રાન્ઝેક્શનની તારીખ
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,સપ્લાયર સ્કોરકાર્ડ ચલોના નમૂનાઓ.
@@ -3241,7 +3245,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,એક્સચેન્જ મેળવી / નુકશાન
 DocType: Opportunity,Lost Reason,લોસ્ટ કારણ
 DocType: Amazon MWS Settings,Enable Amazon,એમેઝોનને સક્ષમ કરો
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},પંક્તિ # {0}: ખાતું {1} કંપનીથી સંબંધિત નથી {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},પંક્તિ # {0}: ખાતું {1} કંપનીથી સંબંધિત નથી {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},ડૉકટાઇપ {0} શોધવામાં અસમર્થ
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,નવું સરનામું
 DocType: Quality Inspection,Sample Size,સેમ્પલ કદ
@@ -3352,7 +3356,7 @@
 DocType: Water Analysis,Origin,મૂળ
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,આ દસ્તાવેજ દ્વારા મર્યાદા વધારે છે {0} {1} આઇટમ માટે {4}. તમે બનાવે છે અન્ય {3} જ સામે {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,બચત પછી રિકરિંગ સુયોજિત કરો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,પસંદ કરો ફેરફાર રકમ એકાઉન્ટ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,પસંદ કરો ફેરફાર રકમ એકાઉન્ટ
 DocType: Purchase Invoice,Price List Currency,ભાવ યાદી કરન્સી
 DocType: Naming Series,User must always select,વપરાશકર્તા હંમેશા પસંદ કરવી જ પડશે
 DocType: Stock Settings,Allow Negative Stock,નકારાત્મક સ્ટોક પરવાનગી આપે છે
@@ -3394,7 +3398,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,શું તમે ખરેખર આ નિમણૂક રદ કરવા માગો છો?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,હોટેલ રૂમ પ્રાઇસીંગ પેકેજ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,સેલ્સ પાઇપલાઇન
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},પગાર પુન મૂળભૂત એકાઉન્ટ સુયોજિત કરો {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},પગાર પુન મૂળભૂત એકાઉન્ટ સુયોજિત કરો {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,જરૂરી પર
 DocType: Rename Tool,File to Rename,નામ ફાઇલ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},રો વસ્તુ BOM પસંદ કરો {0}
@@ -3415,7 +3419,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ખરીદી વસ્તુઓ કિંમત
 DocType: Employee Separation,Employee Separation Template,કર્મચારી વિભાજન ઢાંચો
 DocType: Selling Settings,Sales Order Required,વેચાણ ઓર્ડર જરૂરી
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,એક વિક્રેતા બનો
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,એક વિક્રેતા બનો
 DocType: Purchase Invoice,Credit To,માટે ક્રેડિટ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,સક્રિય તરફ દોરી જાય છે / ગ્રાહકો
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,માનક ડિલિવરી નોટ ફોર્મેટનો ઉપયોગ કરવા માટે ખાલી છોડો
@@ -3456,7 +3460,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,કરવેરા નમૂના બનાવો
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,વપરાશકર્તા ફોરમ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,કાચો માલ ખાલી ન હોઈ શકે.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,પંક્તિ # {0} (ચુકવણી ટેબલ): રકમ નકારાત્મક હોવી જોઈએ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,પંક્તિ # {0} (ચુકવણી ટેબલ): રકમ નકારાત્મક હોવી જોઈએ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","સ્ટોક અપડેટ કરી શકાયું નથી, ભરતિયું ડ્રોપ શીપીંગ વસ્તુ છે."
 DocType: Contract,Fulfilment Status,પૂર્ણ સ્થિતિ
 DocType: Lab Test Sample,Lab Test Sample,લેબ ટેસ્ટ નમૂના
@@ -3595,7 +3599,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,દસ્તાવેજ તારીખ
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},ફી રેકોર્ડ્સ બનાવનાર - {0}
 DocType: Asset Category Account,Asset Category Account,એસેટ વર્ગ એકાઉન્ટ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,પંક્તિ # {0} (ચુકવણી ટેબલ): રકમ સકારાત્મક હોવી જોઈએ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,પંક્તિ # {0} (ચુકવણી ટેબલ): રકમ સકારાત્મક હોવી જોઈએ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},સેલ્સ ક્રમ સાથે જથ્થો કરતાં વધુ આઇટમ {0} પેદા કરી શકતા નથી {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,એટ્રીબ્યુટ મૂલ્યો પસંદ કરો
 DocType: Purchase Invoice,Reason For Issuing document,દસ્તાવેજને અદા કરવાનું કારણ
@@ -3650,7 +3654,7 @@
 DocType: Purchase Receipt,Time at which materials were received,"સામગ્રી પ્રાપ્ત કરવામાં આવી હતી, જે અંતે સમય"
 DocType: Products Settings,Products per Page,પૃષ્ઠ દીઠ પ્રોડક્ટ્સ
 DocType: Stock Ledger Entry,Outgoing Rate,આઉટગોઇંગ દર
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,અથવા
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,અથવા
 DocType: Sales Order,Billing Status,બિલિંગ સ્થિતિ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,સમસ્યાની જાણ કરો
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,ઉપયોગિતા ખર્ચ
@@ -3677,7 +3681,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,કર્મચારી કર મુક્તિ ઘોષણા
 DocType: Payment Entry,Cheque/Reference Date,ચેક / સંદર્ભ તારીખ
 DocType: Purchase Invoice,Total Taxes and Charges,કુલ કર અને ખર્ચ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,ઉપયોગ-માટે-ઉપયોગ તારીખ ભૂતકાળની તારીખ તરીકે દાખલ કરવામાં આવી છે
 DocType: Employee,Emergency Contact,કટોકટી સંપર્ક
 DocType: Bank Reconciliation Detail,Payment Entry,ચુકવણી એન્ટ્રી
 ,sales-browser,વેચાણ બ્રાઉઝર
@@ -3723,6 +3726,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),રીટર્ન છે (ક્રેડિટ નોટ)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,જોબ શરૂ કરો
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},સંપત્તિ {0} માટે સીરીયલ નંબર આવશ્યક છે
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,કૃપા કરીને {0} સેટઅપ&gt; સેટિંગ્સ&gt; નામકરણ શ્રેણી દ્વારા નામકરણ સીરીઝ સેટ કરો
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,અપંગ નમૂનો ડિફૉલ્ટ નમૂનો ન હોવું જોઈએ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,{0} પંક્તિ માટે: નિયુક્ત કરેલું કક્ષ દાખલ કરો
 DocType: Account,Income Account,આવક એકાઉન્ટ
@@ -3736,6 +3740,7 @@
 DocType: Loyalty Program,Help Section,સહાય વિભાગ
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,પાછલું
 DocType: Appraisal Goal,Key Responsibility Area,કી જવાબદારી વિસ્તાર
+DocType: Delivery Trip,Distance UOM,અંતર યુએમએમ
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","વિદ્યાર્થી બૅચેસ તમે હાજરી, આકારણીઓ અને વિદ્યાર્થીઓ માટે ફી ટ્રૅક મદદ"
 DocType: Payment Entry,Total Allocated Amount,કુલ ફાળવેલ રકમ
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,શાશ્વત યાદી માટે ડિફોલ્ટ યાદી એકાઉન્ટ સેટ
@@ -3777,7 +3782,7 @@
 DocType: Item Supplier,Item Supplier,વસ્તુ પુરવઠોકર્તા
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,બેચ કોઈ વિચાર વસ્તુ કોડ દાખલ કરો
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},{0} quotation_to માટે નીચેની પસંદ કરો {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,ટ્રાન્સફર માટે કોઈ આઈટમ્સ પસંદ નથી
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,ટ્રાન્સફર માટે કોઈ આઈટમ્સ પસંદ નથી
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,બધા સંબોધે છે.
 DocType: Company,Stock Settings,સ્ટોક સેટિંગ્સ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","નીચેના ગુણધર્મો બંને રેકોર્ડ જ છે, તો મર્જ જ શક્ય છે. ગ્રુપ root લખવું, કંપની છે"
@@ -4062,7 +4067,7 @@
 DocType: Patient,Personal and Social History,વ્યક્તિગત અને સામાજિક ઇતિહાસ
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,વપરાશકર્તા {0} બનાવી
 DocType: Fee Schedule,Fee Breakup for each student,દરેક વિદ્યાર્થી માટે ફી બ્રેકઅપ
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),કુલ એડવાન્સ ({0}) ઓર્ડર સામે {1} ગ્રાન્ડ કુલ કરતાં વધારે ન હોઈ શકે છે ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),કુલ એડવાન્સ ({0}) ઓર્ડર સામે {1} ગ્રાન્ડ કુલ કરતાં વધારે ન હોઈ શકે છે ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,અસમાન મહિના સમગ્ર લક્ષ્યો વિતરિત કરવા માટે માસિક વિતરણ પસંદ કરો.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,કોડ બદલો
 DocType: Purchase Invoice Item,Valuation Rate,મૂલ્યાંકન દર
@@ -4071,7 +4076,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,ફાયર્ડ આઇટીસી સેસ
 ,Student Monthly Attendance Sheet,વિદ્યાર્થી માસિક હાજરી શીટ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,શીપીંગ નિયમ ફક્ત વેચાણ માટે લાગુ પડે છે
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,અવમૂલ્યન રો {0}: આગામી અવમૂલ્યન તારીખ ખરીદ તારીખ પહેલાં ન હોઈ શકે
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,અવમૂલ્યન રો {0}: આગામી અવમૂલ્યન તારીખ ખરીદ તારીખ પહેલાં ન હોઈ શકે
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,પ્રોજેક્ટ પ્રારંભ તારીખ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,સુધી
 DocType: Rename Tool,Rename Log,લોગ
@@ -4088,12 +4093,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,સેલ્સ વ્યવહારો પર આધારિત કેટલી વાર પ્રોજેક્ટ અને કંપનીને અપડેટ કરવું જોઈએ.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ના રોજ સમાપ્ત થાય
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,વિદ્યાર્થીઓ ઉમેરી
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","કૃપા કરીને આ દસ્તાવેજને રદ કરવા માટે કર્મચારી <a href=""#Form/Employee/{0}"">{0}</a> \ કાઢી નાખો"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},પસંદ કરો {0}
 DocType: C-Form,C-Form No,સી-ફોર્મ નં
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,અંતર
+DocType: Delivery Stop,Distance,અંતર
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,તમે ખરીદો અથવા વેચો છો તે તમારા ઉત્પાદનો અથવા સેવાઓની સૂચિ બનાવો.
 DocType: Water Analysis,Storage Temperature,સંગ્રહ તાપમાન
 DocType: Sales Order,SAL-ORD-.YYYY.-,એસએએલ- ORD- .YYYY.-
@@ -4120,7 +4123,7 @@
 DocType: Homepage,Company Description for website homepage,વેબસાઇટ હોમપેજ માટે કંપની વર્ણન
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ગ્રાહકોની સુવિધા માટે, આ કોડ ઇન્વૉઇસેસ અને ડ લવર નોંધો જેવા પ્રિન્ટ બંધારણો ઉપયોગ કરી શકાય છે"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier નામ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,{0} માટે માહિતી પુનઃપ્રાપ્ત કરી શકાઈ નથી.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,{0} માટે માહિતી પુનઃપ્રાપ્ત કરી શકાઈ નથી.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,એન્ટ્રી જર્નલ ખોલીને
 DocType: Contract,Fulfilment Terms,પરિપૂર્ણતા શરતો
 DocType: Sales Invoice,Time Sheet List,સમયનો શીટ યાદી
@@ -4300,7 +4303,7 @@
 DocType: Serial No,Warranty / AMC Details,વોરંટી / એએમસી વિગતો
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,પ્રવૃત્તિ આધારિત ગ્રુપ માટે જાતે વિદ્યાર્થીઓની પસંદગી
 DocType: Journal Entry,User Remark,વપરાશકર્તા ટીકા
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,રસ્તો ઑપ્ટિમાઇઝ
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,રસ્તો ઑપ્ટિમાઇઝ
 DocType: Travel Itinerary,Non Diary,નોન ડાયરી
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,ડાબી કર્મચારીઓ માટે રીટેન્શન બોનસ બનાવી શકતા નથી
 DocType: Lead,Market Segment,માર્કેટ સેગમેન્ટ
@@ -4330,7 +4333,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,લોયલ્ટી પ્રોગ્રામ
 DocType: Student Guardian,Father,પિતા
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,આધાર ટિકિટ
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,'અદ્યતન સ્ટોક' સ્થિર સંપત્તિ વેચાણ માટે ચેક કરી શકાતું નથી
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,'અદ્યતન સ્ટોક' સ્થિર સંપત્તિ વેચાણ માટે ચેક કરી શકાતું નથી
 DocType: Bank Reconciliation,Bank Reconciliation,બેન્ક રિકંસીલેશન
 DocType: Attendance,On Leave,રજા પર
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,સુધારાઓ મેળવો
@@ -4375,7 +4378,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,સીરીયલ કોઈ અને બેચ
 DocType: Warranty Claim,From Company,કંપનીથી
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,આકારણી માપદંડ સ્કોર્સ ની રકમ {0} હોઈ જરૂર છે.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Depreciations સંખ્યા નક્કી સુયોજિત કરો
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Depreciations સંખ્યા નક્કી સુયોજિત કરો
 DocType: Supplier Scorecard Period,Calculations,ગણતરીઓ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,ભાવ અથવા Qty
 DocType: Payment Terms Template,Payment Terms,ચુકવણી શરતો
@@ -4394,7 +4397,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,ડિસ્કાઉન્ટ (%) પર માર્જિન સાથે ભાવ યાદી દર
 DocType: Healthcare Service Unit Type,Rate / UOM,રેટ / યુઓએમ
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,બધા વખારો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,આંતર કંપની વ્યવહારો માટે કોઈ {0} મળ્યું નથી.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,આંતર કંપની વ્યવહારો માટે કોઈ {0} મળ્યું નથી.
 DocType: Travel Itinerary,Rented Car,ભાડે આપતી કાર
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,તમારી કંપની વિશે
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,એકાઉન્ટ ક્રેડિટ બેલેન્સ શીટ એકાઉન્ટ હોવું જ જોઈએ
@@ -4495,6 +4498,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,પ્લાન્ટ એનાલિસિસ માપદંડ
 DocType: Cheque Print Template,Cheque Height,ચેક ઊંચાઈ
 DocType: Supplier,Supplier Details,પુરવઠોકર્તા વિગતો
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,કૃપા કરીને સેટઅપ&gt; નંબરિંગ સીરીઝ દ્વારા હાજરી માટે નંબરિંગ શ્રેણી સેટ કરો
 DocType: Setup Progress,Setup Progress,સેટઅપ પ્રગતિ
 DocType: Expense Claim,Approval Status,મંજૂરી સ્થિતિ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},કિંમત પંક્તિ માં કિંમત કરતાં ઓછી હોવી જોઈએ થી {0}
@@ -4587,7 +4591,6 @@
 DocType: Travel Request,Fully Sponsored,સંપૂર્ણપણે પ્રાયોજિત
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,રિવર્સ જર્નલ એન્ટ્રી
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ગ્રાહક {0} બનાવવામાં આવેલ છે
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,કૃપા કરીને માનવ સંસાધન&gt; એચઆર સેટિંગ્સમાં કર્મચારી નામકરણ સિસ્ટમ સેટ કરો
 DocType: Stock Settings,Limit Percent,મર્યાદા ટકા
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,હાલમાં કોઈ વેરહાઉસમાં કોઈ સ્ટોક ઉપલબ્ધ નથી
 ,Payment Period Based On Invoice Date,ભરતિયું તારીખ પર આધારિત ચુકવણી સમય
@@ -4646,7 +4649,7 @@
 DocType: BOM Explosion Item,Source Warehouse,સોર્સ વેરહાઉસ
 DocType: Installation Note,Installation Date,સ્થાપન તારીખ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,લેજર શેર કરો
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},રો # {0}: એસેટ {1} કંપની ને અનુલક્ષતું નથી {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},રો # {0}: એસેટ {1} કંપની ને અનુલક્ષતું નથી {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,સેલ્સ ઇન્વોઇસ {0} બનાવી
 DocType: Employee,Confirmation Date,સમર્થન તારીખ
 DocType: Inpatient Occupancy,Check Out,તપાસો
@@ -4666,6 +4669,7 @@
 DocType: Production Plan,Sales Orders Detail,સેલ્સ ઓર્ડર્સ વિગતવાર
 DocType: Bin,Requested Quantity,વિનંતી જથ્થો
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE -YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,કૃપા કરીને શિક્ષણ&gt; શિક્ષણ સેટિંગ્સમાં પ્રશિક્ષક નામકરણ સિસ્ટમ સેટ કરો
 DocType: Patient,Marital Status,વૈવાહિક સ્થિતિ
 DocType: Stock Settings,Auto Material Request,ઓટો સામગ્રી વિનંતી
 DocType: Woocommerce Settings,API consumer secret,API ગ્રાહક રહસ્ય
@@ -4718,7 +4722,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,દિવસ પસંદ કરો
 DocType: Academic Term,Term Name,ટર્મ નામ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),ક્રેડિટ ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,પગાર સ્લિપ્સ બનાવવો ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,પગાર સ્લિપ્સ બનાવવો ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,તમે રૂટ નોડને સંપાદિત કરી શકતા નથી.
 DocType: Buying Settings,Purchase Order Required,ઓર્ડર જરૂરી ખરીદી
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,ટાઈમર
@@ -4754,7 +4758,7 @@
 DocType: Account,Rate at which this tax is applied,"આ કર લાગુ પડે છે, જે અંતે દર"
 DocType: Cash Flow Mapper,Section Name,વિભાગનું નામ
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,પુનઃક્રમાંકિત કરો Qty
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},અવમૂલ્યન રો {0}: ઉપયોગી જીવન પછી અપેક્ષિત મૂલ્ય {1} કરતા વધારે અથવા તેનાથી વધુ હોવા જોઈએ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},અવમૂલ્યન રો {0}: ઉપયોગી જીવન પછી અપેક્ષિત મૂલ્ય {1} કરતા વધારે અથવા તેનાથી વધુ હોવા જોઈએ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,વર્તમાન જોબ શરૂઆતનો
 DocType: Company,Stock Adjustment Account,સ્ટોક એડજસ્ટમેન્ટ એકાઉન્ટ
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,માંડવાળ
@@ -4801,7 +4805,7 @@
 DocType: Program Enrollment,School House,શાળા હાઉસ
 DocType: Serial No,Out of AMC,એએમસીના આઉટ
 DocType: Opportunity,Opportunity Amount,તકનીક રકમ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,નક્કી Depreciations સંખ્યા કુલ Depreciations સંખ્યા કરતાં વધારે ન હોઈ શકે
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,નક્કી Depreciations સંખ્યા કુલ Depreciations સંખ્યા કરતાં વધારે ન હોઈ શકે
 DocType: Purchase Order,Order Confirmation Date,ઑર્ડર પુષ્ટિકરણ તારીખ
 DocType: Driver,HR-DRI-.YYYY.-,એચઆર-ડીઆરઆઇ-. યેવાયવાય.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,જાળવણી મુલાકાત કરી
@@ -4842,7 +4846,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,બેચ:
 DocType: Volunteer,Afternoon,બપોર પછી
 DocType: Loyalty Program,Loyalty Program Help,લોયલ્ટી પ્રોગ્રામ સહાય
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} &#39;{1}&#39; અક્ષમ છે
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} &#39;{1}&#39; અક્ષમ છે
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ઓપન તરીકે સેટ કરો
 DocType: Cheque Print Template,Scanned Cheque,સ્કેન ચેક
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,સબમિટ વ્યવહારો પર સંપર્કો આપોઆપ ઇમેઇલ્સ મોકલો.
@@ -4855,7 +4859,7 @@
 DocType: Warranty Claim,Item and Warranty Details,વસ્તુ અને વોરંટી વિગતો
 DocType: Chapter,Chapter Members,પ્રકરણના સભ્યો
 DocType: Sales Team,Contribution (%),યોગદાન (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,નોંધ: ચુકવણી એન્ટ્રી થી બનાવી શકાય નહીં &#39;કેશ અથવા બેન્ક એકાઉન્ટ&#39; સ્પષ્ટ કરેલ ન હતી
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,નોંધ: ચુકવણી એન્ટ્રી થી બનાવી શકાય નહીં &#39;કેશ અથવા બેન્ક એકાઉન્ટ&#39; સ્પષ્ટ કરેલ ન હતી
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,પ્રોજેક્ટ {0} પહેલાંથી અસ્તિત્વમાં છે
 DocType: Clinical Procedure,Nursing User,નર્સિંગ વપરાશકર્તા
 DocType: Employee Benefit Application,Payroll Period,પેરોલ સમયગાળો
@@ -4863,6 +4867,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},સીરિયલ કોઈ {0} બેચની નથી {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,જવાબદારીઓ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,આ અવતરણની માન્યતા અવધિ સમાપ્ત થઈ ગઈ છે.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","કૃપા કરીને આ દસ્તાવેજને રદ કરવા માટે કર્મચારી <a href=""#Form/Employee/{0}"">{0}</a> \ કાઢી નાખો"
 DocType: Expense Claim Account,Expense Claim Account,ખર્ચ દાવો એકાઉન્ટ
 DocType: Account,Capital Work in Progress,પ્રગતિમાં કેપિટલ વર્ક
 DocType: Accounts Settings,Allow Stale Exchange Rates,સ્ટેલ એક્સચેન્જ દરોને મંજૂરી આપો
@@ -4943,7 +4949,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,ઇશ્યૂ સામગ્રી
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,ERPNext સાથે Shopify કનેક્ટ કરો
 DocType: Material Request Item,For Warehouse,વેરહાઉસ માટે
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,ડિલિવરી નોંધો {0} સુધારાશે
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,ડિલિવરી નોંધો {0} સુધારાશે
 DocType: Employee,Offer Date,ઓફર તારીખ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,સુવાકયો
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,તમે ઑફલાઇન મોડ છે. તમે જ્યાં સુધી તમે નેટવર્ક ફરીથી લોડ કરવા માટે સમર્થ હશે નહિં.
@@ -4993,7 +4999,7 @@
 DocType: Shipping Rule,Calculate Based On,પર આધારિત ગણતરી
 DocType: Contract,Unfulfilled,પૂર્ણ થઈ નથી
 DocType: Delivery Note Item,From Warehouse,વેરહાઉસ માંથી
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,ઉલ્લેખિત માપદંડ માટે કોઈ કર્મચારી નથી
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,ઉલ્લેખિત માપદંડ માટે કોઈ કર્મચારી નથી
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,માલ બિલ સાથે કોઈ વસ્તુઓ ઉત્પાદન
 DocType: Shopify Settings,Default Customer,ડિફૉલ્ટ ગ્રાહક
 DocType: Sales Stage,Stage Name,સ્ટેજ નામ
@@ -5035,7 +5041,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ડિસ્કાઉન્ટ રકમ બાદ કર જથ્થો
 DocType: Patient,Inpatient Status,Inpatient સ્થિતિ
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,દૈનિક કામ સારાંશ સેટિંગ્સ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,પસંદ કરેલ ભાવની સૂચિ ચેક અને ચકાસાયેલ ક્ષેત્રોની ખરીદી કરવી જોઈએ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,પસંદ કરેલ ભાવની સૂચિ ચેક અને ચકાસાયેલ ક્ષેત્રોની ખરીદી કરવી જોઈએ.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,તારીખ દ્વારા Reqd દાખલ કરો
 DocType: Payment Entry,Internal Transfer,આંતરિક ટ્રાન્સફર
 DocType: Asset Maintenance,Maintenance Tasks,જાળવણી કાર્યો
@@ -5071,7 +5077,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,ગ્રુપ દ્વારા
 DocType: Guardian,Interests,રૂચિ
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,/ અક્ષમ કરો કરન્સી સક્રિય કરો.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,કેટલાક પગાર સ્લિપ સબમિટ કરી શક્યાં નથી
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,કેટલાક પગાર સ્લિપ સબમિટ કરી શક્યાં નથી
 DocType: Exchange Rate Revaluation,Get Entries,પ્રવેશો મેળવો
 DocType: Production Plan,Get Material Request,સામગ્રી વિનંતી વિચાર
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,ટપાલ ખર્ચ
@@ -5155,7 +5161,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},ખર્ચ હિસાબ આઇટમ માટે ફરજિયાત છે {0}
 DocType: BOM,Website Description,વેબસાઇટ વર્ણન
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,ઈક્વિટી કુલ ફેરફાર
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,ખરીદી ભરતિયું {0} રદ કૃપા કરીને પ્રથમ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,ખરીદી ભરતિયું {0} રદ કૃપા કરીને પ્રથમ
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,પરવાનગી નથી. કૃપા કરી સેવા એકમ પ્રકારને અક્ષમ કરો
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ઇમેઇલ સરનામું અનન્ય હોવો જોઈએ, પહેલેથી જ અસ્તિત્વમાં છે {0}"
 DocType: Serial No,AMC Expiry Date,એએમસી સમાપ્તિ તારીખ
@@ -5195,7 +5201,7 @@
 DocType: Hotel Room,Hotel Room,હોટેલ રૂમ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},એકાઉન્ટ {0} કરે કંપની માટે અનુસરે છે નથી {1}
 DocType: Leave Type,Rounding,રાઉન્ડિંગ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,{0} પંક્તિમાં ક્રમાંકોમાં સાથે ડિલીવરી નોંધ મેચ થતો નથી
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,{0} પંક્તિમાં ક્રમાંકોમાં સાથે ડિલીવરી નોંધ મેચ થતો નથી
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),ડિસ્પેન્સડ રકમ (પ્રો રેટ)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","પછી ગ્રાહક, કસ્ટમર ગ્રુપ, ટેરિટરી, સપ્લાયર, સપ્લાયર ગ્રૂપ, ઝુંબેશ, સેલ્સ પાર્ટનર વગેરેના આધારે પ્રાઇસીંગ રૂલ્સને ફિલ્ટર કરવામાં આવે છે."
 DocType: Student,Guardian Details,ગાર્ડિયન વિગતો
@@ -5250,7 +5256,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},વેરહાઉસ સ્ટોક વસ્તુ માટે જરૂરી {0}
 DocType: Leave Allocation,Unused leaves,નહિં વપરાયેલ પાંદડા
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,ચુકવણી એન્ટ્રી કરો
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,બધા વિભાગો
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,બધા વિભાગો
 DocType: Healthcare Service Unit,Vacant,ખાલી
 DocType: Patient,Alcohol Past Use,મદ્યાર્ક ભૂતકાળનો ઉપયોગ
 DocType: Fertilizer Content,Fertilizer Content,ખાતર સામગ્રી
@@ -5261,7 +5267,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,આ સેલ્સ ઑર્ડર રદ કરવા પહેલાં વર્ક ઓર્ડર {0} રદ કરવો જોઈએ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),(પેટા-સ્થળોના સહિત) ફેલાય છે BOM મેળવો
 DocType: Authorization Rule,Applicable To (Employee),લાગુ કરો (કર્મચારી)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,કારણે તારીખ ફરજિયાત છે
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,કારણે તારીખ ફરજિયાત છે
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,લક્ષણ માટે વૃદ્ધિ {0} 0 ન હોઈ શકે
 DocType: Employee Benefit Claim,Benefit Type and Amount,લાભ પ્રકાર અને રકમ
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,બૂક કરેલ રૂમ
@@ -5405,7 +5411,7 @@
 DocType: Purchase Invoice Item,Total Weight,કૂલ વજન
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,સેલ્સ પર કમિશન
 DocType: Job Offer Term,Value / Description,ભાવ / વર્ણન
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","રો # {0}: એસેટ {1} સુપ્રત કરી શકાય નહીં, તે પહેલેથી જ છે {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","રો # {0}: એસેટ {1} સુપ્રત કરી શકાય નહીં, તે પહેલેથી જ છે {2}"
 DocType: Tax Rule,Billing Country,બિલિંગ દેશ
 DocType: Purchase Order Item,Expected Delivery Date,અપેક્ષિત બોલ તારીખ
 DocType: Restaurant Order Entry,Restaurant Order Entry,રેસ્ટોરન્ટ ઓર્ડર એન્ટ્રી
@@ -5444,12 +5450,13 @@
 DocType: Maintenance Visit,Breakdown,વિરામ
 DocType: Travel Itinerary,Vegetarian,શાકાહારી
 DocType: Patient Encounter,Encounter Date,એન્કાઉન્ટર ડેટ
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,ખાતું: {0} ચલણ સાથે: {1} પસંદ કરી શકાતી નથી
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,ખાતું: {0} ચલણ સાથે: {1} પસંદ કરી શકાતી નથી
 DocType: Bank Statement Transaction Settings Item,Bank Data,બેંક ડેટા
 DocType: Purchase Receipt Item,Sample Quantity,નમૂના જથ્થો
 DocType: Bank Guarantee,Name of Beneficiary,લાભાર્થીનું નામ
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","તાજેતરની મૂલ્યાંકન દર / ભાવ યાદી દર / કાચા માલની છેલ્લી ખરીદી દરના આધારે, શેડ્યૂલર દ્વારા આપમેળે બીઓએમની કિંમતને અપડેટ કરો."
 DocType: Supplier,SUP-.YYYY.-,એસયુપી- YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,સપ્લાયર&gt; સપ્લાયર જૂથ
 DocType: Bank Reconciliation Detail,Cheque Date,ચેક તારીખ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},એકાઉન્ટ {0}: પિતૃ એકાઉન્ટ {1} કંપની ને અનુલક્ષતું નથી: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,સફળતાપૂર્વક આ કંપની સંબંધિત તમામ વ્યવહારો કાઢી!
@@ -5477,7 +5484,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,બાળક ગાંઠો માત્ર &#39;ગ્રુપ&#39; પ્રકાર ગાંઠો હેઠળ બનાવી શકાય છે
 DocType: Attendance Request,Half Day Date,અડધા દિવસ તારીખ
 DocType: Academic Year,Academic Year Name,શૈક્ષણિક વર્ષ નામ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} ને {1} સાથે વ્યવહાર કરવાની મંજૂરી નથી કૃપા કરી કંપનીને બદલો
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} ને {1} સાથે વ્યવહાર કરવાની મંજૂરી નથી કૃપા કરી કંપનીને બદલો
 DocType: Sales Partner,Contact Desc,સંપર્ક DESC
 DocType: Email Digest,Send regular summary reports via Email.,ઈમેઈલ મારફતે નિયમિત સારાંશ અહેવાલ મોકલો.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},ખર્ચ દાવો પ્રકાર મૂળભૂત એકાઉન્ટ સુયોજિત કરો {0}
@@ -5510,7 +5517,7 @@
 DocType: Hotel Room,Hotel Manager,હોટેલ વ્યવસ્થાપક
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,શોપિંગ કાર્ટ માટે સેટ ટેક્સ નિયમ
 DocType: Purchase Invoice,Taxes and Charges Added,કર અને ખર્ચ ઉમેર્યું
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,અવમૂલ્યન રો {0}: આગલી અવમૂલ્યન તારીખ ઉપલબ્ધ થવાની તારીખ પહેલાં ન હોઈ શકે
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,અવમૂલ્યન રો {0}: આગલી અવમૂલ્યન તારીખ ઉપલબ્ધ થવાની તારીખ પહેલાં ન હોઈ શકે
 ,Sales Funnel,વેચાણ નાળચું
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,સંક્ષેપનો ફરજિયાત છે
 DocType: Project,Task Progress,ટાસ્ક પ્રગતિ
@@ -5524,7 +5531,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,બધા ગ્રાહક જૂથો
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,સંચિત માસિક
 DocType: Attendance Request,On Duty,ફરજ પર
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ફરજિયાત છે. કદાચ ચલણ એક્સચેન્જ રેકોર્ડ {1} {2} માટે બનાવેલ નથી.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ફરજિયાત છે. કદાચ ચલણ એક્સચેન્જ રેકોર્ડ {1} {2} માટે બનાવેલ નથી.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},હોદ્દો માટે સ્ટાફિંગ પ્લાન {0} પહેલેથી અસ્તિત્વ ધરાવે છે {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,ટેક્સ ઢાંચો ફરજિયાત છે.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,એકાઉન્ટ {0}: પિતૃ એકાઉન્ટ {1} અસ્તિત્વમાં નથી
@@ -5603,11 +5610,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,ઓછામાં ઓછા એક વખાર ફરજિયાત છે
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","યુઓએમ, આઈટમ ગ્રૂપ, વર્ણન અને કલાકની સંખ્યા જેવી આઇટમ ફીલ્ડ્સને ગોઠવો."
 DocType: Certification Application,Certification Status,પ્રમાણન સ્થિતિ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,માર્કેટપ્લેસ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,માર્કેટપ્લેસ
 DocType: Travel Itinerary,Travel Advance Required,યાત્રા એડવાન્સ આવશ્યક છે
 DocType: Subscriber,Subscriber Name,ઉપભોક્તાનું નામ
 DocType: Serial No,Out of Warranty,વોરંટી બહાર
-DocType: Cashier Closing,Cashier-closing-,કેશિયર-ક્લોઝિંગ-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,મેપ કરેલ ડેટા પ્રકાર
 DocType: BOM Update Tool,Replace,બદલો
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,કોઈ ઉત્પાદનો મળી.
@@ -5694,7 +5700,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,વેચાણ અને ખરીદી માટે ડિફોલ્ટ કર ટેમ્પ્લેટ બનાવવામાં આવે છે.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,મૂલ્યાંકન પરિણામ રેકોર્ડ {0} પહેલાથી અસ્તિત્વમાં છે.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","ઉદાહરણ: એબીસીડી. ##### જો શ્રેણી સેટ કરેલ હોય અને લેવડદેવડમાં બેચ નો ઉલ્લેખ નથી, તો પછી આ શ્રેણીના આધારે આપમેળે બેચ નંબર બનાવવામાં આવશે. જો તમે હંમેશા આ આઇટમ માટે બેચ નો ઉલ્લેખ કરશો, તો આને ખાલી છોડી દો. નોંધ: આ સેટિંગ, સ્ટોક સેટિંગ્સમાં નેમિંગ સિરીઝ પ્રીફિક્સ પર અગ્રતા લેશે."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,કૃપા કરીને સેટઅપ&gt; નંબરિંગ સીરીઝ દ્વારા હાજરી માટે નંબરિંગ શ્રેણી સેટ કરો
 DocType: BOM,Materials Required (Exploded),મટિરીયલ્સ (વિસ્ફોટ) જરૂરી
 DocType: Contract,Party User,પાર્ટી યુઝર
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',કૃપા કરીને કંપની ખાલી ફિલ્ટર સેટ જો ગ્રુપ દ્વારા &#39;કંપની&#39; છે
@@ -5895,7 +5900,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,સામે કાઉન્ટ
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,બંને ટ્રાયલ પીરિયડ પ્રારંભ તારીખ અને ટ્રાયલ પીરિયડ સમાપ્તિ તારીખ સેટ હોવી જોઈએ
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,સરેરાશ દર
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,પેમેન્ટ સુનિશ્ચિતમાં કુલ ચૂકવણીની રકમ ગ્રાન્ડ / ગોળાકાર કુલની સમકક્ષ હોવી જોઈએ
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,પેમેન્ટ સુનિશ્ચિતમાં કુલ ચૂકવણીની રકમ ગ્રાન્ડ / ગોળાકાર કુલની સમકક્ષ હોવી જોઈએ
 DocType: Subscription Plan Detail,Plan,યોજના
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,સામાન્ય ખાતાવહી મુજબ બેન્ક નિવેદન બેલેન્સ
 DocType: Job Applicant,Applicant Name,અરજદારનું નામ
@@ -5964,7 +5969,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,સાબુ સફાઈકારક
 DocType: BOM,Show Items,બતાવો વસ્તુઓ
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,સમય સમય કરતાં વધારે ન હોઈ શકે.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,શું તમે બધા ગ્રાહકોને ઇમેઇલ દ્વારા સૂચિત કરવા માંગો છો?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,શું તમે બધા ગ્રાહકોને ઇમેઇલ દ્વારા સૂચિત કરવા માંગો છો?
 DocType: Subscription Plan,Billing Interval,બિલિંગ અંતરાલ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,મોશન પિક્ચર અને વિડિઓ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,આદેશ આપ્યો
@@ -5973,9 +5978,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,પંક્તિ {0}: {1} 0 કરતાં મોટી હોવી જોઈએ
 DocType: Assessment Criteria,Assessment Criteria Group,આકારણી માપદંડ ગ્રુપ
 DocType: Healthcare Settings,Patient Name By,પેશન્ટ નામ દ્વારા
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},{0} થી {1} સુધી પગાર માટે સંચય જર્નલ એન્ટ્રી
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},{0} થી {1} સુધી પગાર માટે સંચય જર્નલ એન્ટ્રી
 DocType: Sales Invoice Item,Enable Deferred Revenue,ડિફર્ડ રેવન્યુને સક્ષમ કરો
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},ખુલવાનો સંચિત અવમૂલ્યન બરાબર કરતાં ઓછી હોવી જોઈએ {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},ખુલવાનો સંચિત અવમૂલ્યન બરાબર કરતાં ઓછી હોવી જોઈએ {0}
 DocType: Warehouse,Warehouse Name,વેરહાઉસ નામ
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,વાસ્તવિક પ્રારંભ તારીખ વાસ્તવિક સમાપ્તિ તારીખ કરતાં ઓછી હોવી આવશ્યક છે
 DocType: Naming Series,Select Transaction,પસંદ ટ્રાન્ઝેક્શન
@@ -6126,7 +6131,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,ગ્રેડ {1} નો કર્મચારી {0} પાસે કોઈ મૂળભૂત રજા નીતિ નથી
 DocType: Salary Detail,Salary Detail,પગાર વિગતવાર
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,પ્રથમ {0} પસંદ કરો
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,{0} વપરાશકર્તાઓ ઉમેરાયા
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,{0} વપરાશકર્તાઓ ઉમેરાયા
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","મલ્ટિ-ટાયર પ્રોગ્રામના કિસ્સામાં, ગ્રાહક તેમના ખર્ચ મુજબ સંબંધિત ટાયરમાં ઓટો હશે"
 DocType: Appointment Type,Physician,ફિઝિશિયન
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,વસ્તુ બેચ {0} {1} સમયસીમા સમાપ્ત થઈ ગઈ છે.
@@ -6270,7 +6275,7 @@
 DocType: Asset,Custodian,કસ્ટોડિયન
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,પોઇન્ટ ઓફ સેલ પ્રોફાઇલ
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} 0 અને 100 ની વચ્ચેનું મૂલ્ય હોવું જોઈએ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},{1} થી {2} સુધીની {0} ચુકવણી
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},{1} થી {2} સુધીની {0} ચુકવણી
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,અસુરક્ષીત લોન્સ
 DocType: Cost Center,Cost Center Name,ખર્ચ કેન્દ્રને નામ
 DocType: Student,B+,બી +
@@ -6302,6 +6307,7 @@
 DocType: Employee,Date of Issue,ઇશ્યૂ તારીખ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","ખરીદી સેટિંગ્સ મુજબ ખરીદી Reciept જરૂરી == &#39;હા&#39; હોય, તો પછી ખરીદી ઇન્વોઇસ બનાવવા માટે, વપરાશકર્તા આઇટમ માટે પ્રથમ ખરીદી રસીદ બનાવવા માટે જરૂર હોય તો {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},ROW # {0}: આઇટમ માટે સેટ પુરવઠોકર્તા {1}
+DocType: Global Defaults,Default Distance Unit,ડિફોલ્ટ ડિસ્ટન્સ યુનિટ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,રો {0}: કલાક કિંમત શૂન્ય કરતાં મોટી હોવી જ જોઈએ.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,વસ્તુ {1} સાથે જોડાયેલ વેબસાઇટ છબી {0} શોધી શકાતી નથી
 DocType: Issue,Content Type,સામગ્રી પ્રકાર
@@ -6357,7 +6363,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,એકાઉન્ટ ડેબિટ એક બેલેન્સ શીટ એકાઉન્ટ હોવું જ જોઈએ
 DocType: Asset,Naming Series,નામકરણ સિરીઝ
 DocType: Vital Signs,Coated,કોટેડ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,રો {0}: ઉપયોગી જીવન પછી અપેક્ષિત મૂલ્ય કુલ ખરીદી રકમ કરતાં ઓછું હોવું આવશ્યક છે
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,રો {0}: ઉપયોગી જીવન પછી અપેક્ષિત મૂલ્ય કુલ ખરીદી રકમ કરતાં ઓછું હોવું આવશ્યક છે
 DocType: GoCardless Settings,GoCardless Settings,GoCardless સેટિંગ્સ
 DocType: Leave Block List,Leave Block List Name,બ્લોક યાદી મૂકો નામ
 DocType: Certified Consultant,Certification Validity,પ્રમાણન માન્યતા
@@ -6424,6 +6430,7 @@
 DocType: Bank Statement Settings Item,Bank Header,બેન્ક હેડર
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,લેબ પરીક્ષણ જુઓ
 DocType: Hub Users,Hub Users,હબ વપરાશકર્તાઓ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; પ્રદેશ
 DocType: Purchase Invoice,Y,વાય
 DocType: Maintenance Visit,Maintenance Date,જાળવણી તારીખ
 DocType: Purchase Invoice Item,Rejected Serial No,નકારેલું સીરીયલ કોઈ
@@ -6438,7 +6445,7 @@
 DocType: SG Creation Tool Course,Max Strength,મેક્સ શક્તિ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,પ્રીસેટ્સનો ઇન્સ્ટોલ કરી રહ્યાં છે
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH- .YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},ગ્રાહક માટે કોઈ ડિલિવરી નોટ પસંદ નથી {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},ગ્રાહક માટે કોઈ ડિલિવરી નોટ પસંદ નથી {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,કર્મચારી {0} પાસે મહત્તમ સહાયક રકમ નથી
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,ડિલિવરી તારીખના આધારે આઇટમ્સ પસંદ કરો
 DocType: Grant Application,Has any past Grant Record,ભૂતકાળ ગ્રાન્ટ રેકોર્ડ છે
@@ -6465,7 +6472,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,હોટેલ રૂમ આરક્ષણ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,ગ્રાહક સેવા
 DocType: BOM,Thumbnail,થંબનેલ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,ઇમેઇલ આઇડી સાથે કોઈ સંપર્કો મળ્યાં નથી.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,ઇમેઇલ આઇડી સાથે કોઈ સંપર્કો મળ્યાં નથી.
 DocType: Item Customer Detail,Item Customer Detail,વસ્તુ ગ્રાહક વિગતવાર
 DocType: Notification Control,Prompt for Email on Submission of,સુપરત ઇમેઇલ માટે પ્રોમ્પ્ટ
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},કર્મચારીનું મહત્તમ લાભ રકમ {0} વધી જાય છે {1}
@@ -6720,7 +6727,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,"એકાઉન્ટ પ્રકાર પસંદ છે, કારણ કે ગ્રુપ અપ્રગટ કરી શકતા નથી."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} સુધારાઈ ગયેલ છે. તાજું કરો.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,પછીના દિવસોમાં રજા કાર્યક્રમો બનાવવા વપરાશકર્તાઓ રોકો.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,આઇટમ કોડ&gt; આઇટમ જૂથ&gt; બ્રાન્ડ
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","જો લોયલ્ટી પોઇંટ્સ માટે અમર્યાદિત સમાપ્તિ, સમાપ્તિ અવધિ ખાલી અથવા 0 રાખો."
 DocType: Asset Maintenance Team,Maintenance Team Members,જાળવણી ટીમના સભ્યો
 DocType: Loyalty Point Entry,Purchase Amount,ખરીદી જથ્થો
@@ -6728,7 +6734,7 @@
 											to fullfill Sales Order {2}",આઇટમ {1} ના સીરિયલ નંબર {1} નું વિતરણ કરી શકાતું નથી કારણ કે તે પૂર્ણ ભરેલી સેલ્સ ઓર્ડર {2} માટે આરક્ષિત છે
 DocType: Quotation,SAL-QTN-.YYYY.-,એસએએલ- QTN- .YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,પુરવઠોકર્તા અવતરણ {0} બનાવવામાં
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,અંતે વર્ષ શરૂ વર્ષ પહેલાં ન હોઈ શકે
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,અંતે વર્ષ શરૂ વર્ષ પહેલાં ન હોઈ શકે
 DocType: Employee Benefit Application,Employee Benefits,એમ્પ્લોયી બેનિફિટ્સ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},ભરેલા જથ્થો પંક્તિ માં વસ્તુ {0} માટે જથ્થો બરાબર હોવું જોઈએ {1}
 DocType: Work Order,Manufactured Qty,ઉત્પાદન Qty
@@ -6744,6 +6750,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,બેચ નંબર્સ પસંદ
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,જીએસટીઆઈએન માટે
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ગ્રાહકો માટે ઊભા બીલો.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,કૃપા કરીને માનવ સંસાધન&gt; એચઆર સેટિંગ્સમાં કર્મચારી નામકરણ સિસ્ટમ સેટ કરો
 DocType: Healthcare Settings,Invoice Appointments Automatically,આપમેળે ભરતિયું નિમણૂંક
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,પ્રોજેક્ટ ID
 DocType: Salary Component,Variable Based On Taxable Salary,કરપાત્ર પગાર પર આધારિત વેરિયેબલ
@@ -6792,7 +6799,7 @@
 DocType: POS Profile,Account for Change Amount,જથ્થો બદલી માટે એકાઉન્ટ
 DocType: QuickBooks Migrator,Connecting to QuickBooks,QuickBooks થી કનેક્ટ કરી રહ્યું છે
 DocType: Exchange Rate Revaluation,Total Gain/Loss,કુલ ગેઇન / લોસ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,ઇન્ટર કંપની ઇન્વોઇસ માટે અમાન્ય કંપની
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,ઇન્ટર કંપની ઇન્વોઇસ માટે અમાન્ય કંપની
 DocType: Purchase Invoice,input service,ઇનપુટ સેવા
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},રો {0}: પાર્ટી / એકાઉન્ટ સાથે મેળ ખાતું નથી {1} / {2} માં {3} {4}
 DocType: Employee Promotion,Employee Promotion,કર્મચારીનું પ્રમોશન
@@ -6922,7 +6929,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,લોજીંગ માટે પ્રિફર્ડ એરિયા
 apps/erpnext/erpnext/config/selling.py +184,Analytics,ઍનલિટિક્સ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,કાર્ટ ખાલી છે
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,કૃપા કરીને શિક્ષણ&gt; શિક્ષણ સેટિંગ્સમાં પ્રશિક્ષક નામકરણ સિસ્ટમ સેટ કરો
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",આઇટમ {0} પાસે કોઈ સીરિયલ નંબર નથી. ફક્ત સીરીયલઆઇઝ થયેલ આઇટમ્સની સીરીયલ નંબર પર આધારિત ડિલિવરી હોઈ શકે છે
 DocType: Vehicle,Model,મોડલ
@@ -6952,7 +6958,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,બદલવા માટે કંઈ નથી
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,CSV ફાઈલ પસંદ કરો
 DocType: Holiday List,Total Holidays,કુલ રજાઓ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,મોકલવા માટે ખૂટે ઇમેઇલ નમૂનો. કૃપા કરીને ડિલિવરી સેટિંગ્સમાં એક સેટ કરો.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,મોકલવા માટે ખૂટે ઇમેઇલ નમૂનો. કૃપા કરીને ડિલિવરી સેટિંગ્સમાં એક સેટ કરો.
 DocType: Student Leave Application,Mark as Present,પ્રેઝન્ટ તરીકે માર્ક
 DocType: Supplier Scorecard,Indicator Color,સૂચક રંગ
 DocType: Purchase Order,To Receive and Bill,પ્રાપ્ત અને બિલ
@@ -6961,7 +6967,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,સીરીયલ નંબર પસંદ કરો
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,ડીઝાઈનર
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,નિયમો અને શરતો ઢાંચો
-DocType: Serial No,Delivery Details,ડ લવર વિગતો
+DocType: Delivery Trip,Delivery Details,ડ લવર વિગતો
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},પ્રકાર માટે ખર્ચ કેન્દ્રને પંક્તિ જરૂરી છે {0} કર ટેબલ {1}
 DocType: Program,Program Code,કાર્યક્રમ કોડ
 DocType: Terms and Conditions,Terms and Conditions Help,નિયમો અને શરતો મદદ
@@ -6985,7 +6991,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,સમય દિવસમાં લીડ
 DocType: Cash Flow Mapping,Is Income Tax Expense,આવકવેરા ખર્ચ છે
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,તમારું ઑર્ડર વિતરણ માટે બહાર છે!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},રો # {0}: પોસ્ટ તારીખ ખરીદી તારીખ તરીકે જ હોવી જોઈએ {1} એસેટ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},રો # {0}: પોસ્ટ તારીખ ખરીદી તારીખ તરીકે જ હોવી જોઈએ {1} એસેટ {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,આ તપાસો જો વિદ્યાર્થી સંસ્થાના છાત્રાલય ખાતે રહેતા છે.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,ઉપરના કોષ્ટકમાં વેચાણ ઓર્ડર દાખલ કરો
 ,Stock Summary,સ્ટોક સારાંશ
diff --git a/erpnext/translations/he.csv b/erpnext/translations/he.csv
index 5597c38..8f46ee1 100644
--- a/erpnext/translations/he.csv
+++ b/erpnext/translations/he.csv
@@ -152,7 +152,7 @@
 DocType: Products Settings,Show Products as a List,הצג מוצרים כרשימה
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.py +43,Item {0} is not active or end of life has been reached,פריט {0} אינו פעיל או שהגיע הסוף של חיים
 apps/erpnext/erpnext/utilities/user_progress.py +190,Example: Basic Mathematics,דוגמה: מתמטיקה בסיסית
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","כדי לכלול מס בשורת {0} בשיעור פריט, מסים בשורות {1} חייבים להיות כלולים גם"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","כדי לכלול מס בשורת {0} בשיעור פריט, מסים בשורות {1} חייבים להיות כלולים גם"
 DocType: SMS Center,SMS Center,SMS מרכז
 DocType: Sales Invoice,Change Amount,שנת הסכום
 DocType: BOM Update Tool,New BOM,BOM החדש
@@ -294,7 +294,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"פריט זה הוא תבנית ולא ניתן להשתמש בם בעסקות. תכונות פריט תועתק על לגרסות אלא אם כן ""לא העתק 'מוגדרת"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,"להזמין סה""כ נחשב"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,קצב שבו מטבע לקוחות מומר למטבע הבסיס של הלקוח
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},שורה # {0}: חשבונית הרכש אינו יכול להתבצע נגד נכס קיים {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},שורה # {0}: חשבונית הרכש אינו יכול להתבצע נגד נכס קיים {1}
 DocType: Item Tax,Tax Rate,שיעור מס
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +73,{0} already allocated for Employee {1} for period {2} to {3},{0} כבר הוקצה לעובדי {1} לתקופה {2} {3} ל
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +145,Purchase Invoice {0} is already submitted,לרכוש חשבונית {0} כבר הוגשה
@@ -504,7 +504,7 @@
 DocType: Work Order Operation,In minutes,בדקות
 DocType: Issue,Resolution Date,תאריך החלטה
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,גיליון נוצר:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},אנא הגדר מזומנים ברירת מחדל או חשבון בנק במצב של תשלום {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},אנא הגדר מזומנים ברירת מחדל או חשבון בנק במצב של תשלום {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,לְהִרָשֵׁם
 DocType: Selling Settings,Customer Naming By,Naming הלקוח על ידי
 DocType: Depreciation Schedule,Depreciation Amount,סכום הפחת
@@ -543,7 +543,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +351,Marketing,שיווק
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,כניסת תשלום כבר נוצר
 DocType: Purchase Receipt Item Supplied,Current Stock,מלאי נוכחי
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},# שורה {0}: Asset {1} אינו קשור פריט {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},# שורה {0}: Asset {1} אינו קשור פריט {2}
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,חשבון {0} הוזן מספר פעמים
 DocType: Account,Expenses Included In Valuation,הוצאות שנכללו בהערכת שווי
 DocType: Email Digest,Next email will be sent on:,"הדוא""ל הבא יישלח על:"
@@ -633,7 +633,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +146,Nos,מס
 DocType: Item,Items with higher weightage will be shown higher,פריטים עם weightage גבוה יותר תוכלו לראות גבוהים יותר
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,פרט בנק פיוס
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,# שורה {0}: Asset {1} יש להגיש
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,# שורה {0}: Asset {1} יש להגיש
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,אף עובדים מצא
 DocType: Item,If subcontracted to a vendor,אם קבלן לספקים
 DocType: SMS Center,All Customer Contact,כל קשרי הלקוחות
@@ -816,7 +816,7 @@
 DocType: Serial No,Creation Document No,יצירת מסמך לא
 DocType: Share Transfer,Issue,נושא
 DocType: Asset,Scrapped,לגרוטאות
-DocType: Purchase Invoice,Returns,החזרות
+DocType: Cashier Closing,Returns,החזרות
 DocType: Job Card,WIP Warehouse,מחסן WIP
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},מספר סידורי {0} הוא תחת חוזה תחזוקת upto {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,גיוס
@@ -843,7 +843,7 @@
 apps/erpnext/erpnext/templates/pages/home.html +32,View All Products,הצג את כל המוצרים
 DocType: Healthcare Practitioner,Default Currency,מטבע ברירת מחדל
 DocType: Asset Movement,From Employee,מעובדים
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,אזהרה: מערכת לא תבדוק overbilling מאז סכום עבור פריט {0} ב {1} הוא אפס
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,אזהרה: מערכת לא תבדוק overbilling מאז סכום עבור פריט {0} ב {1} הוא אפס
 DocType: Journal Entry,Make Difference Entry,הפוך כניסת הבדל
 DocType: Upload Attendance,Attendance From Date,נוכחות מתאריך
 DocType: Appraisal Template Goal,Key Performance Area,פינת של ביצועים מרכזיים
@@ -913,7 +913,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +486,'Entries' cannot be empty,הרשומות' לא יכולות להיות ריקות'
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},שורה כפולה {0} עם אותו {1}
 ,Trial Balance,מאזן בוחן
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,שנת כספים {0} לא נמצאה
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,שנת כספים {0} לא נמצאה
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,הגדרת עובדים
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,אנא בחר תחילה קידומת
 DocType: Student,O-,O-
@@ -1066,7 +1066,7 @@
 DocType: Item,Maintain Stock,לשמור על המלאי
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,שינוי נטו בנכסים קבועים
 DocType: Leave Control Panel,Leave blank if considered for all designations,שאר ריק אם תיחשב לכל הכינויים
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,תשלום מסוג 'בפועל' בשורת {0} אינו יכול להיות כלולים במחיר הפריט
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,תשלום מסוג 'בפועל' בשורת {0} אינו יכול להיות כלולים במחיר הפריט
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},מקס: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,מDatetime
 DocType: Shopify Settings,For Company,לחברה
@@ -1245,7 +1245,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.py +87,{0} {1} created,{0} {1} נוצר
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},נגד ספק חשבונית {0} יום {1}
 DocType: Customer,Default Price List,מחיר מחירון ברירת מחדל
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,שיא תנועת נכסים {0} נוצרו
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,שיא תנועת נכסים {0} נוצרו
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,אתה לא יכול למחוק את שנת הכספים {0}. שנת הכספים {0} מוגדרת כברירת מחדל ב הגדרות גלובליות
 DocType: Journal Entry,Entry Type,סוג הכניסה
 ,Customer Credit Balance,יתרת אשראי ללקוחות
@@ -1354,7 +1354,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +57,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},בקשת חומר של מקסימום {0} יכולה להתבצע עבור פריט {1} נגד להזמין מכירות {2}
 DocType: Course,Course Abbreviation,קיצור קורס
 DocType: Item,Will also apply for variants,תחול גם לגרסות
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","נכסים לא ניתן לבטל, כפי שהוא כבר {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","נכסים לא ניתן לבטל, כפי שהוא כבר {0}"
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ב
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,פריטי Bundle בעת מכירה.
 DocType: Material Request Plan Item,Actual Qty,כמות בפועל
@@ -1408,7 +1408,7 @@
 ,Amount to Deliver,הסכום לאספקת
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +201,There were errors.,היו שגיאות.
 DocType: Naming Series,Current Value,ערך נוכחי
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,שנתי כספים מרובות קיימות במועד {0}. אנא להגדיר חברה בשנת הכספים
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,שנתי כספים מרובות קיימות במועד {0}. אנא להגדיר חברה בשנת הכספים
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} נוצר
 DocType: Delivery Note Item,Against Sales Order,נגד להזמין מכירות
 ,Serial No Status,סטטוס מספר סידורי
@@ -1496,7 +1496,7 @@
 DocType: Projects Settings,Timesheets,גליונות
 DocType: HR Settings,HR Settings,הגדרות HR
 DocType: Purchase Invoice,Additional Discount Amount,סכום הנחה נוסף
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","# השורה {0}: כמות חייבת להיות 1, כפריט הוא נכס קבוע. השתמש בשורה נפרדת עבור כמות מרובה."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","# השורה {0}: כמות חייבת להיות 1, כפריט הוא נכס קבוע. השתמש בשורה נפרדת עבור כמות מרובה."
 DocType: Leave Block List Allow,Leave Block List Allow,השאר בלוק רשימה אפשר
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr לא יכול להיות ריק או חלל
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Non-Group,קבוצה לקבוצה ללא
@@ -1515,7 +1515,7 @@
 DocType: Workstation,Wages per hour,שכר לשעה
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},איזון המניה בתצווה {0} יהפוך שלילי {1} לפריט {2} במחסן {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,בעקבות בקשות חומר הועלה באופן אוטומטי המבוסס על הרמה מחדש כדי של הפריט
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},חשבון {0} אינו חוקי. מטבע חשבון חייב להיות {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},חשבון {0} אינו חוקי. מטבע חשבון חייב להיות {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},גורם של אוני 'מישגן ההמרה נדרש בשורת {0}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1120,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","# השורה {0}: Reference סוג המסמך חייב להיות אחד להזמין מכירות, חשבוניות מכירות או תנועת יומן"
@@ -1595,7 +1595,7 @@
 DocType: Activity Type,Default Billing Rate,דרג חיוב ברירת מחדל
 DocType: Sales Invoice,Total Billing Amount,סכום חיוב סה&quot;כ
 DocType: Bank Statement Transaction Entry,Receivable Account,חשבון חייבים
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},# שורה {0}: Asset {1} הוא כבר {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},# שורה {0}: Asset {1} הוא כבר {2}
 DocType: Quotation Item,Stock Balance,יתרת מלאי
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,להזמין מכירות לתשלום
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,מנכ&quot;ל
@@ -1849,7 +1849,7 @@
 DocType: Salary Structure,Total Earning,"צבירה סה""כ"
 DocType: Purchase Receipt,Time at which materials were received,זמן שבו חומרים שהתקבלו
 DocType: Stock Ledger Entry,Outgoing Rate,דרג יוצא
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,או
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,או
 DocType: Sales Order,Billing Status,סטטוס חיוב
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,דווח על בעיה
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,הוצאות שירות
@@ -2060,7 +2060,7 @@
 DocType: Patient Appointment,Scheduled,מתוכנן
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,בקשה לציטוט.
 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",אנא בחר פריט שבו &quot;האם פריט במלאי&quot; הוא &quot;לא&quot; ו- &quot;האם פריט מכירות&quot; הוא &quot;כן&quot; ואין Bundle מוצרים אחר
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),מראש סה&quot;כ ({0}) נגד להזמין {1} לא יכול להיות גדול יותר מהסך כולל ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),מראש סה&quot;כ ({0}) נגד להזמין {1} לא יכול להיות גדול יותר מהסך כולל ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,בחר בחתך חודשי להפיץ בצורה לא אחידה על פני מטרות חודשים.
 DocType: Purchase Invoice Item,Valuation Rate,שערי הערכת שווי
 apps/erpnext/erpnext/stock/get_item_details.py +546,Price List Currency not selected,מטבע מחירון לא נבחר
@@ -2193,7 +2193,7 @@
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,סכום חיוב
 DocType: Asset,Double Declining Balance,יתרה זוגית ירידה
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Closed order cannot be cancelled. Unclose to cancel.,כדי סגור לא ניתן לבטל. חוסר קרבה לבטל.
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;עדכון מאגר&#39; לא ניתן לבדוק למכירת נכס קבועה
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;עדכון מאגר&#39; לא ניתן לבדוק למכירת נכס קבועה
 DocType: Bank Reconciliation,Bank Reconciliation,בנק פיוס
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,קבל עדכונים
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +164,Material Request {0} is cancelled or stopped,בקשת חומר {0} בוטלה או נעצרה
@@ -2213,7 +2213,7 @@
 DocType: Sales Invoice,Customer's Purchase Order,הלקוח הזמנת הרכש
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,אין ו אצווה סידורי
 DocType: Warranty Claim,From Company,מחברה
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,אנא להגדיר מספר הפחת הוזמן
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,אנא להגדיר מספר הפחת הוזמן
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,ערך או כמות
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +470,Productions Orders cannot be raised for:,הזמנות הפקות לא ניתן להעלות על:
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,דקות
@@ -2342,7 +2342,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,איפה פעולות ייצור מתבצעות.
 DocType: BOM Explosion Item,Source Warehouse,מחסן מקור
 DocType: Installation Note,Installation Date,התקנת תאריך
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},# השורה {0}: Asset {1} לא שייך לחברת {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},# השורה {0}: Asset {1} לא שייך לחברת {2}
 DocType: Employee,Confirmation Date,תאריך אישור
 DocType: C-Form,Total Invoiced Amount,"סכום חשבונית סה""כ"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +51,Min Qty can not be greater than Max Qty,דקות כמות לא יכולה להיות גדולה יותר מכמות מקס
@@ -2427,7 +2427,7 @@
 DocType: Product Bundle,List items that form the package.,פריטי רשימה היוצרים את החבילה.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,אחוז ההקצאה צריכה להיות שווה ל- 100%
 DocType: Serial No,Out of AMC,מתוך AMC
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,מספר הפחת הוזמן לא יכול להיות גדול ממספרם הכולל של פחת
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,מספר הפחת הוזמן לא יכול להיות גדול ממספרם הכולל של פחת
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,הפוך תחזוקה בקר
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +263,Please contact to the user who have Sales Master Manager {0} role,אנא צור קשר עם למשתמש שיש לי מכירות Master מנהל {0} תפקיד
 DocType: Company,Default Cash Account,חשבון מזומנים ברירת מחדל
@@ -2449,7 +2449,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Date of Birth cannot be greater than today.,תאריך לידה לא יכול להיות גדול יותר מהיום.
 ,Stock Ageing,התיישנות מלאי
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,לוח זמנים
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' אינו זמין
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' אינו זמין
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,קבע כלהרחיב
 DocType: Cheque Print Template,Scanned Cheque,המחאה סרוקה
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,"שלח דוא""ל אוטומטית למגעים על עסקות הגשת."
@@ -2457,7 +2457,7 @@
 DocType: Purchase Order,Customer Contact Email,דוא&quot;ל ליצירת קשר של לקוחות
 DocType: Warranty Claim,Item and Warranty Details,פרטי פריט ואחריות
 DocType: Sales Team,Contribution (%),תרומה (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"הערה: כניסת תשלום לא יצרה מאז ""מזומן או חשבון הבנק 'לא צוין"
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"הערה: כניסת תשלום לא יצרה מאז ""מזומן או חשבון הבנק 'לא צוין"
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,אחריות
 DocType: Expense Claim Account,Expense Claim Account,חשבון תביעת הוצאות
 DocType: Sales Person,Sales Person Name,שם איש מכירות
@@ -2592,7 +2592,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},חשבון הוצאות הוא חובה עבור פריט {0}
 DocType: BOM,Website Description,תיאור אתר
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,שינוי נטו בהון עצמי
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,אנא בטל חשבונית רכישת {0} ראשון
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,אנא בטל חשבונית רכישת {0} ראשון
 DocType: Serial No,AMC Expiry Date,תאריך תפוגה AMC
 ,Sales Register,מכירות הרשמה
 DocType: Quotation,Quotation Lost Reason,סיבה אבודה ציטוט
@@ -2637,7 +2637,7 @@
 DocType: Share Transfer,Transfer,העברה
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),תביא BOM התפוצץ (כולל תת מכלולים)
 DocType: Authorization Rule,Applicable To (Employee),כדי ישים (עובד)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,תאריך היעד הוא חובה
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,תאריך היעד הוא חובה
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,תוספת לתכונה {0} לא יכולה להיות 0
 DocType: Journal Entry,Pay To / Recd From,לשלם ל/ Recd מ
 DocType: Naming Series,Setup Series,סדרת התקנה
@@ -2705,7 +2705,7 @@
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +59,Serial #,סידורי #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,עמלה על מכירות
 DocType: Job Offer Term,Value / Description,ערך / תיאור
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","# שורה {0}: Asset {1} לא ניתן להגיש, זה כבר {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","# שורה {0}: Asset {1} לא ניתן להגיש, זה כבר {2}"
 DocType: Tax Rule,Billing Country,ארץ חיוב
 DocType: Purchase Order Item,Expected Delivery Date,תאריך אספקה צפוי
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,חיוב אשראי לא שווה {0} # {1}. ההבדל הוא {2}.
@@ -2728,7 +2728,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,הכנסות מלקוחות חדשות
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Travel Expenses,הוצאות נסיעה
 DocType: Maintenance Visit,Breakdown,התפלגות
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,חשבון: {0} עם מטבע: {1} לא ניתן לבחור
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,חשבון: {0} עם מטבע: {1} לא ניתן לבחור
 DocType: Bank Reconciliation Detail,Cheque Date,תאריך המחאה
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},חשבון {0}: הורה חשבון {1} אינו שייך לחברה: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,בהצלחה נמחק כל העסקות הקשורות לחברה זו!
@@ -2773,7 +2773,7 @@
 ,Territory Target Variance Item Group-Wise,פריט יעד שונות טריטורית קבוצה-Wise
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,בכל קבוצות הלקוחות
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,מצטבר חודשי
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} הוא חובה. אולי שיא המרה לא נוצר עבור {1} ל {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} הוא חובה. אולי שיא המרה לא נוצר עבור {1} ל {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,תבנית מס היא חובה.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,חשבון {0}: הורה חשבון {1} לא קיימת
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),מחיר מחירון שיעור (חברת מטבע)
@@ -2991,7 +2991,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,סבון וחומרי ניקוי
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture ווידאו
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,הורה
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},פתיחת פחת שנצבר חייבת להיות פחות מ שווה ל {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},פתיחת פחת שנצבר חייבת להיות פחות מ שווה ל {0}
 DocType: Warehouse,Warehouse Name,שם מחסן
 DocType: Naming Series,Select Transaction,עסקה בחר
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,נא להזין את אישור תפקיד או אישור משתמש
@@ -3478,7 +3478,7 @@
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,מוצרים מומלצים
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,מעצב
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,תבנית תנאים והגבלות
-DocType: Serial No,Delivery Details,פרטי משלוח
+DocType: Delivery Trip,Delivery Details,פרטי משלוח
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},מרכז העלות נדרש בשורת {0} במסי שולחן לסוג {1}
 DocType: Program,Program Code,קוד התוכנית
 ,Item-wise Purchase Register,הרשם רכישת פריט-חכם
@@ -3493,7 +3493,7 @@
 DocType: Leave Type,Is Carry Forward,האם להמשיך קדימה
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +984,Get Items from BOM,קבל פריטים מBOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,להוביל ימי זמן
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},# שורה {0}: פרסום תאריך חייב להיות זהה לתאריך הרכישה {1} של נכס {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},# שורה {0}: פרסום תאריך חייב להיות זהה לתאריך הרכישה {1} של נכס {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,נא להזין הזמנות ומכירות בטבלה לעיל
 ,Stock Summary,סיכום במלאי
 apps/erpnext/erpnext/config/assets.py +62,Transfer an asset from one warehouse to another,להעביר נכס ממחסן אחד למשנהו
diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index 816552f..95c89b4 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,अवधि का नाम
 DocType: Employee,Salary Mode,वेतन साधन
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,रजिस्टर
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,रजिस्टर
 DocType: Patient,Divorced,तलाकशुदा
 DocType: Support Settings,Post Route Key,पोस्ट रूट कुंजी
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,आइटम एक सौदे में कई बार जोड़े जाने की अनुमति दें
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,नई विनिमय दर
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},मुद्रा मूल्य सूची के लिए आवश्यक है {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* लेनदेन में गणना की जाएगी.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,प्रदायक&gt; प्रदायक प्रकार
 DocType: Delivery Trip,MAT-DT-.YYYY.-,मेट-डीटी-.YYYY.-
 DocType: Purchase Order,Customer Contact,ग्राहक से संपर्क
 DocType: Patient Appointment,Check availability,उपलब्धता जाँचें
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,खुले शो
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,सीरीज सफलतापूर्वक अपडेट
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,चेक आउट
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} पंक्ति में {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} पंक्ति में {1}
 DocType: Asset Finance Book,Depreciation Start Date,मूल्यह्रास प्रारंभ दिनांक
 DocType: Pricing Rule,Apply On,पर लागू होते हैं
 DocType: Item Price,Multiple Item prices.,एकाधिक आइटम कीमतों .
@@ -118,7 +117,7 @@
 DocType: Lab Prescription,Lab Prescription,लैब प्रिस्क्रिप्शन
 ,Delay Days,विलंब दिवस
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,सेवा व्यय
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},सीरियल नंबर: {0} पहले से ही बिक्री चालान में संदर्भित है: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},सीरियल नंबर: {0} पहले से ही बिक्री चालान में संदर्भित है: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,बीजक
 DocType: Purchase Invoice Item,Item Weight Details,आइटम वजन विवरण
 DocType: Asset Maintenance Log,Periodicity,आवधिकता
@@ -143,6 +142,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,मुनीम
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,मूल्य सूची बेचना
 DocType: Patient,Tobacco Current Use,तंबाकू वर्तमान उपयोग
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","प्रारंभ तिथि और समाप्ति तिथि जॉब कार्ड <a href=""#Form/Job Card/{0}"">{1} के</a> साथ ओवरलैप कर रही है"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,बिक्री दर
 DocType: Cost Center,Stock User,शेयर उपयोगकर्ता
 DocType: Soil Analysis,(Ca+Mg)/K,(सीए मिलीग्राम +) / कश्मीर
@@ -162,7 +162,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,सम्बंधित
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,उपस्थिति तारीख कर्मचारी के शामिल होने की तारीख से कम नहीं किया जा सकता है
 DocType: Grading Scale,Grading Scale Name,ग्रेडिंग पैमाने नाम
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,उपयोगकर्ताओं को बाज़ार में जोड़ें
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,उपयोगकर्ताओं को बाज़ार में जोड़ें
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,इस रुट खाता है और संपादित नहीं किया जा सकता है .
 DocType: Sales Invoice,Company Address,कंपनी का पता
 DocType: BOM,Operations,संचालन
@@ -319,7 +319,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,डिफ मात्रा
 DocType: Production Plan,Material Request Detail,सामग्री अनुरोध विस्तार
 DocType: Selling Settings,Default Quotation Validity Days,डिफ़ॉल्ट कोटेशन वैधता दिन
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","पंक्ति में कर शामिल करने के लिए {0} आइटम रेट में , पंक्तियों में करों {1} भी शामिल किया जाना चाहिए"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","पंक्ति में कर शामिल करने के लिए {0} आइटम रेट में , पंक्तियों में करों {1} भी शामिल किया जाना चाहिए"
 DocType: SMS Center,SMS Center,एसएमएस केंद्र
 DocType: Payroll Entry,Validate Attendance,उपस्थिति की पुष्टि करें
 DocType: Sales Invoice,Change Amount,राशि परिवर्तन
@@ -438,7 +438,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,शब्दों में राशि के लिए पंक्ति रिक्ति
 DocType: Vehicle,Additional Details,अतिरिक्त जानकारिया
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,दिया का कोई विवरण नहीं
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,प्रदायक&gt; प्रदायक समूह
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,खरीद के लिए अनुरोध.
 DocType: POS Closing Voucher Details,Collected Amount,एकत्रित राशि
 DocType: Lab Test,Submitted Date,सबमिट करने की तिथि
@@ -483,7 +482,7 @@
 DocType: Student Admission,Student Admission,छात्र प्रवेश
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,मूल्यह्रास पंक्ति {0}: मूल्यह्रास प्रारंभ तिथि पिछली तारीख के रूप में दर्ज की जाती है
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,मूल्यह्रास पंक्ति {0}: मूल्यह्रास प्रारंभ तिथि पिछली तारीख के रूप में दर्ज की जाती है
 DocType: Contract Template,Fulfilment Terms and Conditions,पूर्ति नियम और शर्तें
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,सामग्री अनुरोध
 DocType: Bank Reconciliation,Update Clearance Date,अद्यतन क्लीयरेंस तिथि
@@ -540,6 +539,7 @@
 DocType: Accounts Settings,Settings for Accounts,खातों के लिए सेटिंग्स
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},आपूर्तिकर्ता चालान नहीं खरीद चालान में मौजूद है {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,बिक्री व्यक्ति पेड़ की व्यवस्था करें.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","मार्ग को संसाधित नहीं कर सकता, क्योंकि Google मानचित्र सेटिंग्स अक्षम है।"
 DocType: Job Applicant,Cover Letter,कवर लेटर
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,बकाया चेक्स और स्पष्ट करने जमाओं
 DocType: Item,Synced With Hub,हब के साथ सिंक किया गया
@@ -598,7 +598,7 @@
 DocType: Asset Value Adjustment,New Asset Value,नई संपत्ति मूल्य
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,जिस पर दर ग्राहक की मुद्रा ग्राहक आधार मुद्रा में परिवर्तित किया जाता है
 DocType: Course Scheduling Tool,Course Scheduling Tool,पाठ्यक्रम निर्धारण उपकरण
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},पंक्ति # {0}: चालान की खरीद करने के लिए एक मौजूदा परिसंपत्ति के खिलाफ नहीं बनाया जा सकता है {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},पंक्ति # {0}: चालान की खरीद करने के लिए एक मौजूदा परिसंपत्ति के खिलाफ नहीं बनाया जा सकता है {1}
 DocType: Crop Cycle,LInked Analysis,लिंक्ड विश्लेषण
 DocType: POS Closing Voucher,POS Closing Voucher,पीओएस बंद वाउचर
 DocType: Contract,Lapsed,कालातीत
@@ -633,6 +633,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} कोर्स {2} में नामांकित नहीं है
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,छात्र का नाम:
 DocType: POS Closing Voucher Details,Difference,अंतर
+DocType: Delivery Settings,Delay between Delivery Stops,डिलिवरी स्टॉप के बीच देरी
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},धारावाहिक नहीं {0} डिलिवरी नोट से संबंधित नहीं है {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","सर्वर के GoCardless कॉन्फ़िगरेशन के साथ एक समस्या होने लगता है विफलता के मामले में चिंता न करें, राशि आपके खाते में वापस कर दी जाएगी।"
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext डेमो
@@ -691,7 +692,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,मात्रा और दर
 DocType: Delivery Note,% Installed,% स्थापित
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,कक्षाओं / प्रयोगशालाओं आदि जहां व्याख्यान के लिए निर्धारित किया जा सकता है।
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,दोनों कंपनियों की कंपनी मुद्राओं को इंटर कंपनी लेनदेन के लिए मिलना चाहिए।
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,दोनों कंपनियों की कंपनी मुद्राओं को इंटर कंपनी लेनदेन के लिए मिलना चाहिए।
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,पहले कंपनी का नाम दर्ज करें
 DocType: Travel Itinerary,Non-Vegetarian,मांसाहारी
 DocType: Purchase Invoice,Supplier Name,प्रदायक नाम
@@ -776,7 +777,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,तिथि से किराए पर लिया
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,बहुत हो गया भागों का निर्माण करने के लिए
 DocType: POS Profile User,POS Profile User,पीओएस प्रोफ़ाइल उपयोगकर्ता
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,पंक्ति {0}: मूल्यह्रास प्रारंभ दिनांक आवश्यक है
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,पंक्ति {0}: मूल्यह्रास प्रारंभ दिनांक आवश्यक है
 DocType: Purchase Invoice Item,Service Start Date,सेवा प्रारंभ दिनांक
 DocType: Subscription Invoice,Subscription Invoice,सदस्यता चालान
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,प्रत्यक्ष आय
@@ -843,7 +844,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,संक्षिप्त पहले से ही एक और कंपनी के लिए इस्तेमाल किया
 DocType: Selling Settings,Default Customer Group,डिफ़ॉल्ट ग्राहक समूह
 DocType: Employee,IFSC Code,आईएफएससी कोड
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","प्रारंभ तिथि और समाप्ति तिथि जॉब कार्ड <a href=""#Form/Job Card/{0}"">{1} के</a> साथ ओवरलैप कर रही है"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","निष्क्रिय कर देते हैं, &#39;गोल कुल&#39; अगर क्षेत्र किसी भी लेन - देन में दिखाई नहीं देगा"
 DocType: BOM,Operating Cost,संचालन लागत
 DocType: Crop,Produced Items,उत्पादित आइटम
@@ -895,7 +895,7 @@
 DocType: Supplier,Prevent RFQs,आरएफक्यू को रोकें
 DocType: Hub User,Hub User,हब उपयोगकर्ता
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,बनाओ बिक्री आदेश
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},{0} से {1} की अवधि के लिए जमा की गयी पर्ची
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},{0} से {1} की अवधि के लिए जमा की गयी पर्ची
 DocType: Project Task,Project Task,परियोजना के कार्य
 DocType: Loyalty Point Entry Redemption,Redeemed Points,रिडीम किए गए अंक
 ,Lead Id,लीड ईद
@@ -1023,7 +1023,7 @@
 DocType: Fee Validity,Max number of visit,विज़िट की अधिकतम संख्या
 ,Hotel Room Occupancy,होटल कक्ष अधिभोग
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet बनाया:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},भुगतान की विधि में डिफ़ॉल्ट नकद या बैंक खाता सेट करें {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},भुगतान की विधि में डिफ़ॉल्ट नकद या बैंक खाता सेट करें {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,भर्ती
 DocType: GST Settings,GST Settings,जीएसटी सेटिंग्स
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},मुद्रा मूल्य सूची मुद्रा के समान होना चाहिए: {0}
@@ -1077,7 +1077,7 @@
 DocType: Vehicle Log,Service Details,सेवा विवरण
 DocType: Lab Test Template,Grouped,समूहीकृत
 DocType: Selling Settings,Delivery Note Required,डिलिवरी नोट आवश्यक
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,वेतन पर्ची जमा करना ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,वेतन पर्ची जमा करना ...
 DocType: Bank Guarantee,Bank Guarantee Number,बैंक गारंटी संख्या
 DocType: Assessment Criteria,Assessment Criteria,मूल्यांकन के मानदंड
 DocType: BOM Item,Basic Rate (Company Currency),बेसिक रेट (कंपनी मुद्रा)
@@ -1102,13 +1102,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,भुगतान प्रवेश पहले से ही बनाई गई है
 DocType: Request for Quotation,Get Suppliers,आपूर्तिकर्ता प्राप्त करें
 DocType: Purchase Receipt Item Supplied,Current Stock,मौजूदा स्टॉक
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},पंक्ति # {0}: संपत्ति {1} वस्तु {2} से जुड़ा हुआ नहीं है
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},पंक्ति # {0}: संपत्ति {1} वस्तु {2} से जुड़ा हुआ नहीं है
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,पूर्वावलोकन वेतन पर्ची
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,खाता {0} कई बार दर्ज किया गया है
 DocType: Account,Expenses Included In Valuation,व्यय मूल्यांकन में शामिल
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,यदि केवल 30 दिनों के भीतर आपकी सदस्यता समाप्त होने पर आप केवल नवीनीकृत कर सकते हैं
 DocType: Shopping Cart Settings,Show Stock Availability,स्टॉक उपलब्धता दिखाएं
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},संपत्ति श्रेणी {1} या कंपनी {2} में {0} सेट करें
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},संपत्ति श्रेणी {1} या कंपनी {2} में {0} सेट करें
 DocType: Location,Longitude,देशान्तर
 ,Absent Student Report,अनुपस्थित छात्र की रिपोर्ट
 DocType: Crop,Crop Spacing UOM,फसल रिक्ति UOM
@@ -1180,7 +1180,7 @@
 DocType: Soil Texture,Sand,रेत
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,ऊर्जा
 DocType: Opportunity,Opportunity From,अवसर से
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,पंक्ति {0}: {1} आइटम {2} के लिए आवश्यक सीरियल नंबर आपने {3} प्रदान किया है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,पंक्ति {0}: {1} आइटम {2} के लिए आवश्यक सीरियल नंबर आपने {3} प्रदान किया है
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,कृपया एक तालिका चुनें
 DocType: BOM,Website Specifications,वेबसाइट निर्दिष्टीकरण
 DocType: Special Test Items,Particulars,विवरण
@@ -1291,7 +1291,7 @@
 DocType: Item,Items with higher weightage will be shown higher,उच्च वेटेज के साथ आइटम उच्च दिखाया जाएगा
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,लैब टेस्ट और महत्वपूर्ण लक्षण
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,बैंक सुलह विस्तार
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,पंक्ति # {0}: संपत्ति {1} प्रस्तुत किया जाना चाहिए
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,पंक्ति # {0}: संपत्ति {1} प्रस्तुत किया जाना चाहिए
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,नहीं मिला कर्मचारी
 DocType: Item,If subcontracted to a vendor,एक विक्रेता के लिए subcontracted हैं
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,छात्र समूह पहले से ही अपडेट किया गया है।
@@ -1345,7 +1345,6 @@
 DocType: Loyalty Program Collection,Tier Name,टियर नाम
 DocType: HR Settings,Enter retirement age in years,साल में सेवानिवृत्ति की आयु दर्ज
 DocType: Crop,Target Warehouse,लक्ष्य वेअरहाउस
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,कृपया सेटअप&gt; सेटिंग्स&gt; नामकरण श्रृंखला के माध्यम से {0} के लिए नामकरण श्रृंखला सेट करें
 DocType: Payroll Employee Detail,Payroll Employee Detail,पेरोल कर्मचारी विस्तार
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,कृपया एक गोदाम का चयन करें
 DocType: Cheque Print Template,Starting location from left edge,बाएँ किनारे से शुरू स्थान
@@ -1435,7 +1434,7 @@
 DocType: Work Order,Plan material for sub-assemblies,उप असेंबलियों के लिए योजना सामग्री
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,बिक्री भागीदारों और टेरिटरी
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,बीओएम {0} सक्रिय होना चाहिए
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,स्थानांतरण के लिए कोई आइटम उपलब्ध नहीं है
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,स्थानांतरण के लिए कोई आइटम उपलब्ध नहीं है
 DocType: Employee Boarding Activity,Activity Name,गतिविधि का नाम
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,रिलीज दिनांक बदलें
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,उत्पाद की मात्रा समाप्त हुई <b>{0}</b> और मात्रा के लिए <b>{1}</b> अलग नहीं हो सकता है
@@ -1662,6 +1661,7 @@
 DocType: Project,First Email,पहला ईमेल
 DocType: Company,Exception Budget Approver Role,अपवाद बजट दृष्टिकोण भूमिका
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","एक बार सेट हो जाने पर, यह चालान सेट तिथि तक होल्ड पर होगा"
+DocType: Cashier Closing,POS-CLO-,पीओएस CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,बिक्री आदेश / तैयार माल गोदाम में सुरक्षित गोदाम
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,बेच राशि
 DocType: Repayment Schedule,Interest Amount,ब्याज राशि
@@ -1673,7 +1673,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,अभिलेख
 DocType: Asset,Scrapped,खत्म कर दिया
 DocType: Item,Item Defaults,आइटम डिफ़ॉल्ट
-DocType: Purchase Invoice,Returns,रिटर्न
+DocType: Cashier Closing,Returns,रिटर्न
 DocType: Job Card,WIP Warehouse,WIP वेयरहाउस
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},धारावाहिक नहीं {0} तक रखरखाव अनुबंध के तहत है {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,भरती
@@ -1687,7 +1687,6 @@
 DocType: Student,A-,ए-
 DocType: Share Transfer,Transfer Type,स्थानांतरण प्रकार
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,बिक्री व्यय
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; क्षेत्र
 DocType: Diagnosis,Diagnosis,निदान
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,मानक खरीद
 DocType: Attendance Request,Explanation,व्याख्या
@@ -1700,7 +1699,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,ऑर्डर आइटम ओवरड्यू खरीदें
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,पिन कोड
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},बिक्री आदेश {0} है {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},ऋण में ब्याज आय खाता चुनें {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},ऋण में ब्याज आय खाता चुनें {0}
 DocType: Opportunity,Contact Info,संपर्क जानकारी
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,स्टॉक प्रविष्टियां बनाना
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,स्थिति के साथ कर्मचारी को बढ़ावा नहीं दे सकता है
@@ -1712,7 +1711,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,शून्य बिलिंग घंटे के लिए चालान नहीं किया जा सकता
 DocType: Company,Date of Commencement,प्रारंभ होने की तिथि
 DocType: Sales Person,Select company name first.,कंपनी 1 नाम का चयन करें.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},ईमेल भेजा {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},ईमेल भेजा {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,कोटेशन आपूर्तिकर्ता से प्राप्त किया.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,बीओएम को बदलें और सभी बीओएम में नवीनतम मूल्य अपडेट करें
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},{0} | {1} {2}
@@ -1732,7 +1731,7 @@
 DocType: Asset Movement,From Employee,कर्मचारी से
 DocType: Driver,Cellphone Number,सेलफोन नंबर
 DocType: Project,Monitor Progress,प्रगति की निगरानी करें
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,चेतावनी: सिस्टम {0} {1} शून्य है में आइटम के लिए राशि के बाद से overbilling जांच नहीं करेगा
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,चेतावनी: सिस्टम {0} {1} शून्य है में आइटम के लिए राशि के बाद से overbilling जांच नहीं करेगा
 DocType: Journal Entry,Make Difference Entry,अंतर एंट्री
 DocType: Supplier Quotation,Auto Repeat Section,ऑटो दोहराना अनुभाग
 DocType: Upload Attendance,Attendance From Date,दिनांक से उपस्थिति
@@ -1835,7 +1834,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,पंक्ति # {0}: मात्रा क्रय वापसी में दर्ज नहीं किया जा सकता अस्वीकृत
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,चयनित ग्राहक के लिए ग्राहक समूह को बदलने की अनुमति नहीं है।
 ,Purchase Order Items To Be Billed,बिल के लिए खरीद आदेश आइटम
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,अनुमानित आगमन के समय को अपडेट कर रहा है।
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,अनुमानित आगमन के समय को अपडेट कर रहा है।
 DocType: Program Enrollment Tool,Enrollment Details,नामांकन विवरण
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,किसी कंपनी के लिए एकाधिक आइटम डिफ़ॉल्ट सेट नहीं कर सकते हैं।
 DocType: Purchase Invoice Item,Net Rate,असल दर
@@ -1849,7 +1848,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,छोड़ने का प्रकार पागल है
 DocType: Support Settings,Close Issue After Days,बंद अंक दिनों के बाद
 ,Eway Bill,बिल बिल
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,बाज़ार में उपयोगकर्ताओं को जोड़ने के लिए आपको सिस्टम मैनेजर और आइटम मैनेजर भूमिकाओं के साथ एक उपयोगकर्ता होने की आवश्यकता है।
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,बाज़ार में उपयोगकर्ताओं को जोड़ने के लिए आपको सिस्टम मैनेजर और आइटम मैनेजर भूमिकाओं के साथ एक उपयोगकर्ता होने की आवश्यकता है।
 DocType: Leave Control Panel,Leave blank if considered for all branches,रिक्त छोड़ अगर सभी शाखाओं के लिए माना जाता है
 DocType: Job Opening,Staffing Plan,स्टाफिंग योजना
 DocType: Bank Guarantee,Validity in Days,दिन में वैधता
@@ -1869,7 +1868,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},डुप्लिकेट पंक्ति {0} के साथ एक ही {1}
 DocType: Marketplace Settings,Disable Marketplace,बाज़ार अक्षम करें
 ,Trial Balance,शेष - परीक्षण
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,वित्त वर्ष {0} नहीं मिला
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,वित्त वर्ष {0} नहीं मिला
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,कर्मचारी की स्थापना
 DocType: Hotel Room Reservation,Hotel Reservation User,होटल आरक्षण उपयोगकर्ता
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,पहले उपसर्ग का चयन करें
@@ -1977,7 +1976,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,लॉगिन करने में विफल
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,संपत्ति {0} बनाई गई
 DocType: Special Test Items,Special Test Items,विशेष टेस्ट आइटम
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,बाज़ार प्रबंधक पर पंजीकरण करने के लिए आपको सिस्टम मैनेजर और आइटम मैनेजर भूमिकाओं के साथ एक उपयोगकर्ता होने की आवश्यकता है।
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,बाज़ार प्रबंधक पर पंजीकरण करने के लिए आपको सिस्टम मैनेजर और आइटम मैनेजर भूमिकाओं के साथ एक उपयोगकर्ता होने की आवश्यकता है।
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,भुगतान की रीति
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,आपके असाइन किए गए वेतन संरचना के अनुसार आप लाभ के लिए आवेदन नहीं कर सकते हैं
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,वेबसाइट छवि एक सार्वजनिक फ़ाइल या वेबसाइट URL होना चाहिए
@@ -1989,7 +1988,7 @@
 DocType: Warehouse,Warehouse Contact Info,वेयरहाउस संपर्क जानकारी
 DocType: Payment Entry,Write Off Difference Amount,बंद लिखें अंतर राशि
 DocType: Volunteer,Volunteer Name,स्वयंसेवक का नाम
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},अन्य पंक्तियों में डुप्लिकेट देय तिथियों वाली पंक्तियां मिलीं: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},अन्य पंक्तियों में डुप्लिकेट देय तिथियों वाली पंक्तियां मिलीं: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: कर्मचारी ईमेल नहीं मिला है, इसलिए नहीं भेजा गया ईमेल"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},दिए गए दिनांक पर कर्मचारी {0} के लिए आवंटित कोई वेतन संरचना {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},देश के लिए नौवहन नियम लागू नहीं है {0}
@@ -2078,6 +2077,7 @@
 DocType: Salary Component,Earning,कमाई
 DocType: Supplier Scorecard,Scoring Criteria,स्कोरिंग मानदंड
 DocType: Purchase Invoice,Party Account Currency,पार्टी खाता मुद्रा
+DocType: Delivery Trip,Total Estimated Distance,कुल अनुमानित दूरी
 ,BOM Browser,बीओएम ब्राउज़र
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,कृपया इस प्रशिक्षण कार्यक्रम के लिए अपनी स्थिति अपडेट करें
 DocType: Item Barcode,EAN,EAN
@@ -2116,7 +2116,7 @@
 DocType: Activity Cost,Projects,परियोजनाओं
 DocType: Payment Request,Transaction Currency,कारोबारी मुद्रा
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},से {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,कुछ ईमेल अमान्य हैं
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,कुछ ईमेल अमान्य हैं
 DocType: Work Order Operation,Operation Description,ऑपरेशन विवरण
 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.,वित्तीय वर्ष प्रारंभ तिथि और वित्तीय वर्ष सहेजा जाता है एक बार वित्तीय वर्ष के अंत तिथि नहीं बदल सकते.
 DocType: Quotation,Shopping Cart,खरीदारी की टोकरी
@@ -2140,7 +2140,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,निश्चित परिसंपत्ति में शुद्ध परिवर्तन
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd मात्रा
 DocType: Leave Control Panel,Leave blank if considered for all designations,रिक्त छोड़ अगर सभी पदनाम के लिए विचार
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार पंक्ति {0} में 'वास्तविक ' का प्रभार आइटम रेट में शामिल नहीं किया जा सकता
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार पंक्ति {0} में 'वास्तविक ' का प्रभार आइटम रेट में शामिल नहीं किया जा सकता
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},मैक्स: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Datetime से
 DocType: Shopify Settings,For Company,कंपनी के लिए
@@ -2154,7 +2154,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,कोर्स की अनुसूची बनाने में त्रुटियां थीं
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,सूची में पहला व्यय अनुमान डिफ़ॉल्ट व्यय अनुमान के रूप में सेट किया जाएगा।
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,100 से अधिक नहीं हो सकता
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,बाज़ार प्रबंधक पर पंजीकरण करने के लिए आपको सिस्टम मैनेजर और आइटम प्रबंधक भूमिकाओं के साथ प्रशासक के अलावा अन्य उपयोगकर्ता होने की आवश्यकता है।
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,बाज़ार प्रबंधक पर पंजीकरण करने के लिए आपको सिस्टम मैनेजर और आइटम प्रबंधक भूमिकाओं के साथ प्रशासक के अलावा अन्य उपयोगकर्ता होने की आवश्यकता है।
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
 DocType: Packing Slip,MAT-PAC-.YYYY.-,मेट-पीएसी .YYYY.-
 DocType: Maintenance Visit,Unscheduled,अनिर्धारित
@@ -2183,7 +2183,7 @@
 DocType: HR Settings,Employee Settings,कर्मचारी सेटिंग्स
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,भुगतान प्रणाली लोड हो रहा है
 ,Batch-Wise Balance History,बैच वार बैलेंस इतिहास
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,पंक्ति # {0}: आइटम {1} के लिए बिल राशि से अधिक होने पर दर निर्धारित नहीं कर सकता है।
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,पंक्ति # {0}: आइटम {1} के लिए बिल राशि से अधिक होने पर दर निर्धारित नहीं कर सकता है।
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,प्रिंट सेटिंग्स संबंधित प्रिंट प्रारूप में अद्यतन
 DocType: Package Code,Package Code,पैकेज कोड
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,शिक्षु
@@ -2417,7 +2417,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} रिक्तियों और {1} बजट {2} के लिए बजट पहले से ही {3} की सहायक कंपनियों के लिए योजनाबद्ध है। \ आप मूल कंपनी {3} के लिए कर्मचारी योजना {6} के अनुसार केवल {4} रिक्तियों और बजट {5} तक योजना बना सकते हैं।
 DocType: HR Settings,Stop Birthday Reminders,बंद करो जन्मदिन अनुस्मारक
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},कंपनी में डिफ़ॉल्ट पेरोल देय खाता सेट करें {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},कंपनी में डिफ़ॉल्ट पेरोल देय खाता सेट करें {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,अमेज़ॅन द्वारा टैक्स और शुल्क डेटा का वित्तीय टूटना प्राप्त करें
 DocType: SMS Center,Receiver List,रिसीवर सूची
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,खोजें मद
@@ -2487,7 +2487,7 @@
 DocType: Vital Signs,Constipated,कब्ज़
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},प्रदायक के खिलाफ चालान {0} दिनांक {1}
 DocType: Customer,Default Price List,डिफ़ॉल्ट मूल्य सूची
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,एसेट आंदोलन रिकॉर्ड {0} बनाया
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,एसेट आंदोलन रिकॉर्ड {0} बनाया
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,कुछ नहीं मिला।
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,आप नहीं हटा सकते वित्त वर्ष {0}। वित्त वर्ष {0} वैश्विक सेटिंग्स में डिफ़ॉल्ट के रूप में सेट किया गया है
 DocType: Share Transfer,Equity/Liability Account,इक्विटी / देयता खाता
@@ -2624,6 +2624,7 @@
 DocType: Blanket Order,Order Type,आदेश प्रकार
 ,Item-wise Sales Register,आइटम के लिहाज से बिक्री रजिस्टर
 DocType: Asset,Gross Purchase Amount,सकल खरीद राशि
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,आइटम कोड&gt; आइटम समूह&gt; ब्रांड
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,खुलने का संतुलन
 DocType: Asset,Depreciation Method,मूल्यह्रास विधि
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,इस टैक्स मूल दर में शामिल है?
@@ -2704,7 +2705,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,यदि पीओ पर वार्षिक बजट पार हो गया तो कार्रवाई करें
 DocType: Student Leave Application,Student Leave Application,छात्र लीव आवेदन
 DocType: Item,Will also apply for variants,यह भी वेरिएंट के लिए लागू होगी
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","एसेट, रद्द नहीं किया जा सकता क्योंकि यह पहले से ही है {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","एसेट, रद्द नहीं किया जा सकता क्योंकि यह पहले से ही है {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},कर्मचारी {0} को आधा दिन पर {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},कुल काम के घंटे अधिकतम काम के घंटे से अधिक नहीं होना चाहिए {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,पर
@@ -2728,6 +2729,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,डेटा प्राप्त करें
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},छुट्टी प्रकार {0} में अधिकतम छुट्टी की अनुमति है {1}
 DocType: SMS Center,Create Receiver List,रिसीवर सूची बनाएँ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,उपयोग के लिए उपलब्ध तारीख खरीद की तारीख के बाद होना चाहिए
 DocType: Vehicle,Wheels,पहियों
 DocType: Packing Slip,To Package No.,सं पैकेज
 DocType: Patient Relation,Family,परिवार
@@ -2741,7 +2743,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,बिलिंग मुद्रा या तो डिफ़ॉल्ट कंपनी की मुद्रा या पक्ष खाता मुद्रा के बराबर होनी चाहिए
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),पैकेज इस वितरण का एक हिस्सा है कि संकेत करता है (केवल मसौदा)
 DocType: Soil Texture,Loam,चिकनी बलुई मिट्टी
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,पंक्ति {0}: तिथि पोस्ट करने से पहले तिथि नहीं हो सकती
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,पंक्ति {0}: तिथि पोस्ट करने से पहले तिथि नहीं हो सकती
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,भुगतान प्रवेश कर
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},मात्रा मद के लिए {0} से कम होना चाहिए {1}
 ,Sales Invoice Trends,बिक्री चालान रुझान
@@ -2813,7 +2815,7 @@
 DocType: Guardian,Guardian Interests,गार्जियन रूचियाँ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,खाता नाम / संख्या अपडेट करें
 DocType: Naming Series,Current Value,वर्तमान मान
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,एकाधिक वित्तीय वर्ष की तारीख {0} के लिए मौजूद हैं। वित्त वर्ष में कंपनी सेट करें
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,एकाधिक वित्तीय वर्ष की तारीख {0} के लिए मौजूद हैं। वित्त वर्ष में कंपनी सेट करें
 DocType: Education Settings,Instructor Records to be created by,प्रशिक्षक रिकॉर्ड्स द्वारा बनाया जाएगा
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} बनाया
 DocType: GST Account,GST Account,जीएसटी खाता
@@ -2831,7 +2833,7 @@
 DocType: Sales Person,Name and Employee ID,नाम और कर्मचारी ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,नियत तिथि तिथि पोस्टिंग से पहले नहीं किया जा सकता
 DocType: Website Item Group,Website Item Group,वेबसाइट आइटम समूह
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,उपरोक्त चयनित मानदंडों के लिए कोई वेतन पर्ची जमा नहीं हुई है या पहले ही सबमिट की गई वेतन पर्ची
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,उपरोक्त चयनित मानदंडों के लिए कोई वेतन पर्ची जमा नहीं हुई है या पहले ही सबमिट की गई वेतन पर्ची
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,शुल्कों और करों
 DocType: Projects Settings,Projects Settings,परियोजनाएं सेटिंग
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,संदर्भ तिथि दर्ज करें
@@ -2840,7 +2842,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,आपूर्ति मात्रा
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,उच्च स्तरीय समिति-सीपीआर-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,सामग्री अनुरोध आइटम
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,कृपया खरीद रसीद {0} पहले रद्द करें
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,कृपया खरीद रसीद {0} पहले रद्द करें
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,आइटम समूहों के पेड़ .
 DocType: Production Plan,Total Produced Qty,कुल उत्पादन मात्रा
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,इस आरोप प्रकार के लिए अधिक से अधिक या वर्तमान पंक्ति संख्या के बराबर पंक्ति संख्या का उल्लेख नहीं कर सकते
@@ -2949,6 +2951,7 @@
 ,Vehicle Expenses,वाहन खर्च
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,बिक्री चालान जमा पर लैब टेस्ट बनाएं
 DocType: Serial No,Invoice Details,चालान विवरण
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,मार्गों का अनुमान लगाने और अनुकूलित करने के लिए कृपया Google मानचित्र सेटिंग्स सक्षम करें
 DocType: Grant Application,Show on Website,वेबसाइट पर दिखाएं
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,शुरुआत करना
 DocType: Hub Tracked Item,Hub Category,हब श्रेणी
@@ -2988,7 +2991,7 @@
 DocType: Inpatient Record,B Positive,बी सकारात्मक
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",कर्मचारी का अधिकतम लाभ {0} पिछले दावे \ राशि के योग {2} से {1} से अधिक है
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","पंक्ति # {0}: मात्रा, 1 होना चाहिए के रूप में आइटम एक निश्चित परिसंपत्ति है। कई मात्रा के लिए अलग पंक्ति का उपयोग करें।"
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","पंक्ति # {0}: मात्रा, 1 होना चाहिए के रूप में आइटम एक निश्चित परिसंपत्ति है। कई मात्रा के लिए अलग पंक्ति का उपयोग करें।"
 DocType: Leave Block List Allow,Leave Block List Allow,छोड़ दो ब्लॉक सूची की अनुमति दें
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr खाली या स्थान नहीं हो सकता
 DocType: Patient Medical Record,Patient Medical Record,रोगी चिकित्सा रिकॉर्ड
@@ -3022,7 +3025,7 @@
 DocType: Workstation,Wages per hour,प्रति घंटे मजदूरी
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},बैच में स्टॉक संतुलन {0} बन जाएगा नकारात्मक {1} गोदाम में आइटम {2} के लिए {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,सामग्री अनुरोध के बाद मद के फिर से आदेश स्तर के आधार पर स्वचालित रूप से उठाया गया है
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},खाते {0} अमान्य है। खाता मुद्रा होना चाहिए {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},खाते {0} अमान्य है। खाता मुद्रा होना चाहिए {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},तिथि से {0} कर्मचारी की राहत तिथि के बाद नहीं हो सकता है {1}
 DocType: Supplier,Is Internal Supplier,आंतरिक प्रदायक है
 DocType: Employee,Create User Permission,उपयोगकर्ता अनुमति बनाएं
@@ -3166,7 +3169,7 @@
 DocType: Account,Fixed Asset,स्थायी परिसम्पत्ति
 DocType: Amazon MWS Settings,After Date,तिथि के बाद
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,श्रृंखलाबद्ध इन्वेंटरी
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,इंटर कंपनी चालान के लिए अमान्य {0}।
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,इंटर कंपनी चालान के लिए अमान्य {0}।
 ,Department Analytics,विभाग विश्लेषिकी
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,ईमेल डिफ़ॉल्ट संपर्क में नहीं मिला
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,गुप्त उत्पन्न करें
@@ -3178,7 +3181,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,शुल्क संरचना और छात्र समूह {0} में कार्यक्रम अलग-अलग हैं
 DocType: Bank Statement Transaction Entry,Receivable Account,प्राप्य खाता
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,तिथि से वैध तिथि तक वैध से कम होना चाहिए।
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},पंक्ति # {0}: संपत्ति {1} पहले से ही है {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},पंक्ति # {0}: संपत्ति {1} पहले से ही है {2}
 DocType: Quotation Item,Stock Balance,बाकी स्टाक
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,भुगतान करने के लिए बिक्री आदेश
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,सी ई ओ
@@ -3220,6 +3223,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,डेबिट करने के लिए आवश्यक है
 DocType: Clinical Procedure,Inpatient Record,रोगी रिकॉर्ड
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets मदद से अपनी टीम के द्वारा किया गतिविधियों के लिए समय, लागत और बिलिंग का ट्रैक रखने"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,प्रदायक&gt; प्रदायक प्रकार
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,खरीद मूल्य सूची
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,लेनदेन की तारीख
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,आपूर्तिकर्ता स्कोरकार्ड चर के टेम्पलेट्स
@@ -3262,7 +3266,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,मुद्रा लाभ / हानि
 DocType: Opportunity,Lost Reason,खोया कारण
 DocType: Amazon MWS Settings,Enable Amazon,अमेज़ॅन सक्षम करें
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},पंक्ति # {0}: खाता {1} कंपनी के नहीं है {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},पंक्ति # {0}: खाता {1} कंपनी के नहीं है {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},डॉकटाइप खोज में असमर्थ {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,नया पता
 DocType: Quality Inspection,Sample Size,नमूने का आकार
@@ -3373,7 +3377,7 @@
 DocType: Water Analysis,Origin,मूल
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,इस दस्तावेज़ से सीमा से अधिक है {0} {1} आइटम के लिए {4}। आप कर रहे हैं एक और {3} उसी के खिलाफ {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,सहेजने के बाद आवर्ती सेट करें
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,बदलें चुनें राशि खाते
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,बदलें चुनें राशि खाते
 DocType: Purchase Invoice,Price List Currency,मूल्य सूची मुद्रा
 DocType: Naming Series,User must always select,उपयोगकर्ता हमेशा का चयन करना होगा
 DocType: Stock Settings,Allow Negative Stock,नकारात्मक स्टॉक की अनुमति दें
@@ -3415,7 +3419,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,क्या आप वाकई इस नियुक्ति को रद्द करना चाहते हैं?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,होटल रूम प्राइसिंग पैकेज
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,बिक्री पाइपलाइन
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},वेतन घटक में डिफ़ॉल्ट खाता सेट करें {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},वेतन घटक में डिफ़ॉल्ट खाता सेट करें {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,आवश्यक पर
 DocType: Rename Tool,File to Rename,नाम बदलने के लिए फ़ाइल
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},पंक्ति में आइटम के लिए बीओएम चयन करें {0}
@@ -3436,7 +3440,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,खरीदी गई वस्तुओं की लागत
 DocType: Employee Separation,Employee Separation Template,कर्मचारी पृथक्करण टेम्पलेट
 DocType: Selling Settings,Sales Order Required,बिक्री आदेश आवश्यक
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,एक विक्रेता बनें
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,एक विक्रेता बनें
 DocType: Purchase Invoice,Credit To,करने के लिए क्रेडिट
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,सक्रिय सुराग / ग्राहकों
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,मानक डिलिवरी नोट प्रारूप का उपयोग करने के लिए खाली छोड़ दें
@@ -3477,7 +3481,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,कर टेम्पलेट करें
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,उपयोगकर्ता मंच
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,कच्चे माल खाली नहीं किया जा सकता।
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,पंक्ति # {0} (भुगतान तालिका): राशि ऋणात्मक होनी चाहिए
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,पंक्ति # {0} (भुगतान तालिका): राशि ऋणात्मक होनी चाहिए
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","शेयर अद्यतन नहीं कर सका, चालान ड्रॉप शिपिंग आइटम शामिल हैं।"
 DocType: Contract,Fulfilment Status,पूर्ति की स्थिति
 DocType: Lab Test Sample,Lab Test Sample,लैब टेस्ट नमूना
@@ -3636,7 +3640,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,डॉक्टर तिथि
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},शुल्क रिकॉर्ड बनाया - {0}
 DocType: Asset Category Account,Asset Category Account,परिसंपत्ति वर्ग अकाउंट
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,पंक्ति # {0} (भुगतान तालिका): राशि सकारात्मक होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,पंक्ति # {0} (भुगतान तालिका): राशि सकारात्मक होना चाहिए
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},अधिक आइटम उत्पादन नहीं कर सकते {0} से बिक्री आदेश मात्रा {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,विशेषता मान चुनें
 DocType: Purchase Invoice,Reason For Issuing document,दस्तावेज़ जारी करने का कारण
@@ -3691,7 +3695,7 @@
 DocType: Purchase Receipt,Time at which materials were received,जो समय पर सामग्री प्राप्त हुए थे
 DocType: Products Settings,Products per Page,प्रति पृष्ठ उत्पाद
 DocType: Stock Ledger Entry,Outgoing Rate,आउटगोइंग दर
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,या
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,या
 DocType: Sales Order,Billing Status,बिलिंग स्थिति
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,किसी समस्या की रिपोर्ट
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,उपयोगिता व्यय
@@ -3718,7 +3722,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,कर्मचारी कर छूट घोषणा
 DocType: Payment Entry,Cheque/Reference Date,चैक / संदर्भ तिथि
 DocType: Purchase Invoice,Total Taxes and Charges,कुल कर और शुल्क
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,उपयोग के लिए उपलब्ध तारीख पिछली तारीख के रूप में दर्ज की गई है
 DocType: Employee,Emergency Contact,आपातकालीन संपर्क
 DocType: Bank Reconciliation Detail,Payment Entry,भुगतान एंट्री
 ,sales-browser,बिक्री ब्राउज़र
@@ -3764,6 +3767,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),वापसी है (क्रेडिट नोट)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,नौकरी शुरू करो
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},परिसंपत्ति के लिए सीरियल नंबर की आवश्यकता नहीं है {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,कृपया सेटअप&gt; सेटिंग्स&gt; नामकरण श्रृंखला के माध्यम से {0} के लिए नामकरण श्रृंखला सेट करें
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,विकलांगों के लिए टेम्पलेट डिफ़ॉल्ट टेम्पलेट नहीं होना चाहिए
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,पंक्ति {0} के लिए: नियोजित मात्रा दर्ज करें
 DocType: Account,Income Account,आय खाता
@@ -3777,6 +3781,7 @@
 DocType: Loyalty Program,Help Section,सहायता अनुभाग
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,पिछला
 DocType: Appraisal Goal,Key Responsibility Area,कुंजी जिम्मेदारी क्षेत्र
+DocType: Delivery Trip,Distance UOM,दूरी यूओएम
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","छात्र बैचों आप उपस्थिति, आकलन और छात्रों के लिए फीस ट्रैक करने में मदद"
 DocType: Payment Entry,Total Allocated Amount,कुल आवंटित राशि
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,सतत सूची के लिए डिफ़ॉल्ट इन्वेंट्री खाता सेट करें
@@ -3818,7 +3823,7 @@
 DocType: Item Supplier,Item Supplier,आइटम प्रदायक
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,कोई बैच पाने के मद कोड दर्ज करें
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},के लिए एक मूल्य का चयन करें {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,हस्तांतरण के लिए कोई आइटम नहीं चुना गया
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,हस्तांतरण के लिए कोई आइटम नहीं चुना गया
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,सभी पते.
 DocType: Company,Stock Settings,स्टॉक सेटिंग्स
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","निम्नलिखित गुण दोनों रिकॉर्ड में वही कर रहे हैं अगर विलय ही संभव है। समूह, रूट प्रकार, कंपनी है"
@@ -4115,7 +4120,7 @@
 DocType: Patient,Personal and Social History,व्यक्तिगत और सामाजिक इतिहास
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,उपयोगकर्ता {0} बनाया गया
 DocType: Fee Schedule,Fee Breakup for each student,प्रत्येक छात्र के लिए फी ब्रेकअप
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),कुल अग्रिम ({0}) आदेश के खिलाफ {1} महायोग से बड़ा नहीं हो सकता है ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),कुल अग्रिम ({0}) आदेश के खिलाफ {1} महायोग से बड़ा नहीं हो सकता है ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,असमान महीने भर में लक्ष्य को वितरित करने के लिए मासिक वितरण चुनें।
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,कोड बदलें
 DocType: Purchase Invoice Item,Valuation Rate,मूल्यांकन दर
@@ -4124,7 +4129,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,लाभ हुआ आईटीसी सेस
 ,Student Monthly Attendance Sheet,छात्र मासिक उपस्थिति पत्रक
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,नौवहन नियम केवल बेचना के लिए लागू है
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,मूल्यह्रास पंक्ति {0}: अगली मूल्यह्रास तिथि खरीद तिथि से पहले नहीं हो सकती है
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,मूल्यह्रास पंक्ति {0}: अगली मूल्यह्रास तिथि खरीद तिथि से पहले नहीं हो सकती है
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,परियोजना प्रारंभ दिनांक
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,जब तक
 DocType: Rename Tool,Rename Log,प्रवेश का नाम बदलें
@@ -4141,12 +4146,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,बिक्री लेनदेन के आधार पर परियोजना और कंपनी को कितनी बार अपडेट किया जाना चाहिए।
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,पर समय सीमा समाप्त
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,छात्रों को जोड़ें
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","इस दस्तावेज़ को रद्द करने के लिए कृपया कर्मचारी <a href=""#Form/Employee/{0}"">{0}</a> \ हटाएं"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},कृपया चुनें {0}
 DocType: C-Form,C-Form No,कोई सी - फार्म
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,दूरी
+DocType: Delivery Stop,Distance,दूरी
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,अपने उत्पादों या सेवाओं को सूचीबद्ध करें जिन्हें आप खरीद या बेचते हैं।
 DocType: Water Analysis,Storage Temperature,भंडारण तापमान
 DocType: Sales Order,SAL-ORD-.YYYY.-,साल-ORD-.YYYY.-
@@ -4173,7 +4176,7 @@
 DocType: Homepage,Company Description for website homepage,वेबसाइट मुखपृष्ठ के लिए कंपनी विवरण
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",ग्राहकों की सुविधा के लिए इन कोड प्रिंट स्वरूपों में चालान और वितरण नोट की तरह इस्तेमाल किया जा सकता है
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier नाम
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,{0} के लिए जानकारी पुनर्प्राप्त नहीं की जा सकी।
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,{0} के लिए जानकारी पुनर्प्राप्त नहीं की जा सकी।
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,उद्घाटन एंट्री जर्नल
 DocType: Contract,Fulfilment Terms,पूर्ति शर्तें
 DocType: Sales Invoice,Time Sheet List,समय पत्रक सूची
@@ -4353,7 +4356,7 @@
 DocType: Serial No,Warranty / AMC Details,वारंटी / एएमसी विवरण
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,गतिविधि आधारित समूह के लिए मैन्युअल रूप से छात्रों का चयन करें
 DocType: Journal Entry,User Remark,उपयोगकर्ता के टिप्पणी
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,अनुकूलन मार्ग।
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,अनुकूलन मार्ग।
 DocType: Travel Itinerary,Non Diary,गैर डायरी
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,बाएं कर्मचारियों के लिए प्रतिधारण बोनस नहीं बना सकते हैं
 DocType: Lead,Market Segment,बाजार खंड
@@ -4383,7 +4386,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,वफादारी कार्यक्रम
 DocType: Student Guardian,Father,पिता
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,समर्थन टिकट
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;अपडेट शेयर&#39; निश्चित संपत्ति बिक्री के लिए जाँच नहीं की जा सकती
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;अपडेट शेयर&#39; निश्चित संपत्ति बिक्री के लिए जाँच नहीं की जा सकती
 DocType: Bank Reconciliation,Bank Reconciliation,बैंक समाधान
 DocType: Attendance,On Leave,छुट्टी पर
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,अपडेट प्राप्त करे
@@ -4428,7 +4431,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,सीरियल नहीं और बैच
 DocType: Warranty Claim,From Company,कंपनी से
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,मूल्यांकन मापदंड के अंकों के योग {0} की जरूरत है।
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Depreciations की संख्या बुक सेट करें
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Depreciations की संख्या बुक सेट करें
 DocType: Supplier Scorecard Period,Calculations,गणना
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,मूल्य या मात्रा
 DocType: Payment Terms Template,Payment Terms,भुगतान की शर्तें
@@ -4447,7 +4450,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,मार्जिन के साथ मूल्य सूची दर पर डिस्काउंट (%)
 DocType: Healthcare Service Unit Type,Rate / UOM,दर / यूओएम
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,सभी गोदामों
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,इंटर कंपनी लेनदेन के लिए कोई {0} नहीं मिला।
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,इंटर कंपनी लेनदेन के लिए कोई {0} नहीं मिला।
 DocType: Travel Itinerary,Rented Car,किराए पर कार
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,आपकी कंपनी के बारे में
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,खाते में जमा एक बैलेंस शीट खाता होना चाहिए
@@ -4548,6 +4551,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,संयंत्र विश्लेषण मानदंड
 DocType: Cheque Print Template,Cheque Height,चैक ऊंचाई
 DocType: Supplier,Supplier Details,आपूर्तिकर्ता विवरण
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; नंबरिंग श्रृंखला के माध्यम से उपस्थिति के लिए नंबरिंग श्रृंखला सेट करें
 DocType: Setup Progress,Setup Progress,सेटअप प्रगति
 DocType: Expense Claim,Approval Status,स्वीकृति स्थिति
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},मूल्य से पंक्ति में मान से कम होना चाहिए {0}
@@ -4640,7 +4644,6 @@
 DocType: Travel Request,Fully Sponsored,पूरी तरह से प्रायोजित
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,रिवर्स जर्नल एंट्री
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ग्राहक {0} बनाया गया है
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन&gt; एचआर सेटिंग्स में कर्मचारी नामकरण प्रणाली सेट करें
 DocType: Stock Settings,Limit Percent,सीमा प्रतिशत
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,वर्तमान में किसी भी गोदाम में कोई स्टॉक उपलब्ध नहीं है
 ,Payment Period Based On Invoice Date,चालान तिथि के आधार पर भुगतान की अवधि
@@ -4699,7 +4702,7 @@
 DocType: BOM Explosion Item,Source Warehouse,स्रोत वेअरहाउस
 DocType: Installation Note,Installation Date,स्थापना की तारीख
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,लेजर शेयर करें
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},पंक्ति # {0}: संपत्ति {1} कंपनी का नहीं है {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},पंक्ति # {0}: संपत्ति {1} कंपनी का नहीं है {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,बिक्री चालान {0} बनाया गया
 DocType: Employee,Confirmation Date,पुष्टिकरण तिथि
 DocType: Inpatient Occupancy,Check Out,चेक आउट
@@ -4719,6 +4722,7 @@
 DocType: Production Plan,Sales Orders Detail,बिक्री आदेश विस्तार
 DocType: Bin,Requested Quantity,अनुरोध मात्रा
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-शुल्क-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,कृपया शिक्षा&gt; शिक्षा सेटिंग्स में प्रशिक्षक नामकरण प्रणाली सेट करें
 DocType: Patient,Marital Status,वैवाहिक स्थिति
 DocType: Stock Settings,Auto Material Request,ऑटो सामग्री अनुरोध
 DocType: Woocommerce Settings,API consumer secret,एपीआई उपभोक्ता रहस्य
@@ -4771,7 +4775,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,दिन चुनें
 DocType: Academic Term,Term Name,टर्म नाम
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),क्रेडिट ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,वेतन पर्ची बनाना ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,वेतन पर्ची बनाना ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,आप रूट नोड संपादित नहीं कर सकते हैं।
 DocType: Buying Settings,Purchase Order Required,खरीदने के लिए आवश्यक आदेश
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,घड़ी
@@ -4807,7 +4811,7 @@
 DocType: Account,Rate at which this tax is applied,दर जिस पर इस कर को लागू किया जाता है
 DocType: Cash Flow Mapper,Section Name,अनुभाग का नाम
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Reorder मात्रा
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},मूल्यह्रास पंक्ति {0}: उपयोगी जीवन के बाद अपेक्षित मूल्य {1} से अधिक या बराबर होना चाहिए
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},मूल्यह्रास पंक्ति {0}: उपयोगी जीवन के बाद अपेक्षित मूल्य {1} से अधिक या बराबर होना चाहिए
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,वर्तमान नौकरी के उद्घाटन
 DocType: Company,Stock Adjustment Account,स्टॉक समायोजन खाता
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ख़ारिज करना
@@ -4854,7 +4858,7 @@
 DocType: Program Enrollment,School House,स्कूल हाउस
 DocType: Serial No,Out of AMC,एएमसी के बाहर
 DocType: Opportunity,Opportunity Amount,अवसर राशि
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,बुक depreciations की संख्या कुल depreciations की संख्या से अधिक नहीं हो सकता
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,बुक depreciations की संख्या कुल depreciations की संख्या से अधिक नहीं हो सकता
 DocType: Purchase Order,Order Confirmation Date,आदेश पुष्टिकरण तिथि
 DocType: Driver,HR-DRI-.YYYY.-,मानव संसाधन-डीआरआई-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,रखरखाव भेंट बनाओ
@@ -4895,7 +4899,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,बैच:
 DocType: Volunteer,Afternoon,दोपहर
 DocType: Loyalty Program,Loyalty Program Help,वफादारी कार्यक्रम सहायता
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' अक्षम किया गया है
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' अक्षम किया गया है
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ओपन के रूप में सेट करें
 DocType: Cheque Print Template,Scanned Cheque,स्कैन किए हुए चैक
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,भेजने से लेन-देन पर संपर्क करने के लिए स्वत: ईमेल भेजें।
@@ -4908,7 +4912,7 @@
 DocType: Warranty Claim,Item and Warranty Details,मद और वारंटी के विवरण
 DocType: Chapter,Chapter Members,अध्याय सदस्य
 DocType: Sales Team,Contribution (%),अंशदान (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,नोट : भुगतान एंट्री ' नकद या बैंक खाता' निर्दिष्ट नहीं किया गया था के बाद से नहीं बनाया जाएगा
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,नोट : भुगतान एंट्री ' नकद या बैंक खाता' निर्दिष्ट नहीं किया गया था के बाद से नहीं बनाया जाएगा
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,परियोजना {0} पहले से मौजूद है
 DocType: Clinical Procedure,Nursing User,नर्सिंग उपयोगकर्ता
 DocType: Employee Benefit Application,Payroll Period,पेरोल अवधि
@@ -4916,6 +4920,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},सीरियल नंबर {0} बैच से संबंधित नहीं है {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,जिम्मेदारियों
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,इस उद्धरण की वैधता अवधि समाप्त हो गई है।
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","इस दस्तावेज़ को रद्द करने के लिए कृपया कर्मचारी <a href=""#Form/Employee/{0}"">{0}</a> \ हटाएं"
 DocType: Expense Claim Account,Expense Claim Account,व्यय दावा अकाउंट
 DocType: Account,Capital Work in Progress,प्रगति में पूंजीगत कार्य
 DocType: Accounts Settings,Allow Stale Exchange Rates,स्टेले एक्सचेंज दरें अनुमति दें
@@ -4996,7 +5002,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,मुद्दा सामग्री
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,ERPNext के साथ Shopify कनेक्ट करें
 DocType: Material Request Item,For Warehouse,गोदाम के लिए
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,डिलिवरी नोट्स {0} अपडेट किया गया
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,डिलिवरी नोट्स {0} अपडेट किया गया
 DocType: Employee,Offer Date,प्रस्ताव की तिथि
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,कोटेशन
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,आप ऑफ़लाइन मोड में हैं। आप जब तक आप नेटवर्क है फिर से लोड करने में सक्षम नहीं होगा।
@@ -5046,7 +5052,7 @@
 DocType: Shipping Rule,Calculate Based On,के आधार पर गणना करें
 DocType: Contract,Unfulfilled,अधूरी
 DocType: Delivery Note Item,From Warehouse,गोदाम से
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,निर्दिष्ट मानदंडों के लिए कोई कर्मचारी नहीं
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,निर्दिष्ट मानदंडों के लिए कोई कर्मचारी नहीं
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,सामग्री के बिल के साथ कोई वस्तुओं का निर्माण करने के लिए
 DocType: Shopify Settings,Default Customer,डिफ़ॉल्ट ग्राहक
 DocType: Sales Stage,Stage Name,मंच का नाम
@@ -5088,7 +5094,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,सबसे कम राशि के बाद टैक्स राशि
 DocType: Patient,Inpatient Status,रोगी स्थिति
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,दैनिक काम सारांश सेटिंग
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,चयनित मूल्य सूची में चेक किए गए फ़ील्ड खरीदने और बेचने चाहिए।
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,चयनित मूल्य सूची में चेक किए गए फ़ील्ड खरीदने और बेचने चाहिए।
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,कृपया तिथि के अनुसार रेक्ड दर्ज करें
 DocType: Payment Entry,Internal Transfer,आंतरिक स्थानांतरण
 DocType: Asset Maintenance,Maintenance Tasks,रखरखाव कार्य
@@ -5124,7 +5130,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,समूह द्वारा
 DocType: Guardian,Interests,रूचियाँ
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,/ निष्क्रिय मुद्राओं सक्षम करें.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,कुछ वेतन पर्ची जमा नहीं कर सका
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,कुछ वेतन पर्ची जमा नहीं कर सका
 DocType: Exchange Rate Revaluation,Get Entries,प्रविष्टियां प्राप्त करें
 DocType: Production Plan,Get Material Request,सामग्री अनुरोध प्राप्त
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,पोस्टल व्यय
@@ -5208,7 +5214,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},व्यय खाते आइटम के लिए अनिवार्य है {0}
 DocType: BOM,Website Description,वेबसाइट विवरण
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,इक्विटी में शुद्ध परिवर्तन
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,चालान की खरीद {0} को रद्द कृपया पहले
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,चालान की खरीद {0} को रद्द कृपया पहले
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,अनुमति नहीं। कृपया सेवा इकाई प्रकार को अक्षम करें
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ईमेल एड्रेस अद्वितीय होना चाहिए, पहले से ही के लिए मौजूद है {0}"
 DocType: Serial No,AMC Expiry Date,एएमसी समाप्ति तिथि
@@ -5248,7 +5254,7 @@
 DocType: Hotel Room,Hotel Room,होटल का कमरा
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},खाता {0} करता है कंपनी के अंतर्गत आता नहीं {1}
 DocType: Leave Type,Rounding,गोलाई
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,{0} पंक्ति में सीरियल नंबर डिलिवरी नोट से मेल नहीं खाती
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,{0} पंक्ति में सीरियल नंबर डिलिवरी नोट से मेल नहीं खाती
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),डिस्पेंस राशि (प्रो रेटेड)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","फिर मूल्य निर्धारण नियम ग्राहक, ग्राहक समूह, क्षेत्र, प्रदायक, प्रदायक समूह, अभियान, बिक्री भागीदार आदि के आधार पर फ़िल्टर किए जाते हैं।"
 DocType: Student,Guardian Details,गार्जियन विवरण
@@ -5303,7 +5309,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},शेयर मद के लिए आवश्यक वेयरहाउस {0}
 DocType: Leave Allocation,Unused leaves,अप्रयुक्त पत्ते
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,पुनर्भुगतान प्रवेश करें
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,सभी विभाग
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,सभी विभाग
 DocType: Healthcare Service Unit,Vacant,रिक्त
 DocType: Patient,Alcohol Past Use,शराब विगत का प्रयोग करें
 DocType: Fertilizer Content,Fertilizer Content,उर्वरक सामग्री
@@ -5314,7 +5320,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,इस बिक्री आदेश को रद्द करने से पहले कार्य आदेश {0} रद्द कर दिया जाना चाहिए
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),( उप असेंबलियों सहित) विस्फोट बीओएम लायें
 DocType: Authorization Rule,Applicable To (Employee),के लिए लागू (कर्मचारी)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,नियत तिथि अनिवार्य है
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,नियत तिथि अनिवार्य है
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,गुण के लिए वेतन वृद्धि {0} 0 नहीं किया जा सकता
 DocType: Employee Benefit Claim,Benefit Type and Amount,लाभ प्रकार और राशि
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,कमरे बुकिंग
@@ -5458,7 +5464,7 @@
 DocType: Purchase Invoice Item,Total Weight,कुल वजन
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,बिक्री पर कमीशन
 DocType: Job Offer Term,Value / Description,मूल्य / विवरण
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","पंक्ति # {0}: संपत्ति {1} प्रस्तुत नहीं किया जा सकता है, यह पहले से ही है {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","पंक्ति # {0}: संपत्ति {1} प्रस्तुत नहीं किया जा सकता है, यह पहले से ही है {2}"
 DocType: Tax Rule,Billing Country,बिलिंग देश
 DocType: Purchase Order Item,Expected Delivery Date,उम्मीद डिलीवरी की तारीख
 DocType: Restaurant Order Entry,Restaurant Order Entry,रेस्तरां आदेश प्रविष्टि
@@ -5497,12 +5503,13 @@
 DocType: Maintenance Visit,Breakdown,भंग
 DocType: Travel Itinerary,Vegetarian,शाकाहारी
 DocType: Patient Encounter,Encounter Date,मुठभेड़ की तारीख
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,खाता: {0} मुद्रा के साथ: {1} चयनित नहीं किया जा सकता
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,खाता: {0} मुद्रा के साथ: {1} चयनित नहीं किया जा सकता
 DocType: Bank Statement Transaction Settings Item,Bank Data,बैंक डेटा
 DocType: Purchase Receipt Item,Sample Quantity,नमूना मात्रा
 DocType: Bank Guarantee,Name of Beneficiary,लाभार्थी का नाम
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","नवीनतम मूल्यांकन दर / मूल्य सूची दर / कच्ची सामग्रियों की अंतिम खरीदारी दर के आधार पर, स्वचालित रूप से समय-समय पर बीओएम लागत को शेड्यूलर के माध्यम से अपडेट करें।"
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,प्रदायक&gt; प्रदायक समूह
 DocType: Bank Reconciliation Detail,Cheque Date,चेक तिथि
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},खाते {0}: माता पिता के खाते {1} कंपनी से संबंधित नहीं है: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,सफलतापूर्वक इस कंपनी से संबंधित सभी लेन-देन को नष्ट कर दिया!
@@ -5530,7 +5537,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,बच्चे नोड्स केवल &#39;समूह&#39; प्रकार नोड्स के तहत बनाया जा सकता है
 DocType: Attendance Request,Half Day Date,आधा दिन की तारीख
 DocType: Academic Year,Academic Year Name,शैक्षिक वर्ष का नाम
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} को {1} से लेनदेन करने की अनुमति नहीं है। कृपया कंपनी को बदलें।
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} को {1} से लेनदेन करने की अनुमति नहीं है। कृपया कंपनी को बदलें।
 DocType: Sales Partner,Contact Desc,संपर्क जानकारी
 DocType: Email Digest,Send regular summary reports via Email.,ईमेल के माध्यम से नियमित रूप से सारांश रिपोर्ट भेजें।
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},में व्यय दावा प्रकार डिफ़ॉल्ट खाता सेट करें {0}
@@ -5563,7 +5570,7 @@
 DocType: Hotel Room,Hotel Manager,होटल के प्रबंधक
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,शॉपिंग कार्ट के लिए सेट कर नियम
 DocType: Purchase Invoice,Taxes and Charges Added,कर और शुल्क जोड़ा
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,मूल्यह्रास पंक्ति {0}: अगली मूल्यह्रास तिथि उपलब्ध उपयोग के लिए पहले नहीं हो सकती है
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,मूल्यह्रास पंक्ति {0}: अगली मूल्यह्रास तिथि उपलब्ध उपयोग के लिए पहले नहीं हो सकती है
 ,Sales Funnel,बिक्री कीप
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,संक्षिप्त अनिवार्य है
 DocType: Project,Task Progress,कार्य प्रगति
@@ -5577,7 +5584,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,सभी ग्राहक समूहों
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,संचित मासिक
 DocType: Attendance Request,On Duty,काम पर
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} अनिवार्य है. हो सकता है कि विनिमय दर रिकॉर्ड {2} को {1} के लिए नहीं बनाई गई है.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} अनिवार्य है. हो सकता है कि विनिमय दर रिकॉर्ड {2} को {1} के लिए नहीं बनाई गई है.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},स्टाफिंग योजना {0} पदनाम के लिए पहले से मौजूद है {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,टैक्स खाका अनिवार्य है।
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,खाते {0}: माता पिता के खाते {1} मौजूद नहीं है
@@ -5657,11 +5664,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,कम से कम एक गोदाम अनिवार्य है
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","यूओएम, आइटम समूह, विवरण और घंटे की संख्या जैसे आइटम फ़ील्ड कॉन्फ़िगर करें।"
 DocType: Certification Application,Certification Status,प्रमाणन की स्थिति
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,बाजार
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,बाजार
 DocType: Travel Itinerary,Travel Advance Required,यात्रा अग्रिम आवश्यक है
 DocType: Subscriber,Subscriber Name,सब्सक्राइबर का नाम
 DocType: Serial No,Out of Warranty,वारंटी के बाहर
-DocType: Cashier Closing,Cashier-closing-,कैशियर-समापन-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,मैप किए गए डेटा प्रकार
 DocType: BOM Update Tool,Replace,बदलें
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,कोई उत्पाद नहीं मिला
@@ -5748,7 +5754,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,विक्रय और खरीद के लिए डिफ़ॉल्ट कर टेम्पलेट बनाए गए हैं
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,मूल्यांकन परिणाम रिकॉर्ड {0} पहले से मौजूद है।
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","उदाहरण: एबीसीडी। #####। यदि श्रृंखला सेट की गई है और बैच संख्या का लेनदेन में उल्लेख नहीं किया गया है, तो इस श्रृंखला के आधार पर स्वचालित बैच संख्या बनाई जाएगी। यदि आप हमेशा इस आइटम के लिए बैच नंबर का स्पष्ट रूप से उल्लेख करना चाहते हैं, तो इसे खाली छोड़ दें। नोट: यह सेटिंग स्टॉक सेटिंग्स में नामकरण श्रृंखला उपसर्ग पर प्राथमिकता लेगी।"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; नंबरिंग श्रृंखला के माध्यम से उपस्थिति के लिए नंबरिंग श्रृंखला सेट करें
 DocType: BOM,Materials Required (Exploded),माल आवश्यक (विस्फोट)
 DocType: Contract,Party User,पार्टी उपयोगकर्ता
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',अगर ग्रुप बाय &#39;कंपनी&#39; है तो कंपनी को फिल्टर रिक्त करें
@@ -5949,7 +5954,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,ऑप गणना
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,दोनों परीक्षण अवधि प्रारंभ तिथि और परीक्षण अवधि समाप्ति तिथि निर्धारित की जानी चाहिए
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,सामान्य दर
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,भुगतान शेड्यूल में कुल भुगतान राशि ग्रैंड / गोल की कुल राशि के बराबर होनी चाहिए
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,भुगतान शेड्यूल में कुल भुगतान राशि ग्रैंड / गोल की कुल राशि के बराबर होनी चाहिए
 DocType: Subscription Plan Detail,Plan,योजना
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,जनरल लेजर के अनुसार बैंक बैलेंस
 DocType: Job Applicant,Applicant Name,आवेदक के नाम
@@ -6018,7 +6023,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,साबुन और डिटर्जेंट
 DocType: BOM,Show Items,शो आइटम
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,समय समय पर से बड़ा नहीं हो सकता है।
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,क्या आप सभी ग्राहकों को ईमेल द्वारा सूचित करना चाहते हैं?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,क्या आप सभी ग्राहकों को ईमेल द्वारा सूचित करना चाहते हैं?
 DocType: Subscription Plan,Billing Interval,बिलिंग अंतराल
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,मोशन पिक्चर और वीडियो
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,आदेशित
@@ -6027,9 +6032,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,पंक्ति {0}: {1} 0 से अधिक होना चाहिए
 DocType: Assessment Criteria,Assessment Criteria Group,मूल्यांकन मापदंड समूह
 DocType: Healthcare Settings,Patient Name By,रोगी का नाम
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},{0} से {1} के वेतन के लिए प्रत्यावर्ती जर्नल प्रविष्टि
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},{0} से {1} के वेतन के लिए प्रत्यावर्ती जर्नल प्रविष्टि
 DocType: Sales Invoice Item,Enable Deferred Revenue,स्थगित राजस्व सक्षम करें
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},खुलने संचित मूल्यह्रास के बराबर की तुलना में कम होना चाहिए {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},खुलने संचित मूल्यह्रास के बराबर की तुलना में कम होना चाहिए {0}
 DocType: Warehouse,Warehouse Name,वेअरहाउस नाम
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,वास्तविक प्रारंभ तिथि वास्तविक समाप्ति तिथि से कम होनी चाहिए
 DocType: Naming Series,Select Transaction,लेन - देन का चयन करें
@@ -6180,7 +6185,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,ग्रेड {1} के कर्मचारी {0} में कोई डिफ़ॉल्ट छुट्टी नीति नहीं है
 DocType: Salary Detail,Salary Detail,वेतन विस्तार
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,पहला {0} का चयन करें
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,जोड़ा गया {0} उपयोगकर्ता
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,जोड़ा गया {0} उपयोगकर्ता
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","मल्टी-स्तरीय कार्यक्रम के मामले में, ग्राहक अपने खर्च के अनुसार संबंधित स्तर को स्वचालित रूप से सौंपा जाएगा"
 DocType: Appointment Type,Physician,चिकित्सक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,आइटम के बैच {0} {1} समाप्त हो गया है।
@@ -6355,6 +6360,7 @@
 DocType: Employee,Date of Issue,जारी करने की तारीख
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","ख़रीद सेटिंग के मुताबिक यदि खरीद रिसीप्ट की आवश्यकता है == &#39;हां&#39;, तो खरीद चालान बनाने के लिए, उपयोगकर्ता को आइटम के लिए पहली खरीदी रसीद बनाने की ज़रूरत है {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},पंक्ति # {0}: आइटम के लिए सेट प्रदायक {1}
+DocType: Global Defaults,Default Distance Unit,डिफ़ॉल्ट दूरी इकाई
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,पंक्ति {0}: घंटे मूल्य शून्य से अधिक होना चाहिए।
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,मद {1} से जुड़ी वेबसाइट छवि {0} पाया नहीं जा सकता
 DocType: Issue,Content Type,सामग्री प्रकार
@@ -6410,7 +6416,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,खाते में डेबिट एक बैलेंस शीट खाता होना चाहिए
 DocType: Asset,Naming Series,श्रृंखला का नामकरण
 DocType: Vital Signs,Coated,लेपित
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,पंक्ति {0}: उपयोगी जीवन के बाद अपेक्षित मूल्य सकल खरीद राशि से कम होना चाहिए
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,पंक्ति {0}: उपयोगी जीवन के बाद अपेक्षित मूल्य सकल खरीद राशि से कम होना चाहिए
 DocType: GoCardless Settings,GoCardless Settings,GoCardless सेटिंग्स
 DocType: Leave Block List,Leave Block List Name,ब्लॉक सूची नाम छोड़ दो
 DocType: Certified Consultant,Certification Validity,प्रमाणन वैधता
@@ -6477,6 +6483,7 @@
 DocType: Bank Statement Settings Item,Bank Header,बैंक हैडर
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,लैब परीक्षण देखें
 DocType: Hub Users,Hub Users,हब उपयोगकर्ता
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; क्षेत्र
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,रखरखाव तिथि
 DocType: Purchase Invoice Item,Rejected Serial No,अस्वीकृत धारावाहिक नहीं
@@ -6492,7 +6499,7 @@
 DocType: SG Creation Tool Course,Max Strength,मैक्स शक्ति
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,प्रीसेट स्थापित करना
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-एफएसएच-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},ग्राहक के लिए कोई डिलिवरी नोट चयनित नहीं है {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},ग्राहक के लिए कोई डिलिवरी नोट चयनित नहीं है {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,कर्मचारी {0} में अधिकतम लाभ राशि नहीं है
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,डिलीवरी तिथि के आधार पर आइटम चुनें
 DocType: Grant Application,Has any past Grant Record,किसी भी पिछले अनुदान रिकॉर्ड है
@@ -6519,7 +6526,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,होटल रूम आरक्षण
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,ग्राहक सेवा
 DocType: BOM,Thumbnail,थंबनेल
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,ईमेल आईडी के साथ कोई संपर्क नहीं मिला।
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,ईमेल आईडी के साथ कोई संपर्क नहीं मिला।
 DocType: Item Customer Detail,Item Customer Detail,आइटम ग्राहक विस्तार
 DocType: Notification Control,Prompt for Email on Submission of,प्रस्तुत करने पर ईमेल के लिए संकेत
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},कर्मचारी की अधिकतम लाभ राशि {0} से अधिक है {1}
@@ -6774,7 +6781,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,"खाते का प्रकार चयन किया जाता है, क्योंकि समूह को गुप्त नहीं कर सकते।"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} संशोधित किया गया है . फ़िर से दूबारा करें.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,निम्नलिखित दिन पर छुट्टी अनुप्रयोग बनाने से उपयोगकर्ताओं को बंद करो.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,आइटम कोड&gt; आइटम समूह&gt; ब्रांड
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","यदि वफादारी अंक के लिए असीमित समाप्ति, समाप्ति अवधि खाली या 0 रखें।"
 DocType: Asset Maintenance Team,Maintenance Team Members,रखरखाव दल के सदस्यों
 DocType: Loyalty Point Entry,Purchase Amount,खरीद ने का मूलय
@@ -6782,7 +6788,7 @@
 											to fullfill Sales Order {2}",आइटम {1} के सीरियल नंबर {0} को वितरित नहीं कर सकता क्योंकि यह सुरक्षित है बिक्री आदेश {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,साल-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,प्रदायक कोटेशन {0} बनाया
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,समाप्ति वर्ष प्रारंभ साल से पहले नहीं हो सकता
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,समाप्ति वर्ष प्रारंभ साल से पहले नहीं हो सकता
 DocType: Employee Benefit Application,Employee Benefits,कर्मचारी लाभ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},{0} पंक्ति में {1} पैक्ड मात्रा आइटम के लिए मात्रा के बराबर होना चाहिए
 DocType: Work Order,Manufactured Qty,निर्मित मात्रा
@@ -6798,6 +6804,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,बैच नंबर का चयन करें
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,जीएसटीआईएन के लिए
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,बिलों ग्राहकों के लिए उठाया.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन&gt; एचआर सेटिंग्स में कर्मचारी नामकरण प्रणाली सेट करें
 DocType: Healthcare Settings,Invoice Appointments Automatically,स्वचालित रूप से चालान नियुक्तियां
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,परियोजना ईद
 DocType: Salary Component,Variable Based On Taxable Salary,कर योग्य वेतन पर परिवर्तनीय परिवर्तनीय
@@ -6846,7 +6853,7 @@
 DocType: POS Profile,Account for Change Amount,राशि परिवर्तन के लिए खाता
 DocType: QuickBooks Migrator,Connecting to QuickBooks,QuickBooks से कनेक्ट हो रहा है
 DocType: Exchange Rate Revaluation,Total Gain/Loss,कुल लाभ / हानि
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,इंटर कंपनी चालान के लिए अवैध कंपनी।
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,इंटर कंपनी चालान के लिए अवैध कंपनी।
 DocType: Purchase Invoice,input service,इनपुट सेवा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},पंक्ति {0}: पार्टी / खाते के साथ मैच नहीं करता है {1} / {2} में {3} {4}
 DocType: Employee Promotion,Employee Promotion,कर्मचारी संवर्धन
@@ -6976,7 +6983,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,लॉजिंग के लिए पसंदीदा क्षेत्र
 apps/erpnext/erpnext/config/selling.py +184,Analytics,एनालिटिक्स
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,कार्ट खाली है
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,कृपया शिक्षा&gt; शिक्षा सेटिंग्स में प्रशिक्षक नामकरण प्रणाली सेट करें
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",आइटम {0} में कोई सीरियल नंबर नहीं है केवल सीरियललाइज्ड आइटम \ सीरियल नंबर के आधार पर डिलीवरी कर सकते हैं
 DocType: Vehicle,Model,आदर्श
@@ -7006,7 +7012,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,बदलने के लिए कुछ नहीं
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,एक csv फ़ाइल का चयन करें
 DocType: Holiday List,Total Holidays,कुल छुट्टियां
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,प्रेषण के लिए गुम ईमेल टेम्पलेट। कृपया डिलिवरी सेटिंग्स में एक सेट करें।
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,प्रेषण के लिए गुम ईमेल टेम्पलेट। कृपया डिलिवरी सेटिंग्स में एक सेट करें।
 DocType: Student Leave Application,Mark as Present,उपहार के रूप में मार्क
 DocType: Supplier Scorecard,Indicator Color,सूचक रंग
 DocType: Purchase Order,To Receive and Bill,प्राप्त करें और बिल के लिए
@@ -7015,7 +7021,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,सीरियल नंबर का चयन करें
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,डिज़ाइनर
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,नियमों और शर्तों टेम्पलेट
-DocType: Serial No,Delivery Details,वितरण विवरण
+DocType: Delivery Trip,Delivery Details,वितरण विवरण
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},लागत केंद्र पंक्ति में आवश्यक है {0} कर तालिका में प्रकार के लिए {1}
 DocType: Program,Program Code,प्रोग्राम कोड
 DocType: Terms and Conditions,Terms and Conditions Help,नियम और शर्तें मदद
@@ -7039,7 +7045,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,लीड समय दिन
 DocType: Cash Flow Mapping,Is Income Tax Expense,आयकर व्यय है
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,आपका ऑर्डर डिलीवरी के लिए बाहर है!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},पंक्ति # {0}: पोस्ट दिनांक खरीद की तारीख के रूप में ही होना चाहिए {1} संपत्ति का {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},पंक्ति # {0}: पोस्ट दिनांक खरीद की तारीख के रूप में ही होना चाहिए {1} संपत्ति का {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,यह जाँच लें कि छात्र संस्थान के छात्रावास में रह रहा है।
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,उपरोक्त तालिका में विक्रय आदेश दर्ज करें
 ,Stock Summary,स्टॉक सारांश
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index e4f91f7..d95a215 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Naziv razdoblja
 DocType: Employee,Salary Mode,Plaća način
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Registrirajte se
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Registrirajte se
 DocType: Patient,Divorced,Rastavljen
 DocType: Support Settings,Post Route Key,Objavi ključ rute
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Dopusti Stavka biti dodan više puta u transakciji
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Novi tečaj
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Valuta je potrebna za cjenik {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bit će izračunata u transakciji.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Dobavljač&gt; Vrsta dobavljača
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Kupac Kontakt
 DocType: Patient Appointment,Check availability,Provjera dostupnosti
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Prikaži otvorena
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Serija je uspješno ažurirana
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Provjeri
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} u retku {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} u retku {1}
 DocType: Asset Finance Book,Depreciation Start Date,Početni datum amortizacije
 DocType: Pricing Rule,Apply On,Nanesite na
 DocType: Item Price,Multiple Item prices.,Višestruke cijene proizvoda.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Lab Prescription
 ,Delay Days,Dani odgode
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,usluga Rashodi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijski broj: {0} već se odnosi na prodajnu fakturu: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijski broj: {0} već se odnosi na prodajnu fakturu: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Faktura
 DocType: Purchase Invoice Item,Item Weight Details,Detalji o težini stavke
 DocType: Asset Maintenance Log,Periodicity,Periodičnost
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Knjigovođa
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Cjenik prodaje
 DocType: Patient,Tobacco Current Use,Duhanska struja
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Datum početka i datum završetka preklapaju se s poslovnom karticom <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Stopa prodaje
 DocType: Cost Center,Stock User,Stock Korisnik
 DocType: Soil Analysis,(Ca+Mg)/K,(+ Ca Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,povezan
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Datum Gledatelji ne može biti manja od ulaska datuma zaposlenika
 DocType: Grading Scale,Grading Scale Name,Ljestvici Ime
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Dodajte korisnike na tržište
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Dodajte korisnike na tržište
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,To jekorijen račun i ne može se mijenjati .
 DocType: Sales Invoice,Company Address,adresa tvrtke
 DocType: BOM,Operations,Operacije
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Qty
 DocType: Production Plan,Material Request Detail,Detalji o zahtjevu za materijal
 DocType: Selling Settings,Default Quotation Validity Days,Zadani rokovi valjanosti ponude
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
 DocType: SMS Center,SMS Center,SMS centar
 DocType: Payroll Entry,Validate Attendance,Potvrđivanje prisutnosti
 DocType: Sales Invoice,Change Amount,Promjena Iznos
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Prored za iznos u riječima
 DocType: Vehicle,Additional Details,dodatni detalji
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Nema opisa
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Dobavljač&gt; Grupa dobavljača
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Zahtjev za kupnju.
 DocType: POS Closing Voucher Details,Collected Amount,Prikupljeni iznos
 DocType: Lab Test,Submitted Date,Poslani datum
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,Studentski Ulaz
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Proizvod {0} je otkazan
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Row amortizacije {0}: Datum početka amortizacije unesen je kao protekli datum
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Row amortizacije {0}: Datum početka amortizacije unesen je kao protekli datum
 DocType: Contract Template,Fulfilment Terms and Conditions,Uvjeti ispunjavanja uvjeta
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Zahtjev za robom
 DocType: Bank Reconciliation,Update Clearance Date,Ažurirajte provjeri datum
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,Postavke za račune
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Dobavljač Račun br postoji u fakturi {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Uredi raspodjelu prodavača.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Nije moguće obraditi rutu, jer je postavke Google karata onemogućene."
 DocType: Job Applicant,Cover Letter,Pismo
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Izvanredna Čekovi i depoziti za brisanje
 DocType: Item,Synced With Hub,Sinkronizirati s Hub
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Nova vrijednost imovine
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Stopa po kojoj Kupac valuta se pretvaraju u kupca osnovne valute
 DocType: Course Scheduling Tool,Course Scheduling Tool,Naravno alat za raspoređivanje
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},"Red # {0}: Kupnja Račun, ne može se protiv postojećeg sredstva {1}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},"Red # {0}: Kupnja Račun, ne može se protiv postojećeg sredstva {1}"
 DocType: Crop Cycle,LInked Analysis,LInked analiza
 DocType: POS Closing Voucher,POS Closing Voucher,POS voucher za zatvaranje
 DocType: Contract,Lapsed,posrnuo
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} nije upisana u tečaj {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Ime studenta:
 DocType: POS Closing Voucher Details,Difference,Razlika
+DocType: Delivery Settings,Delay between Delivery Stops,Odgoda između isporuke prestaje
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serijski Ne {0} ne pripada isporuke Napomena {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Čini se da postoji problem s konfiguracijom GoCardless poslužitelja. Ne brinite, u slučaju neuspjeha, iznos će biti vraćen na vaš račun."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -693,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Količina i stopa
 DocType: Delivery Note,% Installed,% Instalirano
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Učionice / laboratoriji i sl, gdje predavanja može biti na rasporedu."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Valute trgovačkih društava obje tvrtke trebale bi se podudarati s transakcijama tvrtke Inter.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Valute trgovačkih društava obje tvrtke trebale bi se podudarati s transakcijama tvrtke Inter.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Unesite ime tvrtke prvi
 DocType: Travel Itinerary,Non-Vegetarian,Ne-vegetarijanska
 DocType: Purchase Invoice,Supplier Name,Dobavljač Ime
@@ -778,7 +779,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Najam od datuma
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Dosta Dijelovi za izgradnju
 DocType: POS Profile User,POS Profile User,Korisnik POS profila
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Redak {0}: potreban je početni datum amortizacije
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Redak {0}: potreban je početni datum amortizacije
 DocType: Purchase Invoice Item,Service Start Date,Datum početka usluge
 DocType: Subscription Invoice,Subscription Invoice,Pretplatnička faktura
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Izravni dohodak
@@ -845,7 +846,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Naziv već koristi druga tvrtka
 DocType: Selling Settings,Default Customer Group,Zadana grupa kupaca
 DocType: Employee,IFSC Code,IFSC kod
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Datum početka i datum završetka preklapaju se s poslovnom karticom <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ako onemogućite, &#39;Ukupno&#39; Zaobljeni polje neće biti vidljiv u bilo kojoj transakciji"
 DocType: BOM,Operating Cost,Operativni troškovi
 DocType: Crop,Produced Items,Proizvedene stavke
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,Spriječiti rasprave
 DocType: Hub User,Hub User,Korisnik huba
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Napravi prodajnu narudžbu
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Plaća poslana za razdoblje od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Plaća poslana za razdoblje od {0} do {1}
 DocType: Project Task,Project Task,Zadatak projekta
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Otkupljene točke
 ,Lead Id,Id potencijalnog kupca
@@ -1027,7 +1027,7 @@
 DocType: Fee Validity,Max number of visit,Maksimalni broj posjeta
 ,Hotel Room Occupancy,Soba za boravak hotela
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet stvorio:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Upisati
 DocType: GST Settings,GST Settings,Postavke GST-a
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Valuta bi trebala biti ista kao i Cjenik Valuta: {0}
@@ -1081,7 +1081,7 @@
 DocType: Vehicle Log,Service Details,Pojedinosti usluge
 DocType: Lab Test Template,Grouped,grupirane
 DocType: Selling Settings,Delivery Note Required,Potrebna je otpremnica
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Slanje nagrada za plaće ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Slanje nagrada za plaće ...
 DocType: Bank Guarantee,Bank Guarantee Number,Broj bankarske garancije
 DocType: Assessment Criteria,Assessment Criteria,Kriteriji za ocjenjivanje
 DocType: BOM Item,Basic Rate (Company Currency),Osnovna stopa (valuta tvrtke)
@@ -1106,13 +1106,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Ulazak Plaćanje je već stvorio
 DocType: Request for Quotation,Get Suppliers,Nabavite dobavljače
 DocType: Purchase Receipt Item Supplied,Current Stock,Trenutačno stanje skladišta
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Red # {0}: Imovina {1} ne povezan s točkom {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Red # {0}: Imovina {1} ne povezan s točkom {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Pregled Plaća proklizavanja
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Račun {0} unesen više puta
 DocType: Account,Expenses Included In Valuation,Troškovi uključeni u vrednovanje
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Možete obnoviti pretplatu samo ako vaše članstvo istekne u roku od 30 dana
 DocType: Shopping Cart Settings,Show Stock Availability,Prikaži raspoloživa roba
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Postavite {0} u kategoriji imovine {1} ili tvrtku {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Postavite {0} u kategoriji imovine {1} ili tvrtku {2}
 DocType: Location,Longitude,dužina
 ,Absent Student Report,Odsutni Student Report
 DocType: Crop,Crop Spacing UOM,Obrezivanje razmaka UOM
@@ -1184,7 +1184,7 @@
 DocType: Soil Texture,Sand,Pijesak
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,energija
 DocType: Opportunity,Opportunity From,Prilika od
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Redak {0}: {1} Serijski brojevi potrebni za stavku {2}. Naveli ste {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Redak {0}: {1} Serijski brojevi potrebni za stavku {2}. Naveli ste {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Odaberite tablicu
 DocType: BOM,Website Specifications,Web Specifikacije
 DocType: Special Test Items,Particulars,Pojedinosti
@@ -1295,7 +1295,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Stavke sa višim weightage će se prikazati više
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Lab testovi i vitalni znakovi
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Pomirenje Detalj
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Red # {0}: Imovina {1} mora biti predana
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Red # {0}: Imovina {1} mora biti predana
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nisu pronađeni zaposlenici
 DocType: Item,If subcontracted to a vendor,Ako podugovoren dobavljaču
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentska grupa je već ažurirana.
@@ -1349,7 +1349,6 @@
 DocType: Loyalty Program Collection,Tier Name,Tier Name
 DocType: HR Settings,Enter retirement age in years,Unesite dob za umirovljenje u godinama
 DocType: Crop,Target Warehouse,Ciljana galerija
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Postavite Serija za imenovanje {0} putem postavke&gt; Postavke&gt; Serija za imenovanje
 DocType: Payroll Employee Detail,Payroll Employee Detail,Pojedinosti zaposlenika plaće
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Odaberite skladište
 DocType: Cheque Print Template,Starting location from left edge,Počevši lokaciju od lijevog ruba
@@ -1439,7 +1438,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Plan materijal za pod-sklopova
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Prodaja Partneri i Županija
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} mora biti aktivna
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Nema dostupnih stavki za prijenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Nema dostupnih stavki za prijenos
 DocType: Employee Boarding Activity,Activity Name,Naziv aktivnosti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Promijenite datum objavljivanja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Količina gotovog proizvoda <b>{0}</b> i za količinu <b>{1}</b> ne može se razlikovati
@@ -1666,6 +1665,7 @@
 DocType: Project,First Email,Prva e-pošta
 DocType: Company,Exception Budget Approver Role,Uloga odobravanja proračuna za izuzeće
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Nakon postavljanja, ova će faktura biti na čekanju do zadanog datuma"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervirano Warehouse u prodajni nalog / skladišta gotovih proizvoda
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Prodaja Iznos
 DocType: Repayment Schedule,Interest Amount,Iznos kamata
@@ -1677,7 +1677,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,ploče
 DocType: Asset,Scrapped,otpisan
 DocType: Item,Item Defaults,Stavke zadane vrijednosti
-DocType: Purchase Invoice,Returns,vraća
+DocType: Cashier Closing,Returns,vraća
 DocType: Job Card,WIP Warehouse,WIP Skladište
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serijski Ne {0} je pod ugovorom za održavanje upto {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,regrutacija
@@ -1691,7 +1691,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Vrsta prijenosa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Prodajni troškovi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Grupa kupaca&gt; Teritorij
 DocType: Diagnosis,Diagnosis,Dijagnoza
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standardna kupnju
 DocType: Attendance Request,Explanation,Obrazloženje
@@ -1704,7 +1703,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Narudžbenice su stavke dospjele
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Poštanski broj
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Prodaja Naručite {0} {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Odaberite račun za dohodak od kamata u zajam {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Odaberite račun za dohodak od kamata u zajam {0}
 DocType: Opportunity,Contact Info,Kontakt Informacije
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Izrada Stock unose
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Ne mogu promovirati zaposlenika sa statusom lijevo
@@ -1716,7 +1715,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Račun se ne može izvršiti za nulti sat naplate
 DocType: Company,Date of Commencement,Datum početka
 DocType: Sales Person,Select company name first.,Prvo odaberite naziv tvrtke.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},E-mail poslan na {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},E-mail poslan na {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ponude dobivene od dobavljača.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Zamijenite BOM i ažurirajte najnoviju cijenu u svim BOM-ovima
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Za {0} | {1} {2}
@@ -1736,7 +1735,7 @@
 DocType: Asset Movement,From Employee,Od zaposlenika
 DocType: Driver,Cellphone Number,broj mobitela
 DocType: Project,Monitor Progress,Monitor napredak
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Upozorenje : Sustav neće provjeravati overbilling od iznosa za točku {0} u {1} je nula
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Upozorenje : Sustav neće provjeravati overbilling od iznosa za točku {0} u {1} je nula
 DocType: Journal Entry,Make Difference Entry,Čine razliku Entry
 DocType: Supplier Quotation,Auto Repeat Section,Auto Repeat Section
 DocType: Upload Attendance,Attendance From Date,Gledanost od datuma
@@ -1839,7 +1838,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Red # {0}: Odbijen Kom se ne može upisati u kupnju povratak
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Promjena grupe kupaca za odabranog kupca nije dopuštena.
 ,Purchase Order Items To Be Billed,Stavke narudžbenice za naplatu
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Ažuriranje procijenjenih vremena dolaska.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Ažuriranje procijenjenih vremena dolaska.
 DocType: Program Enrollment Tool,Enrollment Details,Pojedinosti o upisu
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Nije moguće postaviti više zadanih postavki za tvrtku.
 DocType: Purchase Invoice Item,Net Rate,Neto stopa
@@ -1853,7 +1852,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Vrsta napuštanja je laka
 DocType: Support Settings,Close Issue After Days,Zatvori Issue Nakon dana
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Morate biti korisnik s ulogama upravitelja sustava i upravitelja stavki kako biste korisnike dodali na tržište.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Morate biti korisnik s ulogama upravitelja sustava i upravitelja stavki kako biste korisnike dodali na tržište.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Ostavite prazno ako se odnosi na sve poslovnice
 DocType: Job Opening,Staffing Plan,Plan osoblja
 DocType: Bank Guarantee,Validity in Days,Valjanost u danima
@@ -1873,7 +1872,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Dupli red {0} sa istim {1}
 DocType: Marketplace Settings,Disable Marketplace,Onemogući tržište
 ,Trial Balance,Pretresno bilanca
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađena
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađena
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Postavljanje zaposlenika
 DocType: Hotel Room Reservation,Hotel Reservation User,Korisnik hotela rezervacije
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Odaberite prefiks prvi
@@ -1981,7 +1980,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Prijava nije uspjela
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Izrađen je element {0}
 DocType: Special Test Items,Special Test Items,Posebne ispitne stavke
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Morate biti korisnik s ulogama upravitelja sustava i upravitelja stavki da biste se registrirali na tržištu.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Morate biti korisnik s ulogama upravitelja sustava i upravitelja stavki da biste se registrirali na tržištu.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Način plaćanja
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Prema vašoj dodijeljenoj Strukturi plaća ne možete podnijeti zahtjev za naknadu
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Web slika bi trebala biti javna datoteke ili URL web stranice
@@ -1993,7 +1992,7 @@
 DocType: Warehouse,Warehouse Contact Info,Kontakt informacije skladišta
 DocType: Payment Entry,Write Off Difference Amount,Otpis razlika visine
 DocType: Volunteer,Volunteer Name,Ime volontera
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Nađeno je redaka s datumima duplikata u drugim redcima: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Nađeno je redaka s datumima duplikata u drugim redcima: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: Radnik email nije pronađen, stoga ne e-mail poslan"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Struktura plaće nije dodijeljena za zaposlenika {0} na određeni datum {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Pravilo isporuke nije primjenjivo za zemlju {0}
@@ -2082,6 +2081,7 @@
 DocType: Salary Component,Earning,Zarada
 DocType: Supplier Scorecard,Scoring Criteria,Kriteriji za bodovanje
 DocType: Purchase Invoice,Party Account Currency,Strana valuta računa
+DocType: Delivery Trip,Total Estimated Distance,Ukupna procijenjena udaljenost
 ,BOM Browser,BOM preglednik
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Ažurirajte svoj status za ovaj trening događaj
 DocType: Item Barcode,EAN,EAN
@@ -2120,7 +2120,7 @@
 DocType: Activity Cost,Projects,Projekti
 DocType: Payment Request,Transaction Currency,transakcija valuta
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Od {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Neke e-poruke nisu važeće
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Neke e-poruke nisu važeće
 DocType: Work Order Operation,Operation Description,Operacija Opis
 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.,Ne možete promijeniti fiskalnu godinu datum početka i datum završetka fiskalne godine kada Fiskalna godina se sprema.
 DocType: Quotation,Shopping Cart,Košarica
@@ -2144,7 +2144,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Neto promjena u dugotrajne imovine
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,Ostavite prazno ako se odnosi na sve oznake
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Maksimalno: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od datetime
 DocType: Shopify Settings,For Company,Za tvrtke
@@ -2158,7 +2158,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Došlo je do pogrešaka prilikom izrade tečaja Raspored
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Prvi Odrednik odobrenja u popisu će biti postavljen kao zadani odobrenje troškova.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,ne može biti veće od 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Morate biti korisnik koji nije administrator s ulogama upravitelja sustava i upravitelja stavki da biste se registrirali na tržištu.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Morate biti korisnik koji nije administrator s ulogama upravitelja sustava i upravitelja stavki da biste se registrirali na tržištu.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Proizvod {0} nije skladišni proizvod
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Neplanski
@@ -2187,7 +2187,7 @@
 DocType: HR Settings,Employee Settings,Postavke zaposlenih
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Učitavanje sustava plaćanja
 ,Batch-Wise Balance History,Batch-Wise povijest bilance
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Redak # {0}: Nije moguće postaviti stopu ako je iznos veći od naplaćenog iznosa za stavku {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Redak # {0}: Nije moguće postaviti stopu ako je iznos veći od naplaćenog iznosa za stavku {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Postavke ispisa ažurirana u odgovarajućem formatu za ispis
 DocType: Package Code,Package Code,kod paketa
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,šegrt
@@ -2419,7 +2419,7 @@
 DocType: Delivery Trip,Optimize Route,Optimizirajte rutu
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Pokušajte planirati poslovanje za X dana unaprijed.
 DocType: HR Settings,Stop Birthday Reminders,Zaustavi Rođendan Podsjetnici
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Molimo postavite zadanog Platne naplativo račun u Društvu {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Molimo postavite zadanog Platne naplativo račun u Društvu {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Preuzmite financijsku raspad poreznih i administrativnih podataka Amazon
 DocType: SMS Center,Receiver List,Prijemnik Popis
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Traži Stavka
@@ -2489,7 +2489,7 @@
 DocType: Vital Signs,Constipated,konstipovan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Protiv dobavljača Račun {0} datira {1}
 DocType: Customer,Default Price List,Zadani cjenik
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Unos imovine Pokret {0} stvorio
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Unos imovine Pokret {0} stvorio
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Nijedna stavka nije pronađena.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ne možete izbrisati Fiskalnu godinu {0}. Fiskalna godina {0} je postavljena kao zadana u Globalnim postavkama
 DocType: Share Transfer,Equity/Liability Account,Račun vlasničke i odgovornosti
@@ -2626,6 +2626,7 @@
 DocType: Blanket Order,Order Type,Vrsta narudžbe
 ,Item-wise Sales Register,Stavka-mudri prodaja registar
 DocType: Asset,Gross Purchase Amount,Bruto Iznos narudžbe
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Šifra stavke&gt; Skupina stavke&gt; Brand
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Početna salda
 DocType: Asset,Depreciation Method,Metoda amortizacije
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je li ovo pristojba uključena u osnovne stope?
@@ -2706,7 +2707,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Postupak ako je godišnji proračun prekoračen na PO
 DocType: Student Leave Application,Student Leave Application,Studentski Ostavite aplikacija
 DocType: Item,Will also apply for variants,Također će podnijeti zahtjev za varijante
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Imovina se ne može otkazati, jer je već {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Imovina se ne može otkazati, jer je već {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Zaposlenik {0} na pola dana na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Ukupno radno vrijeme ne smije biti veći od max radnog vremena {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,na
@@ -2730,6 +2731,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Dohvatite podatke
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Maksimalni dopust dopušten u dopuštenoj vrsti {0} je {1}
 DocType: SMS Center,Create Receiver List,Stvaranje Receiver popis
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Datum dostupan za upotrebu trebao bi biti nakon datuma kupnje
 DocType: Vehicle,Wheels,kotači
 DocType: Packing Slip,To Package No.,Za Paket br
 DocType: Patient Relation,Family,Obitelj
@@ -2743,7 +2745,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Valuta naplate mora biti jednaka valutnoj valuti ili valuti stranke računa tvrtke
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Ukazuje da je paket je dio ove isporuke (samo nacrti)
 DocType: Soil Texture,Loam,Ilovača
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Redak {0}: Datum dospijeća ne može biti prije objavljivanja datuma
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Redak {0}: Datum dospijeća ne može biti prije objavljivanja datuma
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Napravi ulazno plaćanje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Količina za proizvod {0} mora biti manja od {1}
 ,Sales Invoice Trends,Trendovi prodajnih računa
@@ -2815,7 +2817,7 @@
 DocType: Guardian,Guardian Interests,Guardian Interesi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Ažuriranje naziva / broja računa
 DocType: Naming Series,Current Value,Trenutna vrijednost
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Više fiskalne godine postoji za sada {0}. Molimo postavite tvrtka u fiskalnoj godini
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Više fiskalne godine postoji za sada {0}. Molimo postavite tvrtka u fiskalnoj godini
 DocType: Education Settings,Instructor Records to be created by,Instruktorski zapisi moraju biti izrađeni od strane
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} stvorio
 DocType: GST Account,GST Account,GST račun
@@ -2833,7 +2835,7 @@
 DocType: Sales Person,Name and Employee ID,Ime i ID zaposlenika
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
 DocType: Website Item Group,Website Item Group,Grupa proizvoda web stranice
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nije pronađena plaća za podnošenje gore navedenih kriterija ili već dostavljen skraćeni prihod
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nije pronađena plaća za podnošenje gore navedenih kriterija ili već dostavljen skraćeni prihod
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Carine i porezi
 DocType: Projects Settings,Projects Settings,Postavke projekata
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Unesite Referentni datum
@@ -2842,7 +2844,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Isporučena količina
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,FHP-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Zahtjev za robom - proizvod
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Najprije otkazite potvrdu o kupnji {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Najprije otkazite potvrdu o kupnji {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Stablo grupe proizvoda.
 DocType: Production Plan,Total Produced Qty,Ukupna proizvodna količina
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Ne mogu se odnositi broj retka veći ili jednak trenutnom broju red za ovu vrstu Charge
@@ -2951,6 +2953,7 @@
 ,Vehicle Expenses,Troškovi vozila
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Napravite laboratorijske testove na prodajnoj dostavnici
 DocType: Serial No,Invoice Details,Pojedinosti fakture
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Omogućite postavkama Google karata da procjene i optimiziraju rute
 DocType: Grant Application,Show on Website,Pokaži na web stranici
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Započnite
 DocType: Hub Tracked Item,Hub Category,Kategorija hubova
@@ -2990,7 +2993,7 @@
 DocType: Inpatient Record,B Positive,B Pozitivan
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Maksimalna korist zaposlenika {0} premašuje {1} sumu {2} prethodnog zahtjeva \ iznosa
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Red # {0}: Količina mora biti jedan, jer predmet je fiksni kapital. Molimo koristite poseban red za više kom."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Red # {0}: Količina mora biti jedan, jer predmet je fiksni kapital. Molimo koristite poseban red za više kom."
 DocType: Leave Block List Allow,Leave Block List Allow,Odobrenje popisa neodobrenih odsustava
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr ne može biti prazno ili razmak
 DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
@@ -3024,7 +3027,7 @@
 DocType: Workstation,Wages per hour,Satnice
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock ravnoteža u batch {0} postat negativna {1} za točku {2} na skladištu {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Sljedeći materijal Zahtjevi su automatski podigli na temelju stavke razini ponovno narudžbi
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Račun {0} je nevažeći. Valuta računa mora biti {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Račun {0} je nevažeći. Valuta računa mora biti {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Od datuma {0} ne može biti nakon datuma olakšavanja zaposlenika {1}
 DocType: Supplier,Is Internal Supplier,Je li unutarnji dobavljač
 DocType: Employee,Create User Permission,Izradi User Permission
@@ -3168,7 +3171,7 @@
 DocType: Account,Fixed Asset,Dugotrajna imovina
 DocType: Amazon MWS Settings,After Date,Nakon datuma
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Serijaliziranom Inventar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Nevažeći {0} za fakturu tvrtke Inter.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Nevažeći {0} za fakturu tvrtke Inter.
 ,Department Analytics,Analytics odjela
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Email nije pronađen u zadanom kontaktu
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generirajte tajnu
@@ -3180,7 +3183,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Program u strukturi naknada i studentskoj grupi {0} razlikuju se.
 DocType: Bank Statement Transaction Entry,Receivable Account,Potraživanja račun
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Vrijedi od datuma mora biti manji od Valid Upto Date.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Red # {0}: Imovina {1} Već {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Red # {0}: Imovina {1} Već {2}
 DocType: Quotation Item,Stock Balance,Skladišna bilanca
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Prodajnog naloga za plaćanje
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,CEO
@@ -3222,6 +3225,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Zaduženja je potrebno
 DocType: Clinical Procedure,Inpatient Record,Popis bolesnika
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomoći pratiti vrijeme, troškove i naplatu za aktivnostima obavljaju unutar vašeg tima"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Dobavljač&gt; Vrsta dobavljača
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Kupovni cjenik
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Datum transakcije
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Predlošci varijabli s rezultatima dobavljača.
@@ -3264,7 +3268,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Razmjena Dobit / gubitak
 DocType: Opportunity,Lost Reason,Razlog gubitka
 DocType: Amazon MWS Settings,Enable Amazon,Omogućite Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Red # {0}: Račun {1} ne pripada tvrtki {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Red # {0}: Račun {1} ne pripada tvrtki {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Nije moguće pronaći DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nova adresa
 DocType: Quality Inspection,Sample Size,Veličina uzorka
@@ -3375,7 +3379,7 @@
 DocType: Water Analysis,Origin,Podrijetlo
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ovaj dokument je preko granice po {0} {1} za stavku {4}. Jeste li što drugo {3} protiv iste {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Molimo postavite ponavljajući nakon spremanja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Iznos računa Odaberi promjene
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Iznos računa Odaberi promjene
 DocType: Purchase Invoice,Price List Currency,Valuta cjenika
 DocType: Naming Series,User must always select,Korisničko uvijek mora odabrati
 DocType: Stock Settings,Allow Negative Stock,Dopustite negativnu zalihu
@@ -3417,7 +3421,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Jeste li sigurni da želite otkazati ovaj termin?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Hotelski paket cijene za sobu
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Prodaja cjevovoda
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Molimo postavite zadani račun plaće komponente {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Molimo postavite zadani račun plaće komponente {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Potrebna On
 DocType: Rename Tool,File to Rename,Datoteka za Preimenovanje
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Odaberite BOM za točku u nizu {0}
@@ -3438,7 +3442,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Troškovi kupljene predmete
 DocType: Employee Separation,Employee Separation Template,Predložak za razdvajanje zaposlenika
 DocType: Selling Settings,Sales Order Required,Prodajnog naloga Obvezno
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Postanite prodavač
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Postanite prodavač
 DocType: Purchase Invoice,Credit To,Kreditne Da
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Aktivne ponude / kupce
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Ostavite prazno da biste koristili standardni format isporuke Napomena
@@ -3479,7 +3483,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Napravite predložak poreza
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum za korisnike
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Sirovine ne može biti prazno.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Redak # {0} (Tablica plaćanja): iznos mora biti negativan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Redak # {0} (Tablica plaćanja): iznos mora biti negativan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Ne može se ažurirati zaliha, fakture sadrži drop shipping stavke."
 DocType: Contract,Fulfilment Status,Status ispunjenja
 DocType: Lab Test Sample,Lab Test Sample,Uzorak laboratorija
@@ -3638,7 +3642,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Datum dokumenta
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Naknada zapisa nastalih - {0}
 DocType: Asset Category Account,Asset Category Account,Imovina Kategorija račun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Red # {0} (Tablica plaćanja): iznos mora biti pozitivan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Red # {0} (Tablica plaćanja): iznos mora biti pozitivan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Ne može proizvesti više predmeta {0} od prodajnog naloga količina {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Odaberite Vrijednosti atributa
 DocType: Purchase Invoice,Reason For Issuing document,Razlog za izdavanje dokumenta
@@ -3693,7 +3697,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Vrijeme u kojem su materijali primili
 DocType: Products Settings,Products per Page,Proizvodi po stranici
 DocType: Stock Ledger Entry,Outgoing Rate,Odlazni Ocijenite
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,ili
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,ili
 DocType: Sales Order,Billing Status,Status naplate
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Prijavi problem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,komunalna Troškovi
@@ -3720,7 +3724,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Deklaracija o izuzeću od plaćanja radnika
 DocType: Payment Entry,Cheque/Reference Date,Ček / Referentni datum
 DocType: Purchase Invoice,Total Taxes and Charges,Ukupno Porezi i naknade
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Datum dostupan za korištenje unosi se kao protekli datum
 DocType: Employee,Emergency Contact,Kontakt hitne službe
 DocType: Bank Reconciliation Detail,Payment Entry,Ulaz za plaćanje
 ,sales-browser,prodaja-preglednik
@@ -3766,6 +3769,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Je li povrat (kreditna bilješka)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Započni posao
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Serijski broj nije potreban za imovinu {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Postavite Serija za imenovanje {0} putem postavke&gt; Postavke&gt; Serija za imenovanje
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Onemogućeno predložak ne smije biti zadani predložak
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Za redak {0}: unesite planirani iznos
 DocType: Account,Income Account,Račun prihoda
@@ -3779,6 +3783,7 @@
 DocType: Loyalty Program,Help Section,Odjeljak za pomoć
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Prethodna
 DocType: Appraisal Goal,Key Responsibility Area,Zona ključnih odgovornosti
+DocType: Delivery Trip,Distance UOM,Udaljenost UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Studentski Serije vam pomoći pratiti posjećenost, procjene i naknade za učenike"
 DocType: Payment Entry,Total Allocated Amount,Ukupni raspoređeni iznos
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Postavite zadani oglasni prostor za trajni oglasni prostor
@@ -3820,7 +3825,7 @@
 DocType: Item Supplier,Item Supplier,Dobavljač proizvoda
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Nema odabranih stavki za prijenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Nema odabranih stavki za prijenos
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Sve adrese.
 DocType: Company,Stock Settings,Postavke skladišta
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je moguće samo ako sljedeća svojstva su isti u obje evidencije. Je Grupa, korijen Vrsta, Društvo"
@@ -4117,7 +4122,7 @@
 DocType: Patient,Personal and Social History,Osobna i društvena povijest
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Korisnik {0} je stvoren
 DocType: Fee Schedule,Fee Breakup for each student,Otkazivanje naknade za svakog studenta
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Ukupno unaprijed ({0}) protiv Red {1} ne može biti veći od sveukupnog ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Ukupno unaprijed ({0}) protiv Red {1} ne može biti veći od sveukupnog ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Odaberite mjesečna distribucija na nejednako distribuirati ciljeve diljem mjeseci.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Promijeni kod
 DocType: Purchase Invoice Item,Valuation Rate,Stopa vrednovanja
@@ -4126,7 +4131,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Availed ITC Cess
 ,Student Monthly Attendance Sheet,Studentski mjesečna posjećenost list
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Pravilo o isporuci primjenjuje se samo za prodaju
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Row amortizacije {0}: Sljedeći datum amortizacije ne može biti prije datuma kupnje
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Row amortizacije {0}: Sljedeći datum amortizacije ne može biti prije datuma kupnje
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum početka projekta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Do
 DocType: Rename Tool,Rename Log,Preimenuj prijavu
@@ -4143,12 +4148,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Koliko često se projekt i tvrtka trebaju ažurirati na temelju prodajnih transakcija.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,istječe
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Dodaj studente
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Obrišite zaposlenika <a href=""#Form/Employee/{0}"">{0}</a> \ da biste otkazali ovaj dokument"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Odaberite {0}
 DocType: C-Form,C-Form No,C-obrazac br
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Udaljenost
+DocType: Delivery Stop,Distance,Udaljenost
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Navedite svoje proizvode ili usluge koje kupujete ili prodaju.
 DocType: Water Analysis,Storage Temperature,Temperatura skladištenja
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4175,7 +4178,7 @@
 DocType: Homepage,Company Description for website homepage,Opis tvrtke za web stranici
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Za praktičnost kupaca, te kodovi mogu se koristiti u tiskanim formata kao što su fakture i otpremnice"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Naziv suplier
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Nije moguće dohvatiti podatke za {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Nije moguće dohvatiti podatke za {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Časopis za otvaranje
 DocType: Contract,Fulfilment Terms,Uvjeti ispunjenja
 DocType: Sales Invoice,Time Sheet List,Vrijeme Lista list
@@ -4355,7 +4358,7 @@
 DocType: Serial No,Warranty / AMC Details,Jamstveni / AMC Brodu
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Ručno odaberite studente za Grupu temeljenu na aktivnostima
 DocType: Journal Entry,User Remark,Upute Zabilješka
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Optimiranje ruta.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Optimiranje ruta.
 DocType: Travel Itinerary,Non Diary,Ne dnevnik
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Ne može se stvoriti bonus zadržavanja za lijeve zaposlenike
 DocType: Lead,Market Segment,Tržišni segment
@@ -4385,7 +4388,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Program odanosti
 DocType: Student Guardian,Father,Otac
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Podržite ulaznice
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,'Ažuriraj zalihe' ne može se provesti na prodaju osnovnog sredstva
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,'Ažuriraj zalihe' ne može se provesti na prodaju osnovnog sredstva
 DocType: Bank Reconciliation,Bank Reconciliation,Banka pomirenje
 DocType: Attendance,On Leave,Na odlasku
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Nabavite ažuriranja
@@ -4430,7 +4433,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serijski broj i serije
 DocType: Warranty Claim,From Company,Iz Društva
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Zbroj ocjene kriterija za ocjenjivanje treba biti {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Molimo postavite Broj deprecijaciju Rezervirano
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Molimo postavite Broj deprecijaciju Rezervirano
 DocType: Supplier Scorecard Period,Calculations,izračuni
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,"Vrijednost, ili Kol"
 DocType: Payment Terms Template,Payment Terms,Uvjeti plaćanja
@@ -4449,7 +4452,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Popust (%) na Cjeniku s marginom
 DocType: Healthcare Service Unit Type,Rate / UOM,Ocijenite / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Svi Skladišta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Ne postoji {0} pronađen za transakcije tvrtke Inter.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Ne postoji {0} pronađen za transakcije tvrtke Inter.
 DocType: Travel Itinerary,Rented Car,Najam automobila
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,O vašoj tvrtki
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Kredit na računu mora biti bilanca račun
@@ -4550,6 +4553,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Kriteriji analize biljaka
 DocType: Cheque Print Template,Cheque Height,Ček Visina
 DocType: Supplier,Supplier Details,Dobavljač Detalji
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Postavite serijske brojeve za prisustvovanje putem Setup&gt; Serija numeriranja
 DocType: Setup Progress,Setup Progress,Postavi napredak
 DocType: Expense Claim,Approval Status,Status odobrenja
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Od vrijednosti mora biti manje nego vrijednosti u redu {0}
@@ -4642,7 +4646,6 @@
 DocType: Travel Request,Fully Sponsored,Potpuno sponzoriran
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Obrnuti unos dnevnika
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Korisnik {0} je stvoren.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite Sustav imenovanja zaposlenika u ljudskim resursima&gt; HR postavke
 DocType: Stock Settings,Limit Percent,Ograničenje posto
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Trenutno nema raspoloživih količina u bilo kojem skladištu
 ,Payment Period Based On Invoice Date,Razdoblje za naplatu po Datum fakture
@@ -4701,7 +4704,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Izvor galerija
 DocType: Installation Note,Installation Date,Instalacija Datum
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Dijelite knjigu
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Red # {0}: Imovina {1} ne pripada društvu {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Red # {0}: Imovina {1} ne pripada društvu {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Izrađena je prodajna faktura {0}
 DocType: Employee,Confirmation Date,potvrda Datum
 DocType: Inpatient Occupancy,Check Out,Provjeri
@@ -4721,6 +4724,7 @@
 DocType: Production Plan,Sales Orders Detail,Detalj narudžbe
 DocType: Bin,Requested Quantity,Tražena količina
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Postavite instruktor imenovanja sustava u obrazovanju&gt; Postavke obrazovanja
 DocType: Patient,Marital Status,Bračni status
 DocType: Stock Settings,Auto Material Request,Automatski zahtjev za materijalom
 DocType: Woocommerce Settings,API consumer secret,API tajna potrošača
@@ -4773,7 +4777,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Odaberite Dani
 DocType: Academic Term,Term Name,pojam ime
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Kredit ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Stvaranje plaće skliznula ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Stvaranje plaće skliznula ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Ne možete uređivati root čvor.
 DocType: Buying Settings,Purchase Order Required,Narudžbenica kupnje je obavezna
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Odbrojavanje
@@ -4809,7 +4813,7 @@
 DocType: Account,Rate at which this tax is applied,Stopa po kojoj je taj porez se primjenjuje
 DocType: Cash Flow Mapper,Section Name,Naziv odjeljka
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Poredaj Kom
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Amortizacija reda {0}: očekivana vrijednost nakon korisnog vijeka trajanja mora biti veća ili jednaka {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Amortizacija reda {0}: očekivana vrijednost nakon korisnog vijeka trajanja mora biti veća ili jednaka {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Trenutni radnih mjesta
 DocType: Company,Stock Adjustment Account,Stock Adjustment račun
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Otpisati
@@ -4856,7 +4860,7 @@
 DocType: Program Enrollment,School House,Škola Kuća
 DocType: Serial No,Out of AMC,Od AMC
 DocType: Opportunity,Opportunity Amount,Iznos prilika
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Broj deprecijaciju rezervirano ne može biti veća od Ukupan broj deprecijaciju
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Broj deprecijaciju rezervirano ne može biti veća od Ukupan broj deprecijaciju
 DocType: Purchase Order,Order Confirmation Date,Datum potvrde narudžbe
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Provjerite održavanja Posjetite
@@ -4897,7 +4901,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,serija:
 DocType: Volunteer,Afternoon,Poslijepodne
 DocType: Loyalty Program,Loyalty Program Help,Pomoć za program vjernosti
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' je onemogućen
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' je onemogućen
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Postavi kao Opena
 DocType: Cheque Print Template,Scanned Cheque,Scanned Ček
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Pošaljite e-poštu automatski u imenik na podnošenje transakcija.
@@ -4910,7 +4914,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Stavka i jamstvo Detalji
 DocType: Chapter,Chapter Members,Članovi poglavlja
 DocType: Sales Team,Contribution (%),Doprinos (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Napomena : Stupanje Plaćanje neće biti izrađen od ' Gotovina ili bankovni račun ' nije naveden
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Napomena : Stupanje Plaćanje neće biti izrađen od ' Gotovina ili bankovni račun ' nije naveden
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Projekt {0} već postoji
 DocType: Clinical Procedure,Nursing User,Korisnik za njegu
 DocType: Employee Benefit Application,Payroll Period,Razdoblje obračuna plaća
@@ -4918,6 +4922,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Serijski broj {0} ne pripada skupini {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Odgovornosti
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Rok valjanosti ove ponude je završen.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Obrišite zaposlenika <a href=""#Form/Employee/{0}"">{0}</a> \ da biste otkazali ovaj dokument"
 DocType: Expense Claim Account,Expense Claim Account,Rashodi Zatraži račun
 DocType: Account,Capital Work in Progress,Kapitalni radovi u tijeku
 DocType: Accounts Settings,Allow Stale Exchange Rates,Dopusti stale tečaj
@@ -4998,7 +5004,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Materijal Izazova
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Spojite Shopify s ERPNextom
 DocType: Material Request Item,For Warehouse,Za galeriju
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Bilješke o isporuci {0} ažurirane
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Bilješke o isporuci {0} ažurirane
 DocType: Employee,Offer Date,Datum ponude
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Citati
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Vi ste u izvanmrežnom načinu rada. Nećete biti u mogućnosti da ponovno učitati dok imate mrežu.
@@ -5048,7 +5054,7 @@
 DocType: Shipping Rule,Calculate Based On,Izračun temeljen na
 DocType: Contract,Unfulfilled,neispunjen
 DocType: Delivery Note Item,From Warehouse,Iz skladišta
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Nema zaposlenika za navedene kriterije
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Nema zaposlenika za navedene kriterije
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Nema Stavke sa Bill materijala za proizvodnju
 DocType: Shopify Settings,Default Customer,Zadani kupac
 DocType: Sales Stage,Stage Name,Naziv stadija
@@ -5090,7 +5096,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Iznos poreza Nakon iznosa popusta
 DocType: Patient,Inpatient Status,Status pacijenata
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Dnevni Postavke rad Sažetak
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Odabrani cjenik trebao bi biti provjeren na poljima kupnje i prodaje.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Odabrani cjenik trebao bi biti provjeren na poljima kupnje i prodaje.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Unesite Reqd po datumu
 DocType: Payment Entry,Internal Transfer,Interni premještaj
 DocType: Asset Maintenance,Maintenance Tasks,Zadatci održavanja
@@ -5126,7 +5132,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Grupa Do
 DocType: Guardian,Interests,interesi
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Omogućiti / onemogućiti valute .
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Nije bilo moguće poslati nagradu za plaće
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Nije bilo moguće poslati nagradu za plaće
 DocType: Exchange Rate Revaluation,Get Entries,Dobijte unose
 DocType: Production Plan,Get Material Request,Dobiti materijala zahtjev
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Poštanski troškovi
@@ -5209,7 +5215,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Rashodi račun je obvezna za predmet {0}
 DocType: BOM,Website Description,Opis web stranice
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Neto promjena u kapitalu
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Otkažite fakturi {0} prvi
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Otkažite fakturi {0} prvi
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Nije dopušteno. Onemogućite vrstu usluge
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail adresa mora biti jedinstvena, već postoji za {0}"
 DocType: Serial No,AMC Expiry Date,AMC Datum isteka
@@ -5249,7 +5255,7 @@
 DocType: Hotel Room,Hotel Room,Hotelska soba
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Račun {0} ne pripada društvu {1}
 DocType: Leave Type,Rounding,Zaokruživanje
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Serijski brojevi u retku {0} ne podudaraju se s dostavom
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Serijski brojevi u retku {0} ne podudaraju se s dostavom
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Nepodmireni iznos (procijenjeni)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Zatim se Pravila o cijenama filtriraju prema kupcu, grupi kupaca, teritoriju, dobavljaču, grupi dobavljača, kampanji, prodajnom partneru itd."
 DocType: Student,Guardian Details,Guardian Detalji
@@ -5304,7 +5310,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
 DocType: Leave Allocation,Unused leaves,Neiskorišteni lišće
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Učinite uplatu
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Svi odjeli
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Svi odjeli
 DocType: Healthcare Service Unit,Vacant,prazan
 DocType: Patient,Alcohol Past Use,Prethodna upotreba alkohola
 DocType: Fertilizer Content,Fertilizer Content,Sadržaj gnojiva
@@ -5315,7 +5321,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Radni nalog {0} mora biti otkazan prije otkazivanja ovog prodajnog naloga
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
 DocType: Authorization Rule,Applicable To (Employee),Odnosi se na (Radnik)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Datum dospijeća je obavezno
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Datum dospijeća je obavezno
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Pomak za Osobina {0} ne može biti 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Vrsta i iznos koristi
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Sobe rezervirane
@@ -5459,7 +5465,7 @@
 DocType: Purchase Invoice Item,Total Weight,Totalna tezina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Komisija za prodaju
 DocType: Job Offer Term,Value / Description,Vrijednost / Opis
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Red # {0}: Imovina {1} ne može se podnijeti, to je već {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Red # {0}: Imovina {1} ne može se podnijeti, to je već {2}"
 DocType: Tax Rule,Billing Country,Naplata Država
 DocType: Purchase Order Item,Expected Delivery Date,Očekivani rok isporuke
 DocType: Restaurant Order Entry,Restaurant Order Entry,Unos narudžbe restorana
@@ -5498,12 +5504,13 @@
 DocType: Maintenance Visit,Breakdown,Slom
 DocType: Travel Itinerary,Vegetarian,Vegetarijanac
 DocType: Patient Encounter,Encounter Date,Datum susreta
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutom: {1} ne može se odabrati
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutom: {1} ne može se odabrati
 DocType: Bank Statement Transaction Settings Item,Bank Data,Podaci o bankama
 DocType: Purchase Receipt Item,Sample Quantity,Količina uzorka
 DocType: Bank Guarantee,Name of Beneficiary,Naziv Korisnika
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Ažuriranje BOM-a automatski se naplaćuje putem Planera, temeljeno na najnovijoj stopi vrednovanja / stopi cjenika / zadnje stope kupnje sirovina."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Dobavljač&gt; Grupa dobavljača
 DocType: Bank Reconciliation Detail,Cheque Date,Ček Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Račun {0}: nadređeni račun {1} ne pripada tvrtki: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Uspješno izbrisati sve transakcije vezane uz ovu tvrtku!
@@ -5531,7 +5538,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Dijete čvorovi mogu biti samo stvorio pod tipa čvorišta &#39;Grupa&#39;
 DocType: Attendance Request,Half Day Date,Poludnevni Datum
 DocType: Academic Year,Academic Year Name,Naziv akademske godine
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} nije dopušteno izvršiti transakciju s {1}. Promijenite tvrtku.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} nije dopušteno izvršiti transakciju s {1}. Promijenite tvrtku.
 DocType: Sales Partner,Contact Desc,Kontakt ukratko
 DocType: Email Digest,Send regular summary reports via Email.,Pošalji redovite sažetak izvješća putem e-maila.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Molimo postavite zadanog računa o troškovima za tužbu tipa {0}
@@ -5564,7 +5571,7 @@
 DocType: Hotel Room,Hotel Manager,Voditelj hotela
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Postavite Porezni Pravilo za košaricu
 DocType: Purchase Invoice,Taxes and Charges Added,Porezi i naknade Dodano
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Row amortizacije {0}: Sljedeći datum amortizacije ne može biti prije datuma raspoloživog korištenja
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Row amortizacije {0}: Sljedeći datum amortizacije ne može biti prije datuma raspoloživog korištenja
 ,Sales Funnel,prodaja dimnjak
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Naziv je obavezan
 DocType: Project,Task Progress,Zadatak Napredak
@@ -5578,7 +5585,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Sve grupe kupaca
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,ukupna mjesečna
 DocType: Attendance Request,On Duty,Na dužnosti
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda Mjenjačnica zapis nije stvoren za {1} na {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda Mjenjačnica zapis nije stvoren za {1} na {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Plan osoblja {0} već postoji za oznaku {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Porez Predložak je obavezno.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Račun {0}: nadređeni račun {1} ne postoji
@@ -5658,11 +5665,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Atleast jednom skladištu je obavezno
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Konfigurirajte polja stavke kao što su UOM, grupa stavki, opis i broj sati."
 DocType: Certification Application,Certification Status,Status certifikacije
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,tržište
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,tržište
 DocType: Travel Itinerary,Travel Advance Required,Potrebno je unaprijed
 DocType: Subscriber,Subscriber Name,Pretplatničko ime
 DocType: Serial No,Out of Warranty,Od jamstvo
-DocType: Cashier Closing,Cashier-closing-,Blagajnik-closing-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Vrsta kartiranog podataka
 DocType: BOM Update Tool,Replace,Zamijeniti
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Nisu pronađeni proizvodi.
@@ -5749,7 +5755,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Osnovni su predlošci poreza za prodaju i kupnju.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Zapis ocjena rezultata {0} već postoji.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Primjer: ABCD. #####. Ako je niz postavljen, a transakcije se ne navode u Batch No, tada će se automatski izračunati broj serije na temelju ove serije. Ako uvijek želite izričito spomenuti Nijednu seriju za ovu stavku, ostavite to prazno. Napomena: ta će postavka imati prednost pred Prefiksom serije naziva u Stock Settings."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Postavite serijske brojeve za prisustvovanje putem Setup&gt; Serija numeriranja
 DocType: BOM,Materials Required (Exploded),Potrebna roba
 DocType: Contract,Party User,Korisnik stranke
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Postavite prazan filtar Tvrtke ako je Skupna pošta &quot;Tvrtka&quot;
@@ -5950,7 +5955,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Count Count
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Moraju biti postavljeni datum početka datuma probnog razdoblja i datum završetka probnog razdoblja
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Prosječna stopa
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Ukupni iznos plaćanja u rasporedu plaćanja mora biti jednak Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Ukupni iznos plaćanja u rasporedu plaćanja mora biti jednak Grand / Rounded Total
 DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Banka Izjava stanje po glavnom knjigom
 DocType: Job Applicant,Applicant Name,Podnositelj zahtjeva Ime
@@ -6019,7 +6024,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sapun i deterdžent
 DocType: BOM,Show Items,Prikaži stavke
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,S vremena ne može biti veća od na vrijeme.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Želite li obavijestiti sve korisnike putem e-pošte?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Želite li obavijestiti sve korisnike putem e-pošte?
 DocType: Subscription Plan,Billing Interval,Interval naplate
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Pokretna slika & video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naručeno
@@ -6028,9 +6033,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Redak {0}: {1} mora biti veći od 0
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteriji za ocjenu Grupa
 DocType: Healthcare Settings,Patient Name By,Ime pacijenta po
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Obračunski dnevnik za plaće od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Obračunski dnevnik za plaće od {0} do {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Omogućivanje odgođenog prihoda
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Otvaranje za akumuliranu amortizaciju mora biti manja od jednaka {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Otvaranje za akumuliranu amortizaciju mora biti manja od jednaka {0}
 DocType: Warehouse,Warehouse Name,Naziv skladišta
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Stvarni datum početka mora biti manji od stvarnog datuma završetka
 DocType: Naming Series,Select Transaction,Odaberite transakciju
@@ -6181,7 +6186,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Zaposlenik {0} razreda {1} nema zadanu politiku odlaska
 DocType: Salary Detail,Salary Detail,Plaća Detalj
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Odaberite {0} Prvi
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Dodano je {0} korisnika
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Dodano je {0} korisnika
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","U slučaju višerazinskog programa, Kupci će biti automatski dodijeljeni odgovarajućem stupcu po njihovu potrošenom"
 DocType: Appointment Type,Physician,Liječnik
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Hrpa {0} od {1} Stavka je istekla.
@@ -6325,7 +6330,7 @@
 DocType: Asset,Custodian,staratelj
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Point-of-prodaju Profil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} mora biti vrijednost između 0 i 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Plaćanje {0} od {1} do {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Plaćanje {0} od {1} do {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,unsecured krediti
 DocType: Cost Center,Cost Center Name,Troška Name
 DocType: Student,B+,B +
@@ -6357,6 +6362,7 @@
 DocType: Employee,Date of Issue,Datum izdavanja
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Kao i po postavkama kupnje ako je zahtjev za kupnju potreban == &#39;YES&#39;, a zatim za izradu fakture za kupnju, korisnik mora najprije stvoriti potvrdu o kupnji za stavku {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Red # {0}: Postavite dobavljač za stavke {1}
+DocType: Global Defaults,Default Distance Unit,Zadana jedinica udaljenosti
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Red {0}: Sati vrijednost mora biti veća od nule.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Web stranica slike {0} prilogu točki {1} Ne mogu naći
 DocType: Issue,Content Type,Vrsta sadržaja
@@ -6412,7 +6418,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Zaduženja računa mora biti bilanca račun
 DocType: Asset,Naming Series,Imenovanje serije
 DocType: Vital Signs,Coated,premazan
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Redak {0}: očekivana vrijednost nakon korisnog životnog vijeka mora biti manja od bruto narudžbenice
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Redak {0}: očekivana vrijednost nakon korisnog životnog vijeka mora biti manja od bruto narudžbenice
 DocType: GoCardless Settings,GoCardless Settings,Postavke GoCardless
 DocType: Leave Block List,Leave Block List Name,Naziv popisa neodobrenih odsustava
 DocType: Certified Consultant,Certification Validity,Valjanost certifikacije
@@ -6479,6 +6485,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Bank Header
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Pogledajte laboratorijske testove
 DocType: Hub Users,Hub Users,Korisnici huba
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Grupa kupaca&gt; Teritorij
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Datum održavanje
 DocType: Purchase Invoice Item,Rejected Serial No,Odbijen Serijski br
@@ -6494,7 +6501,7 @@
 DocType: SG Creation Tool Course,Max Strength,Max snaga
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Instaliranje unaprijed postavljenih postavki
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Nijedna isporuka nije odabrana za kupca {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Nijedna isporuka nije odabrana za kupca {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Zaposlenik {0} nema maksimalnu naknadu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Odaberite stavke na temelju datuma isporuke
 DocType: Grant Application,Has any past Grant Record,Ima li nekih prethodnih Grant Record
@@ -6521,7 +6528,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Rezervacija hotela
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Služba za korisnike
 DocType: BOM,Thumbnail,Thumbnail
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Nije pronađen nijedan kontakt s ID-ovima e-pošte.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Nije pronađen nijedan kontakt s ID-ovima e-pošte.
 DocType: Item Customer Detail,Item Customer Detail,Proizvod - detalji kupca
 DocType: Notification Control,Prompt for Email on Submission of,Pitaj za e-poštu na podnošenje
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Maksimalna naknada zaposlenika {0} premašuje {1}
@@ -6776,7 +6783,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,Ne može se tajno u grupu jer je izabrana vrsta računa.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} je izmijenjen. Osvježi stranicu.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Prestani korisnike od izrade ostaviti aplikacija na sljedećim danima.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Šifra stavke&gt; Skupina stavke&gt; Brand
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Ako je neograničeno isteklo za Points lojalnost, zadržite trajanje isteka prazno ili 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Održavanje članova tima
 DocType: Loyalty Point Entry,Purchase Amount,Iznos narudžbe
@@ -6784,7 +6790,7 @@
 											to fullfill Sales Order {2}",Nije moguće prikazati serijski broj {0} stavke {1} kao što je rezervirano \ da bi se ispunio prodajni nalog {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Dobavljač Navod {0} stvorio
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Godina završetka ne može biti prije Početak godine
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Godina završetka ne može biti prije Početak godine
 DocType: Employee Benefit Application,Employee Benefits,Primanja zaposlenih
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti jednaka količini za proizvod {0} u redku {1}
 DocType: Work Order,Manufactured Qty,Proizvedena količina
@@ -6800,6 +6806,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Odaberite Batch Numbers
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Za GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Mjenice podignuta na kupce.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite Sustav imenovanja zaposlenika u ljudskim resursima&gt; HR postavke
 DocType: Healthcare Settings,Invoice Appointments Automatically,Automatsko postavljanje računa
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id projekta
 DocType: Salary Component,Variable Based On Taxable Salary,Varijabla na temelju oporezive plaće
@@ -6848,7 +6855,7 @@
 DocType: POS Profile,Account for Change Amount,Račun za promjene visine
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Povezivanje s QuickBooksom
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Ukupni dobitak / gubitak
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Neispravna tvrtka za fakturu interne tvrtke.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Neispravna tvrtka za fakturu interne tvrtke.
 DocType: Purchase Invoice,input service,ulazna usluga
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Red {0}: stranka / računa ne odgovara {1} / {2} u {3} {4}
 DocType: Employee Promotion,Employee Promotion,Promocija zaposlenika
@@ -6978,7 +6985,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Povoljno područje za smještaj
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analitika
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Košarica je prazna
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Postavite instruktor imenovanja sustava u obrazovanju&gt; Postavke obrazovanja
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Stavka {0} nema serijski broj. Samo serijalizirane stavke \ mogu imati isporuku na temelju serijskog br
 DocType: Vehicle,Model,Model
@@ -7008,7 +7014,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Ništa se ne mijenja
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Odaberite CSV datoteku
 DocType: Holiday List,Total Holidays,Ukupno praznici
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Nedostaje predložak e-pošte za slanje. Postavite jedan u Postavke isporuke.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Nedostaje predložak e-pošte za slanje. Postavite jedan u Postavke isporuke.
 DocType: Student Leave Application,Mark as Present,Označi kao sadašnja
 DocType: Supplier Scorecard,Indicator Color,Boja indikatora
 DocType: Purchase Order,To Receive and Bill,Za primanje i Bill
@@ -7017,7 +7023,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Odaberite serijski broj br
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Imenovatelj
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Uvjeti i odredbe - šprance
-DocType: Serial No,Delivery Details,Detalji isporuke
+DocType: Delivery Trip,Delivery Details,Detalji isporuke
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
 DocType: Program,Program Code,programski kod
 DocType: Terms and Conditions,Terms and Conditions Help,Uvjeti za pomoć
@@ -7041,7 +7047,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Potencijalni kupac - ukupno dana
 DocType: Cash Flow Mapping,Is Income Tax Expense,Je li trošak poreza na dohodak
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Vaša je narudžba izvan isporuke!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Red # {0}: datum knjiženja moraju biti isti kao i datum kupnje {1} od {2} imovine
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Red # {0}: datum knjiženja moraju biti isti kao i datum kupnje {1} od {2} imovine
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Provjerite je li student boravio u Hostelu Instituta.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Unesite prodajni nalozi u gornjoj tablici
 ,Stock Summary,Stock Sažetak
diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv
index 7cebbbf..fdfb29c 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Időszak neve
 DocType: Employee,Salary Mode,Bér mód
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Regisztrál
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Regisztrál
 DocType: Patient,Divorced,Elvált
 DocType: Support Settings,Post Route Key,Utasítássori kulcs
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Egy tranzakción belül a tétel többszöri hozzáadásának engedélyedzése
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Új árfolyam
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Árfolyam szükséges ehhez az  árlistához: {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* A tranzakcióban lesz kiszámolva.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Szállító&gt; Szállító típusa
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Vevő ügyfélkapcsolat
 DocType: Patient Appointment,Check availability,Ellenőrizd az elérhetőséget
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Mutassa nyitva
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Sorozat sikeresen frissítve
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Kijelentkezés
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} a {1} sorban
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} a {1} sorban
 DocType: Asset Finance Book,Depreciation Start Date,Értékcsökkenés kezdete
 DocType: Pricing Rule,Apply On,Alkalmazza ezen
 DocType: Item Price,Multiple Item prices.,Több tétel ár.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Labor rendelvények
 ,Delay Days,Késedelem napokban
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Szolgáltatás költsége
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Sorozat szám: {0} már hivatkozott ezen az Értékesítési számlán: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Sorozat szám: {0} már hivatkozott ezen az Értékesítési számlán: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Számla
 DocType: Purchase Invoice Item,Item Weight Details,Tétel súly részletei
 DocType: Asset Maintenance Log,Periodicity,Időszakosság
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Könyvelő
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Értékesítési ár-lista
 DocType: Patient,Tobacco Current Use,Dohányzás jelenlegi felhasználása
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","A kezdő dátum és a befejező dátum átfedésben van a munkakártyával <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Értékesítési ár
 DocType: Cost Center,Stock User,Készlet Felhasználó
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg)/K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Kapcsolódó
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,"Részvétel dátuma nem lehet kisebb, mint a munkavállaló belépési dátuma"
 DocType: Grading Scale,Grading Scale Name,Osztályozás időszak neve
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Felhasználók hozzáadása a piactéren
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Felhasználók hozzáadása a piactéren
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Ez egy forrás fiók és nem lehet szerkeszteni.
 DocType: Sales Invoice,Company Address,Vállalkozás címe
 DocType: BOM,Operations,Műveletek
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Qty
 DocType: Production Plan,Material Request Detail,Anyag igény részletei
 DocType: Selling Settings,Default Quotation Validity Days,Alapértelmezett árajánlat érvényességi napok
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","A tétel adójának beillesztéséhez ebbe a sorba: {0}, az ebben a sorban {1} lévő adókat is muszály hozzávenni"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","A tétel adójának beillesztéséhez ebbe a sorba: {0}, az ebben a sorban {1} lévő adókat is muszály hozzávenni"
 DocType: SMS Center,SMS Center,SMS Központ
 DocType: Payroll Entry,Validate Attendance,Érvényesítse a részvételt
 DocType: Sales Invoice,Change Amount,Váltópénz összeg
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Sor közök az összeg kiírásához
 DocType: Vehicle,Additional Details,További részletek
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Nincs megadott leírás
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Szállító&gt; Szállítócsoport
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Vásárolható rendelés.
 DocType: POS Closing Voucher Details,Collected Amount,Összegyűjtött összeg
 DocType: Lab Test,Submitted Date,Benyújtott dátum
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,Tanuló Felvételi
 ,Terretory,Terület
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,{0} tétel törölve
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Értékcsökkenési sor {0}: Értékcsökkenés Kezdés dátuma egy korábbi dátumként szerepel
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Értékcsökkenési sor {0}: Értékcsökkenés Kezdés dátuma egy korábbi dátumként szerepel
 DocType: Contract Template,Fulfilment Terms and Conditions,Teljesítési általános feltételek
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Anyagigénylés
 DocType: Bank Reconciliation,Update Clearance Date,Végső dátum frissítése
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,Fiókok beállítása
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Beszállítói számla nem létezik ebben a beszállítói számlán: {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Kezelje az értékesítő szeméályek fáját.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Az útvonalat nem lehet feldolgozni, mivel a Google Térkép Beállítások letiltva."
 DocType: Job Applicant,Cover Letter,Kísérő levél
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,"Fennálló, kinntlévő negatív csekkek és a Betétek kiegyenlítésre"
 DocType: Item,Synced With Hub,Szinkronizálta Hub-al
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Új tárgyi eszköz értéke
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Arány, amelyen az Ügyfél pénznemét átalakítja az ügyfél alapértelmezett pénznemére"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Tanfolyam ütemező eszköz
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Sor # {0}: Beszerzési számlát nem lehet létrehozni egy már meglévő vagyontárgyra: {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Sor # {0}: Beszerzési számlát nem lehet létrehozni egy már meglévő vagyontárgyra: {1}
 DocType: Crop Cycle,LInked Analysis,Kapcsolt elemzések
 DocType: POS Closing Voucher,POS Closing Voucher,POS záró utalvány
 DocType: Contract,Lapsed,Tárgytalan
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} nem vontuk be a tanfolyamba {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Tanuló neve:
 DocType: POS Closing Voucher Details,Difference,Különbség
+DocType: Delivery Settings,Delay between Delivery Stops,Késés a szállítás leállítása között
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Széria sz. {0} nem tartozik a szállítólevélhez {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Úgy tűnik, hogy probléma van a szerver GoCardless konfigurációjával. Ne aggódjon, hiba esetén az összeget visszatérítjük a számlájára."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -693,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Mennyiség és árérték
 DocType: Delivery Note,% Installed,% telepítve
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Tantermek / Laboratoriumok stb, ahol előadások vehetők igénybe."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Mindkét vállalat vállalati pénznemének meg kell egyeznie az Inter vállalkozás tranzakciók esetében.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Mindkét vállalat vállalati pénznemének meg kell egyeznie az Inter vállalkozás tranzakciók esetében.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Kérjük adja meg a cégnevet elsőként
 DocType: Travel Itinerary,Non-Vegetarian,Nem vegetáriánus
 DocType: Purchase Invoice,Supplier Name,Beszállító neve
@@ -778,7 +779,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Bérelt dátumtól
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Elég alkatrészek a megépítéshez
 DocType: POS Profile User,POS Profile User,POS profil felhasználója
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,{0} sor: Értékcsökkenés kezdő dátuma szükséges
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,{0} sor: Értékcsökkenés kezdő dátuma szükséges
 DocType: Purchase Invoice Item,Service Start Date,Szolgáltatás kezdési dátuma
 DocType: Subscription Invoice,Subscription Invoice,Előfizetési számla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Közvetlen jövedelem
@@ -845,7 +846,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Rövidítést már használja egy másik cég
 DocType: Selling Settings,Default Customer Group,Alapértelmezett Vevői csoport
 DocType: Employee,IFSC Code,IFSC kód
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","A kezdő dátum és a befejező dátum átfedésben van a munkakártyával <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ha kikapcsolja, a 'Kerekített összesen' mező nem fog látszódni sehol sem"
 DocType: BOM,Operating Cost,Működési költség
 DocType: Crop,Produced Items,Gyártott termékek
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,Árajánlatkérések megakadályozása
 DocType: Hub User,Hub User,Hub felhasználó
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Vevői rendelés létrehozás
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Bérpapír benyújtva a  {0} -  {1} időszakra
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Bérpapír benyújtva a  {0} -  {1} időszakra
 DocType: Project Task,Project Task,Projekt téma feladat
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Megváltott pontok
 ,Lead Id,Érdeklődés ID
@@ -1027,7 +1027,7 @@
 DocType: Fee Validity,Max number of visit,Látogatások max.  száma
 ,Hotel Room Occupancy,Szállodai szoba kihasználtság
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Munkaidő jelenléti ív nyilvántartás létrehozva:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},"Kérjük, állítsda be az alapértelmezett Készpénz vagy bankszámlát a  Fizetési módban {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},"Kérjük, állítsda be az alapértelmezett Készpénz vagy bankszámlát a  Fizetési módban {0}"
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Beiratkozás
 DocType: GST Settings,GST Settings,GST Beállítások
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},A pénznemnek meg kell egyeznie ennek az Árjegyzéknek a pénznemével: {0}
@@ -1081,7 +1081,7 @@
 DocType: Vehicle Log,Service Details,Szolgáltatás adatai
 DocType: Lab Test Template,Grouped,Csoportosított
 DocType: Selling Settings,Delivery Note Required,Szállítólevél szükséges
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Fizetéscsúcsok küldése ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Fizetéscsúcsok küldése ...
 DocType: Bank Guarantee,Bank Guarantee Number,Bankgarancia száma
 DocType: Assessment Criteria,Assessment Criteria,Értékelési kritériumok
 DocType: BOM Item,Basic Rate (Company Currency),Alapár (Vállalat pénznemében)
@@ -1106,13 +1106,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Fizetés megadása már létrehozott
 DocType: Request for Quotation,Get Suppliers,Szerezd meg a beszállítókat
 DocType: Purchase Receipt Item Supplied,Current Stock,Jelenlegi raktárkészlet
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Sor # {0}: {1} Vagyontárgy nem kapcsolódik ehhez a tételhez {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Sor # {0}: {1} Vagyontárgy nem kapcsolódik ehhez a tételhez {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Bérpapír előnézet
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,A {0} számlát már többször bevitték
 DocType: Account,Expenses Included In Valuation,Készletértékelésbe belevitt költségek
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,"Csak akkor tudja megújítani, ha tagsága lejár 30 napon belül"
 DocType: Shopping Cart Settings,Show Stock Availability,Raktárkészlet elérhetőségének megjelenítése
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},"Állítsa {0} a vagyontárgy ketegóriát: {1}, vagy a vállalkozást: {2}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},"Állítsa {0} a vagyontárgy ketegóriát: {1}, vagy a vállalkozást: {2}"
 DocType: Location,Longitude,Hosszúsági kör
 ,Absent Student Report,Jelentés a hiányzó tanulókról
 DocType: Crop,Crop Spacing UOM,Termés távolság ME
@@ -1184,7 +1184,7 @@
 DocType: Soil Texture,Sand,Homok
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Lehetőség tőle
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{0} sor: {1} A {2} tételhez szükséges sorozatszámok. Ön ezt adta meg {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{0} sor: {1} A {2} tételhez szükséges sorozatszámok. Ön ezt adta meg {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,"Kérem, válasszon egy táblát"
 DocType: BOM,Website Specifications,Weboldal részletek
 DocType: Special Test Items,Particulars,Adatok
@@ -1275,7 +1275,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Magasabb súlyozású tételek előrébb jelennek meg
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Laboratóriumi tesztek  és életjelek
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank egyeztetés részletek
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Sor # {0}: {1} Vagyontárgyat kell benyújtani
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Sor # {0}: {1} Vagyontárgyat kell benyújtani
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Egyetlen Alkalmazottat sem talált
 DocType: Item,If subcontracted to a vendor,Ha alvállalkozásba kiadva egy beszállítóhoz
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Diák csoport már frissítve.
@@ -1329,7 +1329,6 @@
 DocType: Loyalty Program Collection,Tier Name,Réteg neve
 DocType: HR Settings,Enter retirement age in years,Adja meg a nyugdíjkorhatárt (év)
 DocType: Crop,Target Warehouse,Cél raktár
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Állítsa be a Naming sorozat {0} beállítását a Beállítás&gt; Beállítások&gt; Nevezési sorozatok segítségével
 DocType: Payroll Employee Detail,Payroll Employee Detail,Alkalmazotti bérszámfejtés részletei
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,"Kérjük, válasszon egy raktárat"
 DocType: Cheque Print Template,Starting location from left edge,Kiindulási hely a bal éltől
@@ -1419,7 +1418,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Terv anyag a részegységekre
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Vevő partnerek és Területek
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,ANYGJZ: {0} aktívnak kell lennie
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Nem áll rendelkezésre tétel az átadásra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Nem áll rendelkezésre tétel az átadásra
 DocType: Employee Boarding Activity,Activity Name,Tevékenység elnevezése
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Közzététel dátuma
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,A késztermék mennyisége <b>{0}</b> és mennyisége <b>{1}</b> nem különbözhet
@@ -1646,6 +1645,7 @@
 DocType: Project,First Email,Első e-mail
 DocType: Company,Exception Budget Approver Role,Kivétel Költségvetési jóváhagyó szerep
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date",Beállítás után a számla a beállított dátumig feltartva
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Raktár a lefoglalásokhoz a Vevői rendelésben / készáru raktárban
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Értékesítési összeg
 DocType: Repayment Schedule,Interest Amount,Kamatösszeg
@@ -1657,7 +1657,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Rögzítések
 DocType: Asset,Scrapped,Selejtezve
 DocType: Item,Item Defaults,Tétel alapértelmezések
-DocType: Purchase Invoice,Returns,Visszatérítés
+DocType: Cashier Closing,Returns,Visszatérítés
 DocType: Job Card,WIP Warehouse,WIP Raktár
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Széria sz. {0} jelenleg karbantartási szerződés  alatt áll eddig {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,Toborzás
@@ -1671,7 +1671,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Átviteli típus
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Értékesítési költségek
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Ügyfél&gt; Ügyfélcsoport&gt; Terület
 DocType: Diagnosis,Diagnosis,Diagnózis
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Alapértelmezett beszerzési
 DocType: Attendance Request,Explanation,Magyarázat
@@ -1684,7 +1683,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Beszerzési rendelések tételei lejártak
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Irányítószám
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Vevői rendelés {0} az ez {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Válassza ki a kamatjövedelem számlát a hitelben: {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Válassza ki a kamatjövedelem számlát a hitelben: {0}
 DocType: Opportunity,Contact Info,Kapcsolattartó infó
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Készlet bejegyzés létrehozás
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Nem támogathatja a távolléten lévő Alkalmazottat
@@ -1696,7 +1695,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Számlázás nem végezhető el nulla számlázási órára
 DocType: Company,Date of Commencement,Megkezdés időpontja
 DocType: Sales Person,Select company name first.,Válassza ki a vállakozás nevét először.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},Email elküldve neki: {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},Email elküldve neki: {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Beszállítóktól kapott árajánlatok.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,"Helyezze vissza a ANYAGJ-et, és frissítse a legújabb árat minden ANYAGJ-ben"
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Címzett {0} | {1} {2}
@@ -1716,7 +1715,7 @@
 DocType: Asset Movement,From Employee,Alkalmazottól
 DocType: Driver,Cellphone Number,Mobiltelefon szám
 DocType: Project,Monitor Progress,Folyamatok nyomonkövetése
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Figyelmeztetés: A rendszer nem ellenőrzi a túlszámlázást, hiszen a {0} tételre itt {1} az összeg nulla"
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Figyelmeztetés: A rendszer nem ellenőrzi a túlszámlázást, hiszen a {0} tételre itt {1} az összeg nulla"
 DocType: Journal Entry,Make Difference Entry,Különbözeti bejegyzés generálása
 DocType: Supplier Quotation,Auto Repeat Section,Automatikus ismétlés szakasz
 DocType: Upload Attendance,Attendance From Date,Részvétel kezdő dátum
@@ -1819,7 +1818,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Sor # {0}: Elutasítva Menny nem lehet beírni Vásárlási Return
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Az Ügyfélcsoport megváltoztatása a kiválasztott Ügyfél számára nem engedélyezett.
 ,Purchase Order Items To Be Billed,Számlázandó Beszerzési rendelés tételei
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Becsült érkezési idők frissítése.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Becsült érkezési idők frissítése.
 DocType: Program Enrollment Tool,Enrollment Details,Beiratkozások részletei
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Nem állíthat be több elem-alapértelmezést egy vállalat számára.
 DocType: Purchase Invoice Item,Net Rate,Nettó árérték
@@ -1833,7 +1832,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Távollét típusa kötelező
 DocType: Support Settings,Close Issue After Days,Ügyek bezárása ennyi eltelt nap után
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Felhasználónak kell lennie a System Manager és a Item Manager szerepkörökkel, hogy felvehesse a felhasználókat a Marketplace-be."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Felhasználónak kell lennie a System Manager és a Item Manager szerepkörökkel, hogy felvehesse a felhasználókat a Marketplace-be."
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Hagyja üresen, ha figyelembe veszi az összes szervezeti ágban"
 DocType: Job Opening,Staffing Plan,Személyzeti terv
 DocType: Bank Guarantee,Validity in Days,Érvényesség napokban
@@ -1853,7 +1852,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},{0} ismétlődő sor azonos ezzel: {1}
 DocType: Marketplace Settings,Disable Marketplace,A Marketplace letiltása
 ,Trial Balance,Főkönyvi kivonat egyenleg
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Pénzügyi év {0} nem található
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Pénzügyi év {0} nem található
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Alkalmazottak beállítása
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel foglalás felhasználó
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,"Kérjük, válasszon prefix először"
@@ -1961,7 +1960,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Sikertelen bejelentkezés
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,A  {0}  vagyontárgy létrehozva
 DocType: Special Test Items,Special Test Items,Különleges vizsgálati tételek
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Ahhoz, hogy regisztráljon a Marketplace-re, be kell jelentkeznie a System Manager és a Item Manager szerepekkel."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Ahhoz, hogy regisztráljon a Marketplace-re, be kell jelentkeznie a System Manager és a Item Manager szerepekkel."
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Fizetési mód
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Mivel az Önhöz kiosztott fizetési struktúrára nem alkalmazható különjuttatás
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Weboldal kép legyen nyilvános fájl vagy weboldal URL
@@ -1973,7 +1972,7 @@
 DocType: Warehouse,Warehouse Contact Info,Raktári kapcsolattartó
 DocType: Payment Entry,Write Off Difference Amount,Leíró Eltérés összeg
 DocType: Volunteer,Volunteer Name,Önkéntes neve
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Más sorokban duplikált határidőket tartalmazó sorokat talált: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Más sorokban duplikált határidőket tartalmazó sorokat talált: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: Alkalmazott email nem található, ezért nem küldte email"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Nincs fizetési struktúra a(z) {0} munkatársakhoz a megadott időponton {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},A szállítási szabály nem vonatkozik erre ozországra:  {0}
@@ -2062,6 +2061,7 @@
 DocType: Salary Component,Earning,Jövedelem
 DocType: Supplier Scorecard,Scoring Criteria,Jegyzési kritériumok
 DocType: Purchase Invoice,Party Account Currency,Ügyfél számla pénzneme
+DocType: Delivery Trip,Total Estimated Distance,Teljes becsült távolság
 ,BOM Browser,Anyagjegyzék Listázó
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,"Kérjük, frissítse állapotát erre a tréningre"
 DocType: Item Barcode,EAN,EAN
@@ -2100,7 +2100,7 @@
 DocType: Activity Cost,Projects,Projekt témák
 DocType: Payment Request,Transaction Currency,Tranzakció pénzneme
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Feladó: {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Egyes e-mailek érvénytelenek
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Egyes e-mailek érvénytelenek
 DocType: Work Order Operation,Operation Description,Művelet Leírása
 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.,"Nem lehet megváltoztatni a pénzügyi év kezdő és vég dátumát, miután a pénzügyi év mentésre került."
 DocType: Quotation,Shopping Cart,Bevásárló kosár
@@ -2124,7 +2124,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Nettó álló-eszköz változás
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Igényelt menny
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Hagyja üresen, ha figyelembe veszi valamennyi titulushoz"
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,{0} sorban az 'Aktuális' típusú terhelést nem lehet a Tétel árához hozzáadni
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,{0} sorban az 'Aktuális' típusú terhelést nem lehet a Tétel árához hozzáadni
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Dátumtól
 DocType: Shopify Settings,For Company,A Vállakozásnak
@@ -2138,7 +2138,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Hiba történt a kurzus ütemezése során
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,A listában szereplő első költség jóváhagyó az alapértelmezett költség jóváhagyó.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,"nem lehet nagyobb, mint 100"
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,A Rendszergazda és a Tételkezelő szerepköröként a Rendszergazdaon kívül más felhasználónak kell lennie.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,A Rendszergazda és a Tételkezelő szerepköröként a Rendszergazdaon kívül más felhasználónak kell lennie.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Tétel: {0} -  Nem készletezhető tétel
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Nem tervezett
@@ -2167,7 +2167,7 @@
 DocType: HR Settings,Employee Settings,Alkalmazott beállítások
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Fizetési rendszer betöltés
 ,Batch-Wise Balance History,Köteg-Szakaszos mérleg előzmények
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"A(z) {0} sor: nem lehet beállítani az árat, ha az összeg nagyobb, mint a(z) {1} tétel számlázott összege."
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"A(z) {0} sor: nem lehet beállítani az árat, ha az összeg nagyobb, mint a(z) {1} tétel számlázott összege."
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Nyomtatási beállítások frissítve a mindenkori nyomtatási formátumban
 DocType: Package Code,Package Code,Csomag kód
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Gyakornok
@@ -2401,7 +2401,7 @@
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.","{0} álláshelyet és {1} költségvetést erre: {2} már terveztek a {3} leányvállalatra. \
 				Csak  {4}-ig lehet tervezni álláshelyet  és {5}-ig költségvetést a {6} személyzet tervezéshez a {3} forrás vállalkozáshoz."
 DocType: HR Settings,Stop Birthday Reminders,Születésnapi emlékeztetők kikapcsolása
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},"Kérjük, állítsa be alapértelmezett Bérszámfejtés fizetendő számlát a cégben: {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},"Kérjük, állítsa be alapértelmezett Bérszámfejtés fizetendő számlát a cégben: {0}"
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Szerezd meg az adók és díjak adatait az Amazon részéről
 DocType: SMS Center,Receiver List,Fogadófél lista
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Tétel keresése
@@ -2471,7 +2471,7 @@
 DocType: Vital Signs,Constipated,Székrekedéses
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Beszállító Ellenszámla {0} dátuma {1}
 DocType: Customer,Default Price List,Alapértelmezett árlista
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Vagyontárgy mozgás bejegyzés {0} létrehozva
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Vagyontárgy mozgás bejegyzés {0} létrehozva
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Nem található tétel.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,"Nem törölheti ezt a Pénzügyi évet: {0}. Pénzügyi év: {0} az alapértelmezett beállítás, a Globális beállításokban"
 DocType: Share Transfer,Equity/Liability Account,Tőke / felelősség számla
@@ -2609,6 +2609,7 @@
 DocType: Blanket Order,Order Type,Rendelés típusa
 ,Item-wise Sales Register,Tételenkénti Értékesítés Regisztráció
 DocType: Asset,Gross Purchase Amount,Bruttó Vásárlás összege
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Tételkód&gt; Tételcsoport&gt; Márka
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Nyitó egyenlegek
 DocType: Asset,Depreciation Method,Értékcsökkentési módszer
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ez az adó az Alap árban benne van?
@@ -2689,7 +2690,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,"Cselekvés, ha éves költségvetés meghaladja a PO-t"
 DocType: Student Leave Application,Student Leave Application,Diák távollét alkalmazás
 DocType: Item,Will also apply for variants,Változatokra is alkalmazni fogja
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Vagyontárgy nem törölhető, mivel ez már {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Vagyontárgy nem törölhető, mivel ez már {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Alkalmazott {0} félműszakos ekkor {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},"Teljes munkaidő nem lehet nagyobb, mint a max munkaidő {0}"
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Tovább
@@ -2713,6 +2714,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Adatok lekérése
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},A {0} távolétre megengedett maximális távollétek száma {1}
 DocType: SMS Center,Create Receiver List,Címzettlista létrehozása
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Rendelkezésre álló Dátum a vásárlási dátum után kell lennie
 DocType: Vehicle,Wheels,Kerekek
 DocType: Packing Slip,To Package No.,A csomag sz.
 DocType: Patient Relation,Family,Család
@@ -2726,7 +2728,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,A számlázási pénznemnek meg kell egyeznie az alapértelmezett vállalkozás pénzneméval vagy a másik fél pénznemével
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Azt jelzi, hogy a csomag egy része ennek a szállításnak (Csak tervezet)"
 DocType: Soil Texture,Loam,Termőtalaj
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,{0} sor: Az esedékesség dátuma nem lehet a dátum közzététele előtti
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,{0} sor: Az esedékesség dátuma nem lehet a dátum közzététele előtti
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Befizetés rögzítés létrehozás
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},"Mennyiségnek erre a tételre {0} kisebbnek kell lennie, mint {1}"
 ,Sales Invoice Trends,Kimenő értékesítési számlák alakulása
@@ -2798,7 +2800,7 @@
 DocType: Guardian,Guardian Interests,Helyettesítő kamat
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Számla név / szám frissítés
 DocType: Naming Series,Current Value,Jelenlegi érték
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Több pénzügyi éve létezik a dátum: {0}. Kérjük, állítsa be a céget a pénzügyi évben"
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Több pénzügyi éve létezik a dátum: {0}. Kérjük, állítsa be a céget a pénzügyi évben"
 DocType: Education Settings,Instructor Records to be created by,Az oktatói rekordokat készítette a
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} létrehozva
 DocType: GST Account,GST Account,GST számla fiók
@@ -2815,7 +2817,7 @@
 DocType: Sales Person,Name and Employee ID,Név és Alkalmazotti azonosító ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,A határidő nem lehet a rögzítés dátuma előtti
 DocType: Website Item Group,Website Item Group,Weboldal tétel Csoport
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"A fenti kritériumok alapján nincs benyújtandó bérpapír, VAGY a bérpapírt már benyújtották"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"A fenti kritériumok alapján nincs benyújtandó bérpapír, VAGY a bérpapírt már benyújtották"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Vámok és adók
 DocType: Projects Settings,Projects Settings,Projektek beállításai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,"Kérjük, adjon meg Hivatkozási dátumot"
@@ -2824,7 +2826,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Beszálított mennyiség
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Anyagigénylési tétel
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,"Kérjük, törölje először a beszerzési megbízást {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,"Kérjük, törölje először a beszerzési megbízást {0}"
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Elem Csoportok fája.
 DocType: Production Plan,Total Produced Qty,Összesen termelt mennyiség
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,"Nem lehet hivatkozni nagyobb vagy egyenlő sor számra, mint az aktuális sor szám erre a terehelés típusra"
@@ -2932,6 +2934,7 @@
 ,Vehicle Expenses,Jármű költségek
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Hozzon létre laboratóriumi teszteket a Sales invoice Submit-ban
 DocType: Serial No,Invoice Details,Számla részletei
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Engedélyezze a Google Térkép Beállítások használatát az útvonalak becsléséhez és optimalizálásához
 DocType: Grant Application,Show on Website,Megjelenítés a weboldalon
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Kezdés ekkor
 DocType: Hub Tracked Item,Hub Category,Hub kategória
@@ -2971,7 +2974,7 @@
 DocType: Inpatient Record,B Positive,B Pozitív
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Az {0} munkavállaló legmagasabb haszna meghaladja {1} az előző igényelt összeg összeggal {2}
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Sor # {0}: Mennyiség legyen 1, mivel a tétel egy álló-eszköz. Használjon külön sort több menny."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Sor # {0}: Mennyiség legyen 1, mivel a tétel egy álló-eszköz. Használjon külön sort több menny."
 DocType: Leave Block List Allow,Leave Block List Allow,Távollét blokk lista engedélyezése
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Rövidített nem lehet üres vagy szóköz
 DocType: Patient Medical Record,Patient Medical Record,Beteg orvosi kartonja
@@ -3005,7 +3008,7 @@
 DocType: Workstation,Wages per hour,Bérek óránként
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Készlet egyenleg ebben a kötegben: {0} negatívvá válik {1} erre a tételre: {2} ebben a raktárunkban: {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Következő Anyag igénylések merültek fel  automatikusan a Tétel újra-rendelés szinje alpján
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},A {0} számla érvénytelen. A számla pénzneme legyen {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},A {0} számla érvénytelen. A számla pénzneme legyen {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},A(z) {0} dátumtól kezdve nem lehet a munkavállaló mentesítési dátuma  {1} utáni
 DocType: Supplier,Is Internal Supplier,Ő belső beszállító
 DocType: Employee,Create User Permission,Felhasználói jogosultság létrehozása
@@ -3149,7 +3152,7 @@
 DocType: Account,Fixed Asset,Álló-eszköz
 DocType: Amazon MWS Settings,After Date,Dátum után
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Széria számozott készlet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Érvénytelen {0} az Inter vállalkozás számlájára.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Érvénytelen {0} az Inter vállalkozás számlájára.
 ,Department Analytics,Részleg elemzés
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-mail nem található az alapértelmezett  kapcsolatban
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generáljon titkot
@@ -3161,7 +3164,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Díjstruktúra és a hallgatói csoport {0} programja eltérő.
 DocType: Bank Statement Transaction Entry,Receivable Account,Bevételek számla
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,"A dátumtól számított értéknek kisebbnek kell lennie, mint a Valós idejű dátum."
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Sor # {0}:  {1}  Vagyontárgy már {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Sor # {0}:  {1}  Vagyontárgy már {2}
 DocType: Quotation Item,Stock Balance,Készlet egyenleg
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Vevői rendelés a Fizetéshez
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,Vezérigazgató(CEO)
@@ -3203,6 +3206,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Tartozás megterhelése szükséges
 DocType: Clinical Procedure,Inpatient Record,Betegkönyv
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Munkaidő jelenléti ív segít nyomon követni az idő, költség és számlázási tevékenységeit a csoportjának."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Szállító&gt; Szállító típusa
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Beszerzési árlista
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,A tranzakció dátuma
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,A beszállító eredménymutató-változóinak sablonjai.
@@ -3245,7 +3249,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Árfolyamnyereség / veszteség
 DocType: Opportunity,Lost Reason,Elvesztés oka
 DocType: Amazon MWS Settings,Enable Amazon,Engedélyezze az Amazon alkalmazást
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},#{0} sor: A {1} számla fiók nem tartozik a  {2} vállalathoz
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},#{0} sor: A {1} számla fiók nem tartozik a  {2} vállalathoz
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Nem sikerült megtalálni ezt: DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Új cím
 DocType: Quality Inspection,Sample Size,Minta mérete
@@ -3356,7 +3360,7 @@
 DocType: Water Analysis,Origin,Származás
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ez a dokumentum túlcsordult ennyivel {0} {1} erre a tételre {4}. Létrehoz egy másik {3}  ugyanazon {2} helyett?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,"Kérjük, állítsa be az ismétlődést a mentés után"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Válasszon váltópénz összeg számlát
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Válasszon váltópénz összeg számlát
 DocType: Purchase Invoice,Price List Currency,Árlista pénzneme
 DocType: Naming Series,User must always select,Felhasználónak mindig választani kell
 DocType: Stock Settings,Allow Negative Stock,Negatív készlet engedélyezése
@@ -3398,7 +3402,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Biztosan törölni szeretné ezt a  találkozót?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Szállodai szoba árazási csomag
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Értékesítési folyamat
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},"Kérjük, állítsa be az alapértelmezett számla foókot a fizetés komponenshez {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},"Kérjük, állítsa be az alapértelmezett számla foókot a fizetés komponenshez {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Szükség
 DocType: Rename Tool,File to Rename,Átnevezendő fájl
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Kérjük, válassza ki ANYGJZ erre a tételre ebben a sorban {0}"
@@ -3419,7 +3423,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Bszerzett tételek költsége
 DocType: Employee Separation,Employee Separation Template,Munkavállalói elválasztási sablon
 DocType: Selling Settings,Sales Order Required,Vevői rendelés szükséges
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Legyél eladó
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Legyél eladó
 DocType: Purchase Invoice,Credit To,Követelés ide
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Aktív Érdeklődések / Vevők
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Hagyja üresen a szabványos kézbesítési szállítólevél formátum használatát
@@ -3460,7 +3464,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Adózási sablon létrehozás
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Felhasználói fórum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Nyersanyagok nem lehet üres.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,# {0} (Fizetési táblázat) sor: Az összegnek negatívnak kell lennie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,# {0} (Fizetési táblázat) sor: Az összegnek negatívnak kell lennie
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Nem sikerült frissíteni a készletet, számla tartalmaz közvetlen szállítási elemet."
 DocType: Contract,Fulfilment Status,Teljesítés állapota
 DocType: Lab Test Sample,Lab Test Sample,Labor teszt minta
@@ -3599,7 +3603,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Doc dátum
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Díj rekordok létrehozva - {0}
 DocType: Asset Category Account,Asset Category Account,Vagyontárgy kategória főkönyvi számla
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,# {0} (Fizetési táblázat) sor: Az összegnek pozitívnak kell lennie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,# {0} (Fizetési táblázat) sor: Az összegnek pozitívnak kell lennie
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},"Nem lehet több mint ennyit {0} gyártani a tételből, mint amennyi a Vevői rendelési mennyiség {1}"
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Válassza ki a jellemzők értékeit
 DocType: Purchase Invoice,Reason For Issuing document,Dokumentum kiadásának oka
@@ -3654,7 +3658,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Anyagok érkezésénak Időpontja
 DocType: Products Settings,Products per Page,Termékek oldalanként
 DocType: Stock Ledger Entry,Outgoing Rate,Kimenő árérték
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,vagy
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,vagy
 DocType: Sales Order,Billing Status,Számlázási állapot
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Probléma jelentése
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Közműben
@@ -3681,7 +3685,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Munkavállalói adómentességi nyilatkozat
 DocType: Payment Entry,Cheque/Reference Date,Csekk/Hivatkozási dátum
 DocType: Purchase Invoice,Total Taxes and Charges,Összes adók és költségek
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,A rendelkezésre állási dátum egy korábbi dátumként lett bejegyezve
 DocType: Employee,Emergency Contact,Sürgősségi Kapcsolat
 DocType: Bank Reconciliation Detail,Payment Entry,Fizetési bevitel
 ,sales-browser,értékesítés-böngésző
@@ -3727,6 +3730,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Ez visszatérés (tőlünk követelés jegyzet)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Indítsa el a munkát
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Sorszám kötelező a {0} vagyoni eszközhöz
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Állítsa be a Naming sorozat {0} beállítását a Beállítás&gt; Beállítások&gt; Nevezési sorozatok segítségével
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Letiltott sablon nem lehet alapértelmezett sablon
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,A(z) {0} sorhoz: Írja be a tervezett mennyiséget
 DocType: Account,Income Account,Jövedelem számla
@@ -3740,6 +3744,7 @@
 DocType: Loyalty Program,Help Section,Súgó szakasz
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Előző
 DocType: Appraisal Goal,Key Responsibility Area,Felelősségi terület
+DocType: Delivery Trip,Distance UOM,Távolság UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Tanulók kötegei, segítenek nyomon követni a részvételt, értékeléseket és díjakat a hallgatókhoz"
 DocType: Payment Entry,Total Allocated Amount,Lefoglalt teljes összeg
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Alapértelmezett készlet számla beállítása a folyamatos készlethez
@@ -3781,7 +3786,7 @@
 DocType: Item Supplier,Item Supplier,Tétel Beszállító
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,"Kérjük, adja meg a tételkódot a köteg szám megadásához"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},"Kérjük, válasszon értéket {0} ehhez az árajánlathoz {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Nincs átcsoportosításra váró tétel
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Nincs átcsoportosításra váró tétel
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Összes cím.
 DocType: Company,Stock Settings,Készlet beállítások
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Összevonása csak akkor lehetséges, ha a következő tulajdonságok azonosak mindkét bejegyzések. Van Group, Root típusa, Company"
@@ -4066,7 +4071,7 @@
 DocType: Patient,Personal and Social History,Személyes és társadalmi történelem
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,A(z) {0} felhasználó létrehozva
 DocType: Fee Schedule,Fee Breakup for each student,Részvételi díj  szüneteltetés minden hallgató számára
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Összesen előleg ({0}) erre a rendelésre {1} nem lehet nagyobb, mint a végösszeg ({2})"
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Összesen előleg ({0}) erre a rendelésre {1} nem lehet nagyobb, mint a végösszeg ({2})"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Válassza ki a havi elosztást a célok egyenlőtlen elosztásához a hónapban .
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Kód módosítása
 DocType: Purchase Invoice Item,Valuation Rate,Készletérték ár
@@ -4075,7 +4080,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Hasznosított ITC Cess
 ,Student Monthly Attendance Sheet,Tanuló havi jelenléti ív
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Csak az értékesítésre vonatkozó szállítási szabály
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Értékcsökkenési sor {0}: A következő értékcsökkenési időpont nem lehet a vétel időpontja előtti
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Értékcsökkenési sor {0}: A következő értékcsökkenési időpont nem lehet a vétel időpontja előtti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt téma kezdési dátuma
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Eddig
 DocType: Rename Tool,Rename Log,Átnevezési napló
@@ -4092,12 +4097,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Milyen gyakran kell frissíteni a projektet és a vállalatot az értékesítési tranzakciók alapján.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Lejárat dátuma
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Add diákok
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Kérjük, törölje a Munkavállalót <a href=""#Form/Employee/{0}"">{0}</a> \ törölni ezt a dokumentumot"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},"Kérjük, válassza ki a {0}"
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Távolság
+DocType: Delivery Stop,Distance,Távolság
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Sorolja fel a vásárolt vagy eladott termékeit vagy szolgáltatásait.
 DocType: Water Analysis,Storage Temperature,Tárolási hőmérséklet
 DocType: Sales Order,SAL-ORD-.YYYY.-,ÉRT-Chicago-.YYYY.-
@@ -4124,7 +4127,7 @@
 DocType: Homepage,Company Description for website homepage,Vállalkozás leírása az internetes honlapon
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","A vevők kényelméért, ezek a kódok használhatók a nyomtatási formátumokhoz, mint számlákon és a szállítóleveleken"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Beszállító neve
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Nem sikerült lekérni információkat ehhez: {0} .
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Nem sikerült lekérni információkat ehhez: {0} .
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Nyitó könyvelési tétel megnyitása
 DocType: Contract,Fulfilment Terms,Teljesítési feltételek
 DocType: Sales Invoice,Time Sheet List,Idő nyilvántartó lista
@@ -4304,7 +4307,7 @@
 DocType: Serial No,Warranty / AMC Details,Garancia és éves karbantartási szerződés részletei
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Válassza a diákokat kézzel az Aktivitás alapú csoporthoz
 DocType: Journal Entry,User Remark,Felhasználói megjegyzés
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Útvonalak optimalizálása.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Útvonalak optimalizálása.
 DocType: Travel Itinerary,Non Diary,Nem napló
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Nem lehet létrehozni visszatartási bónuszt a felmondott munkavállalók számára
 DocType: Lead,Market Segment,Piaci rész
@@ -4334,7 +4337,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Hűségprogram
 DocType: Student Guardian,Father,Apa
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Támogatói jegyek
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,'Készlet frisítés' nem ellenőrizhető tárgyi eszköz értékesítésre
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,'Készlet frisítés' nem ellenőrizhető tárgyi eszköz értékesítésre
 DocType: Bank Reconciliation,Bank Reconciliation,Bank egyeztetés
 DocType: Attendance,On Leave,Távolléten
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Változások lekérdezése
@@ -4379,7 +4382,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Széria sz. és Köteg
 DocType: Warranty Claim,From Company,Cégtől
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Értékelési kritériumok pontszám összegének ennyinek kell lennie: {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,"Kérjük, állítsa be a könyvelt amortizációk számát"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,"Kérjük, állítsa be a könyvelt amortizációk számát"
 DocType: Supplier Scorecard Period,Calculations,Számítások
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Érték vagy menny
 DocType: Payment Terms Template,Payment Terms,Fizetési feltételek
@@ -4398,7 +4401,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,"Kedvezmény (%) a árjegyék árain, árkülönbözettel"
 DocType: Healthcare Service Unit Type,Rate / UOM,Ár / ME
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Összes Raktár
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,{0} találha az Inter Company Tranzakciók esetében.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,{0} találha az Inter Company Tranzakciók esetében.
 DocType: Travel Itinerary,Rented Car,Bérelt autó
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,A Társaságról
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Követelés főkönyvi számlának Mérlegszámlának kell lennie
@@ -4499,6 +4502,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Növényelemzési kritérium
 DocType: Cheque Print Template,Cheque Height,Csekk magasság
 DocType: Supplier,Supplier Details,Beszállítói adatok
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Kérjük, állítsa be a számozási sorozatot a részvételhez a Beállítás&gt; Számozási sorozatok segítségével"
 DocType: Setup Progress,Setup Progress,Telepítés előrehaladása
 DocType: Expense Claim,Approval Status,Jóváhagyás állapota
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},"Űrlap értéke kisebb legyen, mint az érték ebben a sorban {0}"
@@ -4591,7 +4595,6 @@
 DocType: Travel Request,Fully Sponsored,Teljesen szponzorált
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Fordított naplóbejegyzés
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,A(z)  {0} vevő létrehozva.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Kérjük, állítsa be az alkalmazottak elnevezési rendszerét az emberi erőforrás&gt; HR beállításoknál"
 DocType: Stock Settings,Limit Percent,Határérték százalék
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Jelenleg nincs raktárkészlet egyik raktárban sem
 ,Payment Period Based On Invoice Date,Fizetési határidő számla dátuma alapján
@@ -4650,7 +4653,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Forrás raktár
 DocType: Installation Note,Installation Date,Telepítés dátuma
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Ledger megosztása
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},#{0}sor: {1} Vagyontárgy nem tartozik ehhez a céghez {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},#{0}sor: {1} Vagyontárgy nem tartozik ehhez a céghez {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,A {0} kimenő értékesítési számla létrehozva
 DocType: Employee,Confirmation Date,Visszaigazolás dátuma
 DocType: Inpatient Occupancy,Check Out,Kijelentkezés
@@ -4670,6 +4673,7 @@
 DocType: Production Plan,Sales Orders Detail,Vevői rendelések részletei
 DocType: Bin,Requested Quantity,kért mennyiség
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-DÍJ-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Kérjük, állítsd be az oktatónevezési rendszert az oktatásban&gt; Oktatási beállítások"
 DocType: Patient,Marital Status,Családi állapot
 DocType: Stock Settings,Auto Material Request,Automata anyagigénylés
 DocType: Woocommerce Settings,API consumer secret,API fogyasztói titok
@@ -4722,7 +4726,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Válasszon napot
 DocType: Academic Term,Term Name,Feltétel neve
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Tőlünk követelés ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Fizetési bérpapírt hoz  létre...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Fizetési bérpapírt hoz  létre...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Nem szerkesztheti a fő csomópontot.
 DocType: Buying Settings,Purchase Order Required,Beszerzési megrendelés Kötelező
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Időzítő
@@ -4758,7 +4762,7 @@
 DocType: Account,Rate at which this tax is applied,"Arány, amelyen ezt az adót alkalmazzák"
 DocType: Cash Flow Mapper,Section Name,Szekció neve
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Újra rendelendő mennyiség
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Értékcsökkenési sor {0}: A hasznos élettartam utáni értéknek nagyobbnak vagy egyenlőnek kell lennie mint {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Értékcsökkenési sor {0}: A hasznos élettartam utáni értéknek nagyobbnak vagy egyenlőnek kell lennie mint {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Jelenlegi munkalehetőségek
 DocType: Company,Stock Adjustment Account,Készlet igazítás számla
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Leíró
@@ -4805,7 +4809,7 @@
 DocType: Program Enrollment,School House,Iskola épület
 DocType: Serial No,Out of AMC,ÉKSz időn túl
 DocType: Opportunity,Opportunity Amount,Lehetőség összege
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Lekönyvelt amortizációk száma nem lehet nagyobb, mint az összes amortizációk száma"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Lekönyvelt amortizációk száma nem lehet nagyobb, mint az összes amortizációk száma"
 DocType: Purchase Order,Order Confirmation Date,Megrendelés visszaigazolás  dátuma
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Karbantartási látogatás készítés
@@ -4846,7 +4850,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Köteg:
 DocType: Volunteer,Afternoon,Délután
 DocType: Loyalty Program,Loyalty Program Help,Hűségprogram Súgó
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' letiltott
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' letiltott
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Megnyitottá állít
 DocType: Cheque Print Template,Scanned Cheque,Beolvasott Csekk
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Küldjön automatikus e-maileket a Kapcsolatoknak a benyújtott tranzakciókkal.
@@ -4859,7 +4863,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Tétel és garancia Részletek
 DocType: Chapter,Chapter Members,Fejezet tagjai
 DocType: Sales Team,Contribution (%),Hozzájárulás (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Megjegyzés: Fizetés bejegyzés nem hozható létre, mivel 'Készpénz vagy bankszámla' nem volt megadva"
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Megjegyzés: Fizetés bejegyzés nem hozható létre, mivel 'Készpénz vagy bankszámla' nem volt megadva"
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,A {0} projekt már létezik
 DocType: Clinical Procedure,Nursing User,Ápoló felhasználó
 DocType: Employee Benefit Application,Payroll Period,Bérszámfejtés időszaka
@@ -4867,6 +4871,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},A {0} sorozatszám nem tartozik a {1} köteghez
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Felelősségek
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Ennek az árajánlatnak az érvényességi ideje lejárt.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Kérjük, törölje a Munkavállalót <a href=""#Form/Employee/{0}"">{0}</a> \ törölni ezt a dokumentumot"
 DocType: Expense Claim Account,Expense Claim Account,Költség követelés számla
 DocType: Account,Capital Work in Progress,Fővállalkozói munka folyamatban
 DocType: Accounts Settings,Allow Stale Exchange Rates,Engedélyezze az átmeneti árfolyam értékeket
@@ -4947,7 +4953,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Problémás Anyag
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Csatlakoztassa a Shopify-t az ERPNext segítségével
 DocType: Material Request Item,For Warehouse,Ebbe a raktárba
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,A kézbesítési szállítólevél megjegyzések {0} frissítve
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,A kézbesítési szállítólevél megjegyzések {0} frissítve
 DocType: Employee,Offer Date,Ajánlat dátuma
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Árajánlatok
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,"Ön offline módban van. Ön nem lesz képes, frissíteni amíg nincs hálózata."
@@ -4997,7 +5003,7 @@
 DocType: Shipping Rule,Calculate Based On,Számítás ezen alapul
 DocType: Contract,Unfulfilled,Beteljesítetlen
 DocType: Delivery Note Item,From Warehouse,Raktárról
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Az említett kritériumok alapján nincsenek alkalmazottak
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Az említett kritériumok alapján nincsenek alkalmazottak
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Nincs elem az Anyagjegyzéken a Gyártáshoz
 DocType: Shopify Settings,Default Customer,Alapértelmezett vevő
 DocType: Sales Stage,Stage Name,Szakasz név
@@ -5039,7 +5045,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Adó összege a kedvezmény összege után
 DocType: Patient,Inpatient Status,Fekvőbeteg állapot
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Napi munka összefoglalási beállítások
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,A kiválasztott árlistának bejelölt vételi és eladási mezőkkel kell rendelkeznie.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,A kiválasztott árlistának bejelölt vételi és eladási mezőkkel kell rendelkeznie.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,"Kérjük, adja meg az igénylés dátumát"
 DocType: Payment Entry,Internal Transfer,belső Transfer
 DocType: Asset Maintenance,Maintenance Tasks,Karbantartási feladatok
@@ -5075,7 +5081,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Csoportosítva
 DocType: Guardian,Interests,Érdekek
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Pénznemek engedélyezése / tiltása
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Nem lehetett benyújtani néhány fizetési bérpapírt
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Nem lehetett benyújtani néhány fizetési bérpapírt
 DocType: Exchange Rate Revaluation,Get Entries,Kapjon bejegyzéseket
 DocType: Production Plan,Get Material Request,Anyag igénylés lekérése
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Postai költségek
@@ -5159,7 +5165,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Költség számla kötelező elem ehhez {0}
 DocType: BOM,Website Description,Weboldal leírása
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Nettó változás a saját tőkében
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,"Kérjük, vonja vissza a(z) {0} Beszállítói számlát először"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,"Kérjük, vonja vissza a(z) {0} Beszállítói számlát először"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Nem megengedett. Tiltsa le a szolgáltatási egység típusát
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail címnek egyedinek kell lennie, ez már létezik: {0}"
 DocType: Serial No,AMC Expiry Date,Éves karbantartási szerződés lejárati dátuma
@@ -5199,7 +5205,7 @@
 DocType: Hotel Room,Hotel Room,Szállodai szoba
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},A {0}számlához nem tartozik a {1} vállalat
 DocType: Leave Type,Rounding,Kerekítés
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Sorozatszámok ebben a sorban {0} nem egyezik a szállítólevéllel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Sorozatszámok ebben a sorban {0} nem egyezik a szállítólevéllel
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Adagolt összeg (Pro-besorolású)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Ezután az árazási szabályokat az Vevő, az Vevő csoport, a Terület, a Beszállító, a Beszállítócsoport, a Kampány, az Értékesítési Partner stb. alapján kiszűrik."
 DocType: Student,Guardian Details,Helyettesítő részletei
@@ -5254,7 +5260,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Raktár szükséges a {0} tételhez
 DocType: Leave Allocation,Unused leaves,A fel nem használt távollétek
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Visszafizetési bejegyzés létrehozás
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Összes részleg
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Összes részleg
 DocType: Healthcare Service Unit,Vacant,Üres
 DocType: Patient,Alcohol Past Use,Korábbi alkoholfogyasztás
 DocType: Fertilizer Content,Fertilizer Content,Műtrágya tartalma
@@ -5265,7 +5271,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,A  {0} munka rendelést meg kell szüntetni a vevői rendelés visszavonása előtt
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Hozzon létre robbant anyagjegyzéket ANYJ (beleértve a részegységeket)
 DocType: Authorization Rule,Applicable To (Employee),Alkalmazandó (Alkalmazott)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Határidő dátum kötelező
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Határidő dátum kötelező
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Növekmény erre a Jellemzőre {0} nem lehet 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Juttatási típus és összeg
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Foglalható szobák
@@ -5409,7 +5415,7 @@
 DocType: Purchase Invoice Item,Total Weight,Össz súly
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Értékesítések jutalékai
 DocType: Job Offer Term,Value / Description,Érték / Leírás
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","#{0} sor: {1} Vagyontárgyat nem lehet benyújtani, ez már {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","#{0} sor: {1} Vagyontárgyat nem lehet benyújtani, ez már {2}"
 DocType: Tax Rule,Billing Country,Számlázási Ország
 DocType: Purchase Order Item,Expected Delivery Date,Várható szállítás dátuma
 DocType: Restaurant Order Entry,Restaurant Order Entry,Étterem rendelési bejegyzés
@@ -5448,12 +5454,13 @@
 DocType: Maintenance Visit,Breakdown,Üzemzavar
 DocType: Travel Itinerary,Vegetarian,Vegetáriánus
 DocType: Patient Encounter,Encounter Date,Találkozó dátuma
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Számla: {0} ebben a pénznemben: {1} nem választható
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Számla: {0} ebben a pénznemben: {1} nem választható
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bank adatok
 DocType: Purchase Receipt Item,Sample Quantity,Minta mennyisége
 DocType: Bank Guarantee,Name of Beneficiary,Kedvezményezett neve
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Az ANYAGJ frissítése automatikusan az ütemezőn keresztül történik, a legfrissebb készletérték ár / árlisták ára /  a nyersanyagok utolsó beszerzési ára alapján."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Szállító&gt; Szállítócsoport
 DocType: Bank Reconciliation Detail,Cheque Date,Csekk dátuma
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},A {0} számla: Szülő számla {1} nem tartozik ehhez a céghez: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Sikeresen törölve valamennyi a vállalattal kapcsolatos ügylet !
@@ -5481,7 +5488,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Al csomópontok csak 'csoport' típusú csomópontok alatt hozhatók létre
 DocType: Attendance Request,Half Day Date,Félnapos dátuma
 DocType: Academic Year,Academic Year Name,Akadémiai neve
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,"{0} nem engedélyezett a {1} művelettel. Kérjük, változtassa meg a Vállalatot."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,"{0} nem engedélyezett a {1} művelettel. Kérjük, változtassa meg a Vállalatot."
 DocType: Sales Partner,Contact Desc,Kapcsolattartó leírása
 DocType: Email Digest,Send regular summary reports via Email.,Küldje el a rendszeres összefoglaló jelentéseket e-mailben.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},"Kérjük, állítsa be az alapértelmezett főkönyvi számlát a Költség Követelés típusban: {0}"
@@ -5514,7 +5521,7 @@
 DocType: Hotel Room,Hotel Manager,Hotel igazgató
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Adózási szabály megadása a bevásárlókosárhoz
 DocType: Purchase Invoice,Taxes and Charges Added,Adók és költségek hozzáadva
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Értékcsökkenési sor {0}: A következő értékcsökkenési időpont nem lehet a rendelkezésre álló felhasználási dátuma előtt
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Értékcsökkenési sor {0}: A következő értékcsökkenési időpont nem lehet a rendelkezésre álló felhasználási dátuma előtt
 ,Sales Funnel,Értékesítési csatorna
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Rövidítés kötelező
 DocType: Project,Task Progress,Feladat előrehaladása
@@ -5528,7 +5535,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Összes vevői csoport
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,Halmozott Havi
 DocType: Attendance Request,On Duty,Szolgálatban
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} kötelező. Talán a Pénzváltó rekord nincs létrehozva  {1} -&gt; {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} kötelező. Talán a Pénzváltó rekord nincs létrehozva  {1} -&gt; {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Személyzeti terv {0} már létezik a  {1} titulusra
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Adó Sablon kötelező.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,A {0} számla: Szülő számla {1} nem létezik
@@ -5607,11 +5614,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Legalább egy Raktár kötelező
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Konfigurálja a tételmezőket, például a UOM, a tételcsoport, a leírás és az óraórák számát."
 DocType: Certification Application,Certification Status,Tanúsítási státusza
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Piactér
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Piactér
 DocType: Travel Itinerary,Travel Advance Required,Utazási előleg szükséges
 DocType: Subscriber,Subscriber Name,Előfizető neve
 DocType: Serial No,Out of Warranty,Garanciaidőn túl
-DocType: Cashier Closing,Cashier-closing-,Pénztáros-closing-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Foltolt adattípus
 DocType: BOM Update Tool,Replace,Csere
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Nem talált termékeket.
@@ -5698,7 +5704,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Az értékesítés és a vásárlás alapértelmezett adómintáit létre hozták.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Értékelés eredménye rekord {0} már létezik.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Példa: ABCD. #####. Ha sorozatot állít be, és a tétel nem szerepel a tranzakciókban, akkor a sorozaton alapuló automatikus tételszám kerül létrehozásra. Ha mindig erről a tételr köteg számról szeretné kifejezetten megemlíteni a tételszámot, hagyja üresen. Megjegyzés: ez a beállítás elsőbbséget élvez a készletbeállítások között az elnevezési sorozat előtag felett a leltár beállításoknál."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Kérjük, állítsa be a számozási sorozatot a részvételhez a Beállítás&gt; Számozási sorozatok segítségével"
 DocType: BOM,Materials Required (Exploded),Szükséges anyagok (Robbantott)
 DocType: Contract,Party User,Ügyfél felhasználó
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Kérjük, állítsa Vállakozás szűrését üresre, ha a csoportosítás beállítása 'Vállalkozás'"
@@ -5899,7 +5904,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Lehet. számláló
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Mindkét; a próbaidőszak kezdési időpontját és a próbaidőszak végső dátumát meg kell adni
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Átlagérték
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,A kifizetési ütemezés teljes összegének meg kell egyeznie a Teljes / kerekített összeggel
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,A kifizetési ütemezés teljes összegének meg kell egyeznie a Teljes / kerekített összeggel
 DocType: Subscription Plan Detail,Plan,Terv
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bankkivonat mérleg a főkönyvi kivonat szerint
 DocType: Job Applicant,Applicant Name,Pályázó neve
@@ -5968,7 +5973,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Szappan & Mosószer
 DocType: BOM,Show Items,Tételek megjelenítése
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,"Idő-től nem lehet nagyobb, mint idő-ig."
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Szeretné értesíteni az összes ügyfelet e-mailben?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Szeretné értesíteni az összes ügyfelet e-mailben?
 DocType: Subscription Plan,Billing Interval,Számlázási időtartam
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Mozgókép és videó
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Megrendelt
@@ -5977,9 +5982,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,"A {0} sor {1} értékének nagyobbnak kell lennie, mint 0"
 DocType: Assessment Criteria,Assessment Criteria Group,Értékelési kritériumok Group
 DocType: Healthcare Settings,Patient Name By,A beteg neve
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Betéti naplóbejegyzés a {0} - {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Betéti naplóbejegyzés a {0} - {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Engedélyezze a halasztott bevétel engedélyezését
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Nyitó halmozott ÉCS kisebbnek vagy egyenlőnek kell lennie ezzel: {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Nyitó halmozott ÉCS kisebbnek vagy egyenlőnek kell lennie ezzel: {0}
 DocType: Warehouse,Warehouse Name,Raktár neve
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,"A tényleges kezdő időpontnak kisebbnek kell lennie, mint a tényleges befejezési dátum"
 DocType: Naming Series,Select Transaction,Válasszon Tranzakciót
@@ -6130,7 +6135,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Az {1} besorolási fokozat {0} alkalmazottjának nincs alapértelmezett szabadságpolitikája
 DocType: Salary Detail,Salary Detail,Bér részletei
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,"Kérjük, válassza ki a {0} először"
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Hozzáadott {0} felhasználók
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Hozzáadott {0} felhasználók
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","Többszintű program esetében az ügyfeleket automatikusan az adott kategóriába sorolják, az általuk elköltöttek szerint"
 DocType: Appointment Type,Physician,Orvos
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Köteg {0} ebből a tételből: {1} lejárt.
@@ -6274,7 +6279,7 @@
 DocType: Asset,Custodian,Gondnok
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Értékesítési hely profil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,A {0} érték 0 és 100 közé esik
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},{0} kifizetése {1} -ről {2}-re
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},{0} kifizetése {1} -ről {2}-re
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Fedezetlen hitelek
 DocType: Cost Center,Cost Center Name,Költséghely neve
 DocType: Student,B+,B +
@@ -6306,6 +6311,7 @@
 DocType: Employee,Date of Issue,Probléma dátuma
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","A vevői beállítások szerint ha Vásárlás átvételét igazoló nyugta szükséges == 'IGEN', akkor a vásárlást igazoló számla létrehozására, a felhasználónak először létre kell hoznia vásárlási nyugtát erre a tételre: {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Sor # {0}: Nem beszállító erre a tételre {1}
+DocType: Global Defaults,Default Distance Unit,Alapértelmezett távolságegység
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,"{0} sor: Óra értéknek nagyobbnak kell lennie, mint nulla."
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,"Weboldal kép: {0} ami csatolva lett a {1}  tételhez, nem található"
 DocType: Issue,Content Type,Tartalom típusa
@@ -6361,7 +6367,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Tartozás főkönyvi számlának Mérlegszámlának kell lennie
 DocType: Asset,Naming Series,Sorszámozási csoportok
 DocType: Vital Signs,Coated,Bevont
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,"{0} sor: Várható értéknek a Hasznos Életút után kevesebbnek kell lennie, mint a bruttó beszerzési összeg"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,"{0} sor: Várható értéknek a Hasznos Életút után kevesebbnek kell lennie, mint a bruttó beszerzési összeg"
 DocType: GoCardless Settings,GoCardless Settings,GoCardless beállításai
 DocType: Leave Block List,Leave Block List Name,Távollét blokk lista neve
 DocType: Certified Consultant,Certification Validity,Tanúsítvány érvényessége
@@ -6428,6 +6434,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Bank fejléc
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Laboratóriumi tesztek megtekintése
 DocType: Hub Users,Hub Users,Hub felhasználók
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Ügyfél&gt; Ügyfélcsoport&gt; Terület
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Karbantartás dátuma
 DocType: Purchase Invoice Item,Rejected Serial No,Elutasított sorozatszám
@@ -6442,7 +6449,7 @@
 DocType: SG Creation Tool Course,Max Strength,Max állomány
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Telepítés beállításai
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Nincs kézbesítési értesítés ehhez az Ügyfélhez {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Nincs kézbesítési értesítés ehhez az Ügyfélhez {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,A (z) {0} alkalmazottnak nincs maximális juttatási összege
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Válasszon elemeket a szállítási dátum alapján
 DocType: Grant Application,Has any past Grant Record,Van bármilyen korábbi Támogatási rekord
@@ -6469,7 +6476,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Szállodai szoba foglalás
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Ügyfélszolgálat
 DocType: BOM,Thumbnail,Miniatűr
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Nincs kapcsolat az e-mail azonosítóval.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Nincs kapcsolat az e-mail azonosítóval.
 DocType: Item Customer Detail,Item Customer Detail,Tétel vevőjének részletei
 DocType: Notification Control,Prompt for Email on Submission of,Felszólító az emailre ehhez a benyújtáshoz
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},A (z) {0} alkalmazott maximális haszna meghaladja {1}
@@ -6724,7 +6731,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,"Nem lehet csoporttá alakítani, mert a számla típus ki van választva."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,"{0} {1} módosításra került. Kérjük, frissítse."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,"Tiltsa a felhasználóknak, hogy eltávozást igényelhessenek a következő napokra."
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Tételkód&gt; Tételcsoport&gt; Márka
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Ha a Loyalty Pontok korlátlan lejárati ideje lejárt, akkor tartsa az Expiry Duration (lejárati időtartam) üresen vagy 0 értéken."
 DocType: Asset Maintenance Team,Maintenance Team Members,Karbantartó csoporttagok
 DocType: Loyalty Point Entry,Purchase Amount,Beszerzés összege
@@ -6732,7 +6738,7 @@
 											to fullfill Sales Order {2}","Az {1} tétel {0} sorszáma nem adható meg, mivel fenntartva \ teljesítési megbízás {2}"
 DocType: Quotation,SAL-QTN-.YYYY.-,ÉRT-ÁRAJ-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Beszállító árajánlata :{0} létrehozva
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Befejező év nem lehet a kezdés évnél korábbi
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Befejező év nem lehet a kezdés évnél korábbi
 DocType: Employee Benefit Application,Employee Benefits,Alkalmazotti juttatások
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Csomagolt mennyiségeknek egyezniük kell a  {1} sorban lévő {0} tétel mennyiségével
 DocType: Work Order,Manufactured Qty,Gyártott menny.
@@ -6748,6 +6754,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Válasszon köteg számokat
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,A GSTIN-hez
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Vevők számlái
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Kérjük, állítsa be az alkalmazottak elnevezési rendszerét az emberi erőforrás&gt; HR beállításoknál"
 DocType: Healthcare Settings,Invoice Appointments Automatically,Számlázási automatikus naptár
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt téma azonosító
 DocType: Salary Component,Variable Based On Taxable Salary,Adóköteles fizetésen alapuló változó
@@ -6796,7 +6803,7 @@
 DocType: POS Profile,Account for Change Amount,Átváltási összeg számlája
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Csatlakozás QuickBookshez
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Teljes nyereség/veszteség
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Érvénytelen vállalkozás az Inter vállalkozás számlájára.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Érvénytelen vállalkozás az Inter vállalkozás számlájára.
 DocType: Purchase Invoice,input service,bemeneti szolgáltatás
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Sor {0}: Ügyfél / fiók nem egyezik {1} / {2} a {3} {4}
 DocType: Employee Promotion,Employee Promotion,Alkalmazotti promóció
@@ -6926,7 +6933,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Kedvezményes szálláslehetőség területe
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Elemzés
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,A kosár üres
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Kérjük, állítsd be az oktatónevezési rendszert az oktatásban&gt; Oktatási beállítások"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",A (z) {0} tétel nem rendelkezik sorszámmal Csak a szerzeményezett elemek \ szállíthatók a sorozatszám alapján
 DocType: Vehicle,Model,Modell
@@ -6956,7 +6962,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Nincs mit változtatni
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,"Kérjük, válasszon egy csv fájlt"
 DocType: Holiday List,Total Holidays,Ünnepek összesen
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,"Hiányzó e-mail sablon a feladáshoz.  Kérjük, állítson be egyet a Szállítási beállításokban."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,"Hiányzó e-mail sablon a feladáshoz.  Kérjük, állítson be egyet a Szállítási beállításokban."
 DocType: Student Leave Application,Mark as Present,Jelenlévővé jelölés
 DocType: Supplier Scorecard,Indicator Color,Jelölés színe
 DocType: Purchase Order,To Receive and Bill,Beérkeztetés és Számlázás
@@ -6965,7 +6971,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Válassza ki a sorozatszámot
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Tervező
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Általános szerződési feltételek sablon
-DocType: Serial No,Delivery Details,Szállítási adatok
+DocType: Delivery Trip,Delivery Details,Szállítási adatok
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Költséghely szükséges ebben a sorban {0} az adók táblázatának ezen típusához {1}
 DocType: Program,Program Code,Programkód
 DocType: Terms and Conditions,Terms and Conditions Help,Általános szerződési feltételek  Súgó
@@ -6989,7 +6995,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Érdeklődés ideje napokban
 DocType: Cash Flow Mapping,Is Income Tax Expense,Ez jövedelemadó költség
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,A rendelése kiszállításra került!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Sor # {0}: Beküldés dátuma meg kell egyeznie a vásárlás dátumát {1} eszköz {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Sor # {0}: Beküldés dátuma meg kell egyeznie a vásárlás dátumát {1} eszköz {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Jelölje be ezt, ha a diák lakóhelye az intézet diákszállása."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Kérjük, adja meg a vevői rendeléseket, a fenti táblázatban"
 ,Stock Summary,Készlet Összefoglaló
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index f6bb0ea..b2572e0 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Nama Periode
 DocType: Employee,Salary Mode,Mode Gaji
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Daftar
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Daftar
 DocType: Patient,Divorced,Bercerai
 DocType: Support Settings,Post Route Key,Posting Kunci Rute
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Izinkan Stok Barang yang sama untuk ditambahkan beberapa kali dalam suatu transaksi
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Nilai Tukar Baru
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Mata Uang diperlukan untuk Daftar Harga {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Akan dihitung dalam transaksi.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Pemasok&gt; Jenis Pemasok
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Kontak Pelanggan
 DocType: Patient Appointment,Check availability,Cek ketersediaan
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Tampilkan terbuka
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Nomor Seri Berhasil Diperbarui
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Periksa
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} secara berurutan {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} secara berurutan {1}
 DocType: Asset Finance Book,Depreciation Start Date,Tanggal Mulai Depresiasi
 DocType: Pricing Rule,Apply On,Terapkan Pada
 DocType: Item Price,Multiple Item prices.,Multiple Item harga.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Resep Lab
 ,Delay Days,Tunda hari
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Beban layanan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Nomor Seri: {0} sudah dirujuk dalam Faktur Penjualan: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Nomor Seri: {0} sudah dirujuk dalam Faktur Penjualan: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Faktur
 DocType: Purchase Invoice Item,Item Weight Details,Rincian Berat Item
 DocType: Asset Maintenance Log,Periodicity,Periode
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Akuntan
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Daftar Harga Jual
 DocType: Patient,Tobacco Current Use,Penggunaan Saat Ini Tembakau
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Tanggal mulai dan tanggal akhir tumpang tindih dengan kartu kerja <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Tingkat penjualan
 DocType: Cost Center,Stock User,Pengguna Persediaan
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca+Mg)/K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,terkait
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,tanggal kehadiran tidak bisa kurang dari tanggal bergabung karyawan
 DocType: Grading Scale,Grading Scale Name,Skala Grading Nama
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Tambahkan Pengguna ke Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Tambahkan Pengguna ke Marketplace
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Ini adalah account root dan tidak dapat diedit.
 DocType: Sales Invoice,Company Address,Alamat perusahaan
 DocType: BOM,Operations,Operasi
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Qty Diff
 DocType: Production Plan,Material Request Detail,Detail Permintaan Material
 DocType: Selling Settings,Default Quotation Validity Days,Hari Validasi Kutipan Default
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Untuk mencakup pajak berturut-turut {0} di tingkat Stok Barang, pajak dalam baris {1} juga harus disertakan"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Untuk mencakup pajak berturut-turut {0} di tingkat Stok Barang, pajak dalam baris {1} juga harus disertakan"
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Payroll Entry,Validate Attendance,Validasi Hadir
 DocType: Sales Invoice,Change Amount,perubahan Jumlah
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,spasi untuk jumlah kata
 DocType: Vehicle,Additional Details,Rincian Tambahan
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Tidak diberikan deskripsi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Pemasok&gt; Grup Pemasok
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Form Permintaan pembelian.
 DocType: POS Closing Voucher Details,Collected Amount,Jumlah yang Dikumpulkan
 DocType: Lab Test,Submitted Date,Tanggal dikirim
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,Mahasiswa Pendaftaran
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Item {0} dibatalkan
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Baris Depresiasi {0}: Tanggal Mulai Penyusutan dimasukkan sebagai tanggal terakhir
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Baris Depresiasi {0}: Tanggal Mulai Penyusutan dimasukkan sebagai tanggal terakhir
 DocType: Contract Template,Fulfilment Terms and Conditions,Syarat dan Ketentuan Pemenuhan
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Permintaan Material
 DocType: Bank Reconciliation,Update Clearance Date,Perbarui Tanggal Kliring
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,Pengaturan Akun
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Pemasok Faktur ada ada di Purchase Invoice {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Pengelolaan Tingkat Salesman
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Tidak dapat memproses rute, karena Pengaturan Google Maps dinonaktifkan."
 DocType: Job Applicant,Cover Letter,Sampul surat
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Penghapusan Cek dan Deposito yang Jatuh Tempo
 DocType: Item,Synced With Hub,Disinkronkan Dengan Hub
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Nilai Aset Baru
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tingkat di mana Mata Uang Pelanggan dikonversi ke mata uang dasar pelanggan
 DocType: Course Scheduling Tool,Course Scheduling Tool,Tentu saja Penjadwalan Perangkat
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Pembelian Faktur tidak dapat dilakukan terhadap aset yang ada {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Pembelian Faktur tidak dapat dilakukan terhadap aset yang ada {1}
 DocType: Crop Cycle,LInked Analysis,Analisis LInked
 DocType: POS Closing Voucher,POS Closing Voucher,Voucher Penutupan POS
 DocType: Contract,Lapsed,Bekas
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} tidak terdaftar di Kursus {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Nama siswa:
 DocType: POS Closing Voucher Details,Difference,Perbedaan
+DocType: Delivery Settings,Delay between Delivery Stops,Penundaan antara Stop Pengiriman
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial ada {0} bukan milik Pengiriman Note {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Sepertinya ada masalah dengan konfigurasi GoCardless server. Jangan khawatir, jika terjadi kegagalan, jumlah itu akan dikembalikan ke akun Anda."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -693,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Kuantitas dan Harga
 DocType: Delivery Note,% Installed,% Terpasang
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,Ruang kelas / Laboratorium dll di mana kuliah dapat dijadwalkan.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Mata uang perusahaan dari kedua perusahaan harus sesuai untuk Transaksi Perusahaan Inter.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Mata uang perusahaan dari kedua perusahaan harus sesuai untuk Transaksi Perusahaan Inter.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Silahkan masukkan nama perusahaan terlebih dahulu
 DocType: Travel Itinerary,Non-Vegetarian,Bukan vegetarian
 DocType: Purchase Invoice,Supplier Name,Nama Supplier
@@ -778,7 +779,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Disewa Dari Tanggal
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Bagian yang cukup untuk Membangun
 DocType: POS Profile User,POS Profile User,Profil Pengguna POS
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Baris {0}: Tanggal Mulai Penyusutan diperlukan
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Baris {0}: Tanggal Mulai Penyusutan diperlukan
 DocType: Purchase Invoice Item,Service Start Date,Tanggal Mulai Layanan
 DocType: Subscription Invoice,Subscription Invoice,Berlangganan Faktur
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Pendapatan Langsung
@@ -845,7 +846,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Singkatan sudah digunakan untuk perusahaan lain
 DocType: Selling Settings,Default Customer Group,Kelompok Pelanggan Standar
 DocType: Employee,IFSC Code,Kode IFSC
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Tanggal mulai dan tanggal akhir tumpang tindih dengan kartu kerja <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Jika disable, lapangan 'Rounded Jumlah' tidak akan terlihat dalam setiap transaksi"
 DocType: BOM,Operating Cost,Biaya Operasi
 DocType: Crop,Produced Items,Item yang Diproduksi
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,Mencegah RFQs
 DocType: Hub User,Hub User,Pengguna Hub
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Membuat Sales Order
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Slip Gaji dikirim untuk periode dari {0} sampai {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Slip Gaji dikirim untuk periode dari {0} sampai {1}
 DocType: Project Task,Project Task,Tugas Proyek
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Poin yang Ditebus
 ,Lead Id,Id Prospek
@@ -1027,7 +1027,7 @@
 DocType: Fee Validity,Max number of visit,Jumlah kunjungan maksimal
 ,Hotel Room Occupancy,Kamar Hotel Okupansi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Absen dibuat:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Silakan set Cash standar atau rekening Bank Mode Pembayaran {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Silakan set Cash standar atau rekening Bank Mode Pembayaran {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Mendaftar
 DocType: GST Settings,GST Settings,Pengaturan GST
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Mata uang harus sama dengan Mata Uang Daftar Harga: {0}
@@ -1081,7 +1081,7 @@
 DocType: Vehicle Log,Service Details,Rincian layanan
 DocType: Lab Test Template,Grouped,Dikelompokkan
 DocType: Selling Settings,Delivery Note Required,Nota Pengiriman Diperlukan
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Mengirimkan Slip Gaji ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Mengirimkan Slip Gaji ...
 DocType: Bank Guarantee,Bank Guarantee Number,Nomor Bank Garansi
 DocType: Assessment Criteria,Assessment Criteria,Kriteria penilaian
 DocType: BOM Item,Basic Rate (Company Currency),Tarif Dasar (Mata Uang Perusahaan)
@@ -1106,13 +1106,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Entri pembayaran sudah dibuat
 DocType: Request for Quotation,Get Suppliers,Dapatkan Pemasok
 DocType: Purchase Receipt Item Supplied,Current Stock,Persediaan saat ini
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Aset {1} tidak terkait dengan Butir {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Aset {1} tidak terkait dengan Butir {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Slip Gaji Preview
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Akun {0} telah dimasukkan beberapa kali
 DocType: Account,Expenses Included In Valuation,Biaya Termasuk di Dalam Penilaian Barang
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Anda hanya bisa memperpanjang jika keanggotaan Anda akan berakhir dalam 30 hari
 DocType: Shopping Cart Settings,Show Stock Availability,Tampilkan Ketersediaan Stok
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Setel {0} dalam kategori aset {1} atau perusahaan {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Setel {0} dalam kategori aset {1} atau perusahaan {2}
 DocType: Location,Longitude,Garis bujur
 ,Absent Student Report,Laporan Absen Siswa
 DocType: Crop,Crop Spacing UOM,Tanaman Jarak UOM
@@ -1184,7 +1184,7 @@
 DocType: Soil Texture,Sand,Pasir
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energi
 DocType: Opportunity,Opportunity From,Peluang Dari
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Baris {0}: {1} Nomor seri diperlukan untuk Item {2}. Anda telah memberikan {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Baris {0}: {1} Nomor seri diperlukan untuk Item {2}. Anda telah memberikan {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Silahkan pilih sebuah tabel
 DocType: BOM,Website Specifications,Website Spesifikasi
 DocType: Special Test Items,Particulars,Particulars
@@ -1276,7 +1276,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Item dengan weightage lebih tinggi akan ditampilkan lebih tinggi
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Tes Laboratorium dan Tanda Vital
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Rincian Rekonsiliasi Bank
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Row # {0}: Aset {1} harus diserahkan
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Row # {0}: Aset {1} harus diserahkan
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Tidak ada karyawan yang ditemukan
 DocType: Item,If subcontracted to a vendor,Jika subkontrak ke pemasok
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Kelompok Siswa sudah diperbarui.
@@ -1330,7 +1330,6 @@
 DocType: Loyalty Program Collection,Tier Name,Nama Tingkat
 DocType: HR Settings,Enter retirement age in years,Memasuki usia pensiun di tahun
 DocType: Crop,Target Warehouse,Target Gudang
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Silakan tetapkan Seri Penamaan untuk {0} melalui Pengaturan&gt; Pengaturan&gt; Seri Penamaan
 DocType: Payroll Employee Detail,Payroll Employee Detail,Daftar gaji karyawan
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Silahkan pilih gudang
 DocType: Cheque Print Template,Starting location from left edge,Mulai lokasi dari tepi kiri
@@ -1420,7 +1419,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Planning Material untuk Barang Rakitan
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Mitra Penjualan dan Wilayah
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} harus aktif
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Tidak ada item yang tersedia untuk transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Tidak ada item yang tersedia untuk transfer
 DocType: Employee Boarding Activity,Activity Name,Nama Kegiatan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Ubah Tanggal Rilis
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Jumlah produk jadi <b>{0}</b> dan Untuk Kuantitas <b>{1}</b> tidak dapat berbeda
@@ -1647,6 +1646,7 @@
 DocType: Project,First Email,Email Pertama
 DocType: Company,Exception Budget Approver Role,Peran Perwakilan Anggaran Pengecualian
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Setelah ditetapkan, faktur ini akan ditahan hingga tanggal yang ditetapkan"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserved Gudang di Sales Order / Stok Barang Jadi Gudang
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Nilai Penjualan
 DocType: Repayment Schedule,Interest Amount,Jumlah bunga
@@ -1658,7 +1658,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Catatan
 DocType: Asset,Scrapped,membatalkan
 DocType: Item,Item Defaults,Default Barang
-DocType: Purchase Invoice,Returns,Retur
+DocType: Cashier Closing,Returns,Retur
 DocType: Job Card,WIP Warehouse,WIP Gudang
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serial ada {0} berada di bawah kontrak pemeliharaan upto {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,Pengerahan
@@ -1672,7 +1672,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Jenis transfer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Beban Penjualan
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Grup Pelanggan&gt; Wilayah
 DocType: Diagnosis,Diagnosis,Diagnosa
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standar Pembelian
 DocType: Attendance Request,Explanation,Penjelasan
@@ -1685,7 +1684,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Item Pesanan Pembelian terlambat
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Kode Pos
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Sales Order {0} adalah {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Pilih akun pendapatan bunga dalam pinjaman {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Pilih akun pendapatan bunga dalam pinjaman {0}
 DocType: Opportunity,Contact Info,Informasi Kontak
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Membuat Entri Persediaan
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Tidak dapat mempromosikan Karyawan dengan status Kiri
@@ -1697,7 +1696,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Faktur tidak dapat dilakukan selama nol jam penagihan
 DocType: Company,Date of Commencement,Tanggal dimulainya
 DocType: Sales Person,Select company name first.,Pilih nama perusahaan terlebih dahulu.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},Email dikirim ke {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},Email dikirim ke {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Penawaran Diterima dari Supplier
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Ganti BOM dan perbarui harga terbaru di semua BOM
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Untuk {0} | {1} {2}
@@ -1717,7 +1716,7 @@
 DocType: Asset Movement,From Employee,Dari Karyawan
 DocType: Driver,Cellphone Number,Nomor ponsel
 DocType: Project,Monitor Progress,Pantau Kemajuan
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Peringatan: Sistem tidak akan memeriksa overbilling karena jumlahnya untuk Item {0} pada {1} adalah nol
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Peringatan: Sistem tidak akan memeriksa overbilling karena jumlahnya untuk Item {0} pada {1} adalah nol
 DocType: Journal Entry,Make Difference Entry,Buat Entri Perbedaan
 DocType: Supplier Quotation,Auto Repeat Section,Bagian Ulangi Otomatis
 DocType: Upload Attendance,Attendance From Date,Absensi Kehadiran dari Tanggal
@@ -1820,7 +1819,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Baris # {0}: Jumlah yang ditolak tidak dapat dimasukkan dalam Retur Pembelian
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Mengubah Grup Pelanggan untuk Pelanggan yang dipilih tidak diizinkan.
 ,Purchase Order Items To Be Billed,Purchase Order Items Akan Ditagih
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Memperbarui perkiraan waktu kedatangan.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Memperbarui perkiraan waktu kedatangan.
 DocType: Program Enrollment Tool,Enrollment Details,Rincian pendaftaran
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Tidak dapat menetapkan beberapa Default Item untuk sebuah perusahaan.
 DocType: Purchase Invoice Item,Net Rate,Nilai Bersih / Net
@@ -1834,7 +1833,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Cuti Jenis adalah madatory
 DocType: Support Settings,Close Issue After Days,Tutup Isu Setelah Days
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Anda harus menjadi pengguna dengan peran Manajer Sistem dan Manajer Item untuk menambahkan pengguna ke Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Anda harus menjadi pengguna dengan peran Manajer Sistem dan Manajer Item untuk menambahkan pengguna ke Marketplace.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Biarkan kosong jika dipertimbangkan untuk semua cabang
 DocType: Job Opening,Staffing Plan,Rencana Kepegawaian
 DocType: Bank Guarantee,Validity in Days,Validitas dalam hari
@@ -1854,7 +1853,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Baris duplikat {0} dengan sama {1}
 DocType: Marketplace Settings,Disable Marketplace,Nonaktifkan Marketplace
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Tahun fiskal {0} tidak ditemukan
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Tahun fiskal {0} tidak ditemukan
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Persiapan Karyawan
 DocType: Hotel Room Reservation,Hotel Reservation User,Pengguna Reservasi Hotel
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Silakan pilih awalan terlebih dahulu
@@ -1962,7 +1961,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Gagal untuk masuk
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Aset {0} dibuat
 DocType: Special Test Items,Special Test Items,Item Uji Khusus
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Anda harus menjadi pengguna dengan peran Manajer Sistem dan Manajer Item untuk mendaftar di Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Anda harus menjadi pengguna dengan peran Manajer Sistem dan Manajer Item untuk mendaftar di Marketplace.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Mode Pembayaran
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,"Sesuai dengan Struktur Gaji yang ditugaskan, Anda tidak dapat mengajukan permohonan untuk tunjangan"
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Website Image harus file umum atau URL situs
@@ -1974,7 +1973,7 @@
 DocType: Warehouse,Warehouse Contact Info,Info Kontak Gudang
 DocType: Payment Entry,Write Off Difference Amount,Menulis Off Perbedaan Jumlah
 DocType: Volunteer,Volunteer Name,Nama Relawan
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Baris dengan tanggal jatuh tempo ganda di baris lain ditemukan: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Baris dengan tanggal jatuh tempo ganda di baris lain ditemukan: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: email Karyawan tidak ditemukan, maka email tidak dikirim"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Tidak ada Struktur Gaji yang ditugaskan untuk Karyawan {0} pada tanggal tertentu {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Aturan pengiriman tidak berlaku untuk negara {0}
@@ -2063,6 +2062,7 @@
 DocType: Salary Component,Earning,Pendapatan
 DocType: Supplier Scorecard,Scoring Criteria,Kriteria penilaian
 DocType: Purchase Invoice,Party Account Currency,Akun Mata Uang per Party
+DocType: Delivery Trip,Total Estimated Distance,Perkiraan Jarak Total
 ,BOM Browser,BOM Browser
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Harap perbarui status anda untuk acara pelatihan ini
 DocType: Item Barcode,EAN,EAN
@@ -2101,7 +2101,7 @@
 DocType: Activity Cost,Projects,Proyek
 DocType: Payment Request,Transaction Currency,Mata uang transaksi
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Dari {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Beberapa email tidak valid
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Beberapa email tidak valid
 DocType: Work Order Operation,Operation Description,Deskripsi Operasi
 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.,Tidak dapat mengubah Tahun Anggaran Tanggal Mulai dan Tanggal Akhir Tahun Anggaran setelah Tahun Anggaran disimpan.
 DocType: Quotation,Shopping Cart,Daftar Belanja
@@ -2125,7 +2125,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Perubahan bersih dalam Aset Tetap
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,Biarkan kosong jika dipertimbangkan untuk semua sebutan
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Mengisi tipe 'sebenarnya' berturut-turut {0} tidak dapat dimasukkan dalam Butir Tingkat
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Mengisi tipe 'sebenarnya' berturut-turut {0} tidak dapat dimasukkan dalam Butir Tingkat
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Dari Datetime
 DocType: Shopify Settings,For Company,Untuk Perusahaan
@@ -2139,7 +2139,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Ada kesalahan dalam membuat Jadwal Kursus
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Expense Approver pertama dalam daftar akan ditetapkan sebagai Approver Approver default.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,tidak dapat lebih besar dari 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Anda harus menjadi pengguna selain Administrator dengan Manajer Sistem dan peran Pengelola Item untuk mendaftar di Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Anda harus menjadi pengguna selain Administrator dengan Manajer Sistem dan peran Pengelola Item untuk mendaftar di Marketplace.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Barang {0} bukan merupakan Barang persediaan
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Tidak Terjadwal
@@ -2168,7 +2168,7 @@
 DocType: HR Settings,Employee Settings,Pengaturan Karyawan
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Memuat Sistem Pembayaran
 ,Batch-Wise Balance History,Rekap Saldo menurut Kumpulan
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Baris # {0}: Tidak dapat menetapkan Nilai jika jumlahnya lebih besar dari jumlah yang ditagih untuk Item {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Baris # {0}: Tidak dapat menetapkan Nilai jika jumlahnya lebih besar dari jumlah yang ditagih untuk Item {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Pengaturan cetak diperbarui dalam format cetak terkait
 DocType: Package Code,Package Code,Kode paket
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Magang
@@ -2402,7 +2402,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} lowongan dan {1} anggaran untuk {2} sudah direncanakan untuk anak perusahaan dari {3}. \ Anda hanya dapat merencanakan hingga {4} lowongan dan anggaran {5} sesuai rencana kepegawaian {6} untuk perusahaan induk {3}.
 DocType: HR Settings,Stop Birthday Reminders,Stop Pengingat Ulang Tahun
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Silahkan mengatur default Payroll Hutang Akun di Perusahaan {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Silahkan mengatur default Payroll Hutang Akun di Perusahaan {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Dapatkan perpisahan keuangan dari Pajak dan biaya data oleh Amazon
 DocType: SMS Center,Receiver List,Daftar Penerima
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Cari Barang
@@ -2472,7 +2472,7 @@
 DocType: Vital Signs,Constipated,Sembelit
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Terhadap Faktur Supplier {0} di tanggal {1}
 DocType: Customer,Default Price List,Standar List Harga
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Gerakan aset catatan {0} dibuat
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Gerakan aset catatan {0} dibuat
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Tidak ada item yang ditemukan.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Anda tidak dapat menghapus Tahun Anggaran {0}. Tahun Fiskal {0} diatur sebagai default di Pengaturan Global
 DocType: Share Transfer,Equity/Liability Account,Akun Ekuitas / Kewajiban
@@ -2609,6 +2609,7 @@
 DocType: Blanket Order,Order Type,Tipe Order
 ,Item-wise Sales Register,Item-wise Daftar Penjualan
 DocType: Asset,Gross Purchase Amount,Jumlah Pembelian Gross
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kode Barang&gt; Kelompok Barang&gt; Merek
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Saldo awal
 DocType: Asset,Depreciation Method,Metode penyusutan
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Apakah Pajak ini termasuk dalam Basic Rate?
@@ -2689,7 +2690,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Tindakan jika Anggaran Tahunan Terlampaui pada PO
 DocType: Student Leave Application,Student Leave Application,Mahasiswa Cuti Aplikasi
 DocType: Item,Will also apply for variants,Juga akan berlaku untuk varian
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Aset tidak dapat dibatalkan, karena sudah {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Aset tidak dapat dibatalkan, karena sudah {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Karyawan {0} tentang Half hari {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Jumlah jam kerja tidak boleh lebih besar dari max jam kerja {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Nyala
@@ -2713,6 +2714,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Ambil Data
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Cuti maksimum yang diizinkan dalam jenis cuti {0} adalah {1}
 DocType: SMS Center,Create Receiver List,Buat Daftar Penerima
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Tanggal tersedia untuk digunakan harus setelah tanggal pembelian
 DocType: Vehicle,Wheels,roda
 DocType: Packing Slip,To Package No.,Untuk Paket No
 DocType: Patient Relation,Family,Keluarga
@@ -2726,7 +2728,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Mata uang penagihan harus sama dengan mata uang perusahaan atau mata uang akun tertagih
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Menunjukkan bahwa paket tersebut merupakan bagian dari pengiriman ini (Hanya Draft)
 DocType: Soil Texture,Loam,Lempung
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Baris {0}: Tanggal Jatuh Tempo tidak boleh sebelum tanggal posting
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Baris {0}: Tanggal Jatuh Tempo tidak boleh sebelum tanggal posting
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Buat Entri Pembayaran
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Kuantitas untuk Item {0} harus kurang dari {1}
 ,Sales Invoice Trends,Trend Faktur Penjualan
@@ -2798,7 +2800,7 @@
 DocType: Guardian,Guardian Interests,wali Minat
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Perbarui Nama / Nomor Akun
 DocType: Naming Series,Current Value,Nilai saat ini
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Beberapa tahun fiskal ada untuk tanggal {0}. Silakan set perusahaan di Tahun Anggaran
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Beberapa tahun fiskal ada untuk tanggal {0}. Silakan set perusahaan di Tahun Anggaran
 DocType: Education Settings,Instructor Records to be created by,Catatan Instruktur yang akan dibuat oleh
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} dibuat
 DocType: GST Account,GST Account,Akun GST
@@ -2816,7 +2818,7 @@
 DocType: Sales Person,Name and Employee ID,Nama dan ID Karyawan
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Tanggal jatuh tempo tidak bisa sebelum Tanggal Posting
 DocType: Website Item Group,Website Item Group,Situs Stok Barang Grup
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Tidak ada slip gaji yang ditemukan untuk memenuhi kriteria yang dipilih di atas ATAU slip gaji yang telah diajukan
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Tidak ada slip gaji yang ditemukan untuk memenuhi kriteria yang dipilih di atas ATAU slip gaji yang telah diajukan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Tarif dan Pajak
 DocType: Projects Settings,Projects Settings,Pengaturan Proyek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Harap masukkan tanggal Referensi
@@ -2825,7 +2827,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Qty Disupply
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Item Permintaan Material
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Harap batalkan Tanda Terima Pembelian {0} terlebih dahulu
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Harap batalkan Tanda Terima Pembelian {0} terlebih dahulu
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Tree Item Grup.
 DocType: Production Plan,Total Produced Qty,Total Diproduksi Qty
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Tidak dapat merujuk nomor baris yang lebih besar dari atau sama dengan nomor baris saat ini untuk jenis Biaya ini
@@ -2934,6 +2936,7 @@
 ,Vehicle Expenses,Beban kendaraan
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Buat Uji Lab (s) pada Pengiriman Faktur Penjualan
 DocType: Serial No,Invoice Details,Detail faktur
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Harap aktifkan Pengaturan Google Maps untuk memperkirakan dan mengoptimalkan rute
 DocType: Grant Application,Show on Website,Tampilkan di Website
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Mulai dari
 DocType: Hub Tracked Item,Hub Category,Kategori Hub
@@ -2973,7 +2976,7 @@
 DocType: Inpatient Record,B Positive,B Positif
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Manfaat maksimum karyawan {0} melebihi {1} dengan jumlah {2} dari jumlah yang diklaim sebelumnya
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty harus 1, sebagai item aset tetap. Silakan gunakan baris terpisah untuk beberapa qty."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty harus 1, sebagai item aset tetap. Silakan gunakan baris terpisah untuk beberapa qty."
 DocType: Leave Block List Allow,Leave Block List Allow,Cuti Block List Izinkan
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Singkatan tidak boleh kosong atau spasi
 DocType: Patient Medical Record,Patient Medical Record,Catatan Medis Pasien
@@ -3007,7 +3010,7 @@
 DocType: Workstation,Wages per hour,Upah per jam
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Saldo Persediaan di Batch {0} akan menjadi negatif {1} untuk Barang {2} di Gudang {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Berikut Permintaan Bahan telah dibesarkan secara otomatis berdasarkan tingkat re-order Item
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Akun {0} tidak berlaku. Mata Uang Akun harus {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Akun {0} tidak berlaku. Mata Uang Akun harus {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Dari Tanggal {0} tidak boleh setelah Tanggal Pelepasan karyawan {1}
 DocType: Supplier,Is Internal Supplier,Apakah Pemasok Internal
 DocType: Employee,Create User Permission,Buat Izin Pengguna
@@ -3151,7 +3154,7 @@
 DocType: Account,Fixed Asset,Asset Tetap
 DocType: Amazon MWS Settings,After Date,Setelah Tanggal
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Persediaan memiliki serial
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Tidak valid {0} untuk Faktur Perusahaan Inter.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Tidak valid {0} untuk Faktur Perusahaan Inter.
 ,Department Analytics,Analisis Departemen
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Email tidak ditemukan dalam kontak default
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Hasilkan Rahasia
@@ -3163,7 +3166,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Program di Struktur Biaya dan Kelompok Pelajar {0} berbeda.
 DocType: Bank Statement Transaction Entry,Receivable Account,Akun Piutang
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Tanggal Berlaku Sejak Tanggal harus lebih rendah dari Tanggal Upto Berlaku.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Row # {0}: Aset {1} sudah {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Row # {0}: Aset {1} sudah {2}
 DocType: Quotation Item,Stock Balance,Saldo Persediaan
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Nota Penjualan untuk Pembayaran
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,CEO
@@ -3205,6 +3208,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Debit Untuk diperlukan
 DocType: Clinical Procedure,Inpatient Record,Rekam Rawat Inap
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets membantu melacak waktu, biaya dan penagihan untuk kegiatan yang dilakukan oleh tim Anda"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Pemasok&gt; Jenis Pemasok
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Pembelian Daftar Harga
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Tanggal Transaksi
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Template dari variabel scorecard pemasok.
@@ -3247,7 +3251,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Efek Gain / Loss
 DocType: Opportunity,Lost Reason,Alasan Kehilangan
 DocType: Amazon MWS Settings,Enable Amazon,Aktifkan Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Baris # {0}: Akun {1} bukan milik perusahaan {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Baris # {0}: Akun {1} bukan milik perusahaan {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Tidak dapat menemukan DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Alamat baru
 DocType: Quality Inspection,Sample Size,Ukuran Sampel
@@ -3358,7 +3362,7 @@
 DocType: Water Analysis,Origin,Asal
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dokumen ini adalah lebih dari batas oleh {0} {1} untuk item {4}. Apakah Anda membuat yang lain {3} terhadap yang sama {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Silahkan mengatur berulang setelah menyimpan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Pilih akun berubah jumlah
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Pilih akun berubah jumlah
 DocType: Purchase Invoice,Price List Currency,Daftar Harga Mata uang
 DocType: Naming Series,User must always select,Pengguna harus selalu pilih
 DocType: Stock Settings,Allow Negative Stock,Izinkan persediaan negatif
@@ -3400,7 +3404,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Yakin ingin membatalkan janji temu ini?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Paket Harga Kamar Hotel
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Pipeline penjualan
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Silakan set account default di Komponen Gaji {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Silakan set account default di Komponen Gaji {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Diperlukan pada
 DocType: Rename Tool,File to Rename,Nama File untuk Diganti
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Silakan pilih BOM untuk Item di Row {0}
@@ -3421,7 +3425,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Biaya Produk Dibeli
 DocType: Employee Separation,Employee Separation Template,Template Pemisahan Karyawan
 DocType: Selling Settings,Sales Order Required,Nota Penjualan Diperlukan
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Menjadi Penjual
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Menjadi Penjual
 DocType: Purchase Invoice,Credit To,Kredit Untuk
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Prospek / Pelanggan Aktif
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Biarkan kosong untuk menggunakan format Catatan Pengiriman standar
@@ -3462,7 +3466,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Buat Template Pajak
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum pengguna
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Bahan baku tidak boleh kosong.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Baris # {0} (Tabel Pembayaran): Jumlah harus negatif
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Baris # {0} (Tabel Pembayaran): Jumlah harus negatif
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Tidak bisa memperbarui persediaan, faktur berisi barang titipan."
 DocType: Contract,Fulfilment Status,Status Pemenuhan
 DocType: Lab Test Sample,Lab Test Sample,Sampel Uji Lab
@@ -3621,7 +3625,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Tanggal Dokumen
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Biaya Rekaman Dibuat - {0}
 DocType: Asset Category Account,Asset Category Account,Aset Kategori Akun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Baris # {0} (Tabel Pembayaran): Jumlah harus positif
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Baris # {0} (Tabel Pembayaran): Jumlah harus positif
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Tidak dapat menghasilkan lebih Stok Barang {0} daripada kuantitas Sales Order {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Pilih Nilai Atribut
 DocType: Purchase Invoice,Reason For Issuing document,Alasan untuk menerbitkan dokumen
@@ -3676,7 +3680,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Waktu di mana bahan yang diterima
 DocType: Products Settings,Products per Page,Produk per Halaman
 DocType: Stock Ledger Entry,Outgoing Rate,Tingkat keluar
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,atau
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,atau
 DocType: Sales Order,Billing Status,Status Penagihan
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Laporkan Masalah
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Beban utilitas
@@ -3703,7 +3707,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Deklarasi Pembebasan Pajak Karyawan
 DocType: Payment Entry,Cheque/Reference Date,Cek / Tanggal Referensi
 DocType: Purchase Invoice,Total Taxes and Charges,Jumlah Pajak dan Biaya
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Tanggal tersedia untuk digunakan dimasukkan sebagai tanggal terakhir
 DocType: Employee,Emergency Contact,Darurat Kontak
 DocType: Bank Reconciliation Detail,Payment Entry,Masuk pembayaran
 ,sales-browser,penjualan-browser
@@ -3749,6 +3752,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Apakah Pengembalian (Catatan Kredit)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Mulai Pekerjaan
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},No serial diperlukan untuk aset {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Silakan tetapkan Seri Penamaan untuk {0} melalui Pengaturan&gt; Pengaturan&gt; Seri Penamaan
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Template cacat tidak harus template default
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Untuk baris {0}: Masuki rencana qty
 DocType: Account,Income Account,Akun Penghasilan
@@ -3762,6 +3766,7 @@
 DocType: Loyalty Program,Help Section,Bagian Bantuan
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Sebelumnya
 DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility area
+DocType: Delivery Trip,Distance UOM,Jarak UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Batch Student membantu Anda melacak kehadiran, penilaian dan biaya untuk siswa"
 DocType: Payment Entry,Total Allocated Amount,Jumlah Total Dialokasikan
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Tetapkan akun inventaris default untuk persediaan perpetual
@@ -3803,7 +3808,7 @@
 DocType: Item Supplier,Item Supplier,Item Supplier
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Entrikan Item Code untuk mendapatkan bets tidak
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Silakan pilih nilai untuk {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Tidak ada item yang dipilih untuk transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Tidak ada item yang dipilih untuk transfer
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Semua Alamat
 DocType: Company,Stock Settings,Pengaturan Persediaan
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Penggabungan ini hanya mungkin jika sifat berikut yang sama di kedua catatan. Apakah Group, Akar Jenis, Perusahaan"
@@ -4088,7 +4093,7 @@
 DocType: Patient,Personal and Social History,Sejarah Pribadi dan Sosial
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Pengguna {0} dibuat
 DocType: Fee Schedule,Fee Breakup for each student,Fee Breakup untuk setiap siswa
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total muka ({0}) terhadap Orde {1} tidak dapat lebih besar dari Grand Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total muka ({0}) terhadap Orde {1} tidak dapat lebih besar dari Grand Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Pilih Distribusi bulanan untuk merata mendistribusikan target di bulan.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Ubah Kode
 DocType: Purchase Invoice Item,Valuation Rate,Tingkat Penilaian
@@ -4097,7 +4102,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Dilengkapi ITC Cess
 ,Student Monthly Attendance Sheet,Mahasiswa Lembar Kehadiran Bulanan
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Aturan pengiriman hanya berlaku untuk penjualan
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Depreciation Row {0}: Next Depreciation Date tidak boleh sebelum Tanggal Pembelian
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Depreciation Row {0}: Next Depreciation Date tidak boleh sebelum Tanggal Pembelian
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Tanggal Project Mulai
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Sampai
 DocType: Rename Tool,Rename Log,Log Riwayat Ganti Nama
@@ -4114,12 +4119,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Seberapa sering proyek dan perusahaan harus diperbarui berdasarkan Transaksi Penjualan.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Kadaluarsa pada
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Tambahkan Siswa
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Harap hapus Employee <a href=""#Form/Employee/{0}"">{0}</a> \ untuk membatalkan dokumen ini"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Silahkan pilih {0}
 DocType: C-Form,C-Form No,C-Form ada
 DocType: BOM,Exploded_items,Pembesaran Item
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Jarak
+DocType: Delivery Stop,Distance,Jarak
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Cantumkan produk atau layanan yang Anda beli atau jual.
 DocType: Water Analysis,Storage Temperature,Suhu Penyimpanan
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4146,7 +4149,7 @@
 DocType: Homepage,Company Description for website homepage,Deskripsi Perusahaan untuk homepage website
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Untuk kenyamanan pelanggan, kode ini dapat digunakan dalam format cetak seperti Faktur dan Nota Pengiriman"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nama suplier
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Tidak dapat mengambil informasi untuk {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Tidak dapat mengambil informasi untuk {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Membuka Entri Jurnal
 DocType: Contract,Fulfilment Terms,Syarat Pemenuhan
 DocType: Sales Invoice,Time Sheet List,Waktu Daftar Lembar
@@ -4326,7 +4329,7 @@
 DocType: Serial No,Warranty / AMC Details,Garansi / Detail AMC
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Pilih siswa secara manual untuk Activity based Group
 DocType: Journal Entry,User Remark,Keterangan Pengguna
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Mengoptimalkan rute.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Mengoptimalkan rute.
 DocType: Travel Itinerary,Non Diary,Non Diary
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Tidak dapat membuat Bonus Retensi untuk Karyawan yang ditinggalkan
 DocType: Lead,Market Segment,Segmen Pasar
@@ -4356,7 +4359,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Program loyalitas
 DocType: Student Guardian,Father,Ayah
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Tiket Dukungan
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,'Pembaruan Persediaan’ tidak dapat ditandai untuk penjualan aset tetap
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,'Pembaruan Persediaan’ tidak dapat ditandai untuk penjualan aset tetap
 DocType: Bank Reconciliation,Bank Reconciliation,Rekonsiliasi Bank
 DocType: Attendance,On Leave,Sedang cuti
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Dapatkan Perbaruan
@@ -4401,7 +4404,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serial dan Batch
 DocType: Warranty Claim,From Company,Dari Perusahaan
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Jumlah Skor Kriteria Penilaian perlu {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Silakan mengatur Jumlah Penyusutan Dipesan
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Silakan mengatur Jumlah Penyusutan Dipesan
 DocType: Supplier Scorecard Period,Calculations,Perhitungan
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Nilai atau Qty
 DocType: Payment Terms Template,Payment Terms,Syarat pembayaran
@@ -4420,7 +4423,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Discount (%) pada Price List Rate dengan Margin
 DocType: Healthcare Service Unit Type,Rate / UOM,Rate / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Semua Gudang
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Tidak ada {0} ditemukan untuk Transaksi Perusahaan Inter.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Tidak ada {0} ditemukan untuk Transaksi Perusahaan Inter.
 DocType: Travel Itinerary,Rented Car,Mobil sewaan
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Tentang Perusahaan Anda
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Kredit Untuk akun harus rekening Neraca
@@ -4521,6 +4524,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Kriteria Analisis Tanaman
 DocType: Cheque Print Template,Cheque Height,Cek Tinggi
 DocType: Supplier,Supplier Details,Rincian Supplier
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Silakan mengatur seri penomoran untuk Kehadiran melalui Pengaturan&gt; Seri Penomoran
 DocType: Setup Progress,Setup Progress,Setup Progress
 DocType: Expense Claim,Approval Status,Approval Status
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Dari nilai harus kurang dari nilai dalam baris {0}
@@ -4613,7 +4617,6 @@
 DocType: Travel Request,Fully Sponsored,Sepenuhnya Disponsori
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Masuk Balik Jurnal
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Pelanggan {0} dibuat
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Silakan mengatur Sistem Penamaan Karyawan di Sumber Daya Manusia&gt; Pengaturan SDM
 DocType: Stock Settings,Limit Percent,batas Persen
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Saat ini tidak ada persediaan di gudang manapun
 ,Payment Period Based On Invoice Date,Masa Pembayaran Berdasarkan Faktur Tanggal
@@ -4672,7 +4675,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Sumber Gudang
 DocType: Installation Note,Installation Date,Instalasi Tanggal
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Berbagi Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Aset {1} bukan milik perusahaan {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Aset {1} bukan milik perusahaan {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Faktur Penjualan {0} dibuat
 DocType: Employee,Confirmation Date,Konfirmasi Tanggal
 DocType: Inpatient Occupancy,Check Out,Periksa
@@ -4692,6 +4695,7 @@
 DocType: Production Plan,Sales Orders Detail,Detail Pesanan Penjualan
 DocType: Bin,Requested Quantity,diminta Kuantitas
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Silakan siapkan Sistem Penamaan Pengajar di Pendidikan&gt; Pengaturan Pendidikan
 DocType: Patient,Marital Status,Status Perkawinan
 DocType: Stock Settings,Auto Material Request,Permintaan Material Otomatis
 DocType: Woocommerce Settings,API consumer secret,Rahasia konsumen API
@@ -4744,7 +4748,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Pilih Hari
 DocType: Academic Term,Term Name,istilah Nama
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Kredit ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Menciptakan Slip Gaji ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Menciptakan Slip Gaji ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Anda tidak dapat mengedit simpul root.
 DocType: Buying Settings,Purchase Order Required,Order Pembelian Diperlukan
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Timer
@@ -4780,7 +4784,7 @@
 DocType: Account,Rate at which this tax is applied,Tingkat di mana pajak ini diterapkan
 DocType: Cash Flow Mapper,Section Name,nama bagian
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Susun ulang Qty
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Baris Penyusutan {0}: Nilai yang diharapkan setelah masa manfaat harus lebih besar dari atau sama dengan {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Baris Penyusutan {0}: Nilai yang diharapkan setelah masa manfaat harus lebih besar dari atau sama dengan {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Job Openings saat
 DocType: Company,Stock Adjustment Account,Penyesuaian Akun Persediaan
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Mencoret
@@ -4827,7 +4831,7 @@
 DocType: Program Enrollment,School House,Asrama Sekolah
 DocType: Serial No,Out of AMC,Dari AMC
 DocType: Opportunity,Opportunity Amount,Jumlah Peluang
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Jumlah Penyusutan Memesan tidak dapat lebih besar dari total jumlah Penyusutan
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Jumlah Penyusutan Memesan tidak dapat lebih besar dari total jumlah Penyusutan
 DocType: Purchase Order,Order Confirmation Date,Tanggal Konfirmasi Pesanan
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Membuat Maintenance Visit
@@ -4868,7 +4872,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Batch:
 DocType: Volunteer,Afternoon,Sore
 DocType: Loyalty Program,Loyalty Program Help,Bantuan Program Loyalitas
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' dinonaktifkan
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' dinonaktifkan
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ditetapkan sebagai Terbuka
 DocType: Cheque Print Template,Scanned Cheque,Cek Terpindai
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Kirim email otomatis ke Kontak untuk Pengiriman transaksi.
@@ -4881,7 +4885,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Item dan Garansi Detail
 DocType: Chapter,Chapter Members,Anggota Bab
 DocType: Sales Team,Contribution (%),Kontribusi (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Catatan: Entry Pembayaran tidak akan dibuat karena 'Cash atau Rekening Bank tidak ditentukan
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Catatan: Entry Pembayaran tidak akan dibuat karena 'Cash atau Rekening Bank tidak ditentukan
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Project {0} sudah ada
 DocType: Clinical Procedure,Nursing User,Pengguna perawatan
 DocType: Employee Benefit Application,Payroll Period,Periode Penggajian
@@ -4889,6 +4893,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Serial No {0} bukan milik Batch {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Tanggung Jawab
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Masa berlaku dari kutipan ini telah berakhir.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Harap hapus Employee <a href=""#Form/Employee/{0}"">{0}</a> \ untuk membatalkan dokumen ini"
 DocType: Expense Claim Account,Expense Claim Account,Akun Beban Klaim
 DocType: Account,Capital Work in Progress,Modal Bekerja dalam Kemajuan
 DocType: Accounts Settings,Allow Stale Exchange Rates,Izinkan Menggunakan Nilai Tukar Kaldaluarsa
@@ -4969,7 +4975,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Isu Material
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Hubungkan Shopify dengan ERPNext
 DocType: Material Request Item,For Warehouse,Untuk Gudang
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Catatan Pengiriman {0} diperbarui
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Catatan Pengiriman {0} diperbarui
 DocType: Employee,Offer Date,Penawaran Tanggal
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Penawaran
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Anda berada dalam mode offline. Anda tidak akan dapat memuat sampai Anda memiliki jaringan.
@@ -5019,7 +5025,7 @@
 DocType: Shipping Rule,Calculate Based On,Hitung Berbasis On
 DocType: Contract,Unfulfilled,Tidak terpenuhi
 DocType: Delivery Note Item,From Warehouse,Dari Gudang
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Tidak ada karyawan untuk kriteria tersebut
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Tidak ada karyawan untuk kriteria tersebut
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Tidak ada Item dengan Bill of Material untuk Industri
 DocType: Shopify Settings,Default Customer,Pelanggan default
 DocType: Sales Stage,Stage Name,Nama panggung
@@ -5061,7 +5067,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Jumlah pajak Setelah Diskon Jumlah
 DocType: Patient,Inpatient Status,Status Rawat Inap
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Pengaturan Kerja Ringkasan Harian
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Daftar Harga yang Dipilih harus memiliki bidang penjualan dan pembelian yang dicentang.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Daftar Harga yang Dipilih harus memiliki bidang penjualan dan pembelian yang dicentang.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Masukkan Reqd menurut Tanggal
 DocType: Payment Entry,Internal Transfer,internal transfer
 DocType: Asset Maintenance,Maintenance Tasks,Tugas pemeliharaan
@@ -5097,7 +5103,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Kelompok Dengan
 DocType: Guardian,Interests,minat
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Mengaktifkan / menonaktifkan mata uang.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Tidak dapat mengirim beberapa Slip Gaji
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Tidak dapat mengirim beberapa Slip Gaji
 DocType: Exchange Rate Revaluation,Get Entries,Dapatkan Entri
 DocType: Production Plan,Get Material Request,Dapatkan Material Permintaan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Beban pos
@@ -5181,7 +5187,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Rekening pengeluaran adalah wajib untuk item {0}
 DocType: BOM,Website Description,Website Description
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Perubahan Bersih Ekuitas
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Batalkan Purchase Invoice {0} pertama
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Batalkan Purchase Invoice {0} pertama
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Tidak diperbolehkan. Harap nonaktifkan Jenis Unit Layanan
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Alamat Email harus unik, sudah ada untuk {0}"
 DocType: Serial No,AMC Expiry Date,Tanggal Kadaluarsa AMC
@@ -5221,7 +5227,7 @@
 DocType: Hotel Room,Hotel Room,Ruang hotel
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Akun {0} bukan milik perusahaan {1}
 DocType: Leave Type,Rounding,Pembulatan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Nomor Seri di baris {0} tidak cocok dengan Catatan Pengiriman
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Nomor Seri di baris {0} tidak cocok dengan Catatan Pengiriman
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Jumlah Dispensing (Pro-rated)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Kemudian Aturan Penetapan Harga disaring berdasarkan Pelanggan, Grup Pelanggan, Wilayah, Pemasok, Grup Pemasok, Kampanye, Mitra Penjualan, dll."
 DocType: Student,Guardian Details,Detail wali
@@ -5276,7 +5282,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Gudang diperlukan untuk Barang Persediaan{0}
 DocType: Leave Allocation,Unused leaves,cuti terpakai
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Buat Entri Pembayaran
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Semua Departemen
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Semua Departemen
 DocType: Healthcare Service Unit,Vacant,Kosong
 DocType: Patient,Alcohol Past Use,Penggunaan Alkohol yang sebelumnya
 DocType: Fertilizer Content,Fertilizer Content,Isi pupuk
@@ -5287,7 +5293,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Perintah Kerja {0} harus dibatalkan sebelum membatalkan Sales Order ini
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Fetch meledak BOM (termasuk sub-rakitan)
 DocType: Authorization Rule,Applicable To (Employee),Berlaku Untuk (Karyawan)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Due Date adalah wajib
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Due Date adalah wajib
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Kenaikan untuk Atribut {0} tidak dapat 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Jenis dan Jumlah Manfaat
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Kamar yang dipesan
@@ -5431,7 +5437,7 @@
 DocType: Purchase Invoice Item,Total Weight,Berat keseluruhan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Komisi Penjualan
 DocType: Job Offer Term,Value / Description,Nilai / Keterangan
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Aset {1} tidak dapat disampaikan, itu sudah {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Aset {1} tidak dapat disampaikan, itu sudah {2}"
 DocType: Tax Rule,Billing Country,Negara Penagihan
 DocType: Purchase Order Item,Expected Delivery Date,Diharapkan Pengiriman Tanggal
 DocType: Restaurant Order Entry,Restaurant Order Entry,Entri Pemesanan Restoran
@@ -5470,12 +5476,13 @@
 DocType: Maintenance Visit,Breakdown,Rincian
 DocType: Travel Itinerary,Vegetarian,Vegetarian
 DocType: Patient Encounter,Encounter Date,Tanggal Pertemuan
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Account: {0} dengan mata uang: {1} tidak dapat dipilih
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Account: {0} dengan mata uang: {1} tidak dapat dipilih
 DocType: Bank Statement Transaction Settings Item,Bank Data,Data Bank
 DocType: Purchase Receipt Item,Sample Quantity,Jumlah sampel
 DocType: Bank Guarantee,Name of Beneficiary,Nama Penerima Manfaat
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Perbarui biaya BOM secara otomatis melalui Penjadwalan, berdasarkan hitungan penilaian / daftar harga / hitungan pembelian bahan baku terakhir."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Pemasok&gt; Grup Pemasok
 DocType: Bank Reconciliation Detail,Cheque Date,Cek Tanggal
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Akun {0}: akun Induk {1} bukan milik perusahaan: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Berhasil dihapus semua transaksi yang terkait dengan perusahaan ini!
@@ -5503,7 +5510,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,node anak hanya dapat dibuat di bawah &#39;Grup&#39; Jenis node
 DocType: Attendance Request,Half Day Date,Tanggal Setengah Hari
 DocType: Academic Year,Academic Year Name,Nama Tahun Akademis
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} tidak diizinkan bertransaksi dengan {1}. Harap ubah Perusahaan.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} tidak diizinkan bertransaksi dengan {1}. Harap ubah Perusahaan.
 DocType: Sales Partner,Contact Desc,Contact Info
 DocType: Email Digest,Send regular summary reports via Email.,Mengirim laporan ringkasan berkala melalui Email.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Silakan set account default di Beban Klaim Jenis {0}
@@ -5536,7 +5543,7 @@
 DocType: Hotel Room,Hotel Manager,Manajer hotel
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Set Peraturan Pajak untuk keranjang belanja
 DocType: Purchase Invoice,Taxes and Charges Added,Pajak dan Biaya Ditambahkan
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Depreciation Row {0}: Next Depreciation Date tidak boleh sebelum Tersedia-untuk-digunakan Tanggal
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Depreciation Row {0}: Next Depreciation Date tidak boleh sebelum Tersedia-untuk-digunakan Tanggal
 ,Sales Funnel,Penjualan Saluran
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Singkatan wajib diisi
 DocType: Project,Task Progress,tugas Kemajuan
@@ -5550,7 +5557,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Semua Kelompok Pelanggan
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,akumulasi Bulanan
 DocType: Attendance Request,On Duty,Sedang bertugas
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin data Kurs Mata Uang tidak dibuat untuk {1} sampai {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin data Kurs Mata Uang tidak dibuat untuk {1} sampai {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Rencana Kepegawaian {0} sudah ada untuk penunjukan {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Template pajak adalah wajib.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Akun {0}: akun Induk {1} tidak ada
@@ -5629,11 +5636,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Setidaknya satu gudang adalah wajib
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Konfigurasikan Item Fields seperti UOM, Item Group, Deskripsi dan No of Hours."
 DocType: Certification Application,Certification Status,Status Sertifikasi
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Marketplace
 DocType: Travel Itinerary,Travel Advance Required,Diperlukan Advance Travel
 DocType: Subscriber,Subscriber Name,Nama Subscriber
 DocType: Serial No,Out of Warranty,Out of Garansi
-DocType: Cashier Closing,Cashier-closing-,Penutupan kasir
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Dipetakan Jenis Data
 DocType: BOM Update Tool,Replace,Mengganti
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Tidak ditemukan produk.
@@ -5720,7 +5726,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Template pajak default untuk penjualan dan pembelian telah dibuat.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Catatan Hasil Penilaian {0} sudah ada.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Contoh: ABCD. #####. Jika seri disetel dan Batch No tidak disebutkan dalam transaksi, maka nomor bets otomatis akan dibuat berdasarkan seri ini. Jika Anda selalu ingin menyebutkan secara eksplisit Batch No untuk item ini, biarkan ini kosong. Catatan: pengaturan ini akan menjadi prioritas di atas Awalan Seri Penamaan dalam Pengaturan Stok."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Silakan mengatur seri penomoran untuk Kehadiran melalui Pengaturan&gt; Seri Penomoran
 DocType: BOM,Materials Required (Exploded),Bahan yang dibutuhkan (Meledak)
 DocType: Contract,Party User,Pengguna Partai
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Harap tentukan filter Perusahaan jika Group By &#39;Company&#39;
@@ -5921,7 +5926,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Tanggal Awal Periode Uji Coba dan Tanggal Akhir Periode Uji Coba harus ditetapkan
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Harga rata-rata
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Jumlah Pembayaran Total dalam Jadwal Pembayaran harus sama dengan Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Jumlah Pembayaran Total dalam Jadwal Pembayaran harus sama dengan Grand / Rounded Total
 DocType: Subscription Plan Detail,Plan,Rencana
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Saldo Laporan Bank sesuai Buku Besar
 DocType: Job Applicant,Applicant Name,Nama Pemohon
@@ -5990,7 +5995,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sabun & Deterjen
 DocType: BOM,Show Items,Tampilkan Produk
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Dari waktu tidak dapat lebih besar dari Untuk Waktu.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Apakah Anda ingin memberi tahu semua pelanggan melalui email?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Apakah Anda ingin memberi tahu semua pelanggan melalui email?
 DocType: Subscription Plan,Billing Interval,Interval Penagihan
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordered
@@ -5999,9 +6004,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Baris {0}: {1} harus lebih besar dari 0
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteria penilaian Grup
 DocType: Healthcare Settings,Patient Name By,Nama Pasien Oleh
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Entri Jurnal Akrual untuk gaji dari {0} ke {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Entri Jurnal Akrual untuk gaji dari {0} ke {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Aktifkan Pendapatan Ditangguhkan
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Membuka Penyusutan Akumulasi harus kurang dari sama dengan {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Membuka Penyusutan Akumulasi harus kurang dari sama dengan {0}
 DocType: Warehouse,Warehouse Name,Nama Gudang
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Tanggal mulai yang sebenarnya harus kurang dari tanggal akhir yang sebenarnya
 DocType: Naming Series,Select Transaction,Pilih Transaksi
@@ -6152,7 +6157,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Karyawan {0} kelas {1} tidak memiliki kebijakan cuti default
 DocType: Salary Detail,Salary Detail,Detil gaji
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Silahkan pilih {0} terlebih dahulu
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Menambahkan {0} pengguna
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Menambahkan {0} pengguna
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","Dalam kasus program multi-tier, Pelanggan akan ditugaskan secara otomatis ke tingkat yang bersangkutan sesuai yang mereka habiskan"
 DocType: Appointment Type,Physician,Dokter
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Kumpulan {0} Barang {1} telah berakhir.
@@ -6296,7 +6301,7 @@
 DocType: Asset,Custodian,Pemelihara
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Profil Point of Sale
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} harus bernilai antara 0 dan 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Pembayaran {0} dari {1} ke {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Pembayaran {0} dari {1} ke {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Pinjaman tanpa Jaminan
 DocType: Cost Center,Cost Center Name,Nama Pusat Biaya
 DocType: Student,B+,B +
@@ -6328,6 +6333,7 @@
 DocType: Employee,Date of Issue,Tanggal Issue
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Sesuai dengan Setelan Pembelian jika Diperlukan Pembelian Diperlukan == &#39;YA&#39;, maka untuk membuat Purchase Invoice, pengguna harus membuat Purchase Receipt terlebih dahulu untuk item {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Row # {0}: Set Supplier untuk item {1}
+DocType: Global Defaults,Default Distance Unit,Unit Jarak Default
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Row {0}: nilai Jam harus lebih besar dari nol.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Website Image {0} melekat Butir {1} tidak dapat ditemukan
 DocType: Issue,Content Type,Tipe Konten
@@ -6383,7 +6389,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Debit Untuk akun harus rekening Neraca
 DocType: Asset,Naming Series,Series Penamaan
 DocType: Vital Signs,Coated,Dilapisi
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Baris {0}: Nilai yang Diharapkan Setelah Berguna Hidup harus kurang dari Jumlah Pembelian Kotor
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Baris {0}: Nilai yang Diharapkan Setelah Berguna Hidup harus kurang dari Jumlah Pembelian Kotor
 DocType: GoCardless Settings,GoCardless Settings,Pengaturan GoCardless
 DocType: Leave Block List,Leave Block List Name,Cuti Nama Block List
 DocType: Certified Consultant,Certification Validity,Validitas Sertifikasi
@@ -6450,6 +6456,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Header Bank
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Lihat Tes Lab
 DocType: Hub Users,Hub Users,Pengguna Hub
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Grup Pelanggan&gt; Wilayah
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Tanggal Pemeliharaan
 DocType: Purchase Invoice Item,Rejected Serial No,Serial No Barang Ditolak
@@ -6465,7 +6472,7 @@
 DocType: SG Creation Tool Course,Max Strength,Max Kekuatan
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Menginstal preset
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Tidak ada Catatan Pengiriman yang dipilih untuk Pelanggan {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Tidak ada Catatan Pengiriman yang dipilih untuk Pelanggan {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Karyawan {0} tidak memiliki jumlah manfaat maksimal
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Pilih Item berdasarkan Tanggal Pengiriman
 DocType: Grant Application,Has any past Grant Record,Memiliki Record Grant masa lalu
@@ -6492,7 +6499,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Reservasi Kamar Hotel
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Layanan Pelanggan
 DocType: BOM,Thumbnail,Kuku ibu jari
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Tidak ada kontak dengan ID email yang ditemukan.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Tidak ada kontak dengan ID email yang ditemukan.
 DocType: Item Customer Detail,Item Customer Detail,Rincian Barang Pelanggan
 DocType: Notification Control,Prompt for Email on Submission of,Minta Email untuk Pengiriman
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Jumlah tunjangan maksimum karyawan {0} melebihi {1}
@@ -6747,7 +6754,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,Tidak dapat mengkonversi ke Grup karena Tipe Akun dipilih.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} telah diubah. Silahkan refresh.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Menghentikan pengguna dari membuat Aplikasi Leave pada hari-hari berikutnya.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kode Barang&gt; Kelompok Barang&gt; Merek
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Jika kadaluwarsa tak terbatas untuk Poin Loyalitas, biarkan Durasi Kedaluwarsa kosong atau 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Anggota Tim Pemeliharaan
 DocType: Loyalty Point Entry,Purchase Amount,Jumlah pembelian
@@ -6755,7 +6761,7 @@
 											to fullfill Sales Order {2}",Tidak dapat memberikan Serial No {0} item {1} sebagaimana dicadangkan \ untuk memenuhi Sales Order {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Pemasok Quotation {0} dibuat
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Akhir Tahun tidak boleh sebelum Mulai Tahun
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Akhir Tahun tidak boleh sebelum Mulai Tahun
 DocType: Employee Benefit Application,Employee Benefits,Manfaat Karyawan
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Dikemas kuantitas harus sama kuantitas untuk Item {0} berturut-turut {1}
 DocType: Work Order,Manufactured Qty,Qty Diproduksi
@@ -6771,6 +6777,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Pilih Batch Numbers
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Ke GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Tagihan diajukan ke Pelanggan.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Silakan mengatur Sistem Penamaan Karyawan di Sumber Daya Manusia&gt; Pengaturan SDM
 DocType: Healthcare Settings,Invoice Appointments Automatically,Penunjukan Faktur Secara Otomatis
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Proyek Id
 DocType: Salary Component,Variable Based On Taxable Salary,Variabel Berdasarkan Gaji Kena Pajak
@@ -6819,7 +6826,7 @@
 DocType: POS Profile,Account for Change Amount,Akun untuk Perubahan Jumlah
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Menghubungkan ke QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Total Keuntungan / Kerugian
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Perusahaan Tidak Sah untuk Faktur Perusahaan Inter.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Perusahaan Tidak Sah untuk Faktur Perusahaan Inter.
 DocType: Purchase Invoice,input service,masukan layanan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partai / Rekening tidak sesuai dengan {1} / {2} di {3} {4}
 DocType: Employee Promotion,Employee Promotion,Promosi Karyawan
@@ -6949,7 +6956,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Area Pilihan untuk Penginapan
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Cart adalah Kosong
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Silakan siapkan Sistem Penamaan Pengajar di Pendidikan&gt; Pengaturan Pendidikan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Item {0} tidak memiliki Serial No. Hanya item berurutan \ dapat melakukan pengiriman berdasarkan Nomor Seri
 DocType: Vehicle,Model,Model
@@ -6979,7 +6985,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Tidak ada yang berubah
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Silakan pilih file csv
 DocType: Holiday List,Total Holidays,Total Hari Libur
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Template email tidak ada untuk dikirim. Silakan set satu di Pengaturan Pengiriman.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Template email tidak ada untuk dikirim. Silakan set satu di Pengaturan Pengiriman.
 DocType: Student Leave Application,Mark as Present,Tandai sebagai Hadir
 DocType: Supplier Scorecard,Indicator Color,Indikator Warna
 DocType: Purchase Order,To Receive and Bill,Untuk Diterima dan Ditagih
@@ -6988,7 +6994,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Pilih Serial No
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Perancang
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Syarat dan Ketentuan Template
-DocType: Serial No,Delivery Details,Detail Pengiriman
+DocType: Delivery Trip,Delivery Details,Detail Pengiriman
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Biaya Pusat diperlukan dalam baris {0} dalam tabel Pajak untuk tipe {1}
 DocType: Program,Program Code,Kode Program
 DocType: Terms and Conditions,Terms and Conditions Help,Syarat dan Ketentuan Bantuan
@@ -7012,7 +7018,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Hari Masa Tenggang
 DocType: Cash Flow Mapping,Is Income Tax Expense,Merupakan Beban Pajak Penghasilan
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Pesanan Anda keluar untuk pengiriman!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Posting Tanggal harus sama dengan tanggal pembelian {1} aset {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Posting Tanggal harus sama dengan tanggal pembelian {1} aset {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Periksa ini jika Siswa berada di Institute&#39;s Hostel.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Cukup masukkan Penjualan Pesanan dalam tabel di atas
 ,Stock Summary,Ringkasan Persediaan
diff --git a/erpnext/translations/is.csv b/erpnext/translations/is.csv
index d41ebb8..e5a624f 100644
--- a/erpnext/translations/is.csv
+++ b/erpnext/translations/is.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Nafn tímabils
 DocType: Employee,Salary Mode,laun Mode
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Nýskráning
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Nýskráning
 DocType: Patient,Divorced,skilin
 DocType: Support Settings,Post Route Key,Birta leiðarlykil
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Leyfa Atriði til að bæta við mörgum sinnum í viðskiptum
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Nýtt gengi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Gjaldmiðill er nauðsynlegt til verðlisti {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Verður að reikna í viðskiptunum.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Birgir&gt; Birgir Tegund
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,viðskiptavinur samband við
 DocType: Patient Appointment,Check availability,Athuga framboð
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,sýna opinn
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Series Uppfært Tókst
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Athuga
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} í röð {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} í röð {1}
 DocType: Asset Finance Book,Depreciation Start Date,Afskriftir upphafsdagur
 DocType: Pricing Rule,Apply On,gilda um
 DocType: Item Price,Multiple Item prices.,Margar Item verð.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Lab Prescription
 ,Delay Days,Frestur daga
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,þjónusta Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Raðnúmer: {0} er nú þegar vísað í sölureikning: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Raðnúmer: {0} er nú þegar vísað í sölureikning: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,reikningur
 DocType: Purchase Invoice Item,Item Weight Details,Vara þyngd upplýsingar
 DocType: Asset Maintenance Log,Periodicity,tíðni
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,endurskoðandi
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Selja verðskrá
 DocType: Patient,Tobacco Current Use,Núverandi notkun tóbaks
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Upphafsdagur og lokadagur er skarast við starfskortið <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Sala hlutfall
 DocType: Cost Center,Stock User,Stock User
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Tengdar
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Mæting dagsetning má ekki vera minna en inngöngu dagsetningu starfsmanns
 DocType: Grading Scale,Grading Scale Name,Flokkun Scale Name
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Bæta notendum við markaðinn
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Bæta notendum við markaðinn
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Þetta er rót reikningur og ekki hægt að breyta.
 DocType: Sales Invoice,Company Address,Nafn fyrirtækis
 DocType: BOM,Operations,aðgerðir
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Magn
 DocType: Production Plan,Material Request Detail,Efnisbeiðni Detail
 DocType: Selling Settings,Default Quotation Validity Days,Sjálfgefið útboðsdagur
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Til eru skatt í röð {0} í lið gengi, skatta í raðir {1} skal einnig"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Til eru skatt í röð {0} í lið gengi, skatta í raðir {1} skal einnig"
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Payroll Entry,Validate Attendance,Staðfesta staðfestingu
 DocType: Sales Invoice,Change Amount,Breyta Upphæð
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Línubil fyrir fjárhæð í orðum
 DocType: Vehicle,Additional Details,Önnur Nánar
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Engin lýsing gefin
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Birgir&gt; Birgir Group
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Beiðni um kaupin.
 DocType: POS Closing Voucher Details,Collected Amount,Söfnuður upphæð
 DocType: Lab Test,Submitted Date,Sendingardagur
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,Student Aðgangseyrir
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Liður {0} er hætt
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Afskriftir Róður {0}: Afskriftir Upphafsdagur er sleginn inn sem fyrri dagsetning
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Afskriftir Róður {0}: Afskriftir Upphafsdagur er sleginn inn sem fyrri dagsetning
 DocType: Contract Template,Fulfilment Terms and Conditions,Uppfyllingarskilmálar og skilyrði
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,efni Beiðni
 DocType: Bank Reconciliation,Update Clearance Date,Uppfæra Úthreinsun Dagsetning
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,Stillingar fyrir reikninga
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Birgir Invoice Nei er í kaupa Reikningar {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Stjórna velta manneskja Tree.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Get ekki unnið leið, þar sem stillingar Google Korta eru óvirk."
 DocType: Job Applicant,Cover Letter,Kynningarbréf
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Framúrskarandi Tékkar og Innlán til að hreinsa
 DocType: Item,Synced With Hub,Samstillt Með Hub
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Nýr eignvirði
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Gengi sem viðskiptavinir Gjaldmiðill er breytt til grunngj.miðil viðskiptavinarins
 DocType: Course Scheduling Tool,Course Scheduling Tool,Auðvitað Tímasetningar Tool
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Kaup Invoice ekki hægt að gera við núverandi eign {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Kaup Invoice ekki hægt að gera við núverandi eign {1}
 DocType: Crop Cycle,LInked Analysis,Linkað greining
 DocType: POS Closing Voucher,POS Closing Voucher,POS lokunarskírteini
 DocType: Contract,Lapsed,Horfið
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} er ekki skráður í námskeiðið {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Nafn nemanda:
 DocType: POS Closing Voucher Details,Difference,Mismunur
+DocType: Delivery Settings,Delay between Delivery Stops,Tafir milli afhendingarstöðva
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial Nei {0} ekki tilheyra afhendingarseðlinum {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Það virðist vera vandamál með GoCardless stillingar miðlara. Ekki hafa áhyggjur, ef bilun verður, þá færðu upphæðin endurgreiðslu á reikninginn þinn."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -693,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Magn og Rate
 DocType: Delivery Note,% Installed,% Uppsett
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,Kennslustofur / Laboratories etc þar fyrirlestra geta vera tímaáætlun.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Fyrirtækjafjármunir bæði fyrirtækjanna ættu að passa við viðskipti milli fyrirtækja.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Fyrirtækjafjármunir bæði fyrirtækjanna ættu að passa við viðskipti milli fyrirtækja.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Vinsamlegast sláðu inn nafn fyrirtækis fyrst
 DocType: Travel Itinerary,Non-Vegetarian,Non-Vegetarian
 DocType: Purchase Invoice,Supplier Name,Nafn birgja
@@ -778,7 +779,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Leigð frá dagsetningu
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Nóg Varahlutir til að byggja
 DocType: POS Profile User,POS Profile User,POS prófíl notandi
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Row {0}: Afskriftir upphafsdagur er krafist
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Row {0}: Afskriftir upphafsdagur er krafist
 DocType: Purchase Invoice Item,Service Start Date,Upphafsdagur þjónustunnar
 DocType: Subscription Invoice,Subscription Invoice,Áskriftargjald
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,bein Tekjur
@@ -845,7 +846,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Skammstöfun þegar notuð fyrir annað fyrirtæki
 DocType: Selling Settings,Default Customer Group,Sjálfgefið Group Viðskiptavinur
 DocType: Employee,IFSC Code,IFSC-kóði
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Upphafsdagur og lokadagur er skarast við starfskortið <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",Ef öryrkjar &#39;ávöl Samtals&#39; reitur verður ekki sýnilegt í öllum viðskiptum
 DocType: BOM,Operating Cost,Rekstrarkostnaður
 DocType: Crop,Produced Items,Framleiddir hlutir
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,Hindra RFQs
 DocType: Hub User,Hub User,Hub notandi
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Gera Velta Order
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Launasala lögð fyrir tímabil frá {0} til {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Launasala lögð fyrir tímabil frá {0} til {1}
 DocType: Project Task,Project Task,Project Task
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Innleyst stig
 ,Lead Id,Lead Id
@@ -1027,7 +1027,7 @@
 DocType: Fee Validity,Max number of visit,Hámarksfjöldi heimsókna
 ,Hotel Room Occupancy,Hótel herbergi umráð
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet búið:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Vinsamlegast settu sjálfgefinn Cash eða bankareikning í háttur á greiðslu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Vinsamlegast settu sjálfgefinn Cash eða bankareikning í háttur á greiðslu {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,innritast
 DocType: GST Settings,GST Settings,GST Stillingar
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Gjaldmiðill ætti að vera eins og verðskrá Gjaldmiðill: {0}
@@ -1081,7 +1081,7 @@
 DocType: Vehicle Log,Service Details,Upplýsingar um þjónustu
 DocType: Lab Test Template,Grouped,Flokkað
 DocType: Selling Settings,Delivery Note Required,Afhending Note Áskilið
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Sendi launakort ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Sendi launakort ...
 DocType: Bank Guarantee,Bank Guarantee Number,Bankareikningsnúmer
 DocType: Assessment Criteria,Assessment Criteria,Námsmat Viðmið
 DocType: BOM Item,Basic Rate (Company Currency),Basic Rate (Company Gjaldmiðill)
@@ -1106,13 +1106,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Greiðsla Entry er þegar búið
 DocType: Request for Quotation,Get Suppliers,Fáðu birgja
 DocType: Purchase Receipt Item Supplied,Current Stock,Núverandi Stock
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} er ekki tengd við lið {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} er ekki tengd við lið {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Preview Laun Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Reikningur {0} hefur verið slegið mörgum sinnum
 DocType: Account,Expenses Included In Valuation,Kostnaður í Verðmat
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Þú getur aðeins endurnýjað ef aðild þín rennur út innan 30 daga
 DocType: Shopping Cart Settings,Show Stock Availability,Sýna framboð á lager
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Setjið {0} í eignaflokki {1} eða fyrirtæki {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Setjið {0} í eignaflokki {1} eða fyrirtæki {2}
 DocType: Location,Longitude,Lengdargráða
 ,Absent Student Report,Absent Student Report
 DocType: Crop,Crop Spacing UOM,Skera breiða UOM
@@ -1184,7 +1184,7 @@
 DocType: Soil Texture,Sand,Sandur
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Orka
 DocType: Opportunity,Opportunity From,tækifæri Frá
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Raðnúmer er nauðsynlegt fyrir lið {2}. Þú hefur veitt {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Raðnúmer er nauðsynlegt fyrir lið {2}. Þú hefur veitt {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vinsamlegast veldu töflu
 DocType: BOM,Website Specifications,Vefsíða Upplýsingar
 DocType: Special Test Items,Particulars,Upplýsingar
@@ -1276,7 +1276,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Verk með hærri weightage verður sýnt meiri
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Lab prófanir og lífskjör
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Sættir Detail
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} Leggja skal fram
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} Leggja skal fram
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Enginn starfsmaður fannst
 DocType: Item,If subcontracted to a vendor,Ef undirverktaka til seljanda
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Nemendahópur er þegar uppfærð.
@@ -1330,7 +1330,6 @@
 DocType: Loyalty Program Collection,Tier Name,Heiti heiti
 DocType: HR Settings,Enter retirement age in years,Sláðu eftirlaunaaldur í ár
 DocType: Crop,Target Warehouse,Target Warehouse
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vinsamlegast settu Nöfnunarröð fyrir {0} í gegnum Skipulag&gt; Stillingar&gt; Nöfnunarröð
 DocType: Payroll Employee Detail,Payroll Employee Detail,Launaskrá Starfsmannaupplýsingar
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Vinsamlegast veldu vöruhús
 DocType: Cheque Print Template,Starting location from left edge,Byrjun stað frá vinstri kanti
@@ -1420,7 +1419,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Plan efni fyrir undireiningum
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Velta Partners og Territory
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} verður að vera virkt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Engar atriði í boði til að flytja
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Engar atriði í boði til að flytja
 DocType: Employee Boarding Activity,Activity Name,Nafn athafnasvæðis
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Breyta útgáfudegi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +250,Closing (Opening + Total),Lokun (Opnun + Samtals)
@@ -1643,6 +1642,7 @@
 DocType: Project,First Email,Fyrsta tölvupóstur
 DocType: Company,Exception Budget Approver Role,Undantekning fjárhagsáætlun samþykkis hlutverki
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Þegar sett er, verður þessi reikningur að vera í bið til upphafs dags"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Frátekin Warehouse í Velta Order / Finished Goods Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,selja Upphæð
 DocType: Repayment Schedule,Interest Amount,vextir Upphæð
@@ -1654,7 +1654,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Records
 DocType: Asset,Scrapped,rifið
 DocType: Item,Item Defaults,Vara sjálfgefið
-DocType: Purchase Invoice,Returns,Skil
+DocType: Cashier Closing,Returns,Skil
 DocType: Job Card,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serial Nei {0} er undir viðhald samning uppí {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,Ráðningar
@@ -1668,7 +1668,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Flutningsgerð
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,sölukostnaður
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Viðskiptavinur&gt; Viðskiptavinahópur&gt; Territory
 DocType: Diagnosis,Diagnosis,Greining
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standard Buying
 DocType: Attendance Request,Explanation,Útskýring
@@ -1681,7 +1680,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Innkaupapantanir Atriði tímabært
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Póstnúmer
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Velta Order {0} er {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Veldu vaxtatekjur reikning í láni {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Veldu vaxtatekjur reikning í láni {0}
 DocType: Opportunity,Contact Info,Contact Info
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Gerð lager færslur
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Get ekki kynnt starfsmanni með stöðu vinstri
@@ -1693,7 +1692,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Reikningur er ekki hægt að gera í núll reikningstíma
 DocType: Company,Date of Commencement,Dagsetning upphafs
 DocType: Sales Person,Select company name first.,Select nafn fyrirtækis fyrst.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},Tölvupóstur sendur til {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},Tölvupóstur sendur til {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Tilvitnanir berast frá birgja.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Skiptu um BOM og uppfærðu nýjustu verð í öllum BOMs
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Til {0} | {1} {2}
@@ -1713,7 +1712,7 @@
 DocType: Asset Movement,From Employee,frá starfsmanni
 DocType: Driver,Cellphone Number,gemsa númer
 DocType: Project,Monitor Progress,Skjár framfarir
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Viðvörun: Kerfi mun ekki stöðva overbilling síðan upphæð fyrir lið {0} í {1} er núll
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Viðvörun: Kerfi mun ekki stöðva overbilling síðan upphæð fyrir lið {0} í {1} er núll
 DocType: Journal Entry,Make Difference Entry,Gera Mismunur færslu
 DocType: Supplier Quotation,Auto Repeat Section,Sjálfvirk endurtekin þáttur
 DocType: Upload Attendance,Attendance From Date,Aðsókn Frá Dagsetning
@@ -1816,7 +1815,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Hafnað Magn er ekki hægt að færa í Purchase aftur
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Breyting viðskiptavinahóps fyrir valda viðskiptavini er ekki leyfilegt.
 ,Purchase Order Items To Be Billed,Purchase Order Items verður innheimt
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Uppfærir áætlaða komutíma.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Uppfærir áætlaða komutíma.
 DocType: Program Enrollment Tool,Enrollment Details,Upplýsingar um innritun
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Ekki er hægt að stilla mörg atriði sjálfgefna fyrir fyrirtæki.
 DocType: Purchase Invoice Item,Net Rate,Net Rate
@@ -1830,7 +1829,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Leyfi Tegund er madatory
 DocType: Support Settings,Close Issue After Days,Loka Issue Eftir daga
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Þú þarft að vera notandi með kerfisstjóra og hlutverkastjóra hlutverk til að bæta notendum við markaðssvæði.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Þú þarft að vera notandi með kerfisstjóra og hlutverkastjóra hlutverk til að bæta notendum við markaðssvæði.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Skildu eftir autt ef það er talið að öllum greinum
 DocType: Job Opening,Staffing Plan,Mönnun áætlun
 DocType: Bank Guarantee,Validity in Days,Gildi í dögum
@@ -1850,7 +1849,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Afrit róður {0} með sama {1}
 DocType: Marketplace Settings,Disable Marketplace,Slökktu á markaðnum
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Reikningsár {0} fannst ekki
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Reikningsár {0} fannst ekki
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Setja upp Starfsmenn
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel Reservation User
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Vinsamlegast veldu forskeyti fyrst
@@ -1958,7 +1957,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Mistókst að skrá þig inn
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Eignin {0} búin til
 DocType: Special Test Items,Special Test Items,Sérstakar prófanir
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Þú þarft að vera notandi með kerfisstjóra og hlutverkastjóra hlutverk til að skrá þig á markaðssvæðinu.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Þú þarft að vera notandi með kerfisstjóra og hlutverkastjóra hlutverk til að skrá þig á markaðssvæðinu.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Háttur á greiðslu
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Eins og á úthlutað launasamningi þínum er ekki hægt að sækja um bætur
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Vefsíða Image ætti að vera opinber skrá eða vefslóð
@@ -1970,7 +1969,7 @@
 DocType: Warehouse,Warehouse Contact Info,Warehouse Contact Info
 DocType: Payment Entry,Write Off Difference Amount,Skrifaðu Off Mismunur Upphæð
 DocType: Volunteer,Volunteer Name,Sjálfboðaliðanöfn
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Röð með tvíhliða gjalddaga í öðrum röðum fundust: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Röð með tvíhliða gjalddaga í öðrum röðum fundust: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: Starfsmaður tölvupósti fannst ekki, þess vegna email ekki sent"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Nei Launastyrkur úthlutað fyrir starfsmann {0} á tilteknum degi {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Sendingarregla gildir ekki fyrir land {0}
@@ -2059,6 +2058,7 @@
 DocType: Salary Component,Earning,earnings
 DocType: Supplier Scorecard,Scoring Criteria,Stigatöflu
 DocType: Purchase Invoice,Party Account Currency,Party Reikningur Gjaldmiðill
+DocType: Delivery Trip,Total Estimated Distance,Samtals áætlað fjarlægð
 ,BOM Browser,BOM Browser
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Vinsamlegast uppfærðu stöðu þína fyrir þennan þjálfunarviðburð
 DocType: Item Barcode,EAN,EAN
@@ -2097,7 +2097,7 @@
 DocType: Activity Cost,Projects,verkefni
 DocType: Payment Request,Transaction Currency,Færsla Gjaldmiðill
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Frá {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Sumar tölvupóstar eru ógildar
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Sumar tölvupóstar eru ógildar
 DocType: Work Order Operation,Operation Description,Operation Lýsing
 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.,Get ekki breytt Fiscal Year upphafsdagur og reikningsár lokadag þegar Fiscal Year er vistuð.
 DocType: Quotation,Shopping Cart,Innkaupakerra
@@ -2121,7 +2121,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Net Breyting á fast eign
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Magn
 DocType: Leave Control Panel,Leave blank if considered for all designations,Skildu eftir autt ef það er talið fyrir alla heita
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Gjald af gerðinni &#39;Raunveruleg&#39; í röð {0} er ekki að vera með í Item Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Gjald af gerðinni &#39;Raunveruleg&#39; í röð {0} er ekki að vera með í Item Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,frá DATETIME
 DocType: Shopify Settings,For Company,Company
@@ -2135,7 +2135,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Það voru villur að búa til námskeiði
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Fyrsta kostnaðarákvörðunin á listanum verður stillt sem sjálfgefið kostnaðarákvörðun.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,getur ekki verið meiri en 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Þú þarft að vera notandi annar en Stjórnandi með kerfisstjóra og hlutverkastjóra hlutverk til að skrá þig á markaðssvæði.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Þú þarft að vera notandi annar en Stjórnandi með kerfisstjóra og hlutverkastjóra hlutverk til að skrá þig á markaðssvæði.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Liður {0} er ekki birgðir Item
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,unscheduled
@@ -2164,7 +2164,7 @@
 DocType: HR Settings,Employee Settings,Employee Stillingar
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Hleðsla greiðslukerfis
 ,Batch-Wise Balance History,Hópur-Wise Balance Saga
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Row # {0}: Ekki er hægt að stilla Rate ef upphæðin er hærri en reiknuð upphæð fyrir lið {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Row # {0}: Ekki er hægt að stilla Rate ef upphæðin er hærri en reiknuð upphæð fyrir lið {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Prenta uppfærðar í viðkomandi prenta sniði
 DocType: Package Code,Package Code,pakki Code
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,lærlingur
@@ -2397,7 +2397,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} laus störf og {1} fjárhagsáætlun fyrir {2} sem þegar er áætlað fyrir dótturfyrirtæki af {3}. \ Þú getur aðeins áætlað allt að {4} laus störf og fjárhagsáætlun {5} samkvæmt áætluninni fyrir starfsmanninn {6} fyrir móðurfélagið {3}.
 DocType: HR Settings,Stop Birthday Reminders,Stop afmælisáminningar
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Vinsamlegast settu Default Launaskrá Greiðist reikning í félaginu {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Vinsamlegast settu Default Launaskrá Greiðist reikning í félaginu {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Fá fjárhagslegt brot á skattar og gjöld gagna af Amazon
 DocType: SMS Center,Receiver List,Receiver List
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,leit Item
@@ -2467,7 +2467,7 @@
 DocType: Vital Signs,Constipated,Hægðatregða
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Gegn Birgir Invoice {0} dagsett {1}
 DocType: Customer,Default Price List,Sjálfgefið Verðskrá
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Eignastýring Hreyfing met {0} búin
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Eignastýring Hreyfing met {0} búin
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Engar vörur fundust.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Þú getur ekki eytt Fiscal Year {0}. Reikningsár {0} er sett sem sjálfgefið í Global Settings
 DocType: Share Transfer,Equity/Liability Account,Eigið / ábyrgðareikningur
@@ -2604,6 +2604,7 @@
 DocType: Blanket Order,Order Type,Order Type
 ,Item-wise Sales Register,Item-vitur Sales Register
 DocType: Asset,Gross Purchase Amount,Gross Kaup Upphæð
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Vörunúmer&gt; Liðurhópur&gt; Vörumerki
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Opna sölur
 DocType: Asset,Depreciation Method,Afskriftir Method
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Er þetta Tax innifalinn í grunntaxta?
@@ -2684,7 +2685,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Aðgerð ef árleg fjárhagsáætlun er yfir PO
 DocType: Student Leave Application,Student Leave Application,Student Leave Umsókn
 DocType: Item,Will also apply for variants,Mun einnig gilda fyrir afbrigði
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Eign er ekki hætt, eins og það er nú þegar {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Eign er ekki hætt, eins og það er nú þegar {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Starfsmaður {0} á hálfan dag á {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Samtals vinnutími ætti ekki að vera meiri en max vinnutíma {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Á
@@ -2708,6 +2709,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Sækja gögn
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Hámarks leyfi sem leyfður er í tegund ferðarinnar {0} er {1}
 DocType: SMS Center,Create Receiver List,Búa Receiver lista
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Laus-til-nota Dagsetning ætti að vera eftir kaupdegi
 DocType: Vehicle,Wheels,hjól
 DocType: Packing Slip,To Package No.,Til spakki
 DocType: Patient Relation,Family,Fjölskylda
@@ -2721,7 +2723,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Innheimtargjald verður að vera jafnt gjaldmiðli gjaldmiðils eða félagsreiknings gjaldmiðils
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Gefur til kynna að pakki er hluti af þessari fæðingu (Only Draft)
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Row {0}: Gjalddagi má ekki vera fyrir útgáfudegi
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Row {0}: Gjalddagi má ekki vera fyrir útgáfudegi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Greiða færslu
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Magn í lið {0} verður að vera minna en {1}
 ,Sales Invoice Trends,Sölureikningi Trends
@@ -2793,7 +2795,7 @@
 DocType: Guardian,Guardian Interests,Guardian Áhugasvið
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Uppfæra reikningsnafn / númer
 DocType: Naming Series,Current Value,Núverandi Value
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Margar reikningsárin til fyrir dagsetningu {0}. Vinsamlegast settu fyrirtæki í Fiscal Year
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Margar reikningsárin til fyrir dagsetningu {0}. Vinsamlegast settu fyrirtæki í Fiscal Year
 DocType: Education Settings,Instructor Records to be created by,Kennariaskrár til að búa til af
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} búin
 DocType: GST Account,GST Account,GST reikning
@@ -2810,7 +2812,7 @@
 DocType: Sales Person,Name and Employee ID,Nafn og Starfsmannafélag ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Skiladagur er ekki hægt áður Staða Dagsetning
 DocType: Website Item Group,Website Item Group,Vefsíða Item Group
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Engin launaspjald fannst fyrir framangreindar valin skilyrði
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Engin launaspjald fannst fyrir framangreindar valin skilyrði
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Skyldur og skattar
 DocType: Projects Settings,Projects Settings,Verkefni Stillingar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Vinsamlegast sláðu viðmiðunardagur
@@ -2819,7 +2821,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Staðar Magn
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Efni Beiðni Item
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Vinsamlegast hafðu samband við kaupgreiðsluna {0} fyrst
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Vinsamlegast hafðu samband við kaupgreiðsluna {0} fyrst
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Tré Item hópa.
 DocType: Production Plan,Total Produced Qty,Heildarframleiðsla
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Getur ekki átt línunúmeri meiri en eða jafnt og núverandi röð númer fyrir þessa Charge tegund
@@ -2928,6 +2930,7 @@
 ,Vehicle Expenses,ökutæki Útgjöld
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Búðu til Lab Test (s) á Sölu Reikningur Senda
 DocType: Serial No,Invoice Details,Reikningsupplýsingar
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Vinsamlega virkjaðu Google Maps Stillingar til að meta og hagræða leiðum
 DocType: Grant Application,Show on Website,Sýna á heimasíðu
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Byrjaðu á
 DocType: Hub Tracked Item,Hub Category,Hub Flokkur
@@ -2967,7 +2970,7 @@
 DocType: Inpatient Record,B Positive,B Jákvæð
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Hámarkshagnaður starfsmanns {0} er meiri en {1} með summanum {2} af fyrri kröfu \ upphæð
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Magn verður að vera 1, eins atriði er fastur eign. Notaðu sérstaka röð fyrir margar Magn."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Magn verður að vera 1, eins atriði er fastur eign. Notaðu sérstaka röð fyrir margar Magn."
 DocType: Leave Block List Allow,Leave Block List Allow,Skildu Block List Leyfa
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Skammstöfun má ekki vera autt eða bil
 DocType: Patient Medical Record,Patient Medical Record,Sjúkratryggingaskrá
@@ -3001,7 +3004,7 @@
 DocType: Workstation,Wages per hour,Laun á klukkustund
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock jafnvægi í Batch {0} verður neikvætt {1} fyrir lið {2} í Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Eftirfarandi efni beiðnir hafa verið hækkaðir sjálfvirkt miðað aftur röð stigi atriðisins
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Reikningur {0} er ógild. Reikningur Gjaldmiðill verður að vera {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Reikningur {0} er ógild. Reikningur Gjaldmiðill verður að vera {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Frá degi {0} er ekki hægt að losa starfsmanninn dagsetningu {1}
 DocType: Supplier,Is Internal Supplier,Er innri birgir
 DocType: Employee,Create User Permission,Búðu til notendaleyfi
@@ -3145,7 +3148,7 @@
 DocType: Account,Fixed Asset,fast Asset
 DocType: Amazon MWS Settings,After Date,Eftir dagsetningu
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,serialized Inventory
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Ógilt {0} fyrir millifærslufyrirtæki.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Ógilt {0} fyrir millifærslufyrirtæki.
 ,Department Analytics,Department Analytics
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Tölvupóstur fannst ekki í vanrækslu sambandi
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Búa til leyndarmál
@@ -3157,7 +3160,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Forrit í gjaldskrárbyggingu og nemendahópnum {0} eru mismunandi.
 DocType: Bank Statement Transaction Entry,Receivable Account,viðskiptakröfur Reikningur
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Gildir frá Dagsetning verður að vera minni en Gildistími dagsetning.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} er þegar {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} er þegar {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Velta Order til greiðslu
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,forstjóri
@@ -3199,6 +3202,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Skuldfærslu Til er krafist
 DocType: Clinical Procedure,Inpatient Record,Sjúkraskrá
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets að halda utan um tíma, kostnað og innheimtu fyrir athafnir gert með lið"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Birgir&gt; Birgir Tegund
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Kaupverðið List
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Dagsetning viðskipta
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Sniðmát af birgðatölumörkum.
@@ -3241,7 +3245,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Gengishagnaður / tap
 DocType: Opportunity,Lost Reason,Lost Ástæða
 DocType: Amazon MWS Settings,Enable Amazon,Virkja Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Row # {0}: Reikningur {1} tilheyrir ekki fyrirtæki {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Row # {0}: Reikningur {1} tilheyrir ekki fyrirtæki {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Gat ekki fundið DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,ný Address
 DocType: Quality Inspection,Sample Size,Prufustærð
@@ -3352,7 +3356,7 @@
 DocType: Water Analysis,Origin,Uppruni
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Þetta skjal er yfir mörkum með {0} {1} fyrir lið {4}. Ert þú að gera annað {3} gegn sama {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Vinsamlegast settu endurtekin eftir vistun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Veldu breyting upphæð reiknings
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Veldu breyting upphæð reiknings
 DocType: Purchase Invoice,Price List Currency,Verðskrá Gjaldmiðill
 DocType: Naming Series,User must always select,Notandi verður alltaf að velja
 DocType: Stock Settings,Allow Negative Stock,Leyfa Neikvæð lager
@@ -3394,7 +3398,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Ertu viss um að þú viljir hætta við þessa stefnumót?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Hotel Herbergi Verðlagning Pakki
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,velta Pipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Vinsamlegast settu sjálfgefin reikningur í laun Component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Vinsamlegast settu sjálfgefin reikningur í laun Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Required On
 DocType: Rename Tool,File to Rename,Skrá til Endurnefna
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Vinsamlegast veldu BOM fyrir lið í Row {0}
@@ -3415,7 +3419,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostnaður vegna aðkeyptrar atriði
 DocType: Employee Separation,Employee Separation Template,Aðskilnaðarsnið frá starfsmanni
 DocType: Selling Settings,Sales Order Required,Velta Order Required
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Gerast seljandi
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Gerast seljandi
 DocType: Purchase Invoice,Credit To,Credit Til
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Virkar leiðir / Viðskiptavinir
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Skildu eftir autt til að nota staðlaða sendingarskýringarmyndina
@@ -3456,7 +3460,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Gerðu skattmálsgrein
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Hráefni má ekki vera auður.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Row # {0} (Greiðsluborð): Magn verður að vera neikvætt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Row # {0} (Greiðsluborð): Magn verður að vera neikvætt
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Gat ekki uppfært lager, reikningsnúmer inniheldur falla skipum hlut."
 DocType: Contract,Fulfilment Status,Uppfyllingarstaða
 DocType: Lab Test Sample,Lab Test Sample,Lab Test Dæmi
@@ -3595,7 +3599,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Skjal dagsetning
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Fee Records Búið - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Flokkur Reikningur
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Row # {0} (Greiðsluborð): Magn verður að vera jákvætt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Row # {0} (Greiðsluborð): Magn verður að vera jákvætt
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Geta ekki framleitt meira ítarefni {0} en Sales Order Magn {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Veldu Eiginleikar
 DocType: Purchase Invoice,Reason For Issuing document,Ástæða fyrir útgáfu skjals
@@ -3650,7 +3654,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Tími þar sem efni bárust
 DocType: Products Settings,Products per Page,Vörur á síðu
 DocType: Stock Ledger Entry,Outgoing Rate,Outgoing Rate
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,eða
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,eða
 DocType: Sales Order,Billing Status,Innheimta Staða
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Tilkynna um vandamál
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,gagnsemi Útgjöld
@@ -3677,7 +3681,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Skattfrelsisyfirlýsing starfsmanna
 DocType: Payment Entry,Cheque/Reference Date,Ávísun / Frestdagur
 DocType: Purchase Invoice,Total Taxes and Charges,Samtals Skattar og gjöld
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Laust í notkun Dagsetning er slegin inn sem fyrri dagsetning
 DocType: Employee,Emergency Contact,Neyðar Tengiliður
 DocType: Bank Reconciliation Detail,Payment Entry,greiðsla Entry
 ,sales-browser,sölu-vafra
@@ -3723,6 +3726,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Er afturábak (lánshæfiseinkunn)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Start Job
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Raðnúmer er krafist fyrir eignina {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vinsamlegast settu Nöfnunarröð fyrir {0} í gegnum Skipulag&gt; Stillingar&gt; Nöfnunarröð
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Óvirkt sniðmát má ekki vera sjálfgefið sniðmát
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Fyrir röð {0}: Sláðu inn skipulagt magn
 DocType: Account,Income Account,tekjur Reikningur
@@ -3736,6 +3740,7 @@
 DocType: Loyalty Program,Help Section,Hjálparsvið
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Fyrri
 DocType: Appraisal Goal,Key Responsibility Area,Key Ábyrgð Area
+DocType: Delivery Trip,Distance UOM,Fjarlægð UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Námsmaður Lotur hjálpa þér að fylgjast með mætingu, mat og gjalda fyrir nemendur"
 DocType: Payment Entry,Total Allocated Amount,Samtals úthlutað magn
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Stilltu sjálfgefinn birgðareikning fyrir varanlegan birgða
@@ -3777,7 +3782,7 @@
 DocType: Item Supplier,Item Supplier,Liður Birgir
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Vinsamlegast sláðu Item Code til að fá lotu nr
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Vinsamlegast veldu gildi fyrir {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Engar atriði valdir til flutnings
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Engar atriði valdir til flutnings
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Öllum vistföngum.
 DocType: Company,Stock Settings,lager Stillingar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Samruni er aðeins mögulegt ef eftirfarandi eiginleikar eru sömu í báðum skrám. Er Group, Root Tegund, Company"
@@ -4062,7 +4067,7 @@
 DocType: Patient,Personal and Social History,Persónuleg og félagsleg saga
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Notandi {0} búinn til
 DocType: Fee Schedule,Fee Breakup for each student,Gjaldskrá fyrir hverja nemanda
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total fyrirfram ({0}) gegn Order {1} er ekki vera meiri en GRAND Samtals ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total fyrirfram ({0}) gegn Order {1} er ekki vera meiri en GRAND Samtals ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Veldu Hlaupa dreifingu til ójafnt dreifa skotmörk yfir mánuði.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Breyta kóða
 DocType: Purchase Invoice Item,Valuation Rate,verðmat Rate
@@ -4071,7 +4076,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Notaði ITC Cess
 ,Student Monthly Attendance Sheet,Student Monthly Aðsókn Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Sendingarregla gildir aðeins um sölu
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Afskriftir Róður {0}: Næsta Afskriftir Dagsetning getur ekki verið fyrir Innkaupardagur
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Afskriftir Róður {0}: Næsta Afskriftir Dagsetning getur ekki verið fyrir Innkaupardagur
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Project Start Date
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,þangað
 DocType: Rename Tool,Rename Log,endurnefna Innskráning
@@ -4088,12 +4093,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Hversu oft ætti verkefnið og fyrirtækið að uppfæra byggt á söluviðskiptum.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,rennur út
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Bæta Nemendur
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Vinsamlegast farðu starfsmanninum <a href=""#Form/Employee/{0}"">{0}</a> \ til að hætta við þetta skjal"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Vinsamlegast veldu {0}
 DocType: C-Form,C-Form No,C-Form Nei
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Fjarlægð
+DocType: Delivery Stop,Distance,Fjarlægð
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Skráðu vörur þínar eða þjónustu sem þú kaupir eða selur.
 DocType: Water Analysis,Storage Temperature,Geymslu hiti
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4120,7 +4123,7 @@
 DocType: Homepage,Company Description for website homepage,Fyrirtæki Lýsing á heimasíðu heimasíðuna
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Fyrir þægindi viðskiptavina, þessi númer er hægt að nota á prenti sniðum eins reikninga og sending minnismiða"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Name
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Gat ekki sótt upplýsingar um {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Gat ekki sótt upplýsingar um {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Opnun dagbókar
 DocType: Contract,Fulfilment Terms,Uppfyllingarskilmálar
 DocType: Sales Invoice,Time Sheet List,Tími Sheet List
@@ -4300,7 +4303,7 @@
 DocType: Serial No,Warranty / AMC Details,Ábyrgð í / AMC Nánar
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Veldu nemendur handvirkt fyrir hópinn sem byggir á starfsemi
 DocType: Journal Entry,User Remark,Notandi Athugasemd
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Hagræðing leiða.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Hagræðing leiða.
 DocType: Travel Itinerary,Non Diary,Ekki dagbók
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Get ekki búið til viðhaldsbónus fyrir vinstri starfsmenn
 DocType: Lead,Market Segment,Market Segment
@@ -4330,7 +4333,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Hollusta Program
 DocType: Student Guardian,Father,faðir
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Stuðningur miða
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;Uppfæra Stock&#39; Ekki er hægt að athuga fasta sölu eigna
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;Uppfæra Stock&#39; Ekki er hægt að athuga fasta sölu eigna
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Sættir
 DocType: Attendance,On Leave,Í leyfi
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,fá uppfærslur
@@ -4375,7 +4378,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serial Nei og Batch
 DocType: Warranty Claim,From Company,frá Company
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Summa skora á mat Criteria þarf að vera {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Vinsamlegast settu Fjöldi Afskriftir Bókað
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Vinsamlegast settu Fjöldi Afskriftir Bókað
 DocType: Supplier Scorecard Period,Calculations,Útreikningar
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Gildi eða Magn
 DocType: Payment Terms Template,Payment Terms,Greiðsluskilmála
@@ -4394,7 +4397,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Afsláttur (%) á Verðskrá Verð með Minni
 DocType: Healthcare Service Unit Type,Rate / UOM,Rate / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Allir Vöruhús
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Engin {0} fundust fyrir millifærsluviðskipti.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Engin {0} fundust fyrir millifærsluviðskipti.
 DocType: Travel Itinerary,Rented Car,Leigðu bíl
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Um fyrirtækið þitt
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Inneign á reikninginn verður að vera Efnahagur reikning
@@ -4495,6 +4498,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Greiningarkerfi plantna
 DocType: Cheque Print Template,Cheque Height,ávísun Hæð
 DocType: Supplier,Supplier Details,birgir Upplýsingar
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vinsamlegast settu upp flokkunarnúmer fyrir þátttöku í gegnum skipulag&gt; Numbers Series
 DocType: Setup Progress,Setup Progress,Uppsetning framfarir
 DocType: Expense Claim,Approval Status,Staða samþykkis
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Frá gildi verður að vera minna en að verðmæti í röð {0}
@@ -4587,7 +4591,6 @@
 DocType: Travel Request,Fully Sponsored,Fully Sponsored
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Viðskiptavinur {0} er búinn til.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vinsamlega settu upp starfsmannamiðlunarkerfi í mannauði&gt; HR-stillingar
 DocType: Stock Settings,Limit Percent,Limit Percent
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Eins og er ekki birgðir í boði á hvaða vöruhúsi
 ,Payment Period Based On Invoice Date,Greiðsla Tímabil Byggt á reikningi Dagsetning
@@ -4646,7 +4649,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Source Warehouse
 DocType: Installation Note,Installation Date,uppsetning Dagsetning
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Share Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ekki tilheyra félaginu {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ekki tilheyra félaginu {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Sölureikningur {0} búinn til
 DocType: Employee,Confirmation Date,staðfesting Dagsetning
 DocType: Inpatient Occupancy,Check Out,Athuga
@@ -4666,6 +4669,7 @@
 DocType: Production Plan,Sales Orders Detail,Sölufyrirtæki
 DocType: Bin,Requested Quantity,Umbeðin Magn
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Vinsamlegast skipulag kennari Nafnakerfi í menntun&gt; Menntun
 DocType: Patient,Marital Status,Hjúskaparstaða
 DocType: Stock Settings,Auto Material Request,Auto Efni Beiðni
 DocType: Woocommerce Settings,API consumer secret,API neytenda leyndarmál
@@ -4718,7 +4722,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Veldu daga
 DocType: Academic Term,Term Name,Term Name
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Credit ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Búa til launaákvarðanir ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Búa til launaákvarðanir ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Þú getur ekki breytt rótarkóði.
 DocType: Buying Settings,Purchase Order Required,Purchase Order Required
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Tímamælir
@@ -4754,7 +4758,7 @@
 DocType: Account,Rate at which this tax is applied,Gengi sem þessi skattur er beitt
 DocType: Cash Flow Mapper,Section Name,Section Name
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Uppröðun Magn
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Afskriftir Rauða {0}: Vænt gildi eftir nýtingartíma verður að vera meiri en eða jafnt við {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Afskriftir Rauða {0}: Vænt gildi eftir nýtingartíma verður að vera meiri en eða jafnt við {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Núverandi Op Atvinna
 DocType: Company,Stock Adjustment Account,Stock jöfnunarreikning
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Afskrifa
@@ -4801,7 +4805,7 @@
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Út af AMC
 DocType: Opportunity,Opportunity Amount,Tækifærsla
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Fjöldi Afskriftir bókað getur ekki verið meiri en heildarfjöldi Afskriftir
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Fjöldi Afskriftir bókað getur ekki verið meiri en heildarfjöldi Afskriftir
 DocType: Purchase Order,Order Confirmation Date,Panta staðfestingardag
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Gera Viðhald Heimsókn
@@ -4842,7 +4846,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Hópur:
 DocType: Volunteer,Afternoon,Að morgni
 DocType: Loyalty Program,Loyalty Program Help,Hollusta Program Hjálp
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} &#39;{1}&#39; er óvirk
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} &#39;{1}&#39; er óvirk
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Setja sem Open
 DocType: Cheque Print Template,Scanned Cheque,skönnuð ávísun
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Senda sjálfvirkar tölvupóst til Tengiliði á Sendi viðskiptum.
@@ -4855,7 +4859,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Item og Ábyrgð Details
 DocType: Chapter,Chapter Members,Kafla meðlimir
 DocType: Sales Team,Contribution (%),Framlag (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Ath: Greiðsla Entry verður ekki búið síðan &#39;Cash eða Bank Account &quot;var ekki tilgreint
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Ath: Greiðsla Entry verður ekki búið síðan &#39;Cash eða Bank Account &quot;var ekki tilgreint
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Verkefni {0} er þegar til
 DocType: Clinical Procedure,Nursing User,Hjúkrunarnotandi
 DocType: Employee Benefit Application,Payroll Period,Launatímabil
@@ -4863,6 +4867,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Raðnúmer {0} tilheyrir ekki batch {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,ábyrgð
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Gildistími þessa tilvitnunar er lokið.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Vinsamlegast farðu starfsmanninum <a href=""#Form/Employee/{0}"">{0}</a> \ til að hætta við þetta skjal"
 DocType: Expense Claim Account,Expense Claim Account,Expense Krafa Reikningur
 DocType: Account,Capital Work in Progress,Capital vinna í framfarir
 DocType: Accounts Settings,Allow Stale Exchange Rates,Leyfa óbreyttu gengi
@@ -4943,7 +4949,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Issue Efni
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Tengdu Shopify með ERPNext
 DocType: Material Request Item,For Warehouse,fyrir Warehouse
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Sendingarskýringar {0} uppfærðar
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Sendingarskýringar {0} uppfærðar
 DocType: Employee,Offer Date,Tilboð Dagsetning
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Tilvitnun
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Þú ert í offline háttur. Þú munt ekki vera fær um að endurhlaða fyrr en þú hefur net.
@@ -4993,7 +4999,7 @@
 DocType: Shipping Rule,Calculate Based On,Reikna miðað við
 DocType: Contract,Unfulfilled,Ófullnægjandi
 DocType: Delivery Note Item,From Warehouse,frá Warehouse
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Engar starfsmenn fyrir nefndar viðmiðanir
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Engar starfsmenn fyrir nefndar viðmiðanir
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Engar Verk með Bill of Materials að Manufacture
 DocType: Shopify Settings,Default Customer,Sjálfgefið viðskiptavinur
 DocType: Sales Stage,Stage Name,Sviðsnafn
@@ -5035,7 +5041,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skatthlutfall Eftir Afsláttur Upphæð
 DocType: Patient,Inpatient Status,Staða sjúklings
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Daglegar Stillingar Vinna Yfirlit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Valin verðskrá ætti að hafa keypt og selt reiti skoðuð.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Valin verðskrá ætti að hafa keypt og selt reiti skoðuð.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Vinsamlegast sláðu inn Reqd eftir dagsetningu
 DocType: Payment Entry,Internal Transfer,innri Transfer
 DocType: Asset Maintenance,Maintenance Tasks,Viðhaldsverkefni
@@ -5071,7 +5077,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Group By
 DocType: Guardian,Interests,Áhugasvið
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Virkja / slökkva á gjaldmiðla.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Gat ekki sent inn launatölur
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Gat ekki sent inn launatölur
 DocType: Exchange Rate Revaluation,Get Entries,Fáðu færslur
 DocType: Production Plan,Get Material Request,Fá Material Beiðni
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,pósti Útgjöld
@@ -5155,7 +5161,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Kostnað reikningur er nauðsynlegur fyrir lið {0}
 DocType: BOM,Website Description,Vefsíða Lýsing
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Net breyting á eigin fé
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Vinsamlegast hætta kaupa Reikningar {0} fyrst
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Vinsamlegast hætta kaupa Reikningar {0} fyrst
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Ekki leyfilegt. Vinsamlega slökkva á þjónustueiningartegundinni
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Netfang verður að vera einstakt, þegar til fyrir {0}"
 DocType: Serial No,AMC Expiry Date,AMC Fyrningardagsetning
@@ -5195,7 +5201,7 @@
 DocType: Hotel Room,Hotel Room,Hótelherbergi
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Reikningur {0} er ekki tilheyrir fyrirtækinu {1}
 DocType: Leave Type,Rounding,Afrennsli
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Raðnúmer í röð {0} samsvarar ekki við Afhendingartilkynningu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Raðnúmer í röð {0} samsvarar ekki við Afhendingartilkynningu
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Úthlutað magn (Pro-hlutfall)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Síðan eru verðlagsreglur síaðir út á grundvelli viðskiptavinar, viðskiptavinarhóps, landsvæði, birgir, söluhópur, herferð, söluaðili osfrv."
 DocType: Student,Guardian Details,Guardian Upplýsingar
@@ -5250,7 +5256,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Warehouse krafist fyrir hlutabréfum lið {0}
 DocType: Leave Allocation,Unused leaves,ónotuð leyfi
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Gerðu endurgreiðslu færslu
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Allar deildir
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Allar deildir
 DocType: Healthcare Service Unit,Vacant,Laust
 DocType: Patient,Alcohol Past Use,Áfengisnotkun áfengis
 DocType: Fertilizer Content,Fertilizer Content,Áburður innihaldsefni
@@ -5261,7 +5267,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Vinnuskilyrðin {0} verður að vera aflýst áður en þú hættir þessari sölupöntun
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Ná sprakk BOM (þ.mt undireiningar)
 DocType: Authorization Rule,Applicable To (Employee),Gildir til (starfsmaður)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Skiladagur er nauðsynlegur
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Skiladagur er nauðsynlegur
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Vöxtur fyrir eigind {0} er ekki verið 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Tegund bóta og upphæð
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Herbergi bókað
@@ -5404,7 +5410,7 @@
 DocType: Purchase Invoice Item,Total Weight,Heildarþyngd
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Þóknun á sölu
 DocType: Job Offer Term,Value / Description,Gildi / Lýsing
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} er ekki hægt að skila, það er þegar {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} er ekki hægt að skila, það er þegar {2}"
 DocType: Tax Rule,Billing Country,Innheimta Country
 DocType: Purchase Order Item,Expected Delivery Date,Áætlaðan fæðingardag
 DocType: Restaurant Order Entry,Restaurant Order Entry,Veitingahús Order Entry
@@ -5443,12 +5449,13 @@
 DocType: Maintenance Visit,Breakdown,Brotna niður
 DocType: Travel Itinerary,Vegetarian,Grænmetisæta
 DocType: Patient Encounter,Encounter Date,Fundur Dagsetning
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Reikningur: {0} með gjaldeyri: {1} Ekki er hægt að velja
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Reikningur: {0} með gjaldeyri: {1} Ekki er hægt að velja
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bankagögn
 DocType: Purchase Receipt Item,Sample Quantity,Dæmi Magn
 DocType: Bank Guarantee,Name of Beneficiary,Nafn bótaþega
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Uppfæra BOM kostnað sjálfkrafa með áætlun, byggt á nýjustu verðlagsgengi / verðskrárgengi / síðasta kaupgengi hráefna."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Birgir&gt; Birgir Group
 DocType: Bank Reconciliation Detail,Cheque Date,ávísun Dagsetning
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Reikningur {0}: Foreldri reikningur {1} ekki tilheyra fyrirtæki: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Eytt öll viðskipti sem tengjast þessu fyrirtæki!
@@ -5476,7 +5483,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Barn hnútar geta verið aðeins búin undir &#39;group&#39; tegund hnúta
 DocType: Attendance Request,Half Day Date,Half Day Date
 DocType: Academic Year,Academic Year Name,Skólaárinu Name
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} Ekki leyft að eiga viðskipti við {1}. Vinsamlegast breyttu félaginu.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} Ekki leyft að eiga viðskipti við {1}. Vinsamlegast breyttu félaginu.
 DocType: Sales Partner,Contact Desc,Viltu samband við Ö
 DocType: Email Digest,Send regular summary reports via Email.,Senda reglulegar skýrslur yfirlit með tölvupósti.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Vinsamlegast settu sjálfgefin reikningur í kostnað kröfutegund {0}
@@ -5509,7 +5516,7 @@
 DocType: Hotel Room,Hotel Manager,Hótelstjórinn
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Setja Tax Regla fyrir körfunni
 DocType: Purchase Invoice,Taxes and Charges Added,Skattar og gjöld bætt
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Afskriftir Rauða {0}: Næsta Afskriftir Dagsetning má ekki vera fyrr en hægt er að nota Dagsetning
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Afskriftir Rauða {0}: Næsta Afskriftir Dagsetning má ekki vera fyrr en hægt er að nota Dagsetning
 ,Sales Funnel,velta trekt
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Skammstöfun er nauðsynlegur
 DocType: Project,Task Progress,verkefni Progress
@@ -5523,7 +5530,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Allir hópar viðskiptavina
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,Uppsafnaður Monthly
 DocType: Attendance Request,On Duty,Á vakt
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er nauðsynlegur. Kannski gjaldeyri færsla er ekki búin fyrir {1} til {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er nauðsynlegur. Kannski gjaldeyri færsla er ekki búin fyrir {1} til {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Stuðningsáætlun {0} er þegar til tilnefningar {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Tax Snið er nauðsynlegur.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Reikningur {0}: Foreldri reikningur {1} er ekki til
@@ -5602,11 +5609,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Atleast einn vöruhús er nauðsynlegur
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Stilla hluti reiti eins og UOM, vöruflokkur, lýsing og fjöldi klukkustunda."
 DocType: Certification Application,Certification Status,Vottunarstaða
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Marketplace
 DocType: Travel Itinerary,Travel Advance Required,Ferðaframboð krafist
 DocType: Subscriber,Subscriber Name,Nafn notanda
 DocType: Serial No,Out of Warranty,Út ábyrgðar
-DocType: Cashier Closing,Cashier-closing-,Gjaldkeri-lokun-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Mapped Data Type
 DocType: BOM Update Tool,Replace,Skipta
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Engar vörur fundust.
@@ -5692,7 +5698,6 @@
 DocType: Quality Inspection,Incoming,Komandi
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Sjálfgefin skatta sniðmát fyrir sölu og kaup eru búnar til.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",Dæmi: ABCD. #####. Ef röð er stillt og lota nr er ekki getið í viðskiptum þá verður sjálfkrafa lotunúmer búið til byggt á þessari röð. Ef þú vilt alltaf nefna lotu nr. Fyrir þetta atriði skaltu láta þetta vera autt. Athugaðu: Þessi stilling mun taka forgang yfir forskeyti fyrir nafngiftaröð í lagerstillingum.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vinsamlegast settu upp flokkunarnúmer fyrir þátttöku í gegnum skipulag&gt; Numbers Series
 DocType: BOM,Materials Required (Exploded),Efni sem þarf (Sprakk)
 DocType: Contract,Party User,Party notandi
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Vinsamlegast stilltu Fyrirtæki sía eyða ef Group By er &#39;Company&#39;
@@ -5893,7 +5898,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Upp Count
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Bæði upphafstímabil og prófunartímabil verður að vera stillt
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Meðaltal
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Samtals greiðslugjald í greiðsluáætlun verður að vera jafnt við Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Samtals greiðslugjald í greiðsluáætlun verður að vera jafnt við Grand / Rounded Total
 DocType: Subscription Plan Detail,Plan,Áætlun
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bankayfirlit jafnvægi eins og á General Ledger
 DocType: Job Applicant,Applicant Name,umsækjandi Nafn
@@ -5962,7 +5967,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sápa &amp; Þvottaefni
 DocType: BOM,Show Items,Sýna Items
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Frá tími getur ekki verið meiri en tíma.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Viltu tilkynna öllum viðskiptavinum með tölvupósti?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Viltu tilkynna öllum viðskiptavinum með tölvupósti?
 DocType: Subscription Plan,Billing Interval,Innheimtuinterval
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Pantaði
@@ -5971,9 +5976,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Rú {0}: {1} verður að vera meiri en 0
 DocType: Assessment Criteria,Assessment Criteria Group,Námsmat Viðmið Group
 DocType: Healthcare Settings,Patient Name By,Nafn sjúklinga eftir
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Ársreikningur Innsláttur launa frá {0} til {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Ársreikningur Innsláttur launa frá {0} til {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Virkja frestað tekjur
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Opnun uppsöfnuðum afskriftum verður að vera minna en eða jafnt og {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Opnun uppsöfnuðum afskriftum verður að vera minna en eða jafnt og {0}
 DocType: Warehouse,Warehouse Name,Warehouse Name
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Raunverulegur upphafsdagur verður að vera minni en raunverulegur lokadagur
 DocType: Naming Series,Select Transaction,Veldu Transaction
@@ -6124,7 +6129,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Starfsmaður {0} í einkunn {1} hefur ekki sjálfgefið eftirlitsstefnu
 DocType: Salary Detail,Salary Detail,laun Detail
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Vinsamlegast veldu {0} fyrst
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Bætt við {0} notendum
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Bætt við {0} notendum
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","Þegar um er að ræða fjölþættaráætlun, verða viðskiptavinir sjálfkrafa tengdir viðkomandi flokka eftir því sem þeir eru í"
 DocType: Appointment Type,Physician,Læknir
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Hópur {0} af Liður {1} hefur runnið út.
@@ -6268,7 +6273,7 @@
 DocType: Asset,Custodian,Vörsluaðili
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Point-af-sölu Profile
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} ætti að vera gildi á milli 0 og 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Greiðsla {0} frá {1} til {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Greiðsla {0} frá {1} til {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Ótryggð Lán
 DocType: Cost Center,Cost Center Name,Kostnaður Center Name
 DocType: Student,B+,B +
@@ -6300,6 +6305,7 @@
 DocType: Employee,Date of Issue,Útgáfudagur
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Eins og á kaupstillingarnar, ef kaupheimildin er krafist == &#39;YES&#39;, þá til að búa til innheimtufé, þarf notandi að búa til kaupgreiðsluna fyrst fyrir atriði {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Row # {0}: Setja Birgir fyrir lið {1}
+DocType: Global Defaults,Default Distance Unit,Sjálfgefin fjarlægðareining
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Row {0}: Hours verður að vera stærri en núll.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Vefsíða Image {0} fylgir tl {1} er ekki hægt að finna
 DocType: Issue,Content Type,content Type
@@ -6355,7 +6361,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Debit Til reikning verður að vera Efnahagur reikning
 DocType: Asset,Naming Series,nafngiftir Series
 DocType: Vital Signs,Coated,Húðað
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Row {0}: Vænt verð eftir gagnlegt líf verður að vera lægra en heildsöluverð
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Row {0}: Vænt verð eftir gagnlegt líf verður að vera lægra en heildsöluverð
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Stillingar
 DocType: Leave Block List,Leave Block List Name,Skildu Block List Nafn
 DocType: Certified Consultant,Certification Validity,Vottun Gildistími
@@ -6422,6 +6428,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Bankareikningur
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Skoða Lab Próf
 DocType: Hub Users,Hub Users,Hub notendur
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Viðskiptavinur&gt; Viðskiptavinahópur&gt; Territory
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,viðhald Dagsetning
 DocType: Purchase Invoice Item,Rejected Serial No,Hafnað Serial Nei
@@ -6436,7 +6443,7 @@
 DocType: SG Creation Tool Course,Max Strength,max Strength
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Uppsetning forstillingar
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Engin afhendingartilkynning valin fyrir viðskiptavini {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Engin afhendingartilkynning valin fyrir viðskiptavini {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Starfsmaður {0} hefur ekki hámarksbætur
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Veldu Atriði byggt á Afhendingardagur
 DocType: Grant Application,Has any past Grant Record,Hefur einhverjar fyrri styrkleikaskrár
@@ -6463,7 +6470,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Hótel herbergi fyrirvara
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Þjónustuver
 DocType: BOM,Thumbnail,Smámynd
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Engar tengiliðir við auðkenni tölvupósts fundust.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Engar tengiliðir við auðkenni tölvupósts fundust.
 DocType: Item Customer Detail,Item Customer Detail,Liður Viðskiptavinur Detail
 DocType: Notification Control,Prompt for Email on Submission of,Hvetja til Email um Framlagning
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Hámarksframlagsþáttur starfsmanns {0} fer yfir {1}
@@ -6718,7 +6725,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,Get ekki leynilegar að samstæðunnar vegna Tegund reiknings er valinn.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} hefur verið breytt. Vinsamlegast hressa.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Hættu notendur frá gerð yfirgefa Umsóknir um næstu dögum.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Vörunúmer&gt; Liðurhópur&gt; Vörumerki
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.",Ef ótakmarkaður rennur út fyrir hollustustigið skaltu halda gildistíma gildistíma tómt eða 0.
 DocType: Asset Maintenance Team,Maintenance Team Members,Viðhaldsliðsmenn
 DocType: Loyalty Point Entry,Purchase Amount,kaup Upphæð
@@ -6726,7 +6732,7 @@
 											to fullfill Sales Order {2}",Ekki er hægt að skila raðnúmeri {0} í lið {1} eins og það er áskilið \ til að fylla út söluskilaboð {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Birgir Tilvitnun {0} búin
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Árslok getur ekki verið áður Start Ár
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Árslok getur ekki verið áður Start Ár
 DocType: Employee Benefit Application,Employee Benefits,starfskjör
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Pakkað magn verður að vera jafnt magn fyrir lið {0} í röð {1}
 DocType: Work Order,Manufactured Qty,Framleiðandi Magn
@@ -6742,6 +6748,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Veldu hópnúmer
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Til GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Víxlar vakti til viðskiptavina.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vinsamlega settu upp starfsmannamiðlunarkerfi í mannauði&gt; HR-stillingar
 DocType: Healthcare Settings,Invoice Appointments Automatically,Innheimtuákvæði sjálfkrafa
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
 DocType: Salary Component,Variable Based On Taxable Salary,Variable Byggt á skattskyldum launum
@@ -6790,7 +6797,7 @@
 DocType: POS Profile,Account for Change Amount,Reikningur fyrir Change Upphæð
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Tengist við QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Heildargreiðsla / tap
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Ógilt félag fyrir millifærslufyrirtæki.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Ógilt félag fyrir millifærslufyrirtæki.
 DocType: Purchase Invoice,input service,inntakstími
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Account passar ekki við {1} / {2} í {3} {4}
 DocType: Employee Promotion,Employee Promotion,Starfsmaður kynningar
@@ -6920,7 +6927,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Valinn svæði fyrir gistingu
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Karfan er tóm
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Vinsamlegast skipulag kennari Nafnakerfi í menntun&gt; Menntun
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Liður {0} er ekki með raðnúmer. Aðeins serilialized hlutir \ geta fengið afhendingu byggt á raðnúmeri
 DocType: Vehicle,Model,Model
@@ -6950,7 +6956,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Ekkert að breyta
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Vinsamlegast veldu csv skrá
 DocType: Holiday List,Total Holidays,Samtals hátíðir
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Vantar email sniðmát til sendingar. Vinsamlegast stilltu einn í Afhendingastillingar.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Vantar email sniðmát til sendingar. Vinsamlegast stilltu einn í Afhendingastillingar.
 DocType: Student Leave Application,Mark as Present,Merkja sem Present
 DocType: Supplier Scorecard,Indicator Color,Vísir Litur
 DocType: Purchase Order,To Receive and Bill,Að taka við og Bill
@@ -6959,7 +6965,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Veldu raðnúmer
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,hönnuður
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Skilmálar og skilyrði Snið
-DocType: Serial No,Delivery Details,Afhending Upplýsingar
+DocType: Delivery Trip,Delivery Details,Afhending Upplýsingar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Kostnaður Center er krafist í röð {0} skatta borð fyrir tegund {1}
 DocType: Program,Program Code,program Code
 DocType: Terms and Conditions,Terms and Conditions Help,Skilmálar og skilyrði Hjálp
@@ -6983,7 +6989,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time Days
 DocType: Cash Flow Mapping,Is Income Tax Expense,Er tekjuskattur kostnaður
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Pöntunin þín er út fyrir afhendingu!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Staða Dagsetning skal vera það sama og kaupdegi {1} eignar {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Staða Dagsetning skal vera það sama og kaupdegi {1} eignar {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Kannaðu þetta ef nemandi er búsettur í gistihúsinu.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Vinsamlegast sláðu sölu skipunum í töflunni hér að ofan
 ,Stock Summary,Stock Yfirlit
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index dc34a13..f8429e7 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Nome del periodo
 DocType: Employee,Salary Mode,Modalità di stipendio
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Registrare
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Registrare
 DocType: Patient,Divorced,Divorziato
 DocType: Support Settings,Post Route Key,Post Route Key
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Consenti di aggiungere lo stesso articolo più volte in una transazione
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Nuovo tasso di cambio
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},E' necessario specificare la  valuta per il listino prezzi {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sarà calcolato nella transazione
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Fornitore&gt; Tipo di fornitore
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Customer Contact
 DocType: Patient Appointment,Check availability,Verificare la disponibilità
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Mostra aperta
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Serie aggiornata con successo
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Check-out
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} nella riga {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} nella riga {1}
 DocType: Asset Finance Book,Depreciation Start Date,Data di inizio ammortamento
 DocType: Pricing Rule,Apply On,Applica su
 DocType: Item Price,Multiple Item prices.,Prezzi Articolo Multipli
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Prescrizione di laboratorio
 ,Delay Days,Giorni di ritardo
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,spese per servizi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Numero di serie: {0} è già indicato nella fattura di vendita: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Numero di serie: {0} è già indicato nella fattura di vendita: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Fattura
 DocType: Purchase Invoice Item,Item Weight Details,Dettagli peso articolo
 DocType: Asset Maintenance Log,Periodicity,Periodicità
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Ragioniere
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Listino prezzi di vendita
 DocType: Patient,Tobacco Current Use,Uso corrente di tabacco
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","La data di inizio e la data di fine si sovrappongono alla scheda del lavoro <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Tasso di vendita
 DocType: Cost Center,Stock User,Utente Giacenze
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca+Mg)/K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Collegamento
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,La data della presenza non può essere inferiore alla data di assunzione del dipendente
 DocType: Grading Scale,Grading Scale Name,Grading Scale Nome
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Aggiungi utenti al Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Aggiungi utenti al Marketplace
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Questo è un account di root e non può essere modificato .
 DocType: Sales Invoice,Company Address,indirizzo aziendale
 DocType: BOM,Operations,Operazioni
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Qtà diff
 DocType: Production Plan,Material Request Detail,Dettaglio richiesta materiale
 DocType: Selling Settings,Default Quotation Validity Days,Giorni di validità delle quotazioni predefinite
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per includere fiscale in riga {0} in rate articolo , tasse nelle righe {1} devono essere inclusi"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per includere fiscale in riga {0} in rate articolo , tasse nelle righe {1} devono essere inclusi"
 DocType: SMS Center,SMS Center,Centro SMS
 DocType: Payroll Entry,Validate Attendance,Convalida partecipazione
 DocType: Sales Invoice,Change Amount,quantità di modifica
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,interlinea per importo in lettere
 DocType: Vehicle,Additional Details,Dettagli aggiuntivi
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Nessuna descrizione fornita
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Fornitore&gt; Gruppo di fornitori
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Richiesta di acquisto.
 DocType: POS Closing Voucher Details,Collected Amount,Importo raccolto
 DocType: Lab Test,Submitted Date,Data di invio
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,L&#39;ammissione degli studenti
 ,Terretory,Territorio
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,L'articolo {0} è annullato
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Riga di ammortamento {0}: data di inizio ammortamento è inserita come data precedente
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Riga di ammortamento {0}: data di inizio ammortamento è inserita come data precedente
 DocType: Contract Template,Fulfilment Terms and Conditions,Termini e condizioni di adempimento
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Richiesta materiale
 DocType: Bank Reconciliation,Update Clearance Date,Aggiornare Liquidazione Data
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,Impostazioni per gli account
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},La Fattura Fornitore non esiste nella Fattura di Acquisto {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Gestire venditori ad albero
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Impossibile elaborare il percorso, poiché le impostazioni di Google Maps sono disabilitate."
 DocType: Job Applicant,Cover Letter,Lettera di presentazione
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Gli assegni in circolazione e depositi per cancellare
 DocType: Item,Synced With Hub,Sincronizzati con Hub
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Nuovo valore patrimoniale
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tasso con cui la valuta Cliente viene convertita in valuta di base del cliente
 DocType: Course Scheduling Tool,Course Scheduling Tool,Strumento Pianificazione Corso
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Acquisto fattura non può essere fatta contro un bene esistente {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Acquisto fattura non può essere fatta contro un bene esistente {1}
 DocType: Crop Cycle,LInked Analysis,Analisi di LInked
 DocType: POS Closing Voucher,POS Closing Voucher,Voucher di chiusura POS
 DocType: Contract,Lapsed,decaduto
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} non è iscritto al corso {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Nome dello studente:
 DocType: POS Closing Voucher Details,Difference,Differenza
+DocType: Delivery Settings,Delay between Delivery Stops,Ritardo tra le fermate di consegna
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial No {0} non appartiene alla Consegna Nota {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Sembra esserci un problema con la configurazione del server GoCardless. Non preoccuparti, in caso di errore, l'importo verrà rimborsato sul tuo conto."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -693,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Quantità e Prezzo
 DocType: Delivery Note,% Installed,% Installato
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,Aule / Laboratori etc dove le lezioni possono essere programmati.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Le valute delle società di entrambe le società devono corrispondere alle Transazioni della Società Inter.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Le valute delle società di entrambe le società devono corrispondere alle Transazioni della Società Inter.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Inserisci il nome della società prima
 DocType: Travel Itinerary,Non-Vegetarian,Non vegetariano
 DocType: Purchase Invoice,Supplier Name,Nome Fornitore
@@ -778,7 +779,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Affittato dalla data
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Parti abbastanza per costruire
 DocType: POS Profile User,POS Profile User,Profilo utente POS
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Riga {0}: è richiesta la Data di inizio ammortamento
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Riga {0}: è richiesta la Data di inizio ammortamento
 DocType: Purchase Invoice Item,Service Start Date,Data di inizio del servizio
 DocType: Subscription Invoice,Subscription Invoice,Fattura di abbonamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,reddito diretta
@@ -845,7 +846,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Abbreviazione già utilizzata per un'altra società
 DocType: Selling Settings,Default Customer Group,Gruppo Clienti Predefinito
 DocType: Employee,IFSC Code,Codice IFSC
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","La data di inizio e la data di fine si sovrappongono alla scheda del lavoro <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Se disabilitare, &#39;Rounded totale&#39; campo non sarà visibile in qualsiasi transazione"
 DocType: BOM,Operating Cost,Costo di gestione
 DocType: Crop,Produced Items,Articoli prodotti
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,Impedire RFQ
 DocType: Hub User,Hub User,Utente Hub
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Crea Ordine di vendita
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Salary Slip presentato per il periodo da {0} a {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Salary Slip presentato per il periodo da {0} a {1}
 DocType: Project Task,Project Task,Attività Progetto
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Punti riscattati
 ,Lead Id,Id del Lead
@@ -1027,7 +1027,7 @@
 DocType: Fee Validity,Max number of visit,Numero massimo di visite
 ,Hotel Room Occupancy,Camera d&#39;albergo Occupazione
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Scheda attività creata:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Si prega di impostare di default Contanti o conto bancario in Modalità di pagamento {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Si prega di impostare di default Contanti o conto bancario in Modalità di pagamento {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Iscriversi
 DocType: GST Settings,GST Settings,Impostazioni GST
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},La valuta deve essere uguale alla valuta della lista dei prezzi: {0}
@@ -1081,7 +1081,7 @@
 DocType: Vehicle Log,Service Details,Dettagli del servizio
 DocType: Lab Test Template,Grouped,raggruppate
 DocType: Selling Settings,Delivery Note Required,Documento di Trasporto Richiesto
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Invio di buste salariali ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Invio di buste salariali ...
 DocType: Bank Guarantee,Bank Guarantee Number,Numero di garanzia bancaria
 DocType: Assessment Criteria,Assessment Criteria,Critero di valutazione
 DocType: BOM Item,Basic Rate (Company Currency),Tasso Base (Valuta Azienda)
@@ -1106,13 +1106,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Il Pagamento è già stato creato
 DocType: Request for Quotation,Get Suppliers,Ottenere Fornitori
 DocType: Purchase Receipt Item Supplied,Current Stock,Giacenza Corrente
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} non legata alla voce {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} non legata alla voce {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Anteprima foglio paga
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Account {0} è stato inserito più volte
 DocType: Account,Expenses Included In Valuation,Spese incluse nella valorizzazione
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Puoi rinnovare solo se la tua iscrizione scade entro 30 giorni
 DocType: Shopping Cart Settings,Show Stock Availability,Mostra disponibilità di magazzino
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Imposta {0} nella categoria di asset {1} o nella società {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Imposta {0} nella categoria di asset {1} o nella società {2}
 DocType: Location,Longitude,Longitudine
 ,Absent Student Report,Report Assenze Studente
 DocType: Crop,Crop Spacing UOM,Crop Spacing UOM
@@ -1184,7 +1184,7 @@
 DocType: Soil Texture,Sand,Sabbia
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Opportunità da
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Riga {0}: {1} Numeri di serie necessari per l&#39;articolo {2}. Hai fornito {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Riga {0}: {1} Numeri di serie necessari per l&#39;articolo {2}. Hai fornito {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Seleziona una tabella
 DocType: BOM,Website Specifications,Website Specifiche
 DocType: Special Test Items,Particulars,Particolari
@@ -1295,7 +1295,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Gli articoli con maggiore weightage nel periodo più alto
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Test di laboratorio e segni vitali
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Dettaglio Riconciliazione Banca
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} deve essere presentata
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} deve essere presentata
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nessun dipendente trovato
 DocType: Item,If subcontracted to a vendor,Se subappaltato a un fornitore
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Il gruppo studente è già aggiornato.
@@ -1349,7 +1349,6 @@
 DocType: Loyalty Program Collection,Tier Name,Nome del livello
 DocType: HR Settings,Enter retirement age in years,Inserire l&#39;età pensionabile in anni
 DocType: Crop,Target Warehouse,Magazzino di Destinazione
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Impostare Serie di denominazione per {0} tramite Impostazione&gt; Impostazioni&gt; Serie di denominazione
 DocType: Payroll Employee Detail,Payroll Employee Detail,Dettaglio dipendente del libro paga
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Seleziona un magazzino
 DocType: Cheque Print Template,Starting location from left edge,A partire da posizione bordo sinistro
@@ -1439,7 +1438,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Materiale Piano per sub-assemblaggi
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,I partner di vendita e Territorio
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,Distinta Base {0} deve essere attiva
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Nessun articolo disponibile per il trasferimento
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Nessun articolo disponibile per il trasferimento
 DocType: Employee Boarding Activity,Activity Name,Nome dell&#39;attività
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Cambia Data di rilascio
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,La quantità di prodotto finito <b>{0}</b> e la quantità di prodotto <b>{1}</b> non possono essere diversi
@@ -1666,6 +1665,7 @@
 DocType: Project,First Email,Prima email
 DocType: Company,Exception Budget Approver Role,Ruolo di approvazione budget eccezionale
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Una volta impostata, questa fattura sarà in attesa fino alla data impostata"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Warehouse Riservato a ordini di vendita / Magazzino prodotti finiti
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Importo di vendita
 DocType: Repayment Schedule,Interest Amount,Ammontare Interessi
@@ -1677,7 +1677,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Records
 DocType: Asset,Scrapped,Demolita
 DocType: Item,Item Defaults,Impostazioni predefinite dell&#39;oggetto
-DocType: Purchase Invoice,Returns,Restituisce
+DocType: Cashier Closing,Returns,Restituisce
 DocType: Job Card,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serial No {0} è sotto contratto di manutenzione fino a {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,Reclutamento
@@ -1691,7 +1691,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Tipo di trasferimento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Spese di vendita
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Gruppo clienti&gt; Territorio
 DocType: Diagnosis,Diagnosis,Diagnosi
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Listino d'Acquisto
 DocType: Attendance Request,Explanation,Spiegazione
@@ -1704,7 +1703,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Ordini di ordini scaduti
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,CAP
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Sales Order {0} è {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Seleziona il conto interessi attivi in prestito {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Seleziona il conto interessi attivi in prestito {0}
 DocType: Opportunity,Contact Info,Info Contatto
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Creazione scorte
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Impossibile promuovere il Dipendente con stato Sinistro
@@ -1716,7 +1715,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,La fattura non può essere effettuata per zero ore di fatturazione
 DocType: Company,Date of Commencement,Data d&#39;inizio
 DocType: Sales Person,Select company name first.,Selezionare il nome della società prima.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},E-mail inviata a {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},E-mail inviata a {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Preventivi ricevuti dai Fornitori.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Sostituire il BOM e aggiornare il prezzo più recente in tutte le BOM
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Per {0} | {1} {2}
@@ -1736,7 +1735,7 @@
 DocType: Asset Movement,From Employee,Da Dipendente
 DocType: Driver,Cellphone Number,Numero di cellulare
 DocType: Project,Monitor Progress,Monitorare i progressi
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Attenzione : Il sistema non controlla fatturazione eccessiva poiché importo per la voce {0} in {1} è zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Attenzione : Il sistema non controlla fatturazione eccessiva poiché importo per la voce {0} in {1} è zero
 DocType: Journal Entry,Make Difference Entry,Aggiungi Differenza
 DocType: Supplier Quotation,Auto Repeat Section,Sezione Auto Repeat
 DocType: Upload Attendance,Attendance From Date,Presenza Da Data
@@ -1839,7 +1838,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rifiutato Quantità non è possibile entrare in acquisto di ritorno
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Non è consentito modificare il gruppo di clienti per il cliente selezionato.
 ,Purchase Order Items To Be Billed,Articoli dell'Ordine di Acquisto da fatturare
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Aggiornamento dei tempi di arrivo stimati.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Aggiornamento dei tempi di arrivo stimati.
 DocType: Program Enrollment Tool,Enrollment Details,Dettagli iscrizione
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Impossibile impostare più valori predefiniti oggetto per un&#39;azienda.
 DocType: Purchase Invoice Item,Net Rate,Tasso Netto
@@ -1853,7 +1852,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Lasciare il tipo è pazzesco
 DocType: Support Settings,Close Issue After Days,Chiudi Problema dopo giorni
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Devi essere un utente con i ruoli di System Manager e Item Manager per aggiungere utenti al Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Devi essere un utente con i ruoli di System Manager e Item Manager per aggiungere utenti al Marketplace.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Lasciare vuoto se considerato per tutti i rami
 DocType: Job Opening,Staffing Plan,Piano del personale
 DocType: Bank Guarantee,Validity in Days,Validità in giorni
@@ -1873,7 +1872,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Fila Duplicate {0} con lo stesso {1}
 DocType: Marketplace Settings,Disable Marketplace,Disabilita Marketplace
 ,Trial Balance,Bilancio di verifica
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Anno fiscale {0} non trovato
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Anno fiscale {0} non trovato
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Impostazione dipendenti
 DocType: Hotel Room Reservation,Hotel Reservation User,Utente prenotazione hotel
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Si prega di selezionare il prefisso prima
@@ -1981,7 +1980,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Impossibile accedere
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Asset {0} creato
 DocType: Special Test Items,Special Test Items,Articoli speciali di prova
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Devi essere un utente con i ruoli di System Manager e Item Manager da registrare sul Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Devi essere un utente con i ruoli di System Manager e Item Manager da registrare sul Marketplace.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Modalità di Pagamento
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,In base alla struttura retributiva assegnata non è possibile richiedere prestazioni
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Website Immagine dovrebbe essere un file o URL del sito web pubblico
@@ -1993,7 +1992,7 @@
 DocType: Warehouse,Warehouse Contact Info,Contatti Magazzino
 DocType: Payment Entry,Write Off Difference Amount,Importo a differenza Svalutazione
 DocType: Volunteer,Volunteer Name,Nome del volontario
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Righe con date di scadenza duplicate in altre righe sono state trovate: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Righe con date di scadenza duplicate in altre righe sono state trovate: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: Indirizzo e-mail del dipendente non trovato, e-mail non inviata"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Nessuna struttura retributiva assegnata al Dipendente {0} in data determinata {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Regola di spedizione non applicabile per il paese {0}
@@ -2082,6 +2081,7 @@
 DocType: Salary Component,Earning,Rendimento
 DocType: Supplier Scorecard,Scoring Criteria,Criteri di punteggio
 DocType: Purchase Invoice,Party Account Currency,Valuta Conto del Partner
+DocType: Delivery Trip,Total Estimated Distance,Distanza totale stimata
 ,BOM Browser,Sfoglia BOM
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Aggiorna il tuo stato per questo evento di addestramento
 DocType: Item Barcode,EAN,EAN
@@ -2120,7 +2120,7 @@
 DocType: Activity Cost,Projects,Progetti
 DocType: Payment Request,Transaction Currency,transazioni valutarie
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Da {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Alcune email non sono valide
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Alcune email non sono valide
 DocType: Work Order Operation,Operation Description,Operazione Descrizione
 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.,Impossibile modificare data di inizio e di fine anno fiscale una volta che l'anno fiscale è stato salvato.
 DocType: Quotation,Shopping Cart,Carrello spesa
@@ -2144,7 +2144,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Variazione netta delle immobilizzazioni
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lasciare vuoto se considerato per tutte le designazioni
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Carica di tipo ' Actual ' in riga {0} non può essere incluso nella voce Tasso
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Carica di tipo ' Actual ' in riga {0} non può essere incluso nella voce Tasso
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Da Datetime
 DocType: Shopify Settings,For Company,Per Azienda
@@ -2158,7 +2158,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Si sono verificati degli errori durante la creazione del programma del corso
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Il primo approvatore di spesa nell&#39;elenco verrà impostato come Approvatore spese predefinito.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,non può essere superiore a 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Devi essere un utente diverso dall&#39;amministratore con i ruoli di System Manager e Item Manager da registrare sul Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Devi essere un utente diverso dall&#39;amministratore con i ruoli di System Manager e Item Manager da registrare sul Marketplace.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,L'articolo {0} non è in Giagenza
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Non in programma
@@ -2187,7 +2187,7 @@
 DocType: HR Settings,Employee Settings,Impostazioni dipendente
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Caricamento del sistema di pagamento
 ,Batch-Wise Balance History,Cronologia Saldo Lotti-Wise
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Riga # {0}: impossibile impostare Tasso se l&#39;importo è maggiore dell&#39;importo fatturato per l&#39;articolo {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Riga # {0}: impossibile impostare Tasso se l&#39;importo è maggiore dell&#39;importo fatturato per l&#39;articolo {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Le impostazioni di stampa aggiornati nel rispettivo formato di stampa
 DocType: Package Code,Package Code,Codice Confezione
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,apprendista
@@ -2421,7 +2421,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} posti vacanti e {1} budget per {2} già pianificati per le società controllate di {3}. \ Puoi solo pianificare fino a {4} posti vacanti e budget {5} come da piano di assunzione del personale {6} per la casa madre {3}.
 DocType: HR Settings,Stop Birthday Reminders,Arresto Compleanno Promemoria
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Si prega di impostare di default Payroll conto da pagare in azienda {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Si prega di impostare di default Payroll conto da pagare in azienda {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Ottieni una rottura finanziaria delle tasse e carica i dati di Amazon
 DocType: SMS Center,Receiver List,Lista Ricevitore
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Cerca Articolo
@@ -2491,7 +2491,7 @@
 DocType: Vital Signs,Constipated,Stitico
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Al ricevimento della Fattura Fornitore {0} datata {1}
 DocType: Customer,Default Price List,Listino Prezzi Predefinito
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,record di Asset Movimento {0} creato
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,record di Asset Movimento {0} creato
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Nessun articolo trovato.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Non è possibile cancellare l&#39;anno fiscale {0}. Anno fiscale {0} è impostato in modo predefinito in Impostazioni globali
 DocType: Share Transfer,Equity/Liability Account,Equity / Liability Account
@@ -2628,6 +2628,7 @@
 DocType: Blanket Order,Order Type,Tipo di ordine
 ,Item-wise Sales Register,Vendite articolo-saggio Registrati
 DocType: Asset,Gross Purchase Amount,Importo Acquisto Gross
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Codice articolo&gt; Gruppo articoli&gt; Marca
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Saldi di bilancio
 DocType: Asset,Depreciation Method,Metodo di ammortamento
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,È questa tassa inclusi nel prezzo base?
@@ -2708,7 +2709,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Azione se il budget annuale è scaduto in ordine di PO
 DocType: Student Leave Application,Student Leave Application,Student Leave Application
 DocType: Item,Will also apply for variants,Si applica anche per le varianti
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Asset non può essere annullato, in quanto è già {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Asset non può essere annullato, in quanto è già {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Employee {0} sulla mezza giornata su {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},l&#39;orario di lavoro totale non deve essere maggiore di ore di lavoro max {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,On
@@ -2732,6 +2733,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Recupera dati
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Permesso massimo permesso nel tipo di permesso {0} è {1}
 DocType: SMS Center,Create Receiver List,Crea Elenco Ricezione
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Data disponibile per l&#39;uso dovrebbe essere successiva alla data di acquisto
 DocType: Vehicle,Wheels,Ruote
 DocType: Packing Slip,To Package No.,A Pacchetto no
 DocType: Patient Relation,Family,Famiglia
@@ -2745,7 +2747,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,La valuta di fatturazione deve essere uguale alla valuta della società predefinita o alla valuta dell&#39;account del partito
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica che il pacchetto è una parte di questa consegna (solo Bozza)
 DocType: Soil Texture,Loam,terra grassa
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Riga {0}: la data di scadenza non può essere precedente alla data di pubblicazione
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Riga {0}: la data di scadenza non può essere precedente alla data di pubblicazione
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Effettua Pagamento
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Quantità per la voce {0} deve essere inferiore a {1}
 ,Sales Invoice Trends,Andamento Fatture di vendita
@@ -2817,7 +2819,7 @@
 DocType: Guardian,Guardian Interests,Custodi Interessi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Aggiorna nome / numero account
 DocType: Naming Series,Current Value,Valore Corrente
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,esistono più esercizi per la data {0}. Si prega di impostare società l&#39;anno fiscale
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,esistono più esercizi per la data {0}. Si prega di impostare società l&#39;anno fiscale
 DocType: Education Settings,Instructor Records to be created by,Istruttore Record da creare da
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} creato
 DocType: GST Account,GST Account,Account GST
@@ -2835,7 +2837,7 @@
 DocType: Sales Person,Name and Employee ID,Nome e ID Dipendente
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,La Data di Scadenza non può essere antecedente alla Data di Registrazione
 DocType: Website Item Group,Website Item Group,Sito Gruppo Articolo
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nessun documento retributivo scoperto da presentare per i criteri sopra menzionati OPPURE lo stipendio già presentato
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nessun documento retributivo scoperto da presentare per i criteri sopra menzionati OPPURE lo stipendio già presentato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Dazi e tasse
 DocType: Projects Settings,Projects Settings,Impostazioni dei progetti
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Inserisci Data di riferimento
@@ -2844,7 +2846,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Dotazione Qtà
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Voce di richiesta materiale
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Si prega di cancellare prima la ricevuta d&#39;acquisto {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Si prega di cancellare prima la ricevuta d&#39;acquisto {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Albero di gruppi di articoli .
 DocType: Production Plan,Total Produced Qty,Quantità totale prodotta
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Non può consultare numero di riga maggiore o uguale al numero di riga corrente per questo tipo di carica
@@ -2953,6 +2955,7 @@
 ,Vehicle Expenses,Spese del veicolo
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Crea test di laboratorio su Fattura di vendita Invia
 DocType: Serial No,Invoice Details,Dettagli della fattura
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Si prega di abilitare le impostazioni di Google Maps per stimare e ottimizzare i percorsi
 DocType: Grant Application,Show on Website,Mostra sul sito web
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Inizia
 DocType: Hub Tracked Item,Hub Category,Categoria Hub
@@ -2992,7 +2995,7 @@
 DocType: Inpatient Record,B Positive,B Positivo
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Il massimo vantaggio del dipendente {0} supera {1} per la somma {2} del precedente importo richiesto
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Quantità deve essere 1, poiche' si tratta di un Bene Strumentale. Si prega di utilizzare riga separata per quantita' multiple."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Quantità deve essere 1, poiche' si tratta di un Bene Strumentale. Si prega di utilizzare riga separata per quantita' multiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Lascia permesso blocco lista
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,L'abbr. non può essere vuota o spazio
 DocType: Patient Medical Record,Patient Medical Record,Registro medico paziente
@@ -3026,7 +3029,7 @@
 DocType: Workstation,Wages per hour,Salari all'ora
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Equilibrio Stock in Lotto {0} sarà negativo {1} per la voce {2} a Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,A seguito di richieste di materiale sono state sollevate automaticamente in base al livello di riordino della Voce
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Account {0} non valido. La valuta del conto deve essere {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Account {0} non valido. La valuta del conto deve essere {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Dalla data {0} non può essere successiva alla Data di rilascio del dipendente {1}
 DocType: Supplier,Is Internal Supplier,È un fornitore interno
 DocType: Employee,Create User Permission,Crea autorizzazione utente
@@ -3170,7 +3173,7 @@
 DocType: Account,Fixed Asset,Asset fisso
 DocType: Amazon MWS Settings,After Date,Dopo la data
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Serialized Inventario
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,{0} non valido per la fattura aziendale interna.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,{0} non valido per la fattura aziendale interna.
 ,Department Analytics,Analisi dei dati del dipartimento
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Email non trovata nel contatto predefinito
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Genera segreto
@@ -3182,7 +3185,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Il programma nella struttura tariffaria e nel gruppo di studenti {0} sono diversi.
 DocType: Bank Statement Transaction Entry,Receivable Account,Conto Crediti
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Valido dalla data deve essere minore di Valido fino alla data.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} è già {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} è già {2}
 DocType: Quotation Item,Stock Balance,Saldo Delle Scorte
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Ordine di vendita a pagamento
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,Amministratore delegato
@@ -3224,6 +3227,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Debito A è richiesto
 DocType: Clinical Procedure,Inpatient Record,Record ospedaliero
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Schede attività per tenere traccia del tempo, i costi e la fatturazione per attività fatta per tua squadra"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Fornitore&gt; Tipo di fornitore
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Acquisto Listino Prezzi
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Data della transazione
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Modelli delle variabili dei scorecard fornitori.
@@ -3266,7 +3270,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Guadagno Exchange / Perdita
 DocType: Opportunity,Lost Reason,Motivo della perdita
 DocType: Amazon MWS Settings,Enable Amazon,Abilita Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Riga n. {0}: l&#39;account {1} non appartiene all&#39;azienda {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Riga n. {0}: l&#39;account {1} non appartiene all&#39;azienda {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Impossibile trovare DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nuovo indirizzo
 DocType: Quality Inspection,Sample Size,Dimensione del campione
@@ -3377,7 +3381,7 @@
 DocType: Water Analysis,Origin,Origine
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Questo documento è oltre il limite da {0} {1} per item {4}. State facendo un altro {3} contro lo stesso {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Si prega di impostare ricorrenti dopo il salvataggio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,conto importo Selezionare cambiamento
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,conto importo Selezionare cambiamento
 DocType: Purchase Invoice,Price List Currency,Prezzo di listino Valuta
 DocType: Naming Series,User must always select,L&#39;utente deve sempre selezionare
 DocType: Stock Settings,Allow Negative Stock,Permetti Scorte Negative
@@ -3419,7 +3423,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Sei sicuro di voler annullare questo appuntamento?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Pacchetto prezzi camera d&#39;albergo
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,pipeline di vendita
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Si prega di impostare account predefinito di stipendio componente {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Si prega di impostare account predefinito di stipendio componente {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Richiesto On
 DocType: Rename Tool,File to Rename,File da rinominare
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Seleziona la Distinta Base per l'Articolo nella riga {0}
@@ -3440,7 +3444,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Costo dei beni acquistati
 DocType: Employee Separation,Employee Separation Template,Modello di separazione dei dipendenti
 DocType: Selling Settings,Sales Order Required,Ordine di Vendita richiesto
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Diventa un venditore
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Diventa un venditore
 DocType: Purchase Invoice,Credit To,Credito a
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Leads attivi / Clienti
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Lascia vuoto per utilizzare il formato di nota di consegna standard
@@ -3481,7 +3485,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Crea modello fiscale
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum utente
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Materie prime non può essere vuoto.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Riga # {0} (Tabella pagamenti): l&#39;importo deve essere negativo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Riga # {0} (Tabella pagamenti): l&#39;importo deve essere negativo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Impossibile aggiornare magazzino, la fattura contiene articoli spediti direttamente dal fornitore."
 DocType: Contract,Fulfilment Status,Stato di adempimento
 DocType: Lab Test Sample,Lab Test Sample,Campione di prova da laboratorio
@@ -3640,7 +3644,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Doc Data
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Records Fee Creato - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Categoria account
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Riga # {0} (Tabella pagamenti): l&#39;importo deve essere positivo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Riga # {0} (Tabella pagamenti): l&#39;importo deve essere positivo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Non può produrre più Voce {0} di Sales Order quantità {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Seleziona i valori degli attributi
 DocType: Purchase Invoice,Reason For Issuing document,Motivo per il rilascio del documento
@@ -3695,7 +3699,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Ora in cui sono stati ricevuti i materiali
 DocType: Products Settings,Products per Page,Prodotti per pagina
 DocType: Stock Ledger Entry,Outgoing Rate,Tasso di uscita
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,oppure
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,oppure
 DocType: Sales Order,Billing Status,Stato Fatturazione
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Segnala un Problema
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Spese di utenza
@@ -3722,7 +3726,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Dichiarazione di esenzione fiscale dei dipendenti
 DocType: Payment Entry,Cheque/Reference Date,Data di riferimento
 DocType: Purchase Invoice,Total Taxes and Charges,Totale imposte e oneri
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Data disponibile per l&#39;uso La data è stata inserita come data passata
 DocType: Employee,Emergency Contact,Contatto di emergenza
 DocType: Bank Reconciliation Detail,Payment Entry,Pagamento
 ,sales-browser,vendite browser
@@ -3768,6 +3771,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),È il ritorno (nota di credito)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Inizia lavoro
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Il numero di serie è richiesto per la risorsa {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Impostare Serie di denominazione per {0} tramite Impostazione&gt; Impostazioni&gt; Serie di denominazione
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,modello disabili non deve essere modello predefinito
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Per la riga {0}: inserisci qtà pianificata
 DocType: Account,Income Account,Conto Proventi
@@ -3781,6 +3785,7 @@
 DocType: Loyalty Program,Help Section,Sezione Aiuto
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,Area Responsabilità Chiave
+DocType: Delivery Trip,Distance UOM,UOM di distanza
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","I lotti degli studenti aiutano a tenere traccia di presenza, le valutazioni e le tasse per gli studenti"
 DocType: Payment Entry,Total Allocated Amount,Totale importo assegnato
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Imposta l&#39;account di inventario predefinito per l&#39;inventario perpetuo
@@ -3822,7 +3827,7 @@
 DocType: Item Supplier,Item Supplier,Articolo Fornitore
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Inserisci il codice Item per ottenere lotto non
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Si prega di selezionare un valore per {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Nessun elemento selezionato per il trasferimento
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Nessun elemento selezionato per il trasferimento
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Tutti gli indirizzi.
 DocType: Company,Stock Settings,Impostazioni Giacenza
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusione è possibile solo se le seguenti proprietà sono le stesse in entrambi i record. E' un Gruppo, Tipo Radice, Azienda"
@@ -4119,7 +4124,7 @@
 DocType: Patient,Personal and Social History,Storia personale e sociale
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Utente {0} creato
 DocType: Fee Schedule,Fee Breakup for each student,Scomposizione per ogni studente
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),L'Anticipo totale ({0}) relativo all'ordine {1} non può essere superiore al totale complessivo ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),L'Anticipo totale ({0}) relativo all'ordine {1} non può essere superiore al totale complessivo ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selezionare distribuzione mensile per distribuire in modo non uniforme obiettivi attraverso mesi.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Cambiare il codice
 DocType: Purchase Invoice Item,Valuation Rate,Tasso di Valorizzazione
@@ -4128,7 +4133,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Disponibile ITC Cess
 ,Student Monthly Attendance Sheet,Presenze mensile Scheda
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Regola di spedizione applicabile solo per la vendita
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Riga di ammortamento {0}: la successiva data di ammortamento non può essere anteriore alla data di acquisto
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Riga di ammortamento {0}: la successiva data di ammortamento non può essere anteriore alla data di acquisto
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data di inizio del progetto
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Fino a
 DocType: Rename Tool,Rename Log,Rinominare Entra
@@ -4145,12 +4150,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Con quale frequenza il progetto e la società devono essere aggiornati in base alle transazioni di vendita.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Scade il
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Aggiungi studenti
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Per favore cancella il Dipendente <a href=""#Form/Employee/{0}"">{0}</a> \ per cancellare questo documento"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Si prega di selezionare {0}
 DocType: C-Form,C-Form No,C-Form N.
 DocType: BOM,Exploded_items,Articoli_esplosi
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Distanza
+DocType: Delivery Stop,Distance,Distanza
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Elenca i tuoi prodotti o servizi acquistati o venduti.
 DocType: Water Analysis,Storage Temperature,Temperatura di conservazione
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4177,7 +4180,7 @@
 DocType: Homepage,Company Description for website homepage,Descrizione della società per home page del sito
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Per la comodità dei clienti, questi codici possono essere utilizzati in formati di stampa, come fatture e Documenti di Trasporto"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nome suplier
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Impossibile recuperare le informazioni per {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Impossibile recuperare le informazioni per {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Diario di apertura
 DocType: Contract,Fulfilment Terms,Termini di adempimento
 DocType: Sales Invoice,Time Sheet List,Lista schede attività
@@ -4357,7 +4360,7 @@
 DocType: Serial No,Warranty / AMC Details,Garanzia / AMC Dettagli
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Selezionare manualmente gli studenti per il gruppo basato sulle attività
 DocType: Journal Entry,User Remark,Osservazioni dell'utente
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Ottimizzare i percorsi.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Ottimizzare i percorsi.
 DocType: Travel Itinerary,Non Diary,Non diario
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Impossibile creare il bonus di conservazione per i dipendenti di sinistra
 DocType: Lead,Market Segment,Segmento di Mercato
@@ -4387,7 +4390,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Programma fedeltà
 DocType: Student Guardian,Father,Padre
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Supporta i biglietti
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;Aggiornamento della&#39; non può essere controllato per vendita asset fissi
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;Aggiornamento della&#39; non può essere controllato per vendita asset fissi
 DocType: Bank Reconciliation,Bank Reconciliation,Riconciliazione Banca
 DocType: Attendance,On Leave,In ferie
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Ricevi aggiornamenti
@@ -4432,7 +4435,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,N. di serie e batch
 DocType: Warranty Claim,From Company,Da Azienda
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Somma dei punteggi di criteri di valutazione deve essere {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Si prega di impostare Numero di ammortamenti Prenotato
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Si prega di impostare Numero di ammortamenti Prenotato
 DocType: Supplier Scorecard Period,Calculations,Calcolo
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Valore o Quantità
 DocType: Payment Terms Template,Payment Terms,Termini di pagamento
@@ -4451,7 +4454,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Sconto (%) sul prezzo di listino con margine
 DocType: Healthcare Service Unit Type,Rate / UOM,Tasso / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Tutti i Depositi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Nessun {0} trovato per transazioni interaziendali.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Nessun {0} trovato per transazioni interaziendali.
 DocType: Travel Itinerary,Rented Car,Auto a noleggio
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Informazioni sulla tua azienda
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Credito Per account deve essere un account di Stato Patrimoniale
@@ -4552,6 +4555,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Criteri di analisi delle piante
 DocType: Cheque Print Template,Cheque Height,Altezza Assegno
 DocType: Supplier,Supplier Details,Dettagli del Fornitore
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configurare le serie di numerazione per Presenze tramite Setup&gt; Numerazione serie
 DocType: Setup Progress,Setup Progress,Avanzamento configurazione
 DocType: Expense Claim,Approval Status,Stato Approvazione
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Dal valore deve essere inferiore al valore nella riga {0}
@@ -4644,7 +4648,6 @@
 DocType: Travel Request,Fully Sponsored,Completamente sponsorizzato
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Entrata di giornale inversa
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Cliente {0} creato.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurare il sistema di denominazione dei dipendenti in Risorse umane&gt; Impostazioni HR
 DocType: Stock Settings,Limit Percent,limite percentuale
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Articolo attualmente non presente in nessun magazzino
 ,Payment Period Based On Invoice Date,Periodo di pagamento basati su Data fattura
@@ -4703,7 +4706,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Magazzino di provenienza
 DocType: Installation Note,Installation Date,Data di installazione
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Condividi libro mastro
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} non appartiene alla società {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} non appartiene alla società {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,La fattura di vendita {0} è stata creata
 DocType: Employee,Confirmation Date,Data di conferma
 DocType: Inpatient Occupancy,Check Out,Check-out
@@ -4723,6 +4726,7 @@
 DocType: Production Plan,Sales Orders Detail,Dettaglio ordini di vendita
 DocType: Bin,Requested Quantity,la quantita &#39;richiesta
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Installa il Sistema di denominazione degli istruttori in Istruzione&gt; Impostazioni istruzione
 DocType: Patient,Marital Status,Stato civile
 DocType: Stock Settings,Auto Material Request,Richiesta Automatica Materiale
 DocType: Woocommerce Settings,API consumer secret,Segreto del consumatore API
@@ -4776,7 +4780,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Seleziona giorni
 DocType: Academic Term,Term Name,termine Nome
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Credito ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Creazione di buste salariali ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Creazione di buste salariali ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Non è possibile modificare il nodo principale.
 DocType: Buying Settings,Purchase Order Required,Ordine di Acquisto Obbligatorio
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Timer
@@ -4812,7 +4816,7 @@
 DocType: Account,Rate at which this tax is applied,Tasso a cui viene applicata questa tassa
 DocType: Cash Flow Mapper,Section Name,Nome della sezione
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Riordina Quantità
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Riga di ammortamento {0}: il valore atteso dopo la vita utile deve essere maggiore o uguale a {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Riga di ammortamento {0}: il valore atteso dopo la vita utile deve essere maggiore o uguale a {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Offerte di lavoro
 DocType: Company,Stock Adjustment Account,Conto di regolazione Archivio
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Svalutazione
@@ -4859,7 +4863,7 @@
 DocType: Program Enrollment,School House,school House
 DocType: Serial No,Out of AMC,Fuori di AMC
 DocType: Opportunity,Opportunity Amount,Importo opportunità
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numero degli ammortamenti prenotata non può essere maggiore di Numero totale degli ammortamenti
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numero degli ammortamenti prenotata non può essere maggiore di Numero totale degli ammortamenti
 DocType: Purchase Order,Order Confirmation Date,Data di conferma dell&#39;ordine
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Aggiungi visita manutenzione
@@ -4900,7 +4904,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Lotto:
 DocType: Volunteer,Afternoon,Pomeriggio
 DocType: Loyalty Program,Loyalty Program Help,Aiuto per programmi fedeltà
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' è disabilitato
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' è disabilitato
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Imposta come Aperto
 DocType: Cheque Print Template,Scanned Cheque,Assegno scansionato
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Invia e-mail automatica ai contatti alla conferma.
@@ -4913,7 +4917,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Voce e garanzia Dettagli
 DocType: Chapter,Chapter Members,Membri del Capitolo
 DocType: Sales Team,Contribution (%),Contributo (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : non verrà creato il Pagamento poiché non è stato specificato il Conto Bancario
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : non verrà creato il Pagamento poiché non è stato specificato il Conto Bancario
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Il progetto {0} esiste già
 DocType: Clinical Procedure,Nursing User,Nursing User
 DocType: Employee Benefit Application,Payroll Period,Periodo del libro paga
@@ -4921,6 +4925,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Il numero di serie {0} non appartiene a Batch {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Responsabilità
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Il periodo di validità di questa quotazione è terminato.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Per favore cancella il Dipendente <a href=""#Form/Employee/{0}"">{0}</a> \ per cancellare questo documento"
 DocType: Expense Claim Account,Expense Claim Account,Conto spese rivendicazione
 DocType: Account,Capital Work in Progress,Capitale lavori in corso
 DocType: Accounts Settings,Allow Stale Exchange Rates,Consenti tariffe scadenti
@@ -5001,7 +5007,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Problema Materiale
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Connetti Shopify con ERPNext
 DocType: Material Request Item,For Warehouse,Per Magazzino
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Note di consegna {0} aggiornate
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Note di consegna {0} aggiornate
 DocType: Employee,Offer Date,Data dell'offerta
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Preventivi
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Sei in modalità non in linea. Si potrà ricaricare quando tornerà disponibile la connessione alla rete.
@@ -5051,7 +5057,7 @@
 DocType: Shipping Rule,Calculate Based On,Calcola in base a
 DocType: Contract,Unfulfilled,insoddisfatto
 DocType: Delivery Note Item,From Warehouse,Dal Deposito
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Nessun dipendente per i criteri indicati
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Nessun dipendente per i criteri indicati
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Non ci sono elementi con Bill of Materials per la produzione
 DocType: Shopify Settings,Default Customer,Cliente predefinito
 DocType: Sales Stage,Stage Name,Nome d&#39;arte
@@ -5093,7 +5099,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Valore Tasse Dopo Sconto dell'Importo
 DocType: Patient,Inpatient Status,Stato di ricovero
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Impostazioni riepilogo giornaliero lavori
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Il listino prezzi selezionato deve contenere i campi di acquisto e vendita.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Il listino prezzi selezionato deve contenere i campi di acquisto e vendita.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Si prega di inserire la data di consegna richiesta
 DocType: Payment Entry,Internal Transfer,Trasferimento interno
 DocType: Asset Maintenance,Maintenance Tasks,Attività di manutenzione
@@ -5129,7 +5135,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Raggruppa per
 DocType: Guardian,Interests,Interessi
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Abilitare / disabilitare valute.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Non potevo inviare alcuni Salary Slips
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Non potevo inviare alcuni Salary Slips
 DocType: Exchange Rate Revaluation,Get Entries,Ottieni voci
 DocType: Production Plan,Get Material Request,Get Materiale Richiesta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,spese postali
@@ -5213,7 +5219,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Conto spese è obbligatoria per l'elemento {0}
 DocType: BOM,Website Description,Descrizione del sito
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Variazione netta Patrimonio
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Si prega di annullare Acquisto Fattura {0} prima
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Si prega di annullare Acquisto Fattura {0} prima
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Non consentito. Si prega di disabilitare il tipo di unità di servizio
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","l' indirizzo e-mail deve essere univoco, esiste già per {0}"
 DocType: Serial No,AMC Expiry Date,Data Scadenza AMC
@@ -5253,7 +5259,7 @@
 DocType: Hotel Room,Hotel Room,Camera d&#39;albergo
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Il Conto {0} non appartiene alla società {1}
 DocType: Leave Type,Rounding,Arrotondamento
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,I numeri seriali nella riga {0} non corrispondono alla nota di consegna
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,I numeri seriali nella riga {0} non corrispondono alla nota di consegna
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Quantità erogata (proporzionale)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Quindi le regole di determinazione dei prezzi vengono filtrate in base a cliente, gruppo di clienti, territorio, fornitore, gruppo di fornitori, campagna, partner di vendita, ecc."
 DocType: Student,Guardian Details,Guardiano Dettagli
@@ -5308,7 +5314,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Magazzino richiesto per l'Articolo in Giacenza {0}
 DocType: Leave Allocation,Unused leaves,Ferie non godute
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Effettua il rimborso
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Tutti i dipartimenti
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Tutti i dipartimenti
 DocType: Healthcare Service Unit,Vacant,Vacante
 DocType: Patient,Alcohol Past Use,Utilizzo passato di alcool
 DocType: Fertilizer Content,Fertilizer Content,Contenuto di fertilizzanti
@@ -5319,7 +5325,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,L&#39;ordine di lavoro {0} deve essere annullato prima di annullare questo ordine cliente
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Recupera BOM esplosa (sotto unità incluse )
 DocType: Authorization Rule,Applicable To (Employee),Applicabile a (Dipendente)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Data di scadenza è obbligatoria
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Data di scadenza è obbligatoria
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Incremento per attributo {0} non può essere 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Tipo di beneficio e importo
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Camere prenotate
@@ -5463,7 +5469,7 @@
 DocType: Purchase Invoice Item,Total Weight,Peso totale
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Commissione sulle vendite
 DocType: Job Offer Term,Value / Description,Valore / Descrizione
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} non può essere presentata, è già {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} non può essere presentata, è già {2}"
 DocType: Tax Rule,Billing Country,Nazione di fatturazione
 DocType: Purchase Order Item,Expected Delivery Date,Data di Consegna Confermata
 DocType: Restaurant Order Entry,Restaurant Order Entry,Inserimento ordine del ristorante
@@ -5502,12 +5508,13 @@
 DocType: Maintenance Visit,Breakdown,Esaurimento
 DocType: Travel Itinerary,Vegetarian,Vegetariano
 DocType: Patient Encounter,Encounter Date,Data dell&#39;incontro
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Account: {0} con valuta: {1} non può essere selezionato
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Account: {0} con valuta: {1} non può essere selezionato
 DocType: Bank Statement Transaction Settings Item,Bank Data,Dati bancari
 DocType: Purchase Receipt Item,Sample Quantity,Quantità del campione
 DocType: Bank Guarantee,Name of Beneficiary,Nome del beneficiario
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","L&#39;aggiornamento dei costi BOM avviene automaticamente via Scheduler, in base all&#39;ultimo tasso di valutazione / prezzo di listino / ultimo tasso di acquisto di materie prime."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Fornitore&gt; Gruppo di fornitori
 DocType: Bank Reconciliation Detail,Cheque Date,Data Assegno
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Account {0}: conto derivato {1} non appartiene alla società: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,"Tutte le operazioni relative a questa società, sono state cancellate con successo!"
@@ -5535,7 +5542,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,I nodi figli possono essere creati solo sotto i nodi di tipo &#39;Gruppo&#39;
 DocType: Attendance Request,Half Day Date,Data di mezza giornata
 DocType: Academic Year,Academic Year Name,Nome Anno Accademico
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} non è consentito effettuare transazioni con {1}. Per favore cambia la compagnia.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} non è consentito effettuare transazioni con {1}. Per favore cambia la compagnia.
 DocType: Sales Partner,Contact Desc,Desc Contatto
 DocType: Email Digest,Send regular summary reports via Email.,Invia report di sintesi periodici via email.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Si prega di impostare account predefinito nel tipo di spesa rivendicazione {0}
@@ -5568,7 +5575,7 @@
 DocType: Hotel Room,Hotel Manager,Direttore dell'albergo
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Set di regole fiscali per carrello della spesa
 DocType: Purchase Invoice,Taxes and Charges Added,Tasse e spese aggiuntive
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Riga di ammortamento {0}: la successiva Data di ammortamento non può essere precedente alla Data disponibile per l&#39;uso
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Riga di ammortamento {0}: la successiva Data di ammortamento non può essere precedente alla Data disponibile per l&#39;uso
 ,Sales Funnel,imbuto di vendita
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,L'abbreviazione è obbligatoria
 DocType: Project,Task Progress,Avanzamento attività
@@ -5582,7 +5589,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Tutti i gruppi di clienti
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,Accantonamento Mensile
 DocType: Attendance Request,On Duty,In servizio
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} è obbligatorio. Forse il record di cambio di valuta non è stato creato per {1} {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} è obbligatorio. Forse il record di cambio di valuta non è stato creato per {1} {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Il piano di staff {0} esiste già per la designazione {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Tax modello è obbligatoria.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Account {0}: conto derivato {1} non esistente
@@ -5661,11 +5668,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,È obbligatorio almeno un deposito
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Configura campi oggetto come UOM, Gruppo articoli, Descrizione e Numero di ore."
 DocType: Certification Application,Certification Status,Stato certificazione
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Mercato
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Mercato
 DocType: Travel Itinerary,Travel Advance Required,Avanzamento del viaggio richiesto
 DocType: Subscriber,Subscriber Name,Nome dell&#39;iscritto
 DocType: Serial No,Out of Warranty,Fuori Garanzia
-DocType: Cashier Closing,Cashier-closing-,Cassiere-chiusura-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Tipo di dati mappati
 DocType: BOM Update Tool,Replace,Sostituire
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Nessun prodotto trovato.
@@ -5752,7 +5758,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Vengono creati modelli di imposta predefiniti per vendite e acquisti.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Risultato della valutazione {0} già esistente.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Esempio: ABCD. #####. Se la serie è impostata e il numero di lotto non è menzionato nelle transazioni, verrà creato il numero di lotto automatico in base a questa serie. Se vuoi sempre menzionare esplicitamente il numero di lotto per questo articolo, lascia vuoto. Nota: questa impostazione avrà la priorità sul Prefisso serie di denominazione nelle Impostazioni stock."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configurare le serie di numerazione per Presenze tramite Setup&gt; Numerazione serie
 DocType: BOM,Materials Required (Exploded),Materiali necessari (dettagli)
 DocType: Contract,Party User,Utente del party
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Impostare il filtro aziendale vuoto se Group By è &#39;Azienda&#39;
@@ -5953,7 +5958,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,È necessario impostare la Data di inizio del periodo di prova e la Data di fine del periodo di prova
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Tasso medio
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,L&#39;importo totale del pagamento nel programma di pagamento deve essere uguale al totale totale / arrotondato
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,L&#39;importo totale del pagamento nel programma di pagamento deve essere uguale al totale totale / arrotondato
 DocType: Subscription Plan Detail,Plan,Piano
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Estratto conto banca come da Contabilità Generale
 DocType: Job Applicant,Applicant Name,Nome del Richiedente
@@ -6022,7 +6027,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Soap & Detergente
 DocType: BOM,Show Items,Mostra elementi
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Da tempo non può essere superiore al tempo.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Vuoi avvisare tutti i clienti via email?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Vuoi avvisare tutti i clienti via email?
 DocType: Subscription Plan,Billing Interval,Intervallo di fatturazione
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordinato
@@ -6031,9 +6036,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Riga {0}: {1} deve essere maggiore di 0
 DocType: Assessment Criteria,Assessment Criteria Group,Gruppo criteri di valutazione
 DocType: Healthcare Settings,Patient Name By,Nome del paziente
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Voce di registrazione accresciuta per gli stipendi da {0} a {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Voce di registrazione accresciuta per gli stipendi da {0} a {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Abilita entrate differite
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},L&#39;apertura del deprezzamento accumulato deve essere inferiore uguale a {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},L&#39;apertura del deprezzamento accumulato deve essere inferiore uguale a {0}
 DocType: Warehouse,Warehouse Name,Nome Magazzino
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,La data di inizio effettiva deve essere inferiore alla data di fine effettiva
 DocType: Naming Series,Select Transaction,Selezionare Transaction
@@ -6184,7 +6189,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Il dipendente {0} del grado {1} non ha alcuna politica di congedo predefinita
 DocType: Salary Detail,Salary Detail,stipendio Dettaglio
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Si prega di selezionare {0} prima
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Aggiunto/i {0} utenti
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Aggiunto/i {0} utenti
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","Nel caso di un programma multilivello, i clienti verranno assegnati automaticamente al livello interessato come da loro speso"
 DocType: Appointment Type,Physician,Medico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Il lotto {0} di {1} scaduto.
@@ -6328,7 +6333,7 @@
 DocType: Asset,Custodian,Custode
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Point-of-Sale Profilo
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} dovrebbe essere un valore compreso tra 0 e 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Pagamento di {0} da {1} a {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Pagamento di {0} da {1} a {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Prestiti non garantiti
 DocType: Cost Center,Cost Center Name,Nome Centro di Costo
 DocType: Student,B+,B +
@@ -6360,6 +6365,7 @@
 DocType: Employee,Date of Issue,Data di Pubblicazione
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Come per le Impostazioni di Acquisto se l&#39;acquisto di Reciept Required == &#39;YES&#39;, quindi per la creazione della fattura di acquisto, l&#39;utente deve creare prima la ricevuta di acquisto per l&#39;elemento {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Fila # {0}: Impostare Fornitore per Articolo {1}
+DocType: Global Defaults,Default Distance Unit,Unità distanza predefinita
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Riga {0}: valore Ore deve essere maggiore di zero.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Website Immagine {0} collegata alla voce {1} non può essere trovato
 DocType: Issue,Content Type,Tipo Contenuto
@@ -6415,7 +6421,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Debito Per account deve essere un account di Stato Patrimoniale
 DocType: Asset,Naming Series,Denominazione Serie
 DocType: Vital Signs,Coated,rivestito
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Riga {0}: Valore previsto dopo che la vita utile deve essere inferiore all&#39;importo di acquisto lordo
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Riga {0}: Valore previsto dopo che la vita utile deve essere inferiore all&#39;importo di acquisto lordo
 DocType: GoCardless Settings,GoCardless Settings,Impostazioni GoCardless
 DocType: Leave Block List,Leave Block List Name,Lascia Block List Nome
 DocType: Certified Consultant,Certification Validity,Validità certificazione
@@ -6482,6 +6488,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Intestazione della banca
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Visualizza test di laboratorio
 DocType: Hub Users,Hub Users,Utenti Hub
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Gruppo clienti&gt; Territorio
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Data di manutenzione
 DocType: Purchase Invoice Item,Rejected Serial No,Rifiutato Serial No
@@ -6496,7 +6503,7 @@
 DocType: SG Creation Tool Course,Max Strength,Forza Max
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Installare i preset
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Nessuna nota di consegna selezionata per il cliente {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Nessuna nota di consegna selezionata per il cliente {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Il dipendente {0} non ha l&#39;importo massimo del beneficio
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Selezionare gli elementi in base alla Data di Consegna
 DocType: Grant Application,Has any past Grant Record,Ha un record di sovvenzione passato
@@ -6523,7 +6530,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Prenotazione camera d&#39;albergo
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Servizio clienti
 DocType: BOM,Thumbnail,Thumbnail
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Nessun contatto con ID email trovato.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Nessun contatto con ID email trovato.
 DocType: Item Customer Detail,Item Customer Detail,Dettaglio articolo cliente
 DocType: Notification Control,Prompt for Email on Submission of,Richiedi Email su presentazione di
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},L&#39;importo massimo del beneficio del dipendente {0} supera {1}
@@ -6778,7 +6785,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,Non può convertirsi gruppo perché è stato selezionato Tipo di account.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} è stato modificato. Aggiornare prego.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Impedire agli utenti di effettuare richieste di permesso per i giorni successivi.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Codice articolo&gt; Gruppo articoli&gt; Marca
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Se la scadenza è illimitata per i Punti Fedeltà, mantenere la Durata Scadenza vuota o 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Membri del team di manutenzione
 DocType: Loyalty Point Entry,Purchase Amount,Ammontare dell&#39;acquisto
@@ -6786,7 +6792,7 @@
 											to fullfill Sales Order {2}",Impossibile recapitare il numero di serie {0} dell&#39;articolo {1} come è prenotato \ per completare l&#39;ordine di vendita {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Preventivo Fornitore {0} creato
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Fine anno non può essere prima di inizio anno
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Fine anno non può essere prima di inizio anno
 DocType: Employee Benefit Application,Employee Benefits,Benefici per i dipendenti
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},La quantità imballata deve essere uguale per l'articolo {0} sulla riga {1}
 DocType: Work Order,Manufactured Qty,Q.tà Prodotte
@@ -6802,6 +6808,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Selezionare i numeri di batch
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,A GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Fatture sollevate dai Clienti.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurare il sistema di denominazione dei dipendenti in Risorse umane&gt; Impostazioni HR
 DocType: Healthcare Settings,Invoice Appointments Automatically,Appuntamenti fattura automaticamente
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Progetto Id
 DocType: Salary Component,Variable Based On Taxable Salary,Variabile basata sullo stipendio tassabile
@@ -6850,7 +6857,7 @@
 DocType: POS Profile,Account for Change Amount,Conto per quantità di modifica
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Connessione a QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Guadagno / perdita totale
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Società non valida per la fattura interna all&#39;azienda.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Società non valida per la fattura interna all&#39;azienda.
 DocType: Purchase Invoice,input service,servizio di input
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Riga {0}: Partner / Account non corrisponde con {1} / {2} {3} {4}
 DocType: Employee Promotion,Employee Promotion,Promozione dei dipendenti
@@ -6980,7 +6987,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Area preferita per alloggio
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analisi dei dati
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Il carrello è vuoto
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Installa il Sistema di denominazione degli istruttori in Istruzione&gt; Impostazioni istruzione
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",L&#39;articolo {0} non ha numero di serie. Solo articoli serilializzati \ può avere consegna in base al numero di serie
 DocType: Vehicle,Model,Modello
@@ -7010,7 +7016,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Niente da cambiare
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Seleziona un file csv
 DocType: Holiday List,Total Holidays,Totale delle vacanze
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Modello di email mancante per la spedizione. Si prega di impostarne uno in Impostazioni di consegna.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Modello di email mancante per la spedizione. Si prega di impostarne uno in Impostazioni di consegna.
 DocType: Student Leave Application,Mark as Present,Segna come Presente
 DocType: Supplier Scorecard,Indicator Color,Colore dell&#39;indicatore
 DocType: Purchase Order,To Receive and Bill,Da ricevere e fatturare
@@ -7019,7 +7025,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Seleziona numero di serie
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Termini e condizioni Template
-DocType: Serial No,Delivery Details,Dettagli Consegna
+DocType: Delivery Trip,Delivery Details,Dettagli Consegna
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Centro di costo è richiesto in riga {0} nella tabella Tasse per il tipo {1}
 DocType: Program,Program Code,Codice di programma
 DocType: Terms and Conditions,Terms and Conditions Help,Termini e condizioni Aiuto
@@ -7043,7 +7049,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Giorni per la Consegna
 DocType: Cash Flow Mapping,Is Income Tax Expense,È l&#39;esenzione dall&#39;imposta sul reddito
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Il tuo ordine è fuori consegna!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Data di registrazione deve essere uguale alla data di acquisto {1} per l'asset {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Data di registrazione deve essere uguale alla data di acquisto {1} per l'asset {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Controllare questo se lo studente è residente presso l&#39;Ostello dell&#39;Istituto.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Si prega di inserire gli ordini di vendita nella tabella precedente
 ,Stock Summary,Sintesi della
diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index be2b972..e002e9c 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,期間名
 DocType: Employee,Salary Mode,給与モード
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,登録
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,登録
 DocType: Patient,Divorced,離婚
 DocType: Support Settings,Post Route Key,ポストルートキー
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,取引内でのアイテムの複数回追加を許可
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,新しい為替レート
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},価格表{0}には通貨が必要です
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,※取引内で計算されます。
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,サプライヤ&gt;サプライヤタイプ
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT- .YYYY.-
 DocType: Purchase Order,Customer Contact,顧客連絡先
 DocType: Patient Appointment,Check availability,空室をチェック
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,オープンを表示
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,シリーズを正常に更新しました
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,チェックアウト
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},行{1}の{0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},行{1}の{0}
 DocType: Asset Finance Book,Depreciation Start Date,減価償却開始日
 DocType: Pricing Rule,Apply On,適用
 DocType: Item Price,Multiple Item prices.,複数のアイテム価格
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,研究室処方
 ,Delay Days,遅延日数
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,サービス費用
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},シリアル番号：{0}は既に販売請求書：{1}で参照されています
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},シリアル番号：{0}は既に販売請求書：{1}で参照されています
 DocType: Bank Statement Transaction Invoice Item,Invoice,請求
 DocType: Purchase Invoice Item,Item Weight Details,アイテムの重量の詳細
 DocType: Asset Maintenance Log,Periodicity,周期性
@@ -164,7 +163,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,関連しました
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,出席日は従業員の入社日付より小さくすることはできません
 DocType: Grading Scale,Grading Scale Name,グレーディングスケール名
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,マーケットプレイスにユーザーを追加する
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,マーケットプレイスにユーザーを追加する
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,ルートアカウントなので編集することができません
 DocType: Sales Invoice,Company Address,会社住所
 DocType: BOM,Operations,作業
@@ -321,7 +320,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,相違数
 DocType: Production Plan,Material Request Detail,品目依頼の詳細
 DocType: Selling Settings,Default Quotation Validity Days,デフォルト見積り有効日数
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",アイテム料金の行{0}に税を含めるには、行{1}の税も含まれていなければなりません
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",アイテム料金の行{0}に税を含めるには、行{1}の税も含まれていなければなりません
 DocType: SMS Center,SMS Center,SMSセンター
 DocType: Payroll Entry,Validate Attendance,出席確認
 DocType: Sales Invoice,Change Amount,変化量
@@ -440,7 +439,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,言葉の金額の行間隔
 DocType: Vehicle,Additional Details,さらなる詳細
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,説明がありません
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,サプライヤ&gt;サプライヤグループ
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,仕入要求
 DocType: POS Closing Voucher Details,Collected Amount,回収額
 DocType: Lab Test,Submitted Date,提出日
@@ -485,7 +483,7 @@
 DocType: Student Admission,Student Admission,生徒入学
 ,Terretory,地域
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,アイテム{0}をキャンセルしました
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,減価償却行{0}：減価償却開始日は過去の日付として入力されます
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,減価償却行{0}：減価償却開始日は過去の日付として入力されます
 DocType: Contract Template,Fulfilment Terms and Conditions,フルフィルメント利用規約
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,資材要求
 DocType: Bank Reconciliation,Update Clearance Date,清算日の更新
@@ -542,6 +540,7 @@
 DocType: Accounts Settings,Settings for Accounts,アカウント設定
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},サプライヤ請求書なしでは購入請求書に存在する{0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,セールスパーソンツリーを管理します。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.",Googleマップの設定が無効になっているため、ルートを処理できません。
 DocType: Job Applicant,Cover Letter,カバーレター
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,明らかに優れた小切手および預金
 DocType: Item,Synced With Hub,ハブと同期
@@ -601,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,新しい資産価値
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,顧客通貨が顧客の基本通貨に換算されるレート
 DocType: Course Scheduling Tool,Course Scheduling Tool,コーススケジュールツール
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：購入請求書は、既存の資産に対して行うことはできません。{1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：購入請求書は、既存の資産に対して行うことはできません。{1}
 DocType: Crop Cycle,LInked Analysis,リンキング分析
 DocType: POS Closing Voucher,POS Closing Voucher,POSクローズバウチャー
 DocType: Contract,Lapsed,失効した
@@ -636,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0}  -  {1}はコースに登録されていません{2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,学生の名前：
 DocType: POS Closing Voucher Details,Difference,差
+DocType: Delivery Settings,Delay between Delivery Stops,配達停止間の遅延
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},シリアル番号 {0} は納品書 {1} に記載がありません
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.",サーバーのGoCardless構成に問題があるようです。ご不便をおかけしても、ご返金いただけない場合は、お客様のアカウントに払い戻されます。
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNextデモ
@@ -694,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,数量とレート
 DocType: Delivery Note,% Installed,％インストール
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,教室/講演会をスケジュールすることができ研究所など。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,両社の会社通貨は、インターカンパニー取引と一致する必要があります。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,両社の会社通貨は、インターカンパニー取引と一致する必要があります。
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,最初の「会社」名を入力してください
 DocType: Travel Itinerary,Non-Vegetarian,非菜食主義者
 DocType: Purchase Invoice,Supplier Name,サプライヤー名
@@ -779,7 +779,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,日付から借りた
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,制作するのに十分なパーツ
 DocType: POS Profile User,POS Profile User,POSプロファイルユーザー
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,行{0}：減価償却開始日が必要です
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,行{0}：減価償却開始日が必要です
 DocType: Purchase Invoice Item,Service Start Date,サービス開始日
 DocType: Subscription Invoice,Subscription Invoice,購読請求書
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,直接利益
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,見積停止
 DocType: Hub User,Hub User,ハブユーザー
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,受注を作成
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},{0}から{1}までの期間給与スリップ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},{0}から{1}までの期間給与スリップ
 DocType: Project Task,Project Task,プロジェクトタスク
 DocType: Loyalty Point Entry Redemption,Redeemed Points,交換ポイント
 ,Lead Id,リードID
@@ -1025,7 +1025,7 @@
 DocType: Fee Validity,Max number of visit,訪問の最大数
 ,Hotel Room Occupancy,ホテルルーム占有率
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,タイムシートを作成しました：
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},支払方法{0}にデフォルトの現金や銀行口座を設定してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},支払方法{0}にデフォルトの現金や銀行口座を設定してください
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,登録します
 DocType: GST Settings,GST Settings,GSTの設定
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},通貨は価格リスト通貨と同じである必要があります通貨：{0}
@@ -1079,7 +1079,7 @@
 DocType: Vehicle Log,Service Details,サービス詳細
 DocType: Lab Test Template,Grouped,グループ化済
 DocType: Selling Settings,Delivery Note Required,納品書必須
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,給料スリップの提出...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,給料スリップの提出...
 DocType: Bank Guarantee,Bank Guarantee Number,バンクギャランティー番号
 DocType: Assessment Criteria,Assessment Criteria,評価基準
 DocType: BOM Item,Basic Rate (Company Currency),基本速度（会社通貨）
@@ -1104,13 +1104,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,支払エントリがすでに作成されています
 DocType: Request for Quotation,Get Suppliers,サプライヤーを取得
 DocType: Purchase Receipt Item Supplied,Current Stock,現在の在庫
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：{1}資産はアイテムにリンクされていません{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：{1}資産はアイテムにリンクされていません{2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,給与明細プレビュー
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,アカウント {0} が複数回入力されました
 DocType: Account,Expenses Included In Valuation,評価中経費
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,30日以内に会員の有効期限が切れる場合にのみ更新することができます
 DocType: Shopping Cart Settings,Show Stock Availability,在庫を表示する
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},資産カテゴリ{1}または会社{2}に{0}を設定してください
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},資産カテゴリ{1}または会社{2}に{0}を設定してください
 DocType: Location,Longitude,経度
 ,Absent Student Report,欠席生徒レポート
 DocType: Crop,Crop Spacing UOM,作物間隔UOM
@@ -1182,7 +1182,7 @@
 DocType: Soil Texture,Sand,砂
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,エネルギー
 DocType: Opportunity,Opportunity From,機会元
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}：{1}アイテム{2}に必要なシリアル番号。あなたは{3}を提供しました。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}：{1}アイテム{2}に必要なシリアル番号。あなたは{3}を提供しました。
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,テーブルを選択してください
 DocType: BOM,Website Specifications,ウェブサイトの仕様
 DocType: Special Test Items,Particulars,詳細
@@ -1299,7 +1299,7 @@
 DocType: Item,Items with higher weightage will be shown higher,高い比重を持つアイテムはより高く表示されます
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,ラボテストとバイタルサイン
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,銀行勘定調整詳細
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,行＃{0}：アセット{1}提出しなければなりません
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,行＃{0}：アセット{1}提出しなければなりません
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,従業員が見つかりません
 DocType: Item,If subcontracted to a vendor,ベンダーに委託した場合
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,生徒グループはすでに更新されています。
@@ -1353,7 +1353,6 @@
 DocType: Loyalty Program Collection,Tier Name,階層名
 DocType: HR Settings,Enter retirement age in years,年間で退職年齢を入力してください
 DocType: Crop,Target Warehouse,ターゲット倉庫
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,セットアップ&gt;設定&gt;ネーミングシリーズで{0}のネーミングシリーズを設定してください
 DocType: Payroll Employee Detail,Payroll Employee Detail,給与管理従業員の詳細
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,倉庫を選択してください
 DocType: Cheque Print Template,Starting location from left edge,左端から開始
@@ -1443,7 +1442,7 @@
 DocType: Work Order,Plan material for sub-assemblies,部分組立品資材計画
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,販売パートナーと地域
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,部品表{0}はアクティブでなければなりません
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,転送可能なアイテムがありません
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,転送可能なアイテムがありません
 DocType: Employee Boarding Activity,Activity Name,アクティビティ名
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,リリース日の変更
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,完成品の数量<b>{0}</b>と数量<b>{1}</b>は異なるものではありません
@@ -1672,6 +1671,7 @@
 DocType: Project,First Email,最初のメール
 DocType: Company,Exception Budget Approver Role,例外予算承認者ロール
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date",設定されると、この請求書は設定日まで保留になります
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,受注の予約倉庫／完成品倉庫
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,販売額
 DocType: Repayment Schedule,Interest Amount,利息額
@@ -1683,7 +1683,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,記録
 DocType: Asset,Scrapped,スクラップ
 DocType: Item,Item Defaults,項目デフォルト
-DocType: Purchase Invoice,Returns,収益
+DocType: Cashier Closing,Returns,収益
 DocType: Job Card,WIP Warehouse,作業中倉庫
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},シリアル番号{0}は {1}まで保守契約下にあります
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,求人
@@ -1697,7 +1697,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,転送タイプ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,販売費
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;テリトリー
 DocType: Diagnosis,Diagnosis,診断
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,標準購入
 DocType: Attendance Request,Explanation,説明
@@ -1710,7 +1709,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,購買発注明細の期限切れ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,郵便番号
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},受注{0}は{1}です
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},ローン{0}の利息収入勘定を選択
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},ローン{0}の利息収入勘定を選択
 DocType: Opportunity,Contact Info,連絡先情報
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,在庫エントリを作成
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,ステータスが「左」の従業員を昇格できません
@@ -1722,7 +1721,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,請求時間は0時間ではできません
 DocType: Company,Date of Commencement,開始日
 DocType: Sales Person,Select company name first.,はじめに会社名を選択してください
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},{0}に送信されたメール
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},{0}に送信されたメール
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,サプライヤーから受け取った見積。
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOMを交換し、すべてのBOMで最新価格を更新する
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},{0} | {1} {2}
@@ -1742,7 +1741,7 @@
 DocType: Asset Movement,From Employee,社員から
 DocType: Driver,Cellphone Number,携帯番号
 DocType: Project,Monitor Progress,モニターの進捗状況
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告：{1}のアイテム{0} がゼロのため、システムは超過請求をチェックしません
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告：{1}のアイテム{0} がゼロのため、システムは超過請求をチェックしません
 DocType: Journal Entry,Make Difference Entry,差違エントリを作成
 DocType: Supplier Quotation,Auto Repeat Section,オートリピートセクション
 DocType: Upload Attendance,Attendance From Date,出勤開始日
@@ -1845,7 +1844,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：拒否数量は「購買返品」に入力することはできません
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,選択した顧客の顧客グループの変更は許可されていません。
 ,Purchase Order Items To Be Billed,支払予定発注アイテム
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,到着予定時刻の更新
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,到着予定時刻の更新
 DocType: Program Enrollment Tool,Enrollment Details,登録の詳細
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,ある企業に対して複数の項目デフォルトを設定することはできません。
 DocType: Purchase Invoice Item,Net Rate,正味単価
@@ -1859,7 +1858,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,離れるタイプはmadatoryです
 DocType: Support Settings,Close Issue After Days,日後に閉じる問題
 ,Eway Bill,エウェルビル
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,ユーザーをMarketplaceに追加するには、System ManagerおよびItem Managerの役割を持つユーザーである必要があります。
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,ユーザーをMarketplaceに追加するには、System ManagerおよびItem Managerの役割を持つユーザーである必要があります。
 DocType: Leave Control Panel,Leave blank if considered for all branches,全支店が対象の場合は空白のままにします
 DocType: Job Opening,Staffing Plan,人員配置計画
 DocType: Bank Guarantee,Validity in Days,有効期限
@@ -1879,7 +1878,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},行{0}は{1}と重複しています
 DocType: Marketplace Settings,Disable Marketplace,マーケットプレースを無効にする
 ,Trial Balance,試算表
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,年度は、{0}が見つかりません
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,年度は、{0}が見つかりません
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,従業員設定
 DocType: Hotel Room Reservation,Hotel Reservation User,ホテル予約ユーザー
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,接頭辞を選択してください
@@ -1987,7 +1986,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,ログインに失敗しました
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,アセット{0}が作成されました
 DocType: Special Test Items,Special Test Items,特別試験項目
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Marketplaceに登録するには、System ManagerおよびItem Managerの役割を持つユーザーである必要があります。
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Marketplaceに登録するには、System ManagerおよびItem Managerの役割を持つユーザーである必要があります。
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,支払方法
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,あなたの割り当てられた給与構造に従って、給付を申請することはできません
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,ウェブサイト画像は、公開ファイルまたはウェブサイトのURLを指定する必要があります
@@ -1999,7 +1998,7 @@
 DocType: Warehouse,Warehouse Contact Info,倉庫連絡先情報
 DocType: Payment Entry,Write Off Difference Amount,差額を償却
 DocType: Volunteer,Volunteer Name,ボランティア名
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},他の行に期限が重複している行が見つかりました：{0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},他の行に期限が重複している行が見つかりました：{0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent",{0}：従業員のメールが見つからないため、送信されません
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},指定された日付{1}に従業員{0}に割り当てられた給与構造がありません
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},国{0}に配送規則が適用されない
@@ -2088,6 +2087,7 @@
 DocType: Salary Component,Earning,収益
 DocType: Supplier Scorecard,Scoring Criteria,スコア基準
 DocType: Purchase Invoice,Party Account Currency,当事者アカウント通貨
+DocType: Delivery Trip,Total Estimated Distance,合計推定距離
 ,BOM Browser,部品表（BOM）ブラウザ
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,このトレーニングイベントのステータスを更新してください
 DocType: Item Barcode,EAN,EAN
@@ -2126,7 +2126,7 @@
 DocType: Activity Cost,Projects,プロジェクト
 DocType: Payment Request,Transaction Currency,取引通貨
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},{0}から | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,一部のメールが無効です
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,一部のメールが無効です
 DocType: Work Order Operation,Operation Description,作業説明
 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.,年度が保存されると会計年度の開始日と会計年度終了日を変更することはできません。
 DocType: Quotation,Shopping Cart,カート
@@ -2150,7 +2150,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,固定資産の純変動
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,必要な数量
 DocType: Leave Control Panel,Leave blank if considered for all designations,全ての肩書を対象にする場合は空白のままにします
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}の料金タイプ「実費」はアイテムの料金に含めることはできません
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}の料金タイプ「実費」はアイテムの料金に含めることはできません
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},最大：{0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,開始日時
 DocType: Shopify Settings,For Company,会社用
@@ -2164,7 +2164,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,コーススケジュールを作成中にエラーが発生しました
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,リストの最初のExpense Approverが、デフォルトExpense Approverとして設定されます。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,100を超えることはできません
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Marketplaceに登録するには、System ManagerおよびItem Managerの役割を持つ管理者以外のユーザーである必要があります。
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Marketplaceに登録するには、System ManagerおよびItem Managerの役割を持つ管理者以外のユーザーである必要があります。
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,スケジュール解除済
@@ -2193,7 +2193,7 @@
 DocType: HR Settings,Employee Settings,従業員の設定
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,支払いシステムの読み込み
 ,Batch-Wise Balance History,バッチごとの残高履歴
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,行番号{0}：金額が明細{1}の請求額よりも大きい場合、レートを設定できません。
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,行番号{0}：金額が明細{1}の請求額よりも大きい場合、レートを設定できません。
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,印刷設定は、それぞれの印刷形式で更新します
 DocType: Package Code,Package Code,パッケージコード
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,見習
@@ -2426,7 +2426,7 @@
 DocType: Delivery Trip,Optimize Route,ルートを最適化する
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,事前にX日の業務を計画してみてください
 DocType: HR Settings,Stop Birthday Reminders,誕生日リマインダを停止
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},当社ではデフォルトの給与支払ってくださいアカウントを設定してください{0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},当社ではデフォルトの給与支払ってくださいアカウントを設定してください{0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Amazonの税金と料金データの財務分割
 DocType: SMS Center,Receiver List,受領者リスト
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,アイテム検索
@@ -2496,7 +2496,7 @@
 DocType: Vital Signs,Constipated,便秘
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},対サプライヤー請求書{0} 日付{1}
 DocType: Customer,Default Price List,デフォルト価格表
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,資産移動レコード{0}を作成
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,資産移動レコード{0}を作成
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,項目は見つかりませんでした。
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,年度{0}を削除することはできません。年度{0}はグローバル設定でデフォルトとして設定されています
 DocType: Share Transfer,Equity/Liability Account,株式/責任勘定
@@ -2634,6 +2634,7 @@
 DocType: Blanket Order,Order Type,注文タイプ
 ,Item-wise Sales Register,アイテムごとの販売登録
 DocType: Asset,Gross Purchase Amount,購入総額
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,商品コード&gt;商品グループ&gt;ブランド
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,開店残高
 DocType: Asset,Depreciation Method,減価償却法
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,この税金が基本料金に含まれているか
@@ -2714,7 +2715,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,年間予算がPOを上回った場合の行動
 DocType: Student Leave Application,Student Leave Application,生徒休業申請
 DocType: Item,Will also apply for variants,バリエーションについても適用されます
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}",{0}として既に存在する資産をキャンセルすることはできません
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}",{0}として既に存在する資産をキャンセルすることはできません
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},上半分の日に従業員{0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},総労働時間は最大労働時間よりも大きくてはいけません{0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,オン
@@ -2738,6 +2739,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,データを取得する
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},休暇タイプ{0}に許可される最大休暇は{1}です。
 DocType: SMS Center,Create Receiver List,受領者リストを作成
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,使用可能日は購入日の後でなければなりません
 DocType: Vehicle,Wheels,車輪
 DocType: Packing Slip,To Package No.,対象梱包番号
 DocType: Patient Relation,Family,家族
@@ -2751,7 +2753,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,請求先通貨は、デフォルトの会社の通貨または勘定通貨のいずれかと同じでなければなりません
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),この納品の一部であることを梱包に示します（「下書き」のみ）
 DocType: Soil Texture,Loam,壌土
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,行{0}：期日は転記前にすることはできません
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,行{0}：期日は転記前にすることはできません
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,支払いエントリを作成
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},アイテム{0}の数量は{1}より小さくなければなりません
 ,Sales Invoice Trends,請求の傾向
@@ -2823,7 +2825,7 @@
 DocType: Guardian,Guardian Interests,保護者の関心
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,アカウント名/番号の更新
 DocType: Naming Series,Current Value,現在の値
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,日付 {0} には複数の会計年度が存在します。会計年度に会社を設定してください
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,日付 {0} には複数の会計年度が存在します。会計年度に会社を設定してください
 DocType: Education Settings,Instructor Records to be created by,講師レコード作成元
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} 作成
 DocType: GST Account,GST Account,GSTアカウント
@@ -2840,7 +2842,7 @@
 DocType: Sales Person,Name and Employee ID,名前と従業員ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,期限日を転記日付より前にすることはできません
 DocType: Website Item Group,Website Item Group,ウェブサイトの項目グループ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,上記の選択された基準のために提出することができなかった給与伝票または既に提出された給与伝票
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,上記の選択された基準のために提出することができなかった給与伝票または既に提出された給与伝票
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,関税と税金
 DocType: Projects Settings,Projects Settings,プロジェクト設定
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,基準日を入力してください
@@ -2849,7 +2851,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,サプライ数量
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,資材要求アイテム
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,最初に購買領収書{0}をキャンセルしてください
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,最初に購買領収書{0}をキャンセルしてください
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,アイテムグループのツリー
 DocType: Production Plan,Total Produced Qty,総生産数量
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,この請求タイプの行数以上の行番号を参照することはできません
@@ -2958,6 +2960,7 @@
 ,Vehicle Expenses,車両費
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,営業請求書にラボテストを作成する
 DocType: Serial No,Invoice Details,請求書の詳細
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,ルートを見積もり、最適化するようにGoogleマップの設定を有効にしてください
 DocType: Grant Application,Show on Website,ウェブサイトに表示
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,開始
 DocType: Hub Tracked Item,Hub Category,ハブカテゴリ
@@ -2997,7 +3000,7 @@
 DocType: Inpatient Record,B Positive,Bポジティブ
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",従業員{0}の最大便益は、請求済みの金額の合計{2}で{1}を超えています
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：固定資産である場合、数量は1でなければなりません。数量を複数とするためには個別の行を使用してください。
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：固定資産である場合、数量は1でなければなりません。数量を複数とするためには個別の行を使用してください。
 DocType: Leave Block List Allow,Leave Block List Allow,許可する休暇リスト
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,略称は、空白またはスペースにすることはできません
 DocType: Patient Medical Record,Patient Medical Record,患者の医療記録
@@ -3031,7 +3034,7 @@
 DocType: Workstation,Wages per hour,時間あたり賃金
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},倉庫 {3} のアイテム {2} ではバッチ {0} の在庫残高がマイナス {1} になります
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,以下の資材要求は、アイテムの再注文レベルに基づいて自動的に提出されています
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},アカウント{0}は無効です。アカウントの通貨は{1}でなければなりません
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},アカウント{0}は無効です。アカウントの通貨は{1}でなければなりません
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},従業員の日付{1}を救済した後の日付{0}以降はできません
 DocType: Supplier,Is Internal Supplier,内部サプライヤ
 DocType: Employee,Create User Permission,ユーザー権限の作成
@@ -3175,7 +3178,7 @@
 DocType: Account,Fixed Asset,固定資産
 DocType: Amazon MWS Settings,After Date,後日
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,シリアル番号を付与した目録
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,会社間請求書の{0}が無効です。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,会社間請求書の{0}が無効です。
 ,Department Analytics,部門分析
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,デフォルトの連絡先に電子メールが見つかりません
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,秘密を生成する
@@ -3187,7 +3190,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,料金体系と生徒グループ{0}の教育課程が異なっています。
 DocType: Bank Statement Transaction Entry,Receivable Account,売掛金勘定
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Valid From Dateは、Valid Upto Dateより小さい値でなければなりません。
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},行＃{0}：アセット{1} {2}既にあります
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},行＃{0}：アセット{1} {2}既にあります
 DocType: Quotation Item,Stock Balance,在庫残高
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,受注からの支払
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,最高経営責任者（CEO）
@@ -3229,6 +3232,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,デビットへが必要とされます
 DocType: Clinical Procedure,Inpatient Record,入院記録
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",タイムシートは、あなたのチームによって行わの活動のための時間・コスト・費用を追跡するのに使用します
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,サプライヤ&gt;サプライヤタイプ
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,仕入価格表
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,取引日
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,サプライヤスコアカード変数のテンプレート。
@@ -3271,7 +3275,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,取引利益/損失
 DocType: Opportunity,Lost Reason,失われた理由
 DocType: Amazon MWS Settings,Enable Amazon,Amazonを有効にする
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},行番号{0}：アカウント{1}は会社{2}に属していません
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},行番号{0}：アカウント{1}は会社{2}に属していません
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType {0}を見つけることができません
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,新しい住所
 DocType: Quality Inspection,Sample Size,サンプルサイズ
@@ -3382,7 +3386,7 @@
 DocType: Water Analysis,Origin,原点
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,この文書では、アイテム{4}の{0} {1}によって限界を超えています。あなたが作っている同じに対して別の{3} {2}？
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,保存した後、繰り返し設定をしてください
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,変化量のアカウントを選択
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,変化量のアカウントを選択
 DocType: Purchase Invoice,Price List Currency,価格表の通貨
 DocType: Naming Series,User must always select,ユーザーは常に選択する必要があります
 DocType: Stock Settings,Allow Negative Stock,マイナス在庫を許可
@@ -3425,7 +3429,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,この予約をキャンセルしてもよろしいですか？
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,ホテルルーム価格パッケージ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,セールスパイプライン
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},給与コンポーネントのデフォルトアカウントを設定してください{0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},給与コンポーネントのデフォルトアカウントを設定してください{0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,必要な箇所
 DocType: Rename Tool,File to Rename,名前を変更するファイル
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},行 {0} 内のアイテムの部品表（BOM）を選択してください
@@ -3446,7 +3450,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,仕入アイテムの費用
 DocType: Employee Separation,Employee Separation Template,従業員分離テンプレート
 DocType: Selling Settings,Sales Order Required,受注必須
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,売り手になる
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,売り手になる
 DocType: Purchase Invoice,Credit To,貸方へ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,アクティブリード／顧客
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,標準の納品書形式を使用する場合は空白のままにします
@@ -3487,7 +3491,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,税テンプレート作成
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ユーザーフォーラム
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,原材料は空白にできません。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,行番号{0}（支払いテーブル）：金額は負数でなければなりません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,行番号{0}（支払いテーブル）：金額は負数でなければなりません
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.",請求書がドロップシッピングアイテムを含むため、在庫を更新できませんでした。
 DocType: Contract,Fulfilment Status,フルフィルメントステータス
 DocType: Lab Test Sample,Lab Test Sample,ラボテストサンプル
@@ -3653,7 +3657,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,ドキュメントの日付
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},作成したフィーレコード -  {0}
 DocType: Asset Category Account,Asset Category Account,資産カテゴリーアカウント
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,行番号{0}（支払いテーブル）：金額は正の値でなければなりません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,行番号{0}（支払いテーブル）：金額は正の値でなければなりません
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},受注数{1}より多くのアイテム{0}を製造することはできません
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,属性値選択
 DocType: Purchase Invoice,Reason For Issuing document,文書を発行する理由
@@ -3708,7 +3712,7 @@
 DocType: Purchase Receipt,Time at which materials were received,資材受領時刻
 DocType: Products Settings,Products per Page,ページあたりの製品
 DocType: Stock Ledger Entry,Outgoing Rate,出庫率
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,または
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,または
 DocType: Sales Order,Billing Status,課金状況
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,課題をレポート
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,水道光熱費
@@ -3735,7 +3739,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,従業員免税宣言
 DocType: Payment Entry,Cheque/Reference Date,小切手/リファレンス日
 DocType: Purchase Invoice,Total Taxes and Charges,租税公課計
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,使用可能日は過去の日付として入力されます
 DocType: Employee,Emergency Contact,緊急連絡先
 DocType: Bank Reconciliation Detail,Payment Entry,支払エントリ
 ,sales-browser,売上高は、ブラウザ
@@ -3781,6 +3784,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),返品（クレジットノート）
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,ジョブを開始する
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},アセット{0}にシリアル番号が必要です
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,セットアップ&gt;設定&gt;ネーミングシリーズで{0}のネーミングシリーズを設定してください
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,[無効]テンプレートは、デフォルトのテンプレートであってはなりません
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,行{0}の場合：計画数量を入力してください
 DocType: Account,Income Account,収益勘定
@@ -3794,6 +3798,7 @@
 DocType: Loyalty Program,Help Section,ヘルプセクション
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,前
 DocType: Appraisal Goal,Key Responsibility Area,重要責任分野
+DocType: Delivery Trip,Distance UOM,距離UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",生徒のバッチは生徒の出席・評価・料金を追跡するのに使用します
 DocType: Payment Entry,Total Allocated Amount,総配分される金額
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,永続在庫のデフォルト在庫アカウントの設定
@@ -3835,7 +3840,7 @@
 DocType: Item Supplier,Item Supplier,アイテムサプライヤー
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,バッチ番号を取得するためにアイテムコードを入力をしてください
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},{0} quotation_to {1} の値を選択してください
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,転送するアイテムが選択されていません
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,転送するアイテムが選択されていません
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,全ての住所。
 DocType: Company,Stock Settings,在庫設定
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",両方のレコードで次のプロパティが同じである場合、マージのみ可能です。グループ、ルートタイプ、会社です
@@ -4131,7 +4136,7 @@
 DocType: Patient,Personal and Social History,個人と社会の歴史
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,ユーザー{0}が作成されました
 DocType: Fee Schedule,Fee Breakup for each student,生徒ごとの違約金
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),注文に対する総事前（{0}）{1}（{2}）総合計よりも大きくすることはできません。
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),注文に対する総事前（{0}）{1}（{2}）総合計よりも大きくすることはできません。
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,月をまたがってターゲットを不均等に配分するには、「月次配分」を選択してください
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,コード変更
 DocType: Purchase Invoice Item,Valuation Rate,評価額
@@ -4140,7 +4145,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,入手可能なITC Cess
 ,Student Monthly Attendance Sheet,生徒月次出席シート
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,配送ルールは販売にのみ適用されます
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,減価償却行{0}：次の減価償却日は購入日より前にすることはできません
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,減価償却行{0}：次の減価償却日は購入日より前にすることはできません
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,プロジェクト開始日
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,まで
 DocType: Rename Tool,Rename Log,ログ名称変更
@@ -4157,12 +4162,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,販売取引に基づいてプロジェクトや会社を更新する頻度。
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,有効期限
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,生徒追加
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","この文書をキャンセルするには、従業員<a href=""#Form/Employee/{0}"">{0}</a> \を削除してください"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},{0}を選択してください
 DocType: C-Form,C-Form No,C-フォームはありません
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,距離
+DocType: Delivery Stop,Distance,距離
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,購入または販売している商品やサービスをリストします。
 DocType: Water Analysis,Storage Temperature,保管温度
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4189,7 +4192,7 @@
 DocType: Homepage,Company Description for website homepage,ウェブサイトのホームページのための会社説明
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",これらのコードは、顧客の便宜のために、請求書および納品書等の印刷形式で使用することができます
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,サプライヤー名
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,{0}の情報を取得できませんでした。
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,{0}の情報を取得できませんでした。
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,オープニングエントリージャーナル
 DocType: Contract,Fulfilment Terms,履行条件
 DocType: Sales Invoice,Time Sheet List,勤務表一覧
@@ -4369,7 +4372,7 @@
 DocType: Serial No,Warranty / AMC Details,保証/ 年間保守契約の詳細
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,アクティビティベースのグループの学生を手動で選択する
 DocType: Journal Entry,User Remark,ユーザー備考
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,ルートの最適化。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,ルートの最適化。
 DocType: Travel Itinerary,Non Diary,非日記
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,左の従業員に対して保持ボーナスを作成することはできません
 DocType: Lead,Market Segment,市場区分
@@ -4399,7 +4402,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,ロイヤルティプログラム
 DocType: Student Guardian,Father,お父さん
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,チケットをサポートする
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,「アップデート証券は「固定資産売却をチェックすることはできません
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,「アップデート証券は「固定資産売却をチェックすることはできません
 DocType: Bank Reconciliation,Bank Reconciliation,銀行勘定調整
 DocType: Attendance,On Leave,休暇中
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,アップデートを入手
@@ -4444,7 +4447,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,シリアル番号とバッチ
 DocType: Warranty Claim,From Company,会社から
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,評価基準のスコアの合計は{0}にする必要があります。
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,予約された減価償却の数を設定してください
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,予約された減価償却の数を設定してください
 DocType: Supplier Scorecard Period,Calculations,計算
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,値または数量
 DocType: Payment Terms Template,Payment Terms,支払い条件
@@ -4463,7 +4466,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,利益率を用いた価格リストレートの割引（％）
 DocType: Healthcare Service Unit Type,Rate / UOM,レート/ UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,全倉庫
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,会社間取引で{0}は見つかりませんでした。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,会社間取引で{0}は見つかりませんでした。
 DocType: Travel Itinerary,Rented Car,レンタカー
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,あなたの会社について
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,貸方アカウントは貸借対照表アカウントである必要があります
@@ -4564,6 +4567,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,植物分析基準
 DocType: Cheque Print Template,Cheque Height,小切手の高さ
 DocType: Supplier,Supplier Details,サプライヤー詳細
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,セットアップ&gt;ナンバリングシリーズで出席者用のナンバリングシリーズをセットアップしてください
 DocType: Setup Progress,Setup Progress,セットアップの進捗状況
 DocType: Expense Claim,Approval Status,承認ステータス
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},行{0}の値以下の値でなければなりません
@@ -4656,7 +4660,6 @@
 DocType: Travel Request,Fully Sponsored,完全にスポンサーされた
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,逆仕訳入力
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,顧客 {0} が作成されました。
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,従業員の命名システムを人事管理&gt; HR設定で設定してください
 DocType: Stock Settings,Limit Percent,リミットパーセント
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,現在どの倉庫にも在庫がありません
 ,Payment Period Based On Invoice Date,請求書の日付に基づく支払期間
@@ -4715,7 +4718,7 @@
 DocType: BOM Explosion Item,Source Warehouse,出庫元
 DocType: Installation Note,Installation Date,設置日
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,株主
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},行＃{0}：アセット{1}の会社に属していない{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},行＃{0}：アセット{1}の会社に属していない{2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,販売請求書{0}が作成されました
 DocType: Employee,Confirmation Date,確定日
 DocType: Inpatient Occupancy,Check Out,チェックアウト
@@ -4735,6 +4738,7 @@
 DocType: Production Plan,Sales Orders Detail,受注詳細
 DocType: Bin,Requested Quantity,要求数量
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,インストラクターの教育におけるネーミングシステムの設定&gt;教育の設定
 DocType: Patient,Marital Status,配偶者の有無
 DocType: Stock Settings,Auto Material Request,自動資材要求
 DocType: Woocommerce Settings,API consumer secret,APIコンシューマーシークレット
@@ -4787,7 +4791,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,日を選択
 DocType: Academic Term,Term Name,期名
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),クレジット（{0}）
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,給料スリップの作成...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,給料スリップの作成...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,ルートノードは編集できません。
 DocType: Buying Settings,Purchase Order Required,発注が必要です
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,タイマー
@@ -4823,7 +4827,7 @@
 DocType: Account,Rate at which this tax is applied,この税金が適用されるレート
 DocType: Cash Flow Mapper,Section Name,セクション名
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,再注文数量
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},減価償却行{0}：耐用年数後の期待値は{1}以上でなければなりません
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},減価償却行{0}：耐用年数後の期待値は{1}以上でなければなりません
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,現在の求人
 DocType: Company,Stock Adjustment Account,在庫調整勘定
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,償却
@@ -4870,7 +4874,7 @@
 DocType: Program Enrollment,School House,スクールハウス
 DocType: Serial No,Out of AMC,年間保守契約外
 DocType: Opportunity,Opportunity Amount,機会費用
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,予約された減価償却の数は、減価償却費の合計数を超えることはできません
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,予約された減価償却の数は、減価償却費の合計数を超えることはできません
 DocType: Purchase Order,Order Confirmation Date,注文確認日
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,保守訪問作成
@@ -4911,7 +4915,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,バッチ：
 DocType: Volunteer,Afternoon,午後
 DocType: Loyalty Program,Loyalty Program Help,ロイヤルティプログラムのヘルプ
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}'は無効になっています
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}'は無効になっています
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,オープンに設定
 DocType: Cheque Print Template,Scanned Cheque,スキャンした小切手
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,取引を処理した時に連絡先に自動メールを送信
@@ -4924,7 +4928,7 @@
 DocType: Warranty Claim,Item and Warranty Details,アイテムおよび保証詳細
 DocType: Chapter,Chapter Members,章のメンバー
 DocType: Sales Team,Contribution (%),寄与度（％）
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：「現金または銀行口座」が指定されていないため、支払エントリが作成されません
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：「現金または銀行口座」が指定されていないため、支払エントリが作成されません
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,プロジェクト{0}は既に存在します
 DocType: Clinical Procedure,Nursing User,看護ユーザー
 DocType: Employee Benefit Application,Payroll Period,給与計算期間
@@ -4932,6 +4936,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},シリアル番号{0}はバッチ{1}に属していません
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,責任
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,この見積りの有効期間は終了しました。
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","この文書をキャンセルするには、従業員<a href=""#Form/Employee/{0}"">{0}</a> \を削除してください"
 DocType: Expense Claim Account,Expense Claim Account,経費請求アカウント
 DocType: Account,Capital Work in Progress,資本は進歩している
 DocType: Accounts Settings,Allow Stale Exchange Rates,失効した為替レートを許可する
@@ -5012,7 +5018,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,資材課題
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,ShopifyをERPNextと接続する
 DocType: Material Request Item,For Warehouse,倉庫用
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,納品書{0}が更新されました
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,納品書{0}が更新されました
 DocType: Employee,Offer Date,雇用契約日
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,見積
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,オフラインモードになっています。ネットワークに接続するまで、リロードすることができません。
@@ -5062,7 +5068,7 @@
 DocType: Shipping Rule,Calculate Based On,計算基準
 DocType: Contract,Unfulfilled,満たされていない
 DocType: Delivery Note Item,From Warehouse,倉庫から
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,指定された基準の従業員はいません
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,指定された基準の従業員はいません
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,製造する部品表（BOM）を持つアイテムはありません
 DocType: Shopify Settings,Default Customer,デフォルト顧客
 DocType: Sales Stage,Stage Name,芸名
@@ -5104,7 +5110,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,割引後の税額
 DocType: Patient,Inpatient Status,入院患者のステータス
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,日次業務概要設定
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,選択された価格リストには、売買フィールドがチェックされている必要があります。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,選択された価格リストには、売買フィールドがチェックされている必要があります。
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Reqd by Dateを入力してください
 DocType: Payment Entry,Internal Transfer,内部転送
 DocType: Asset Maintenance,Maintenance Tasks,保守作業
@@ -5140,7 +5146,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,グループ化
 DocType: Guardian,Interests,興味
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,通貨の有効／無効を切り替え
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,給与明細を提出できませんでした
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,給与明細を提出できませんでした
 DocType: Exchange Rate Revaluation,Get Entries,エントリーを取得する
 DocType: Production Plan,Get Material Request,資材要求取得
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,郵便経費
@@ -5224,7 +5230,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},アイテム{0}には経費科目が必須です
 DocType: BOM,Website Description,ウェブサイトの説明
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,資本の純変動
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,最初の購入請求書{0}をキャンセルしてください
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,最初の購入請求書{0}をキャンセルしてください
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,許可されていません。サービスユニットタイプを無効にしてください
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",メールアドレスは一意である必要があり、すでに {0} が存在します
 DocType: Serial No,AMC Expiry Date,年間保守契約の有効期限日
@@ -5264,7 +5270,7 @@
 DocType: Hotel Room,Hotel Room,ホテルの部屋
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},アカウント{0} は会社 {1} に所属していません
 DocType: Leave Type,Rounding,丸め
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,行{0}のシリアル番号が配達メモと一致しません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,行{0}のシリアル番号が配達メモと一致しません
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),ディスペンシング量（Pro-rated）
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.",次に、顧客、顧客グループ、地域、サプライヤ、サプライヤグループ、キャンペーン、セールスパートナーなどに基づいて料金設定ルールが除外されます。
 DocType: Student,Guardian Details,保護者詳細
@@ -5319,7 +5325,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},在庫アイテム{0}には倉庫が必要です
 DocType: Leave Allocation,Unused leaves,未使用の休暇
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,払い戻しの入力をする
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,すべての部署
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,すべての部署
 DocType: Healthcare Service Unit,Vacant,空き
 DocType: Patient,Alcohol Past Use,アルコール摂取歴
 DocType: Fertilizer Content,Fertilizer Content,肥料の内容
@@ -5330,7 +5336,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に作業指示書{0}をキャンセルする必要があります
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),（部分組立品を含む）展開した部品表を取得する
 DocType: Authorization Rule,Applicable To (Employee),（従業員）に適用
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,期日は必須です
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,期日は必須です
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,属性 {0} の増分は0にすることはできません
 DocType: Employee Benefit Claim,Benefit Type and Amount,給付タイプと金額
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,予約された部屋
@@ -5474,7 +5480,7 @@
 DocType: Purchase Invoice Item,Total Weight,総重量
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,販売手数料
 DocType: Job Offer Term,Value / Description,値／説明
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行#{0}：資産{1}は{2}であるため提出することができません
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行#{0}：資産{1}は{2}であるため提出することができません
 DocType: Tax Rule,Billing Country,請求先の国
 DocType: Purchase Order Item,Expected Delivery Date,配送予定日
 DocType: Restaurant Order Entry,Restaurant Order Entry,レストランオーダーエントリー
@@ -5513,12 +5519,13 @@
 DocType: Maintenance Visit,Breakdown,故障
 DocType: Travel Itinerary,Vegetarian,ベジタリアン
 DocType: Patient Encounter,Encounter Date,出会いの日
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,アカウント：{0} で通貨：{1}を選択することはできません
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,アカウント：{0} で通貨：{1}を選択することはできません
 DocType: Bank Statement Transaction Settings Item,Bank Data,銀行データ
 DocType: Purchase Receipt Item,Sample Quantity,サンプル数量
 DocType: Bank Guarantee,Name of Beneficiary,受益者の氏名
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",最新の評価レート/価格リストレート/原材料の最終購入レートに基づいて、スケジューラを使用してBOM原価を自動的に更新します。
 DocType: Supplier,SUP-.YYYY.-,SUP -YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,サプライヤ&gt;サプライヤグループ
 DocType: Bank Reconciliation Detail,Cheque Date,小切手日
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},アカウント{0}：親アカウント{1}は会社{2}に属していません
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,この会社に関連するすべての取引を正常に削除しました！
@@ -5546,7 +5553,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,子ノードは「グループ」タイプのノードの下に作成することができます
 DocType: Attendance Request,Half Day Date,半日日付
 DocType: Academic Year,Academic Year Name,学年名
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0}は{1}との取引が許可されていません。会社を変更してください。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0}は{1}との取引が許可されていません。会社を変更してください。
 DocType: Sales Partner,Contact Desc,連絡先説明
 DocType: Email Digest,Send regular summary reports via Email.,メール経由で定期的な要約レポートを送信
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},経費請求タイプ{0}に、デフォルトのアカウントを設定してください
@@ -5579,7 +5586,7 @@
 DocType: Hotel Room,Hotel Manager,ホテルマネージャー
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,ショッピングカート用の税ルールを設定
 DocType: Purchase Invoice,Taxes and Charges Added,租税公課が追加されました。
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,減価償却行{0}：次の減価償却日は、使用可能日前にすることはできません
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,減価償却行{0}：次の減価償却日は、使用可能日前にすることはできません
 ,Sales Funnel,セールスファネル
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,略称は必須です
 DocType: Project,Task Progress,タスクの進捗状況
@@ -5593,7 +5600,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,全ての顧客グループ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,月間累計
 DocType: Attendance Request,On Duty,オンデューティー
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}は必須です。おそらく{1}から {2}のための通貨変換レコードが作成されていません
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}は必須です。おそらく{1}から {2}のための通貨変換レコードが作成されていません
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},指定{1}のスタッフ計画{0}はすでに存在しています
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,税テンプレートは必須です
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,アカウント{0}：親アカウント{1}が存在しません
@@ -5672,11 +5679,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,倉庫は少なくとも1つ必須です
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.",UOM、アイテムグループ、説明、時間数などのアイテムフィールドを設定します。
 DocType: Certification Application,Certification Status,認定ステータス
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,市場
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,市場
 DocType: Travel Itinerary,Travel Advance Required,旅行のアドバイスが必要
 DocType: Subscriber,Subscriber Name,加入者名
 DocType: Serial No,Out of Warranty,保証外
-DocType: Cashier Closing,Cashier-closing-,キャッシャー - クローズ -
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,マップされたデータ型
 DocType: BOM Update Tool,Replace,置き換え
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,製品が見つかりませんでした。
@@ -5764,7 +5770,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,販売および購買のデフォルト税テンプレートが登録されます。
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,評価結果レコード{0}は既に存在します。
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",例：ABCD。#####。 seriesが設定され、トランザクションでBatch Noが指定されていない場合、このシリーズに基づいて自動バッチ番号が作成されます。この項目のBatch Noを明示的に指定する場合は、この項目を空白のままにしておきます。注：この設定は、ストック設定のネーミングシリーズ接頭辞よりも優先されます。
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,セットアップ&gt;ナンバリングシリーズで出席者用のナンバリングシリーズをセットアップしてください
 DocType: BOM,Materials Required (Exploded),資材が必要です（展開）
 DocType: Contract,Party User,パーティーユーザー
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Group Byが &#39;Company&#39;の場合、Companyフィルターを空白に設定してください
@@ -5965,7 +5970,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,機会数
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,試用期間開始日と試用期間終了日の両方を設定する必要があります
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,平均レート
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,支払スケジュールの総支払額は、総額/丸め合計と等しくなければなりません
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,支払スケジュールの総支払額は、総額/丸め合計と等しくなければなりません
 DocType: Subscription Plan Detail,Plan,計画
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,総勘定元帳ごとの銀行取引明細残高
 DocType: Job Applicant,Applicant Name,申請者名
@@ -6034,7 +6039,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,石鹸＆洗剤
 DocType: BOM,Show Items,アイテムを表示
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,開始時間を終了時間よりも大きくすることはできません。
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,すべての顧客に電子メールで通知しますか？
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,すべての顧客に電子メールで通知しますか？
 DocType: Subscription Plan,Billing Interval,請求間隔
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,映画＆ビデオ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,注文済
@@ -6043,9 +6048,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,行{0}：{1}は0より大きくなければなりません
 DocType: Assessment Criteria,Assessment Criteria Group,評価基準グループ
 DocType: Healthcare Settings,Patient Name By,患者名
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},{0}から{1}への給与の発生分納登録
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},{0}から{1}への給与の発生分納登録
 DocType: Sales Invoice Item,Enable Deferred Revenue,繰延収益を有効にする
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},減価償却累計額を開くことに等しい未満でなければなりません{0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},減価償却累計額を開くことに等しい未満でなければなりません{0}
 DocType: Warehouse,Warehouse Name,倉庫名
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,実際の開始日は実際の終了日よりも短くなければなりません
 DocType: Naming Series,Select Transaction,取引を選択
@@ -6196,7 +6201,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,{1}の従業員{0}にデフォルト休暇ポリシーはありません
 DocType: Salary Detail,Salary Detail,給与詳細
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,{0}を選択してください
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,{0}ユーザーを追加しました
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,{0}ユーザーを追加しました
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",マルチティアプログラムの場合、顧客は、消費されるごとに自動的に関係する層に割り当てられます
 DocType: Appointment Type,Physician,医師
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,アイテム {1}のバッチ {0} は期限切れです
@@ -6340,7 +6345,7 @@
 DocType: Asset,Custodian,カストディアン
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,POSプロフィール
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0}は0〜100の値でなければなりません
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},{1}から{2}への{0}の支払い
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},{1}から{2}への{0}の支払い
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,無担保ローン
 DocType: Cost Center,Cost Center Name,コストセンター名
 DocType: Student,B+,B +
@@ -6372,6 +6377,7 @@
 DocType: Employee,Date of Issue,発行日
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",各購買設定で「領収書が必要」が有効の場合、請求書を作成するには、先にアイテム {0} の領収書を作成する必要があります
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},行＃{0}：アイテム {1} にサプライヤーを設定してください
+DocType: Global Defaults,Default Distance Unit,デフォルト距離単位
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,行{0}：時間値がゼロより大きくなければなりません。
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,アイテム{1}に添付されたウェブサイト画像{0}が見つかりません
 DocType: Issue,Content Type,コンテンツタイプ
@@ -6427,7 +6433,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,借方アカウントは貸借対照表アカウントである必要があります
 DocType: Asset,Naming Series,シリーズ名を付ける
 DocType: Vital Signs,Coated,コーティングされた
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,行{0}：有効期限が過ぎた後の期待値は、購入総額
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,行{0}：有効期限が過ぎた後の期待値は、購入総額
 DocType: GoCardless Settings,GoCardless Settings,GoCardless設定
 DocType: Leave Block List,Leave Block List Name,休暇リスト名
 DocType: Certified Consultant,Certification Validity,認定の妥当性
@@ -6494,6 +6500,7 @@
 DocType: Bank Statement Settings Item,Bank Header,銀行ヘッダ
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,ラボテストの表示
 DocType: Hub Users,Hub Users,ハブユーザー
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;テリトリー
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,保守日
 DocType: Purchase Invoice Item,Rejected Serial No,拒否されたシリアル番号
@@ -6510,7 +6517,7 @@
 DocType: SG Creation Tool Course,Max Strength,最大強度
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,プリセットのインストール
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},顧客{}の配達メモが選択されていません
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},顧客{}の配達メモが選択されていません
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,従業員{0}には最大給付額はありません
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,納期に基づいて商品を選択
 DocType: Grant Application,Has any past Grant Record,助成金レコードあり
@@ -6537,7 +6544,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,ホテルルーム予約
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,顧客サービス
 DocType: BOM,Thumbnail,サムネイル
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,電子メールIDを持つ連絡先は見つかりませんでした。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,電子メールIDを持つ連絡先は見つかりませんでした。
 DocType: Item Customer Detail,Item Customer Detail,アイテム顧客詳細
 DocType: Notification Control,Prompt for Email on Submission of,提出するメールの指定
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},従業員{0}の最大便益額が{1}を超えています
@@ -6792,7 +6799,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,会計タイプが選択されているため、グループに変換することはできません
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1}が変更されています。画面を更新してください。
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,以下の日にはユーザーからの休暇申請を受け付けない
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,商品コード&gt;商品グループ&gt;ブランド
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.",ロイヤリティポイントの有効期限を無期限にする場合は、有効期限を空または0にしてください。
 DocType: Asset Maintenance Team,Maintenance Team Members,保守チームメンバー
 DocType: Loyalty Point Entry,Purchase Amount,購入金額
@@ -6800,7 +6806,7 @@
 											to fullfill Sales Order {2}",項目{1}のシリアルナンバー{0}は、販売注文{2}を完全に埋めるために予約されているため配送できません
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,サプライヤー見積 {0} 作成済
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,終了年を開始年より前にすることはできません
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,終了年を開始年より前にすることはできません
 DocType: Employee Benefit Application,Employee Benefits,従業員給付
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},梱包済数量は、行{1}のアイテム{0}の数量と等しくなければなりません
 DocType: Work Order,Manufactured Qty,製造数量
@@ -6816,6 +6822,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,バッチ番号選択
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,GSTINに
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,顧客あて請求
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,従業員の命名システムを人事管理&gt; HR設定で設定してください
 DocType: Healthcare Settings,Invoice Appointments Automatically,請求書の予定が自動的に決まる
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,プロジェクトID
 DocType: Salary Component,Variable Based On Taxable Salary,課税可能な給与に基づく変数
@@ -6864,7 +6871,7 @@
 DocType: POS Profile,Account for Change Amount,変化量のためのアカウント
 DocType: QuickBooks Migrator,Connecting to QuickBooks,QuickBooksに接続する
 DocType: Exchange Rate Revaluation,Total Gain/Loss,総損益
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,会社間請求書の会社が無効です。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,会社間請求書の会社が無効です。
 DocType: Purchase Invoice,input service,入力サービス
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：当事者／アカウントが {3} {4} の {1} / {2}と一致しません
 DocType: Employee Promotion,Employee Promotion,従業員の昇進
@@ -6994,7 +7001,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,宿泊施設の優先エリア
 apps/erpnext/erpnext/config/selling.py +184,Analytics,分析
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,カートは空です
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,インストラクターの教育におけるネーミングシステムの設定&gt;教育の設定
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",アイテム{0}にはシリアル番号がありませんシリアル化アイテムのみがシリアル番号に基づいて配送できます
 DocType: Vehicle,Model,モデル
@@ -7024,7 +7030,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,変更するものはありません
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,csvファイルを選択してください
 DocType: Holiday List,Total Holidays,総祝日
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,ディスパッチ用の電子メールテンプレートがありません。配信設定で1つを設定してください。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,ディスパッチ用の電子メールテンプレートがありません。配信設定で1つを設定してください。
 DocType: Student Leave Application,Mark as Present,出席としてマーク
 DocType: Supplier Scorecard,Indicator Color,インジケータの色
 DocType: Purchase Order,To Receive and Bill,受領・請求する
@@ -7033,7 +7039,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,シリアル番号を選択
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,デザイナー
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,規約のテンプレート
-DocType: Serial No,Delivery Details,納品詳細
+DocType: Delivery Trip,Delivery Details,納品詳細
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},タイプ{1}のための税金テーブルの行{0}にコストセンターが必要です
 DocType: Program,Program Code,教育課程コード
 DocType: Terms and Conditions,Terms and Conditions Help,利用規約ヘルプ
@@ -7057,7 +7063,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,リードタイム日数
 DocType: Cash Flow Mapping,Is Income Tax Expense,法人所得税は費用ですか？
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,あなたの注文は配送のためです！
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},資産の転記日付購入日と同じでなければなりません{1} {2}：行＃{0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},資産の転記日付購入日と同じでなければなりません{1} {2}：行＃{0}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,学生が研究所のホステルに住んでいる場合はこれをチェックしてください。
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,上記の表に受注を入力してください
 ,Stock Summary,株式の概要
diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv
index d55946f..04f962c 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,ឈ្មោះកំឡុងពេល
 DocType: Employee,Salary Mode,របៀបប្រាក់បៀវត្ស
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,ចុះឈ្មោះ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,ចុះឈ្មោះ
 DocType: Patient,Divorced,លែងលះគ្នា
 DocType: Support Settings,Post Route Key,សោផ្លូវបង្ហោះ
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,អនុញ្ញាតឱ្យធាតុនឹងត្រូវបានបន្ថែមជាច្រើនដងនៅក្នុងប្រតិបត្តិការ
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,អត្រាប្តូរប្រាក់ថ្មី
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},រូបិយប័ណ្ណត្រូវបានទាមទារសម្រាប់តារាងតម្លៃ {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* នឹងត្រូវបានគណនាក្នុងប្រតិបត្តិការនេះ។
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,អ្នកផ្គត់ផ្គង់&gt; ប្រភេទអ្នកផ្គត់ផ្គង់
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT -YYYY.-
 DocType: Purchase Order,Customer Contact,ទំនាក់ទំនងអតិថិជន
 DocType: Patient Appointment,Check availability,ពិនិត្យភាពអាចរកបាន
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,បង្ហាញតែការបើកចំហ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,កម្រងឯកសារបន្ទាន់សម័យដោយជោគជ័យ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,ពិនិត្យមុនពេលចេញ
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} នៅក្នុងជួរដេក {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} នៅក្នុងជួរដេក {1}
 DocType: Asset Finance Book,Depreciation Start Date,ចាប់ផ្តើមកាលបរិច្ឆេទចាប់ផ្តើម
 DocType: Pricing Rule,Apply On,អនុវត្តនៅលើ
 DocType: Item Price,Multiple Item prices.,តម្លៃមុខទំនិញមានច្រើន
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,វេជ្ជបញ្ជាមន្ទីរពេទ្យ
 ,Delay Days,ពន្យារពេល
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ការចំណាយសេវា
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},លេខស៊េរី: {0} ត្រូវបានយោងរួចហើយនៅក្នុងវិក័យប័ត្រលក់: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},លេខស៊េរី: {0} ត្រូវបានយោងរួចហើយនៅក្នុងវិក័យប័ត្រលក់: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,វិក័យប័ត្រ
 DocType: Purchase Invoice Item,Item Weight Details,ព័ត៌មានលម្អិតទម្ងន់
 DocType: Asset Maintenance Log,Periodicity,រយៈពេល
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,គណនេយ្យករ
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,លក់បញ្ជីតំលៃ
 DocType: Patient,Tobacco Current Use,ការប្រើប្រាស់ថ្នាំជក់បច្ចុប្បន្ន
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","ថ្ងៃខែឆ្នាំនិងកាលបរិច្ឆេទបញ្ចប់ត្រូវបានជាន់គ្នាជាមួយប័ណ្ណការងារ <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,អត្រាលក់
 DocType: Cost Center,Stock User,អ្នកប្រើប្រាស់ភាគហ៊ុន
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,ដែលទាក់ទង
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,កាលបរិច្ឆេទចូលរួមមិនអាចតិចជាងការចូលរួមរបស់បុគ្គលិកនិងកាលបរិច្ឆេទ
 DocType: Grading Scale,Grading Scale Name,ធ្វើមាត្រដ្ឋានចំណាត់ឈ្មោះ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,បន្ថែមអ្នកប្រើប្រាស់ទៅក្នុងទីផ្សារ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,បន្ថែមអ្នកប្រើប្រាស់ទៅក្នុងទីផ្សារ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,នេះគឺជាគណនី root និងមិនអាចត្រូវបានកែសម្រួល។
 DocType: Sales Invoice,Company Address,អាសយដ្ឋានរបស់ក្រុមហ៊ុន
 DocType: BOM,Operations,ប្រតិបត្ដិការ
@@ -320,7 +320,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,ខុសលេខ
 DocType: Production Plan,Material Request Detail,សម្ភារៈស្នើសុំពត៌មាន
 DocType: Selling Settings,Default Quotation Validity Days,សុពលភាពតំលៃថ្ងៃខែ
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",ដើម្បីរួមបញ្ចូលពន្ធក្នុងជួរ {0} នៅក្នុងអត្រាធាតុពន្ធក្នុងជួរដេក {1} ត្រូវតែត្រូវបានរួមបញ្ចូល
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",ដើម្បីរួមបញ្ចូលពន្ធក្នុងជួរ {0} នៅក្នុងអត្រាធាតុពន្ធក្នុងជួរដេក {1} ត្រូវតែត្រូវបានរួមបញ្ចូល
 DocType: SMS Center,SMS Center,ផ្ញើសារជាអក្សរមជ្ឈមណ្ឌល
 DocType: Payroll Entry,Validate Attendance,ធ្វើឱ្យវត្តមានមានសុពលភាព
 DocType: Sales Invoice,Change Amount,ការផ្លាស់ប្តូរចំនួនទឹកប្រាក់
@@ -439,7 +439,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,គម្លាតបន្ទាត់សម្រាប់ចំនួននៅក្នុងពាក្យ
 DocType: Vehicle,Additional Details,សេចក្ដីលម្អិតបន្ថែម
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,ការពិពណ៌នាដែលបានផ្ដល់ឱ្យមិនមាន
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,អ្នកផ្គត់ផ្គង់&gt; ក្រុមអ្នកផ្គត់ផ្គង់
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ស្នើសុំសម្រាប់ការទិញ។
 DocType: POS Closing Voucher Details,Collected Amount,ចំនួនសរុបដែលបានប្រមូល
 DocType: Lab Test,Submitted Date,កាលបរិច្ឆេទដែលបានដាក់ស្នើ
@@ -484,7 +483,7 @@
 DocType: Student Admission,Student Admission,ការចូលរបស់សិស្ស
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,ធាតុ {0} ត្រូវបានលុបចោល
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,រំលោះជួរដេក {0}: កាលបរិច្ឆេទចាប់ផ្តើមរំលោះត្រូវបានបញ្ចូលជាកាលបរិច្ឆេទកន្លងមក
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,រំលោះជួរដេក {0}: កាលបរិច្ឆេទចាប់ផ្តើមរំលោះត្រូវបានបញ្ចូលជាកាលបរិច្ឆេទកន្លងមក
 DocType: Contract Template,Fulfilment Terms and Conditions,លក្ខខណ្ឌនៃការបំពេញ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,សម្ភារៈស្នើសុំ
 DocType: Bank Reconciliation,Update Clearance Date,ធ្វើឱ្យទាន់សម័យបោសសំអាតកាលបរិច្ឆេទ
@@ -541,6 +540,7 @@
 DocType: Accounts Settings,Settings for Accounts,ការកំណត់សម្រាប់គណនី
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},ក្រុមហ៊ុនផ្គត់ផ្គង់មានក្នុងវិក័យប័ត្រគ្មានវិក័យប័ត្រទិញ {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,គ្រប់គ្រងការលក់បុគ្គលដើមឈើ។
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.",មិនអាចដំណើរការផ្លូវបានទេព្រោះការកំណត់ផែនទី Google ត្រូវបានបិទ។
 DocType: Job Applicant,Cover Letter,លិខិត
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,មូលប្បទានប័ត្រឆ្នើមនិងប្រាក់បញ្ញើដើម្បីជម្រះ
 DocType: Item,Synced With Hub,ធ្វើសមកាលកម្មជាមួយនឹងការហាប់
@@ -599,7 +599,7 @@
 DocType: Asset Value Adjustment,New Asset Value,តម្លៃទ្រព្យសកម្មថ្មី
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,អត្រាដែលរូបិយវត្ថុរបស់អតិថិជនត្រូវបានបម្លែងទៅជារូបិយប័ណ្ណមូលដ្ឋានរបស់អតិថិជន
 DocType: Course Scheduling Tool,Course Scheduling Tool,ឧបករណ៍កាលវិភាគវគ្គសិក្សាបាន
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ជួរដេក # {0}: ការទិញវិក័យប័ត្រដែលមិនអាចត្រូវបានធ្វើឡើងប្រឆាំងនឹងទ្រព្យសម្បត្តិដែលមានស្រាប់ {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ជួរដេក # {0}: ការទិញវិក័យប័ត្រដែលមិនអាចត្រូវបានធ្វើឡើងប្រឆាំងនឹងទ្រព្យសម្បត្តិដែលមានស្រាប់ {1}
 DocType: Crop Cycle,LInked Analysis,វិភាគ LInked
 DocType: POS Closing Voucher,POS Closing Voucher,ប័ណ្ណបញ្ចុះតម្លៃម៉ាស៊ីនឆូតកាត
 DocType: Contract,Lapsed,បាត់បង់
@@ -634,6 +634,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} មិនត្រូវបានចុះឈ្មោះក្នុងវគ្គសិក្សានេះ {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,ឈ្មោះរបស់និស្សិត:
 DocType: POS Closing Voucher Details,Difference,ភាពខុសគ្នា
+DocType: Delivery Settings,Delay between Delivery Stops,ការពន្យារពេលរវាងការដឹកជញ្ជូនឈប់
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},សៀរៀល {0} គ្មានមិនមែនជាកម្មសិទ្ធិរបស់ដឹកជញ្ជូនចំណាំ {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.",ហាក់ដូចជាមានបញ្ហាជាមួយការកំណត់រចនាសម្ព័ន្ធ GoCardless របស់ម៉ាស៊ីនមេ។ កុំបារម្ភក្នុងករណីមានការខកខានចំនួនទឹកប្រាក់នឹងត្រូវបានបង្វិលទៅគណនីរបស់អ្នក។
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext សាកល្បង
@@ -692,7 +693,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,បរិមាណនិងអត្រាការប្រាក់
 DocType: Delivery Note,% Installed,% បានដំឡើង
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,ថ្នាក់រៀន / មន្ទីរពិសោធន៍លដែលជាកន្លែងដែលបង្រៀនអាចត្រូវបានកំណត់។
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,រូបិយប័ណ្ណរបស់ក្រុមហ៊ុនទាំងពីរគួរតែផ្គូផ្គងទៅនឹងប្រតិបត្តិការអន្តរអ៊ិនធឺរណែត។
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,រូបិយប័ណ្ណរបស់ក្រុមហ៊ុនទាំងពីរគួរតែផ្គូផ្គងទៅនឹងប្រតិបត្តិការអន្តរអ៊ិនធឺរណែត។
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,សូមបញ្ចូលឈ្មោះរបស់ក្រុមហ៊ុនដំបូង
 DocType: Travel Itinerary,Non-Vegetarian,អ្នកមិនពិសាអាហារ
 DocType: Purchase Invoice,Supplier Name,ឈ្មោះក្រុមហ៊ុនផ្គត់ផ្គង់
@@ -777,7 +778,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,ជួលពីកាលបរិច្ឆេទ
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,ផ្នែកគ្រប់គ្រាន់ដើម្បីកសាង
 DocType: POS Profile User,POS Profile User,អ្នកប្រើប្រាស់បណ្តាញ POS
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,ជួរដេក {0}: កាលបរិច្ឆេទចាប់ផ្តើមរំលោះត្រូវបានទាមទារ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,ជួរដេក {0}: កាលបរិច្ឆេទចាប់ផ្តើមរំលោះត្រូវបានទាមទារ
 DocType: Purchase Invoice Item,Service Start Date,កាលបរិច្ឆេទចាប់ផ្តើមសេវាកម្ម
 DocType: Subscription Invoice,Subscription Invoice,វិក្កយបត្រជាវ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,ប្រាក់ចំណូលដោយផ្ទាល់
@@ -844,7 +845,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,អក្សរសង្ខេបដែលបានប្រើរួចហើយសម្រាប់ក្រុមហ៊ុនផ្សេងទៀត
 DocType: Selling Settings,Default Customer Group,លំនាំដើមគ្រុបអតិថិជន
 DocType: Employee,IFSC Code,កូដ IFSC
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","ថ្ងៃខែឆ្នាំនិងកាលបរិច្ឆេទបញ្ចប់ត្រូវបានជាន់គ្នាជាមួយប័ណ្ណការងារ <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",ប្រសិនបើការបិទវាល &quot;សរុបមូល&quot; នឹងមិនត្រូវបានមើលឃើញនៅក្នុងប្រតិបត្តិការណាមួយឡើយ
 DocType: BOM,Operating Cost,ចំណាយប្រតិបត្តិការ
 DocType: Crop,Produced Items,ផលិតធាតុ
@@ -896,7 +896,7 @@
 DocType: Supplier,Prevent RFQs,រារាំង RFQs
 DocType: Hub User,Hub User,អ្នកប្រើ Hub
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,ធ្វើឱ្យការលក់សណ្តាប់ធ្នាប់
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},តារាងប្រាក់បៀវត្សរ៍ត្រូវបានដាក់ស្នើសម្រាប់រយៈពេលចាប់ពី {0} ដល់ {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},តារាងប្រាក់បៀវត្សរ៍ត្រូវបានដាក់ស្នើសម្រាប់រយៈពេលចាប់ពី {0} ដល់ {1}
 DocType: Project Task,Project Task,គម្រោងការងារ
 DocType: Loyalty Point Entry Redemption,Redeemed Points,ពិន្ទុប្រោសលោះ
 ,Lead Id,ការនាំមុខលេខសម្គាល់
@@ -1026,7 +1026,7 @@
 DocType: Fee Validity,Max number of visit,ចំនួនអតិបរមានៃដំណើរទស្សនកិច្ច
 ,Hotel Room Occupancy,ការស្នាក់នៅបន្ទប់សណ្ឋាគារ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet បង្កើត:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},សូមកំណត់លំនាំដើមឬគណនីសាច់ប្រាក់របស់ធនាគារក្នុងរបៀបនៃការទូទាត់ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},សូមកំណត់លំនាំដើមឬគណនីសាច់ប្រាក់របស់ធនាគារក្នុងរបៀបនៃការទូទាត់ {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,ចុះឈ្មោះ
 DocType: GST Settings,GST Settings,ការកំណត់ជីអេសធី
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},រូបិយប័ណ្ណគួរតែដូចគ្នានឹងបញ្ជីតម្លៃរូបិយប័ណ្ណ: {0}
@@ -1080,7 +1080,7 @@
 DocType: Vehicle Log,Service Details,សេវាលម្អិត
 DocType: Lab Test Template,Grouped,ដាក់ជាក្រុម
 DocType: Selling Settings,Delivery Note Required,ត្រូវការដឹកជញ្ជូនចំណាំ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,ដាក់ស្នើសុំប្រាក់បៀវត្ស ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,ដាក់ស្នើសុំប្រាក់បៀវត្ស ...
 DocType: Bank Guarantee,Bank Guarantee Number,លេខធានា
 DocType: Assessment Criteria,Assessment Criteria,លក្ខណៈវិនិច្ឆ័យការវាយតំលៃ
 DocType: BOM Item,Basic Rate (Company Currency),អត្រាការប្រាក់មូលដ្ឋាន (ក្រុមហ៊ុនរូបិយវត្ថុ)
@@ -1105,13 +1105,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,ចូលក្នុងការទូទាត់ត្រូវបានបង្កើតឡើងរួចទៅហើយ
 DocType: Request for Quotation,Get Suppliers,ទទួលបានអ្នកផ្គត់ផ្គង់
 DocType: Purchase Receipt Item Supplied,Current Stock,ហ៊ុននាពេលបច្ចុប្បន្ន
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនបានភ្ជាប់ទៅនឹងធាតុ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនបានភ្ជាប់ទៅនឹងធាតុ {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,គ្រូពេទ្យប្រហែលជាប្រាក់ខែការមើលជាមុន
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,គណនី {0} ត្រូវបានបញ្ចូលច្រើនដង
 DocType: Account,Expenses Included In Valuation,ការចំណាយដែលបានរួមបញ្ចូលនៅក្នុងការវាយតម្លៃ
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,អ្នកអាចបន្តបានលុះត្រាតែសមាជិកភាពរបស់អ្នកផុតកំណត់ក្នុងរយៈពេល 30 ថ្ងៃ
 DocType: Shopping Cart Settings,Show Stock Availability,បង្ហាញស្តង់ដារដែលអាចរកបាន
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},កំណត់ {0} នៅក្នុងប្រភេទទ្រព្យសម្បត្តិ {1} ឬក្រុមហ៊ុន {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},កំណត់ {0} នៅក្នុងប្រភេទទ្រព្យសម្បត្តិ {1} ឬក្រុមហ៊ុន {2}
 DocType: Location,Longitude,រយៈបណ្តោយ
 ,Absent Student Report,របាយការណ៍សិស្សអវត្តមាន
 DocType: Crop,Crop Spacing UOM,ច្រឹបដំណាំ UOM
@@ -1183,7 +1183,7 @@
 DocType: Soil Texture,Sand,ខ្សាច់
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,ថាមពល
 DocType: Opportunity,Opportunity From,ឱកាសការងារពី
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ជួរដេក {0}: {1} លេខរៀងដែលទាមទារសម្រាប់ធាតុ {2} ។ អ្នកបានផ្តល់ {3} ។
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ជួរដេក {0}: {1} លេខរៀងដែលទាមទារសម្រាប់ធាតុ {2} ។ អ្នកបានផ្តល់ {3} ។
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,សូមជ្រើសរើសតារាង
 DocType: BOM,Website Specifications,ជាក់លាក់វេបសាយ
 DocType: Special Test Items,Particulars,ពិសេស
@@ -1275,7 +1275,7 @@
 DocType: Item,Items with higher weightage will be shown higher,ធាតុជាមួយនឹង weightage ខ្ពស់ជាងនេះនឹងត្រូវបានបង្ហាញដែលខ្ពស់ជាង
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,ការធ្វើតេស្តមន្ទីរពិសោធន៍និងសញ្ញាសំខាន់ៗ
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ពត៌មានលំអិតធនាគារការផ្សះផ្សា
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,ជួរដេក # {0}: ទ្រព្យសកម្ម {1} ត្រូវតែត្រូវបានដាក់ជូន
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,ជួរដេក # {0}: ទ្រព្យសកម្ម {1} ត្រូវតែត្រូវបានដាក់ជូន
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,រកមិនឃើញបុគ្គលិក
 DocType: Item,If subcontracted to a vendor,ប្រសិនបើមានអ្នកលក់មួយម៉ៅការបន្ត
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,និស្សិតក្រុមត្រូវបានធ្វើបច្ចុប្បន្នភាពរួចទៅហើយ។
@@ -1329,7 +1329,6 @@
 DocType: Loyalty Program Collection,Tier Name,ឈ្មោះថ្នាក់
 DocType: HR Settings,Enter retirement age in years,បញ្ចូលអាយុចូលនិវត្តន៍នៅក្នុងប៉ុន្មានឆ្នាំ
 DocType: Crop,Target Warehouse,គោលដៅឃ្លាំង
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,សូមកំណត់ស៊ុមឈ្មោះសម្រាប់ {0} តាម Setup&gt; Settings&gt; Naming Series
 DocType: Payroll Employee Detail,Payroll Employee Detail,និយោជិតប្រាក់ខែពត៌មានលំអិត
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,សូមជ្រើសឃ្លាំង
 DocType: Cheque Print Template,Starting location from left edge,ការចាប់ផ្តើមទីតាំងពីគែមឆ្វេង
@@ -1419,7 +1418,7 @@
 DocType: Work Order,Plan material for sub-assemblies,សម្ភារៈផែនការសម្រាប់ការអនុសភា
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,ដៃគូលក់និងដែនដី
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,Bom {0} ត្រូវតែសកម្ម
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,គ្មានមុខទំនិញសម្រាប់ផ្ទេរ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,គ្មានមុខទំនិញសម្រាប់ផ្ទេរ
 DocType: Employee Boarding Activity,Activity Name,ឈ្មោះសកម្មភាព
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,ប្ដូរកាលបរិច្ឆេទចេញផ្សាយ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,បានបញ្ចប់បរិមាណផលិតផល <b>{0}</b> និងសម្រាប់បរិមាណ <b>{1}</b> មិនអាចខុសគ្នាទេ
@@ -1646,6 +1645,7 @@
 DocType: Project,First Email,អ៊ីម៉ែលដំបូង
 DocType: Company,Exception Budget Approver Role,តួនាទីអ្នកអនុម័តថវិកាលើកលែង
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date",នៅពេលដែលបានកំណត់វិក័យប័ត្រនេះនឹងត្រូវបានបន្តរហូតដល់កាលបរិច្ឆេទកំណត់
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,ឃ្លាំងត្រូវបានបម្រុងទុកនៅក្នុងការលក់លំដាប់ / ឃ្លាំងទំនិញបានបញ្ចប់
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,ចំនួនលក់
 DocType: Repayment Schedule,Interest Amount,ចំនួនការប្រាក់
@@ -1657,7 +1657,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,កំណត់ត្រា
 DocType: Asset,Scrapped,បោះបង់ចោល
 DocType: Item,Item Defaults,លំនាំដើមរបស់ធាតុ
-DocType: Purchase Invoice,Returns,ត្រឡប់
+DocType: Cashier Closing,Returns,ត្រឡប់
 DocType: Job Card,WIP Warehouse,ឃ្លាំង WIP
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},សៀរៀលគ្មាន {0} គឺស្ថិតនៅក្រោមកិច្ចសន្យាថែរក្សារីករាយជាមួយនឹង {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,ការជ្រើសរើសបុគ្គលិក
@@ -1671,7 +1671,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,ប្រភេទផ្ទេរ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,ចំណាយការលក់
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមអតិថិជន&gt; ដែនដី
 DocType: Diagnosis,Diagnosis,ការធ្វើរោគវិនិច្ឆ័យ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,ទិញស្ដង់ដារ
 DocType: Attendance Request,Explanation,ការពន្យល់
@@ -1684,7 +1683,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,ទិញការបញ្ជាទិញទំនិញហួសកំណត់
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,លេខកូដតំបន់
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},លំដាប់ការលក់ {0} គឺ {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},ជ្រើសរើសគណនីប្រាក់ចំណូលក្នុងការប្រាក់ {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},ជ្រើសរើសគណនីប្រាក់ចំណូលក្នុងការប្រាក់ {0}
 DocType: Opportunity,Contact Info,ពត៌មានទំនាក់ទំនង
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,ការធ្វើឱ្យធាតុហ៊ុន
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,មិនអាចលើកកម្ពស់និយោជិកដោយមានស្ថានភាពនៅសល់
@@ -1696,7 +1695,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,វិក័យប័ត្រមិនអាចត្រូវបានធ្វើឡើងសម្រាប់ម៉ោងគិតប្រាក់សូន្យ
 DocType: Company,Date of Commencement,កាលបរិច្ឆេទនៃការចាប់ផ្តើម
 DocType: Sales Person,Select company name first.,ជ្រើសឈ្មោះក្រុមហ៊ុនជាលើកដំបូង។
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},បានផ្ញើអ៊ីមែលទៅ {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},បានផ្ញើអ៊ីមែលទៅ {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,សម្រង់ពាក្យដែលទទួលបានពីការផ្គត់ផ្គង់។
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,ដាក់ BOM និងធ្វើបច្ចុប្បន្នភាពតម្លៃចុងក្រោយបំផុតនៅក្នុងគ្រប់ប័ណ្ឌទាំងអស់
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},ដើម្បី {0} | {1} {2}
@@ -1716,7 +1715,7 @@
 DocType: Asset Movement,From Employee,ពីបុគ្គលិក
 DocType: Driver,Cellphone Number,លេខទូរស័ព្ទដៃ
 DocType: Project,Monitor Progress,វឌ្ឍនភាពម៉ូនីទ័រ
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ព្រមាន: ប្រព័ន្ធនឹងមិនពិនិត្យមើល overbilling ចាប់តាំងពីចំនួនទឹកប្រាក់សម្រាប់ធាតុ {0} {1} ក្នុងសូន្យ
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ព្រមាន: ប្រព័ន្ធនឹងមិនពិនិត្យមើល overbilling ចាប់តាំងពីចំនួនទឹកប្រាក់សម្រាប់ធាតុ {0} {1} ក្នុងសូន្យ
 DocType: Journal Entry,Make Difference Entry,ធ្វើឱ្យធាតុខុសគ្នា
 DocType: Supplier Quotation,Auto Repeat Section,ធ្វើផ្នែកម្តងទៀតដោយស្វ័យប្រវត្តិ
 DocType: Upload Attendance,Attendance From Date,ការចូលរួមពីកាលបរិច្ឆេទ
@@ -1819,7 +1818,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,ជួរដេក # {0}: បានច្រានចោលមិនអាច Qty បញ្ចូលនៅក្នុងការទិញត្រឡប់មកវិញ
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,ការផ្លាស់ប្តូរក្រុមអតិថិជនសម្រាប់អតិថិជនដែលបានជ្រើសមិនត្រូវបានអនុញ្ញាត។
 ,Purchase Order Items To Be Billed,មុខទំនិញបញ្ជាទិញត្រូវបានបង់ប្រាក់
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,ធ្វើបច្ចុប្បន្នភាពម៉ោងមកដល់។
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,ធ្វើបច្ចុប្បន្នភាពម៉ោងមកដល់។
 DocType: Program Enrollment Tool,Enrollment Details,សេចក្ដីលម្អិតនៃការចុះឈ្មោះចូលរៀន
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,មិនអាចកំណត់លំនាំដើមធាតុច្រើនសម្រាប់ក្រុមហ៊ុន។
 DocType: Purchase Invoice Item,Net Rate,អត្រាការប្រាក់សុទ្ធ
@@ -1833,7 +1832,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,ចាកចេញពីប្រភេទគឺឆ្កួត
 DocType: Support Settings,Close Issue After Days,បញ្ហាបន្ទាប់ពីថ្ងៃបិទ
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,អ្នកត្រូវតែជាអ្នកប្រើដែលមានកម្មវិធីគ្រប់គ្រងប្រព័ន្ធនិងធាតុកម្មវិធីគ្រប់គ្រងធាតុដើម្បីបន្ថែមអ្នកប្រើទៅក្នុង Marketplace ។
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,អ្នកត្រូវតែជាអ្នកប្រើដែលមានកម្មវិធីគ្រប់គ្រងប្រព័ន្ធនិងធាតុកម្មវិធីគ្រប់គ្រងធាតុដើម្បីបន្ថែមអ្នកប្រើទៅក្នុង Marketplace ។
 DocType: Leave Control Panel,Leave blank if considered for all branches,ទុកទទេប្រសិនបើអ្នកចាត់ទុកថាជាសាខាទាំងអស់
 DocType: Job Opening,Staffing Plan,ផែនការបុគ្គលិក
 DocType: Bank Guarantee,Validity in Days,សុពលភាពនៅថ្ងៃ
@@ -1853,7 +1852,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},ជួរស្ទួនជាមួយនឹង {0} {1} ដូចគ្នា
 DocType: Marketplace Settings,Disable Marketplace,បិទដំណើរការផ្សារ
 ,Trial Balance,អង្គជំនុំតុល្យភាព
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,ឆ្នាំសារពើពន្ធ {0} មិនបានរកឃើញ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,ឆ្នាំសារពើពន្ធ {0} មិនបានរកឃើញ
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,ការរៀបចំបុគ្គលិក
 DocType: Hotel Room Reservation,Hotel Reservation User,អ្នកប្រើប្រាស់កក់សណ្ឋាគារ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,សូមជ្រើសបុព្វបទជាលើកដំបូង
@@ -1961,7 +1960,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,បានបរាជ័យក្នុងការចូល
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,ទ្រព្យសម្បត្តិ {0} បានបង្កើត
 DocType: Special Test Items,Special Test Items,ធាតុសាកល្បងពិសេស
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,អ្នកត្រូវតែជាអ្នកប្រើដែលមានកម្មវិធីគ្រប់គ្រងប្រព័ន្ធនិងធាតុកម្មវិធីគ្រប់គ្រងធាតុដើម្បីចុះឈ្មោះនៅលើទីផ្សារ។
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,អ្នកត្រូវតែជាអ្នកប្រើដែលមានកម្មវិធីគ្រប់គ្រងប្រព័ន្ធនិងធាតុកម្មវិធីគ្រប់គ្រងធាតុដើម្បីចុះឈ្មោះនៅលើទីផ្សារ។
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,របៀបនៃការទូទាត់
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,តាមរចនាសម្ព័ន្ធប្រាក់ខែដែលបានកំណត់អ្នកមិនអាចស្នើសុំអត្ថប្រយោជន៍បានទេ
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,វេបសាយរូបភាពគួរតែជាឯកសារសាធារណៈឬគេហទំព័ររបស់ URL
@@ -1973,7 +1972,7 @@
 DocType: Warehouse,Warehouse Contact Info,ឃ្លាំងពត៌មានទំនាក់ទំនង
 DocType: Payment Entry,Write Off Difference Amount,សរសេរបិទចំនួនទឹកប្រាក់ផ្សេងគ្នា
 DocType: Volunteer,Volunteer Name,ឈ្មោះស្ម័គ្រចិត្ត
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},ជួរដេកដែលមានកាលបរិច្ឆេទដែលស្ទួនគ្នានៅក្នុងជួរដេកផ្សេងទៀតត្រូវបានរកឃើញ: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},ជួរដេកដែលមានកាលបរិច្ឆេទដែលស្ទួនគ្នានៅក្នុងជួរដេកផ្សេងទៀតត្រូវបានរកឃើញ: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: រកមិនឃើញអ៊ីម៉ែលបុគ្គលិក, ហេតុនេះមិនបានចាត់អ៊ីមែល"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},គ្មានរចនាសម្ព័ន្ធប្រាក់ខែត្រូវបានគេកំណត់សម្រាប់និយោជិក {0} នៅថ្ងៃដែលបានផ្តល់ឱ្យ {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},ច្បាប់ដឹកជញ្ជូនមិនអាចអនុវត្តបានសម្រាប់ប្រទេស {0}
@@ -2062,6 +2061,7 @@
 DocType: Salary Component,Earning,រកប្រាក់ចំណូល
 DocType: Supplier Scorecard,Scoring Criteria,លក្ខណៈវិនិច្ឆ័យពិន្ទុ
 DocType: Purchase Invoice,Party Account Currency,គណបក្សគណនីរូបិយប័ណ្ណ
+DocType: Delivery Trip,Total Estimated Distance,សរុបការប៉ាន់ស្មានចម្ងាយ
 ,BOM Browser,កម្មវិធីរុករក Bom
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,សូមធ្វើបច្ចុប្បន្នភាពស្ថានភាពរបស់អ្នកសម្រាប់ព្រឹត្តិការណ៍បណ្តុះបណ្តាលនេះ
 DocType: Item Barcode,EAN,EAN
@@ -2100,7 +2100,7 @@
 DocType: Activity Cost,Projects,គម្រោងការ
 DocType: Payment Request,Transaction Currency,រូបិយប័ណ្ណប្រតិបត្តិការ
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},ពី {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,អ៊ីមែលខ្លះមិនត្រឹមត្រូវ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,អ៊ីមែលខ្លះមិនត្រឹមត្រូវ
 DocType: Work Order Operation,Operation Description,ប្រតិបត្ដិការពិពណ៌នាសង្ខេប
 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.,មិនអាចផ្លាស់ប្តូរការចាប់ផ្តើមឆ្នាំសារពើពន្ធឆ្នាំសារពើពន្ធនិងកាលបរិច្ឆេទនៅពេលដែលកាលបរិច្ឆេទបញ្ចប់ឆ្នាំសារពើពន្ធត្រូវបានរក្សាទុក។
 DocType: Quotation,Shopping Cart,កន្រ្តកទំនិញ
@@ -2124,7 +2124,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,ការផ្លាស់ប្តូរសុទ្ធនៅលើអចលនទ្រព្យ
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Qty Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,ប្រសិនបើអ្នកទុកវាឱ្យទទេសម្រាប់ការរចនាទាំងអស់បានពិចារណាថា
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,បន្ទុកនៃប្រភេទ &#39;ជាក់ស្តែង &quot;នៅក្នុងជួរដេកដែលបាន {0} មិនអាចត្រូវបានរួមបញ្ចូលនៅក្នុងអត្រាធាតុ
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,បន្ទុកនៃប្រភេទ &#39;ជាក់ស្តែង &quot;នៅក្នុងជួរដេកដែលបាន {0} មិនអាចត្រូវបានរួមបញ្ចូលនៅក្នុងអត្រាធាតុ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},អតិបរមា: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,ចាប់ពី Datetime
 DocType: Shopify Settings,For Company,សម្រាប់ក្រុមហ៊ុន
@@ -2138,7 +2138,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,មានកំហុសក្នុងការបង្កើតកាលវិភាគវគ្គសិក្សា
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,អ្នកអនុម័តចំណាយលើកដំបូងនៅក្នុងបញ្ជីនឹងត្រូវបានកំណត់ជាអ្នកអនុម័តចំណាយ។
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,មិនអាចជាធំជាង 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,អ្នកត្រូវតែជាអ្នកប្រើក្រៅពីអ្នកគ្រប់គ្រងជាមួយកម្មវិធីគ្រប់គ្រងប្រព័ន្ធនិងតួនាទីកម្មវិធីគ្រប់គ្រងធាតុដើម្បីចុះឈ្មោះនៅលើទីផ្សារ។
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,អ្នកត្រូវតែជាអ្នកប្រើក្រៅពីអ្នកគ្រប់គ្រងជាមួយកម្មវិធីគ្រប់គ្រងប្រព័ន្ធនិងតួនាទីកម្មវិធីគ្រប់គ្រងធាតុដើម្បីចុះឈ្មោះនៅលើទីផ្សារ។
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,ធាតុ {0} គឺមិនមានធាតុភាគហ៊ុន
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC -YYYY.-
 DocType: Maintenance Visit,Unscheduled,គ្មានការគ្រោងទុក
@@ -2167,7 +2167,7 @@
 DocType: HR Settings,Employee Settings,ការកំណត់បុគ្គលិក
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,កំពុងផ្ទុកប្រព័ន្ធទូទាត់
 ,Batch-Wise Balance History,ប្រាជ្ញាតុល្យភាពបាច់ប្រវត្តិ
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,ជួរដេក # {0}: មិនអាចកំណត់អត្រាប្រសិនបើបរិមាណធំជាងបរិមាណវិក្កយបត្រសម្រាប់ធាតុ {1} ។
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,ជួរដេក # {0}: មិនអាចកំណត់អត្រាប្រសិនបើបរិមាណធំជាងបរិមាណវិក្កយបត្រសម្រាប់ធាតុ {1} ។
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,ការកំណត់បោះពុម្ពទាន់សម័យក្នុងទ្រង់ទ្រាយម៉ាស៊ីនបោះពុម្ពរបស់
 DocType: Package Code,Package Code,កូដកញ្ចប់
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,សិស្ស
@@ -2400,7 +2400,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} ដំណឹងទំនេរនិង {1} ថវិកាសម្រាប់ {2} គ្រោងរួចរាល់សម្រាប់ក្រុមហ៊ុនបុត្រសម្ព័ន្ធរបស់ {3} ។ អ្នកអាចមានគម្រោងសម្រាប់ {4} ដំណឹងជ្រើសរើសបុគ្គលិកនិងថវិកា {5} តាមផែនការបុគ្គលិក {6} សម្រាប់ក្រុមហ៊ុនមេ {3} ។
 DocType: HR Settings,Stop Birthday Reminders,បញ្ឈប់ការរំលឹកខួបកំណើត
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},សូមកំណត់បើកប្រាក់បៀវត្សគណនីទូទាត់លំនាំដើមក្នុងក្រុមហ៊ុន {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},សូមកំណត់បើកប្រាក់បៀវត្សគណនីទូទាត់លំនាំដើមក្នុងក្រុមហ៊ុន {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,ទទួលបានការបែងចែកហិរញ្ញវត្ថុនៃពន្ធនិងការគិតថ្លៃទិន្នន័យដោយក្រុមហ៊ុន Amazon
 DocType: SMS Center,Receiver List,បញ្ជីអ្នកទទួល
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,ស្វែងរកធាតុ
@@ -2470,7 +2470,7 @@
 DocType: Vital Signs,Constipated,មិនទៀងទាត់
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},ប្រឆាំងនឹងការផ្គត់ផ្គង់វិក័យប័ត្រ {0} {1} ចុះកាលបរិច្ឆេទ
 DocType: Customer,Default Price List,តារាងតម្លៃលំនាំដើម
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,កំណត់ត្រាចលនាទ្រព្យសកម្ម {0} បង្កើតឡើង
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,កំណត់ត្រាចលនាទ្រព្យសកម្ម {0} បង្កើតឡើង
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,មិនមែនមុខទំនិញ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,អ្នកមិនអាចលុបឆ្នាំសារពើពន្ធ {0} ។ ឆ្នាំសារពើពន្ធ {0} ត្រូវបានកំណត់ជាលំនាំដើមនៅក្នុងការកំណត់សកល
 DocType: Share Transfer,Equity/Liability Account,គណនីសមធម៌ / ការទទួលខុសត្រូវ
@@ -2607,6 +2607,7 @@
 DocType: Blanket Order,Order Type,ប្រភេទលំដាប់
 ,Item-wise Sales Register,ធាតុប្រាជ្ញាលក់ចុះឈ្មោះ
 DocType: Asset,Gross Purchase Amount,ចំនួនទឹកប្រាក់សរុបការទិញ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,លេខកូដធាតុ&gt; ក្រុមធាតុ&gt; ម៉ាក
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,បើកសមតុល្យ
 DocType: Asset,Depreciation Method,វិធីសាស្រ្តរំលស់
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,តើការប្រមូលពន្ធលើនេះបានរួមបញ្ចូលក្នុងអត្រាជាមូលដ្ឋាន?
@@ -2687,7 +2688,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,សកម្មភាពប្រសិនបើថវិកាប្រចាំឆ្នាំលើសពី PO
 DocType: Student Leave Application,Student Leave Application,កម្មវិធីទុកឱ្យសិស្ស
 DocType: Item,Will also apply for variants,ក៏នឹងអនុវត្តសម្រាប់វ៉ារ្យ៉ង់
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","ទ្រព្យសម្បត្តិដែលមិនអាចត្រូវបានលុបចោល, ដូចដែលវាមានរួចទៅ {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","ទ្រព្យសម្បត្តិដែលមិនអាចត្រូវបានលុបចោល, ដូចដែលវាមានរួចទៅ {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},បុគ្គលិក {0} នៅថ្ងៃពាក់កណ្តាលនៅលើ {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},ម៉ោងធ្វើការសរុបមិនគួរត្រូវបានធំជាងម៉ោងធ្វើការអតិបរមា {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,នៅថ្ងៃទី
@@ -2711,6 +2712,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,ទាញយកទិន្នន័យ
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},ការអនុញ្ញាតអតិបរមាដែលបានអនុញ្ញាតនៅក្នុងប្រភេទនៃការចាកចេញ {0} គឺ {1}
 DocType: SMS Center,Create Receiver List,បង្កើតបញ្ជីអ្នកទទួល
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,កាលបរិច្ឆេទដែលអាចប្រើបានសម្រាប់ការប្រើគួរស្ថិតនៅក្រោយកាលបរិច្ឆេទទិញ
 DocType: Vehicle,Wheels,កង់
 DocType: Packing Slip,To Package No.,ខ្ចប់លេខ
 DocType: Patient Relation,Family,គ្រួសារ
@@ -2724,7 +2726,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,រូបិយប័ណ្ណវិក័យប័ត្រត្រូវតែស្មើនឹងរូបិយប័ណ្ណឬរូបិយប័ណ្ណគណនីរបស់ភាគីដើម
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),បង្ហាញថាកញ្ចប់នេះគឺជាផ្នែកមួយនៃរឿងនេះការចែកចាយ (មានតែសេចក្តីព្រាង)
 DocType: Soil Texture,Loam,លាយ
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,ជួរដេក {0}: កាលបរិច្ឆេទផុតកំណត់មិនអាចត្រូវបានមុនពេលប្រកាសកាលបរិច្ឆេទ
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,ជួរដេក {0}: កាលបរិច្ឆេទផុតកំណត់មិនអាចត្រូវបានមុនពេលប្រកាសកាលបរិច្ឆេទ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,ធ្វើឱ្យធាតុទូទាត់ប្រាក់
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},បរិមាណដែលត្រូវទទួលទានសម្រាប់ធាតុ {0} ត្រូវតិចជាង {1}
 ,Sales Invoice Trends,ការលក់វិក័យប័ត្រនិន្នាការ
@@ -2796,7 +2798,7 @@
 DocType: Guardian,Guardian Interests,ចំណាប់អារម្មណ៍របស់កាសែត The Guardian
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,ធ្វើបច្ចុប្បន្នភាពឈ្មោះគណនី ឬលេខគណនី
 DocType: Naming Series,Current Value,តម្លៃបច្ចុប្បន្ន
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ឆ្នាំសារពើពន្ធច្រើនមានសម្រាប់កាលបរិច្ឆេទ {0} ។ សូមកំណត់ក្រុមហ៊ុននៅក្នុងឆ្នាំសារពើពន្ធ
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ឆ្នាំសារពើពន្ធច្រើនមានសម្រាប់កាលបរិច្ឆេទ {0} ។ សូមកំណត់ក្រុមហ៊ុននៅក្នុងឆ្នាំសារពើពន្ធ
 DocType: Education Settings,Instructor Records to be created by,កំណត់ត្រាគ្រូបង្រៀនត្រូវបង្កើតដោយ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} បង្កើតឡើង
 DocType: GST Account,GST Account,គណនី GST
@@ -2813,7 +2815,7 @@
 DocType: Sales Person,Name and Employee ID,ឈ្មោះនិងលេខសម្គាល់របស់និយោជិត
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,កាលបរិច្ឆេទដោយសារតែមិនអាចមានមុនពេលការប្រកាសកាលបរិច្ឆេទ
 DocType: Website Item Group,Website Item Group,វេបសាយធាតុគ្រុប
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,មិនមានប្រាក់ខែដែលត្រូវបានរកឃើញដើម្បីដាក់ជូននូវលក្ខណៈវិនិច្ឆ័យដែលបានជ្រើសរើសពីខាងលើឬតារាងប្រាក់ខែដែលបានដាក់ជូនរួចហើយ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,មិនមានប្រាក់ខែដែលត្រូវបានរកឃើញដើម្បីដាក់ជូននូវលក្ខណៈវិនិច្ឆ័យដែលបានជ្រើសរើសពីខាងលើឬតារាងប្រាក់ខែដែលបានដាក់ជូនរួចហើយ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,ភារកិច្ចនិងពន្ធ
 DocType: Projects Settings,Projects Settings,ការកំណត់គម្រោង
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,សូមបញ្ចូលកាលបរិច្ឆេទយោង
@@ -2930,6 +2932,7 @@
 ,Vehicle Expenses,ចំណាយយានយន្ត
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,បង្កើតការធ្វើតេស្តមន្ទីរពិសោធន៍លើការលក់វិក្កយបត្រដាក់ស្នើ
 DocType: Serial No,Invoice Details,សេចក្ដីលម្អិតវិក័យប័ត្រ
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,សូមអនុញ្ញាតការកំណត់ផែនទី Google ដើម្បីប៉ាន់ស្មាននិងបង្កើនផ្លូវហោះហើរ
 DocType: Grant Application,Show on Website,បង្ហាញនៅលើគេហទំព័រ
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,ចាប់ផ្ដើម
 DocType: Hub Tracked Item,Hub Category,ប្រភេទ Hub
@@ -2969,7 +2972,7 @@
 DocType: Inpatient Record,B Positive,B វិជ្ជមាន
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",អត្ថប្រយោជន៍អតិបរមារបស់បុគ្គលិក {0} លើសពី {1} ដោយផលបូក {2} នៃចំនួនទឹកប្រាក់ដែលបានអះអាងមុន
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ជួរដេក # {0}: Qty ត្រូវតែ 1, ជាធាតុជាទ្រព្យសកម្មថេរ។ សូមប្រើជួរដាច់ដោយឡែកសម្រាប់ qty ច្រើន។"
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ជួរដេក # {0}: Qty ត្រូវតែ 1, ជាធាតុជាទ្រព្យសកម្មថេរ។ សូមប្រើជួរដាច់ដោយឡែកសម្រាប់ qty ច្រើន។"
 DocType: Leave Block List Allow,Leave Block List Allow,បញ្ជីប្លុកអនុញ្ញាតឱ្យចាកចេញពី
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr មិនអាចមាននៅទទេឬទំហំ
 DocType: Patient Medical Record,Patient Medical Record,កំណត់ត្រាវេជ្ជសាស្រ្តរបស់អ្នកជម្ងឺ
@@ -3003,7 +3006,7 @@
 DocType: Workstation,Wages per hour,ប្រាក់ឈ្នួលក្នុងមួយម៉ោង
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},ភាគហ៊ុននៅក្នុងជំនាន់ទីតុល្យភាព {0} នឹងក្លាយទៅជាអវិជ្ជមាន {1} សម្រាប់ធាតុ {2} នៅឃ្លាំង {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,បន្ទាប់ពីការសម្ភារៈសំណើត្រូវបានលើកឡើងដោយស្វ័យប្រវត្តិដោយផ្អែកលើកម្រិតឡើងវិញដើម្បីធាតុរបស់
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},គណនី {0} មិនត្រឹមត្រូវ។ រូបិយប័ណ្ណគណនីត្រូវតែ {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},គណនី {0} មិនត្រឹមត្រូវ។ រូបិយប័ណ្ណគណនីត្រូវតែ {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},ពីកាលបរិច្ឆេទ {0} មិនអាចនៅក្រោយថ្ងៃបំបាត់ប្រាក់របស់និយោជិត {1}
 DocType: Supplier,Is Internal Supplier,គឺជាអ្នកផ្គត់ផ្គង់ផ្ទៃក្នុង
 DocType: Employee,Create User Permission,បង្កើតសិទ្ធិអ្នកប្រើ
@@ -3147,7 +3150,7 @@
 DocType: Account,Fixed Asset,ទ្រព្យសកម្មថេរ
 DocType: Amazon MWS Settings,After Date,បន្ទាប់ពីកាលបរិច្ឆេទ
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,សារពើភ័ណ្ឌស៊េរី
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,{0} មិនត្រឹមត្រូវសម្រាប់វិក័យប័ត្រក្រុមហ៊ុន Inter ។
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,{0} មិនត្រឹមត្រូវសម្រាប់វិក័យប័ត្រក្រុមហ៊ុន Inter ។
 ,Department Analytics,នាយកដ្ឋានវិភាគ
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,រកមិនឃើញអ៊ីមែលនៅក្នុងទំនាក់ទំនងលំនាំដើម
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,បង្កើតសម្ងាត់
@@ -3159,7 +3162,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,កម្មវិធីនៅក្នុងរចនាសម្ព័ន្ធតម្លៃនិងក្រុមនិស្សិត {0} គឺខុសគ្នា។
 DocType: Bank Statement Transaction Entry,Receivable Account,គណនីត្រូវទទួល
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,សុពលភាពពីកាលបរិច្ឆេទត្រូវតែតិចជាងសុពលភាពរហូតដល់កាលបរិច្ឆេទ។
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មានរួចហើយ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មានរួចហើយ {2}
 DocType: Quotation Item,Stock Balance,តុល្យភាពភាគហ៊ុន
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,សណ្តាប់ធ្នាប់ការលក់ទៅការទូទាត់
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,នាយកប្រតិបត្តិ
@@ -3201,6 +3204,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,ឥណពន្ធវីសាដើម្បីត្រូវបានទាមទារ
 DocType: Clinical Procedure,Inpatient Record,កំណត់ត្រាអ្នកជំងឺក្នុងមន្ទីរពេទ្យ
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",Timesheets ជួយរក្សាដាននៃពេលវេលាការចំណាយនិងវិក័យប័ត្រសំរាប់ការសកម្មភាពដែលបានធ្វើដោយក្រុមរបស់អ្នក
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,អ្នកផ្គត់ផ្គង់&gt; ប្រភេទអ្នកផ្គត់ផ្គង់
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,បញ្ជីតម្លៃទិញ
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,កាលបរិច្ឆេទនៃប្រតិបត្តិការ
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,គំរូនៃអថេរពិន្ទុនៃក្រុមហ៊ុនផ្គត់ផ្គង់។
@@ -3243,7 +3247,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,អត្រាប្តូរប្រាក់ចំណេញ / បាត់បង់
 DocType: Opportunity,Lost Reason,បាត់បង់មូលហេតុ
 DocType: Amazon MWS Settings,Enable Amazon,បើកដំណើរការ Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},ជួរដេក # {0}: គណនី {1} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុនទេ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},ជួរដេក # {0}: គណនី {1} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុនទេ {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},មិនអាចស្វែងរក Doc Type {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,អាសយដ្ឋានថ្មី
 DocType: Quality Inspection,Sample Size,ទំហំគំរូ
@@ -3354,7 +3358,7 @@
 DocType: Water Analysis,Origin,ប្រភពដើម
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ឯកសារនេះលើសកំណត់ដោយ {0} {1} សម្រាប់ធាតុ {4} ។ តើអ្នកបង្កើត {3} ផ្សេងទៀតប្រឆាំងនឹង {2} ដូចគ្នាដែរឬទេ?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,សូមកំណត់កើតឡើងបន្ទាប់ពីរក្សាទុក
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,គណនីចំនួនទឹកប្រាក់ជ្រើសការផ្លាស់ប្តូរ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,គណនីចំនួនទឹកប្រាក់ជ្រើសការផ្លាស់ប្តូរ
 DocType: Purchase Invoice,Price List Currency,បញ្ជីតម្លៃរូបិយប័ណ្ណ
 DocType: Naming Series,User must always select,អ្នកប្រើដែលត្រូវតែជ្រើសតែងតែ
 DocType: Stock Settings,Allow Negative Stock,អនុញ្ញាតឱ្យមានស្តុកអវិជ្ជមាន
@@ -3396,7 +3400,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,តើអ្នកប្រាកដថាអ្នកចង់លុបចោលការណាត់ជួបនេះទេ?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,កញ្ចប់តម្លៃបន្ទប់សណ្ឋាគារ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,បំពង់បង្ហូរប្រេងការលក់
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},សូមកំណត់គណនីលំនាំដើមនៅក្នុងសមាសភាគប្រាក់ខែ {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},សូមកំណត់គណនីលំនាំដើមនៅក្នុងសមាសភាគប្រាក់ខែ {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,តម្រូវការនៅលើ
 DocType: Rename Tool,File to Rename,ឯកសារដែលត្រូវប្តូរឈ្មោះ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},សូមជ្រើស Bom សម្រាប់ធាតុក្នុងជួរដេក {0}
@@ -3417,7 +3421,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,តម្លៃនៃធាតុដែលបានទិញ
 DocType: Employee Separation,Employee Separation Template,គំរូបំបែកបុគ្គលិក
 DocType: Selling Settings,Sales Order Required,ការលក់លំដាប់ដែលបានទាមទារ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,ក្លាយជាអ្នកលក់
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,ក្លាយជាអ្នកលក់
 DocType: Purchase Invoice,Credit To,ការផ្តល់ឥណទានដល់
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,នាំទៅរកសកម្ម / អតិថិជន
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,ទុកទទេដើម្បីប្រើទ្រង់ទ្រាយចំណាំស្តង់ដារ
@@ -3458,7 +3462,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,បង្កើតគំរូពន្ធ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,វេទិកាអ្នកប្រើ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,វត្ថុធាតុដើមដែលមិនអាចត្រូវបានទទេ។
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,ជួរដេក # {0} (តារាងបង់ប្រាក់): ចំនួនទឹកប្រាក់ត្រូវតែអវិជ្ជមាន
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,ជួរដេក # {0} (តារាងបង់ប្រាក់): ចំនួនទឹកប្រាក់ត្រូវតែអវិជ្ជមាន
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","មិនអាចធ្វើឱ្យទាន់សម័យហ៊ុន, វិក័យប័ត្រមានធាតុដឹកជញ្ជូនទម្លាក់។"
 DocType: Contract,Fulfilment Status,ស្ថានភាពបំពេញ
 DocType: Lab Test Sample,Lab Test Sample,គំរូតេស្តមន្ទីរពិសោធន៍
@@ -3597,7 +3601,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,កាលបរិច្ឆេទឯកសារ
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},កំណត់ត្រាថ្លៃសេវាបានបង្កើត - {0}
 DocType: Asset Category Account,Asset Category Account,គណនីទ្រព្យសកម្មប្រភេទ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,ជួរដេក # {0} (តារាងបង់ប្រាក់): ចំនួនទឹកប្រាក់ត្រូវតែជាវិជ្ជមាន
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,ជួរដេក # {0} (តារាងបង់ប្រាក់): ចំនួនទឹកប្រាក់ត្រូវតែជាវិជ្ជមាន
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},មិនអាចបង្កើតធាតុជាច្រើនទៀត {0} ជាងបរិមាណលំដាប់លក់ {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,ជ្រើសគុណលក្ខណៈគុណលក្ខណៈ
 DocType: Purchase Invoice,Reason For Issuing document,ហេតុផលសម្រាប់ការចេញឯកសារ
@@ -3652,7 +3656,7 @@
 DocType: Purchase Receipt,Time at which materials were received,ពេលវេលាដែលបានសមា្ភារៈត្រូវបានទទួល
 DocType: Products Settings,Products per Page,ផលិតផលក្នុងមួយទំព័រ
 DocType: Stock Ledger Entry,Outgoing Rate,អត្រាចេញ
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,ឬ
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,ឬ
 DocType: Sales Order,Billing Status,ស្ថានភាពវិក័យប័ត្រ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,រាយការណ៍បញ្ហា
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,ចំណាយឧបករណ៍ប្រើប្រាស់
@@ -3679,7 +3683,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,ការប្រកាសលើកលែងពន្ធលើនិយោជិក
 DocType: Payment Entry,Cheque/Reference Date,មូលប្បទានប័ត្រ / សេចក្តីយោងកាលបរិច្ឆេទ
 DocType: Purchase Invoice,Total Taxes and Charges,ពន្ធសរុបនិងការចោទប្រកាន់
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,កាលបរិច្ឆេទដែលអាចប្រើប្រាស់បានត្រូវបានបញ្ចូលជាកាលបរិច្ឆេទកន្លងមក
 DocType: Employee,Emergency Contact,ទំនាក់ទំនងសង្រ្គោះបន្ទាន់
 DocType: Bank Reconciliation Detail,Payment Entry,ចូលការទូទាត់
 ,sales-browser,ការលក់កម្មវិធីរុករក
@@ -3725,6 +3728,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),ការវិលត្រឡប់ (ចំណាំឥណទាន)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,ចាប់ផ្តើមការងារ
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},លេខស៊េរីត្រូវបានទាមទារសម្រាប់ទ្រព្យសម្បត្តិ {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,សូមកំណត់ស៊ុមឈ្មោះសម្រាប់ {0} តាម Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,ពុម្ពជនពិការមិនត្រូវពុម្ពលំនាំដើម
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,សម្រាប់ជួរដេក {0}: បញ្ចូល Qty ដែលបានគ្រោងទុក
 DocType: Account,Income Account,គណនីប្រាក់ចំណូល
@@ -3738,6 +3742,7 @@
 DocType: Loyalty Program,Help Section,ផ្នែកជំនួយ
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,មុន
 DocType: Appraisal Goal,Key Responsibility Area,តំបន់ភារកិច្ចសំខាន់
+DocType: Delivery Trip,Distance UOM,ចម្ងាយយូ
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","ជំនាន់របស់សិស្សជួយអ្នកតាមដានការចូលរួម, ការវាយតម្លៃនិងថ្លៃសម្រាប់សិស្សនិស្សិត"
 DocType: Payment Entry,Total Allocated Amount,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកសរុប
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,កំណត់លំនាំដើមសម្រាប់គណនីសារពើភ័ណ្ឌរហូតសារពើភ័ណ្ឌ
@@ -3779,7 +3784,7 @@
 DocType: Item Supplier,Item Supplier,ផ្គត់ផ្គង់ធាតុ
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,សូមបញ្ចូលលេខកូដធាតុដើម្បីទទួលបាច់នោះទេ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},សូមជ្រើសតម្លៃសម្រាប់ {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,គ្មានមុខទំនិញដែលបានជ្រើសរើសសម្រាប់ផ្ទេរ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,គ្មានមុខទំនិញដែលបានជ្រើសរើសសម្រាប់ផ្ទេរ
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,អាសយដ្ឋានទាំងអស់។
 DocType: Company,Stock Settings,ការកំណត់តម្លៃភាគហ៊ុន
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","រួមបញ្ចូលគ្នារវាងគឺអាចធ្វើបានតែប៉ុណ្ណោះប្រសិនបើមានលក្ខណៈសម្បត្តិដូចខាងក្រោមគឺដូចគ្នានៅក្នុងកំណត់ត្រាទាំងពីរ។ គឺជាក្រុម, ប្រភេទជា Root ក្រុមហ៊ុន"
@@ -4064,7 +4069,7 @@
 DocType: Patient,Personal and Social History,ប្រវត្តិបុគ្គលនិងសង្គម
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,អ្នកប្រើ {0} បានបង្កើត
 DocType: Fee Schedule,Fee Breakup for each student,ការបែងចែកថ្លៃឈ្នួលសម្រាប់សិស្សម្នាក់ៗ
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ជាមុនសរុប ({0}) នឹងដីកាសម្រេច {1} មិនអាចច្រើនជាងសម្ពោធសរុប ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ជាមុនសរុប ({0}) នឹងដីកាសម្រេច {1} មិនអាចច្រើនជាងសម្ពោធសរុប ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ជ្រើសដើម្បីមិនស្មើគ្នាចែកចាយប្រចាំខែគោលដៅនៅទូទាំងខែចែកចាយ។
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,ប្តូរលេខកូដ
 DocType: Purchase Invoice Item,Valuation Rate,អត្រាការវាយតម្លៃ
@@ -4073,7 +4078,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,ផ្តល់ជូនដោយ ITC Cess
 ,Student Monthly Attendance Sheet,សិស្សសន្លឹកអវត្តមានប្រចាំខែ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,ច្បាប់នៃការដឹកជញ្ជូនអាចអនុវត្តបានតែសម្រាប់លក់ប៉ុណ្ណោះ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,រំលស់ជួរដេក {0}: កាលបរិច្ឆេទរំលោះបន្ទាប់មិនអាចនៅមុនកាលបរិច្ឆេទទិញបានទេ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,រំលស់ជួរដេក {0}: កាលបរិច្ឆេទរំលោះបន្ទាប់មិនអាចនៅមុនកាលបរិច្ឆេទទិញបានទេ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,ការចាប់ផ្តើមគម្រោងកាលបរិច្ឆេទ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,រហូតមកដល់
 DocType: Rename Tool,Rename Log,ប្តូរឈ្មោះចូល
@@ -4090,12 +4095,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,តើគួរធ្វើបច្ចុប្បន្នភាពគម្រោងនិងក្រុមហ៊ុនដោយផ្អែកលើប្រតិបត្ដិការលក់ជាញឹកញាប់។
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ផុតកំណត់នៅថ្ងៃទី
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,បន្ថែមសិស្ស
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","សូមលុបនិយោជិក <a href=""#Form/Employee/{0}"">{0}</a> \ ដើម្បីបោះបង់ឯកសារនេះ"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},សូមជ្រើស {0}
 DocType: C-Form,C-Form No,ទម្រង់បែបបទគ្មាន C-
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,ចម្ងាយ
+DocType: Delivery Stop,Distance,ចម្ងាយ
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,រាយផលិតផលឬសេវាកម្មរបស់អ្នកដែលអ្នកទិញឬលក់។
 DocType: Water Analysis,Storage Temperature,សីតុណ្ហាភាពផ្ទុក
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD -YYYY.-
@@ -4122,7 +4125,7 @@
 DocType: Homepage,Company Description for website homepage,សង្ខេបសម្រាប់គេហទំព័ររបស់ក្រុមហ៊ុនគេហទំព័រ
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ចំពោះភាពងាយស្រួលនៃអតិថិជន, កូដទាំងនេះអាចត្រូវបានប្រើនៅក្នុងទ្រង់ទ្រាយបោះពុម្ពដូចជាការវិកិយប័ត្រនិងដឹកជញ្ជូនចំណាំ"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,ឈ្មោះ Suplier
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,មិនអាចរកបានព័ត៌មានសម្រាប់ {0} ។
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,មិនអាចរកបានព័ត៌មានសម្រាប់ {0} ។
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,បើកធាតុទិនានុប្បវត្តិ
 DocType: Contract,Fulfilment Terms,លក្ខខណ្ឌបំពេញ
 DocType: Sales Invoice,Time Sheet List,បញ្ជីសន្លឹកពេលវេលា
@@ -4303,7 +4306,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,ជ្រើសរើសសិស្សនិស្សិតដោយដៃសម្រាប់សកម្មភាពដែលមានមូលដ្ឋាននៅក្រុម
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,ជ្រើសរើសសិស្សនិស្សិតដោយដៃសម្រាប់សកម្មភាពដែលមានមូលដ្ឋាននៅក្រុម
 DocType: Journal Entry,User Remark,សំគាល់របស់អ្នកប្រើ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,បង្កើនផ្លូវហោះហើរ។
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,បង្កើនផ្លូវហោះហើរ។
 DocType: Travel Itinerary,Non Diary,មិនកំណត់ហេតុប្រចាំថ្ងៃ
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,មិនអាចបង្កើតប្រាក់លើកទឹកចិត្តសំរាប់បុគ្គលិកដែលនៅសល់
 DocType: Lead,Market Segment,ចំណែកទីផ្សារ
@@ -4333,7 +4336,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,កម្មវិធីភក្ដីភាព
 DocType: Student Guardian,Father,ព្រះបិតា
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,គាំទ្រសំបុត្រ
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,"""Update ស្តុក 'មិនអាចជ្រើសរើសបានចំពោះទ្រព្យអសកម្ម"
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,"""Update ស្តុក 'មិនអាចជ្រើសរើសបានចំពោះទ្រព្យអសកម្ម"
 DocType: Bank Reconciliation,Bank Reconciliation,ធនាគារការផ្សះផ្សា
 DocType: Attendance,On Leave,ឈប់សម្រាក
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ទទួលបានការធ្វើឱ្យទាន់សម័យ
@@ -4378,7 +4381,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,សៀរៀលទេនិងបាច់ &amp; ‧;
 DocType: Warranty Claim,From Company,ពីក្រុមហ៊ុន
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,ផលបូកនៃពិន្ទុវាយតំលៃត្រូវការដើម្បីឱ្យមាន {0} ។
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,សូមកំណត់ចំនួននៃរំលស់បានកក់
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,សូមកំណត់ចំនួននៃរំលស់បានកក់
 DocType: Supplier Scorecard Period,Calculations,ការគណនា
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,តំលៃឬ Qty
 DocType: Payment Terms Template,Payment Terms,ល័ក្ខខ័ណ្ឌទូទាត់
@@ -4397,7 +4400,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,បញ្ចុះតម្លៃ (%) នៅលើអត្រាតារាងតម្លៃជាមួយរឹម
 DocType: Healthcare Service Unit Type,Rate / UOM,អត្រា / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,ឃ្លាំងទាំងអស់
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,ទេ {0} បានរកឃើញសម្រាប់ប្រតិបត្តិការអន្តរក្រុមហ៊ុន។
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,ទេ {0} បានរកឃើញសម្រាប់ប្រតិបត្តិការអន្តរក្រុមហ៊ុន។
 DocType: Travel Itinerary,Rented Car,ជួលរថយន្ត
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,អំពីក្រុមហ៊ុនរបស់អ្នក
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,ឥណទានទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
@@ -4499,6 +4502,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,លក្ខណៈវិនិច្ឆ័យវិភាគលើរុក្ខជាតិ
 DocType: Cheque Print Template,Cheque Height,កម្ពស់មូលប្បទានប័ត្រ
 DocType: Supplier,Supplier Details,ពត៌មានលំអិតក្រុមហ៊ុនផ្គត់ផ្គង់
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំស៊េរីលេខរៀងសម្រាប់ការចូលរួមតាមរយៈ Setup&gt; Serial Number
 DocType: Setup Progress,Setup Progress,រៀបចំវឌ្ឍនភាព
 DocType: Expense Claim,Approval Status,ស្ថានភាពការអនុម័ត
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},ពីតម្លៃត្រូវតែតិចជាងទៅនឹងតម្លៃនៅក្នុងជួរដេក {0}
@@ -4592,7 +4596,6 @@
 DocType: Travel Request,Fully Sponsored,ឧបត្ថម្ភយ៉ាងពេញទំហឹង
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,បញ្ច្រាសធាតុទិនានុប្បវត្តិ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,អតិថិជន {0} ត្រូវបានបង្កើត។
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំប្រព័ន្ធដាក់ឈ្មោះនិយោជិកនៅក្នុងធនធានមនុស្ស&gt; ការកំណត់ធនធានមនុស្ស
 DocType: Stock Settings,Limit Percent,ដែនកំណត់ភាគរយ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,បច្ចុប្បន្នពុំមានស្តុកនៅក្នុងឃ្លាំងណាមួយឡើយ
 ,Payment Period Based On Invoice Date,អំឡុងពេលបង់ប្រាក់ដែលមានមូលដ្ឋានលើវិក័យប័ត្រកាលបរិច្ឆេទ
@@ -4651,7 +4654,7 @@
 DocType: BOM Explosion Item,Source Warehouse,ឃ្លាំងប្រភព
 DocType: Installation Note,Installation Date,កាលបរិច្ឆេទនៃការដំឡើង
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,ចែករំលែក Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,បានបង្កើតវិក័យប័ត្រលក់ {0}
 DocType: Employee,Confirmation Date,ការអះអាងកាលបរិច្ឆេទ
 DocType: Inpatient Occupancy,Check Out,ពិនិត្យមុនពេលចេញ
@@ -4671,6 +4674,7 @@
 DocType: Production Plan,Sales Orders Detail,លំអិតការបញ្ជាទិញលក់
 DocType: Bin,Requested Quantity,បរិមាណបានស្នើ
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE -YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,សូមបង្កើតប្រព័ន្ធដាក់ឈ្មោះគ្រូបង្រៀននៅក្នុងការអប់រំ&gt; ការកំណត់អប់រំ
 DocType: Patient,Marital Status,ស្ថានភាពគ្រួសារ
 DocType: Stock Settings,Auto Material Request,សម្ភារៈស្នើសុំដោយស្វ័យប្រវត្តិ
 DocType: Woocommerce Settings,API consumer secret,សម្ងាត់របស់អតិថិជន API
@@ -4723,7 +4727,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,ជ្រើសថ្ងៃ
 DocType: Academic Term,Term Name,ឈ្មោះរយៈពេល
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),ឥណទាន ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,បង្កើតតារាងប្រាក់ខែ ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,បង្កើតតារាងប្រាក់ខែ ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,អ្នកមិនអាចកែថ្នាំង root បានទេ។
 DocType: Buying Settings,Purchase Order Required,ទិញលំដាប់ដែលបានទាមទារ
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,ពេលវេលា
@@ -4761,7 +4765,7 @@
 DocType: Account,Rate at which this tax is applied,អត្រាដែលពន្ធនេះត្រូវបានអនុវត្ត
 DocType: Cash Flow Mapper,Section Name,ឈ្មោះផ្នែក
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,រៀបចំ Qty
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},រំលស់ជួរដេក {0}: តម្លៃដែលរំពឹងទុកបន្ទាប់ពីជីវិតដែលមានប្រយោជន៍ត្រូវតែធំជាងឬស្មើ {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},រំលស់ជួរដេក {0}: តម្លៃដែលរំពឹងទុកបន្ទាប់ពីជីវិតដែលមានប្រយោជន៍ត្រូវតែធំជាងឬស្មើ {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,ការងារបច្ចុប្បន្ន
 DocType: Company,Stock Adjustment Account,គណនីកែតម្រូវភាគហ៊ុន
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,បិទការសរសេរ
@@ -4808,7 +4812,7 @@
 DocType: Program Enrollment,School House,សាលាផ្ទះ
 DocType: Serial No,Out of AMC,ចេញពីមជ្ឈមណ្ឌល AMC
 DocType: Opportunity,Opportunity Amount,ចំនួនឱកាស
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ចំនួននៃការធ្លាក់ចុះបានកក់មិនអាចច្រើនជាងចំនួនសរុបនៃការធ្លាក់ថ្លៃ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ចំនួននៃការធ្លាក់ចុះបានកក់មិនអាចច្រើនជាងចំនួនសរុបនៃការធ្លាក់ថ្លៃ
 DocType: Purchase Order,Order Confirmation Date,កាលបរិច្ឆេទបញ្ជាក់ការបញ្ជាទិញ
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI -YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,ធ្វើឱ្យការថែទាំទស្សនកិច្ច
@@ -4849,7 +4853,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,បាច់:
 DocType: Volunteer,Afternoon,ពេលរសៀល
 DocType: Loyalty Program,Loyalty Program Help,ភាពស្មោះត្រង់កម្មវិធីជំនួយ
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} &#39;{1} &quot;ត្រូវបានបិទ
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} &#39;{1} &quot;ត្រូវបានបិទ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ដែលបានកំណត់ជាបើកទូលាយ
 DocType: Cheque Print Template,Scanned Cheque,មូលប្បទានប័ត្រដែលបានស្កេន
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ផ្ញើអ៊ីម៉ែលដោយស្វ័យប្រវត្តិទៅទំនាក់ទំនងនៅលើដាក់ស្នើប្រតិបត្តិការ។
@@ -4862,7 +4866,7 @@
 DocType: Warranty Claim,Item and Warranty Details,លម្អិតអំពីធាតុនិងការធានា
 DocType: Chapter,Chapter Members,ជំពូកសមាជិក
 DocType: Sales Team,Contribution (%),ចំែណក (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ចំណាំ: ការទូទាត់នឹងមិនចូលត្រូវបានបង្កើតតាំងពីសាច់ប្រាក់ឬគណនីធនាគារ &#39;មិនត្រូវបានបញ្ជាក់
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ចំណាំ: ការទូទាត់នឹងមិនចូលត្រូវបានបង្កើតតាំងពីសាច់ប្រាក់ឬគណនីធនាគារ &#39;មិនត្រូវបានបញ្ជាក់
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,គម្រោង {0} មានរួចហើយ
 DocType: Clinical Procedure,Nursing User,អ្នកប្រើថែទាំ
 DocType: Employee Benefit Application,Payroll Period,រយៈពេលប្រាក់បៀវត្ស
@@ -4870,6 +4874,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},ស៊េរីលេខ {0} មិនមែនជារបស់ {1} បាច់ទេ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,ការទទួលខុសត្រូវ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,រយៈពេលសុពលភាពនៃសម្រង់នេះត្រូវបានបញ្ចប់។
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","សូមលុបនិយោជិក <a href=""#Form/Employee/{0}"">{0}</a> \ ដើម្បីបោះបង់ឯកសារនេះ"
 DocType: Expense Claim Account,Expense Claim Account,គណនីបណ្តឹងទាមទារការចំណាយ
 DocType: Account,Capital Work in Progress,រាជធានីកំពុងដំណើរការ
 DocType: Accounts Settings,Allow Stale Exchange Rates,អនុញ្ញាតឱ្យមានអត្រាប្តូរប្រាក់ថេរ
@@ -4951,7 +4957,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,សម្ភារៈបញ្ហា
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,ភ្ជាប់ Connectify ជាមួយ ERPNext
 DocType: Material Request Item,For Warehouse,សម្រាប់ឃ្លាំង
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,ចំណាំការដឹកជញ្ជូន {0} បានអាប់ដេត
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,ចំណាំការដឹកជញ្ជូន {0} បានអាប់ដេត
 DocType: Employee,Offer Date,ការផ្តល់ជូនកាលបរិច្ឆេទ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,សម្រង់ពាក្យ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,អ្នកគឺជាអ្នកនៅក្នុងរបៀបក្រៅបណ្ដាញ។ អ្នកនឹងមិនអាចផ្ទុកឡើងវិញរហូតដល់អ្នកមានបណ្តាញ។
@@ -5002,7 +5008,7 @@
 DocType: Shipping Rule,Calculate Based On,គណនាមូលដ្ឋាននៅលើ
 DocType: Contract,Unfulfilled,មិនបំពេញ
 DocType: Delivery Note Item,From Warehouse,ចាប់ពីឃ្លាំង
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,គ្មាននិយោជិកដែលមានលក្ខណៈវិនិច្ឆ័យដូចបានរៀបរាប់
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,គ្មាននិយោជិកដែលមានលក្ខណៈវិនិច្ឆ័យដូចបានរៀបរាប់
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,គ្មានធាតុជាមួយលោក Bill នៃសម្ភារៈដើម្បីផលិត
 DocType: Shopify Settings,Default Customer,អតិថិជនលំនាំដើម
 DocType: Sales Stage,Stage Name,ឈ្មោះដំណាក់កាល
@@ -5045,7 +5051,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ចំនួនប្រាក់ពន្ធបន្ទាប់ពីចំនួនទឹកប្រាក់ដែលបញ្ចុះតម្លៃ
 DocType: Patient,Inpatient Status,ស្ថានភាពអ្នកជំងឺ
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,ការកំណត់សង្ខេបការងារប្រចាំថ្ងៃ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,បញ្ជីតម្លៃដែលបានជ្រើសរើសគួរតែមានការត្រួតពិនិត្យនិងទិញ។
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,បញ្ជីតម្លៃដែលបានជ្រើសរើសគួរតែមានការត្រួតពិនិត្យនិងទិញ។
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,សូមបញ្ចូល Reqd តាមកាលបរិច្ឆេទ
 DocType: Payment Entry,Internal Transfer,សេវាផ្ទេរប្រាក់ផ្ទៃក្នុង
 DocType: Asset Maintenance,Maintenance Tasks,ភារកិច្ចថែទាំ
@@ -5082,7 +5088,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,ក្រុមតាម
 DocType: Guardian,Interests,ចំណាប់អារម្មណ៍
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,អនុញ្ញាត / មិនអនុញ្ញាតឱ្យរូបិយប័ណ្ណ។
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,មិនអាចដាក់ស្នើប្រាក់ខែ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,មិនអាចដាក់ស្នើប្រាក់ខែ
 DocType: Exchange Rate Revaluation,Get Entries,ទទួលបានធាតុ
 DocType: Production Plan,Get Material Request,ទទួលបានសម្ភារៈសំណើ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,ចំណាយប្រៃសណីយ៍
@@ -5169,7 +5175,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},គណនីចំណាយជាការចាំបាច់មុខទំនិញ {0}
 DocType: BOM,Website Description,វេបសាយការពិពណ៌នាសង្ខេប
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,ការផ្លាស់ប្តូរសុទ្ធនៅសមភាព
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,សូមបោះបង់ការទិញវិក័យប័ត្រ {0} ដំបូង
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,សូមបោះបង់ការទិញវិក័យប័ត្រ {0} ដំបូង
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,មិនអនុញ្ញាត។ សូមបិទប្រភេទអង្គភាព
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","អាសយដ្ឋានអ៊ីមែលត្រូវតែមានតែមួយគត់, រួចហើយសម្រាប់ {0}"
 DocType: Serial No,AMC Expiry Date,កាលបរិច្ឆេទ AMC ផុតកំណត់
@@ -5209,7 +5215,7 @@
 DocType: Hotel Room,Hotel Room,បន្ទប់សណ្ឋាគារ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},គណនី {0} មិនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
 DocType: Leave Type,Rounding,ជុំទី
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,លេខសៀរៀលនៅក្នុងជួរដេក {0} មិនផ្គូផ្គងនឹងការដឹកជញ្ជូនចំណាំ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,លេខសៀរៀលនៅក្នុងជួរដេក {0} មិនផ្គូផ្គងនឹងការដឹកជញ្ជូនចំណាំ
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),ចំនួនទឹកប្រាក់ដែលត្រូវបានផ្តល់ជូន (Pro-rated)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.",បន្ទាប់មកច្បាប់តម្លៃត្រូវបានច្រោះចេញដោយផ្អែកលើអតិថិជនក្រុមអតិថិជនដែនដីអ្នកផ្គត់ផ្គងក្រុមអ្នកផ្គត់ផ្គង់យុទ្ធនាការលក់ដៃគូជាដើម។
 DocType: Student,Guardian Details,កាសែត Guardian លំអិត
@@ -5264,7 +5270,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},ឃ្លាំងដែលបានទាមទារសម្រាប់ធាតុភាគហ៊ុន {0}
 DocType: Leave Allocation,Unused leaves,ស្លឹកមិនប្រើ
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,ធ្វើឱ្យការទូទាត់សង
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,នាយកដ្ឋានទាំងអស់
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,នាយកដ្ឋានទាំងអស់
 DocType: Healthcare Service Unit,Vacant,ទំនេរ
 DocType: Patient,Alcohol Past Use,អាល់កុលប្រើអតីតកាល
 DocType: Fertilizer Content,Fertilizer Content,មាតិកាជី
@@ -5275,7 +5281,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,ត្រូវលុបចោលការបញ្ជាទិញ {0} មុននឹងលុបចោលការបញ្ជាទិញនេះ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),យក Bom ផ្ទុះ (រួមបញ្ចូលទាំងសភាអនុ)
 DocType: Authorization Rule,Applicable To (Employee),ដែលអាចអនុវត្តទៅ (បុគ្គលិក)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,កាលបរិច្ឆេទដល់កំណត់គឺជាចាំបាច់
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,កាលបរិច្ឆេទដល់កំណត់គឺជាចាំបាច់
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,ចំនួនបន្ថែមសម្រាប់គុណលក្ខណៈ {0} មិនអាចជា 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,ប្រភេទអត្ថប្រយោជន៍និងចំនួនទឹកប្រាក់
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,បន្ទប់កក់
@@ -5424,7 +5430,7 @@
 DocType: Purchase Invoice Item,Total Weight,ទំងន់សរុប
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,គណៈកម្មការលើការលក់
 DocType: Job Offer Term,Value / Description,គុណតម្លៃ / ការពិពណ៌នាសង្ខេប
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនអាចត្រូវបានដាក់ស្នើ, វារួចទៅហើយ {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនអាចត្រូវបានដាក់ស្នើ, វារួចទៅហើយ {2}"
 DocType: Tax Rule,Billing Country,វិក័យប័ត្រប្រទេស
 DocType: Purchase Order Item,Expected Delivery Date,គេរំពឹងថាការដឹកជញ្ជូនកាលបរិច្ឆេទ
 DocType: Restaurant Order Entry,Restaurant Order Entry,ភោជនីយដ្ឋានការបញ្ជាទិញចូល
@@ -5463,12 +5469,13 @@
 DocType: Maintenance Visit,Breakdown,ការវិភាគ
 DocType: Travel Itinerary,Vegetarian,អ្នកតមសាច់
 DocType: Patient Encounter,Encounter Date,កាលបរិច្ឆេទជួបគ្នា
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,គណនី: {0} ដែលមានរូបិយប័ណ្ណ: {1} មិនអាចត្រូវបានជ្រើស &amp; ‧;
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,គណនី: {0} ដែលមានរូបិយប័ណ្ណ: {1} មិនអាចត្រូវបានជ្រើស &amp; ‧;
 DocType: Bank Statement Transaction Settings Item,Bank Data,ទិន្នន័យធនាគារ
 DocType: Purchase Receipt Item,Sample Quantity,បរិមាណគំរូ
 DocType: Bank Guarantee,Name of Beneficiary,ឈ្មោះអ្នកទទួលផល
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",បន្ទាន់សម័យ BOM ចំណាយដោយស្វ័យប្រវត្តិតាមរយៈកម្មវិធីកំណត់ពេលដោយផ្អែកលើអត្រាតំលៃចុងក្រោយ / អត្រាតំលៃបញ្ជី / អត្រាទិញចុងក្រោយនៃវត្ថុធាតុដើម។
 DocType: Supplier,SUP-.YYYY.-,SUP -YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,អ្នកផ្គត់ផ្គង់&gt; ក្រុមអ្នកផ្គត់ផ្គង់
 DocType: Bank Reconciliation Detail,Cheque Date,កាលបរិច្ឆេទមូលប្បទានប័ត្រ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},គណនី {0}: គណនីមាតាបិតា {1} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,ទទួលបានជោគជ័យក្នុងការតិបត្តិការទាំងអស់ដែលបានលុបដែលទាក់ទងទៅនឹងក្រុមហ៊ុននេះ!
@@ -5496,7 +5503,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,ថ្នាំងកុមារអាចត្រូវបានបង្កើតតែនៅក្រោមថ្នាំងប្រភេទ &#39;ក្រុម
 DocType: Attendance Request,Half Day Date,កាលបរិច្ឆេទពាក់កណ្តាលថ្ងៃ
 DocType: Academic Year,Academic Year Name,ឈ្មោះអប់រំឆ្នាំ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} មិនត្រូវបានអនុញ្ញាតឱ្យធ្វើការជាមួយ {1} ។ សូមផ្លាស់ប្តូរក្រុមហ៊ុន។
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} មិនត្រូវបានអនុញ្ញាតឱ្យធ្វើការជាមួយ {1} ។ សូមផ្លាស់ប្តូរក្រុមហ៊ុន។
 DocType: Sales Partner,Contact Desc,ការទំនាក់ទំនង DESC
 DocType: Email Digest,Send regular summary reports via Email.,ផ្ញើរបាយការណ៍សេចក្ដីសង្ខេបជាទៀងទាត់តាមរយៈអ៊ីម៉ែល។
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},សូមកំណត់គណនីលំនាំដើមនៅក្នុងប្រភេទពាក្យបណ្តឹងការចំណាយ {0}
@@ -5529,7 +5536,7 @@
 DocType: Hotel Room,Hotel Manager,ប្រធានសណ្ឋាគារ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,កំណត់ច្បាប់ពន្ធសម្រាប់រទេះដើរទិញឥវ៉ាន់
 DocType: Purchase Invoice,Taxes and Charges Added,ពន្ធនិងការចោទប្រកាន់បន្ថែម
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,រំលស់ជួរដេក {0}: កាលបរិច្ឆេទរំលោះបន្ទាប់មិនអាចនៅមុនកាលបរិច្ឆេទដែលអាចប្រើបាន
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,រំលស់ជួរដេក {0}: កាលបរិច្ឆេទរំលោះបន្ទាប់មិនអាចនៅមុនកាលបរិច្ឆេទដែលអាចប្រើបាន
 ,Sales Funnel,ការប្រមូលផ្តុំការលក់
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,អក្សរកាត់គឺជាការចាំបាច់
 DocType: Project,Task Progress,វឌ្ឍនភាពភារកិច្ច
@@ -5543,7 +5550,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,ក្រុមអតិថិជនទាំងអស់
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,បង្គរប្រចាំខែ
 DocType: Attendance Request,On Duty,នៅលើកាតព្វកិច្ច
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} គឺជាចាំបាច់។ ប្រហែលជាកំណត់ត្រាប្តូររូបិយប័ណ្ណមិនត្រូវបានបង្កើតឡើងសម្រាប់ {1} ទៅ {2} ។
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} គឺជាចាំបាច់។ ប្រហែលជាកំណត់ត្រាប្តូររូបិយប័ណ្ណមិនត្រូវបានបង្កើតឡើងសម្រាប់ {1} ទៅ {2} ។
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},ផែនការបុគ្គលិក {0} មានរួចហើយសម្រាប់ការកំណត់ {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,ទំព័រគំរូពន្ធលើគឺជាចាំបាច់។
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,គណនី {0}: គណនីមាតាបិតា {1} មិនមាន
@@ -5623,11 +5630,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,យ៉ាងហោចណាស់មានម្នាក់ឃ្លាំងគឺជាចាំបាច់
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","កំណត់រចនាសម្ព័ន្ធវាលធាតុដូច UOM, ក្រុមធាតុ, ការពិពណ៌នានិងម៉ោងនៃម៉ោង។"
 DocType: Certification Application,Certification Status,ស្ថានភាពបញ្ជាក់
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,ទីផ្សារ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,ទីផ្សារ
 DocType: Travel Itinerary,Travel Advance Required,ត្រូវការការធ្វើដំណើរជាមុន
 DocType: Subscriber,Subscriber Name,ឈ្មោះអតិថិជន
 DocType: Serial No,Out of Warranty,ចេញពីការធានា
-DocType: Cashier Closing,Cashier-closing-,Cashier-closing-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,ប្រភេទទិន្នន័យបានគូសវាស
 DocType: BOM Update Tool,Replace,ជំនួស
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,គ្មានផលិតផលដែលបានរកឃើញ។
@@ -5715,7 +5721,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,គំរូពន្ធលំនាំដើមសម្រាប់ការលក់និងការទិញត្រូវបានបង្កើត។
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,កំណត់ត្រាការវាយតំលៃ {0} មានរួចហើយ។
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",ឧទាហរណ៍: ABCD ។ ##### ។ ប្រសិនបើស៊េរីត្រូវបានកំណត់ហើយបាច់គ្មានត្រូវបានរៀបរាប់នៅក្នុងប្រតិបត្តិការបន្ទាប់មកលេខឡូហ្គោស្វ័យប្រវត្តិនឹងត្រូវបានបង្កើតឡើងដោយផ្អែកលើស៊េរីនេះ។ ប្រសិនបើអ្នកចង់និយាយបញ្ជាក់យ៉ាងច្បាស់ពីជំនាន់ទី 1 សម្រាប់ធាតុនេះសូមទុកវាឱ្យនៅទទេ។ ចំណាំ: ការកំណត់នេះនឹងយកអាទិភាពជាងបុព្វបទស៊េរីឈ្មោះក្នុងការកំណត់ស្តុក។
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំស៊េរីលេខរៀងសម្រាប់ការចូលរួមតាមរយៈ Setup&gt; Serial Number
 DocType: BOM,Materials Required (Exploded),សំភារៈទាមទារ (ផ្ទុះ)
 DocType: Contract,Party User,អ្នកប្រើគណបក្ស
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',សូមកំណត់ក្រុមហ៊ុនត្រងនៅទទេប្រសិនបើក្រុមតាមគឺ &#39;ក្រុមហ៊ុន&#39;
@@ -5918,7 +5923,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,រាប់ចម្បង
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,ដំណាក់កាលនៃការជំនុំជម្រះនិងកាលបរិច្ឆេទបញ្ចប់នៃការជំនុំជម្រះត្រូវបានកំណត់
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,អត្រាមធ្យម
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ចំនួនទឹកប្រាក់ទូទាត់សរុបក្នុងកាលវិភាគទូទាត់ត្រូវតែស្មើគ្នាសរុប / សរុប
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ចំនួនទឹកប្រាក់ទូទាត់សរុបក្នុងកាលវិភាគទូទាត់ត្រូវតែស្មើគ្នាសរុប / សរុប
 DocType: Subscription Plan Detail,Plan,ផែនការ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,ធនាគារតុល្យភាពសេចក្តីថ្លែងការណ៍ដូចជាក្នុងសៀវភៅធំ
 DocType: Job Applicant,Applicant Name,ឈ្មោះកម្មវិធី
@@ -5987,7 +5992,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,ដុំនិងសាប៊ូម្ស៉ៅ
 DocType: BOM,Show Items,បង្ហាញធាតុ
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,ចាប់ពីពេលដែលមិនអាចត្រូវបានធំជាងទៅពេលមួយ។
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,តើអ្នកចង់ជូនដំណឹងដល់អតិថិជនទាំងអស់តាមរយៈអ៊ីម៉ែលទេ?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,តើអ្នកចង់ជូនដំណឹងដល់អតិថិជនទាំងអស់តាមរយៈអ៊ីម៉ែលទេ?
 DocType: Subscription Plan,Billing Interval,ចន្លោះវិក្កយបត្រ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,វីដេអូចលនារូបភាព &amp;
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,បានបញ្ជាឱ្យ
@@ -5996,9 +6001,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,ជួរដេក {0}: {1} ត្រូវតែធំជាង 0
 DocType: Assessment Criteria,Assessment Criteria Group,ការវាយតម្លៃលក្ខណៈវិនិច្ឆ័យជាក្រុម
 DocType: Healthcare Settings,Patient Name By,ឈ្មោះអ្នកជម្ងឺដោយ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},បញ្ចូលធាតុទិនានុប្បវត្តិសម្រាប់ប្រាក់ខែពី {0} ដល់ {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},បញ្ចូលធាតុទិនានុប្បវត្តិសម្រាប់ប្រាក់ខែពី {0} ដល់ {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,បើកដំណើរការចំណូលដែលពនរ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},បើករំលស់បង្គរត្រូវតែតិចជាងស្មើទៅនឹង {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},បើករំលស់បង្គរត្រូវតែតិចជាងស្មើទៅនឹង {0}
 DocType: Warehouse,Warehouse Name,ឈ្មោះឃ្លាំង
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,កាលបរិច្ឆេទចាប់ផ្ដើមពិតប្រាកដត្រូវតែតិចជាងកាលបរិច្ឆេទបញ្ចប់ពិតប្រាកដ
 DocType: Naming Series,Select Transaction,ជ្រើសប្រតិបត្តិការ
@@ -6150,7 +6155,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,និយោជក {0} នៃថ្នាក់ {1} មិនមានគោលនយោបាយចាកចេញទេ
 DocType: Salary Detail,Salary Detail,លំអិតប្រាក់ខែ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,សូមជ្រើស {0} ដំបូង
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,បានបន្ថែម {0} អ្នកប្រើ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,បានបន្ថែម {0} អ្នកប្រើ
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",ក្នុងករណីមានកម្មវិធីពហុលំដាប់អតិថិជននឹងត្រូវបានចាត់តាំងដោយខ្លួនឯងទៅថ្នាក់ដែលពាក់ព័ន្ធដោយចំណាយរបស់ពួកគេ
 DocType: Appointment Type,Physician,គ្រូពេទ្យ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,បាច់នៃ {0} {1} ធាតុបានផុតកំណត់។
@@ -6295,7 +6300,7 @@
 DocType: Asset,Custodian,អ្នកថែរក្សា
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,ចំណុចនៃការលក់ពត៌មានផ្ទាល់ខ្លួន
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} គួរតែជាតម្លៃចន្លោះ 0 និង 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},ការទូទាត់ {0} ពី {1} ទៅ {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},ការទូទាត់ {0} ពី {1} ទៅ {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,ការផ្តល់កម្ចីដោយគ្មានសុវត្ថិភាព
 DocType: Cost Center,Cost Center Name,ឈ្មោះមជ្ឈមណ្ឌលចំណាយអស់
 DocType: Student,B+,B +
@@ -6327,6 +6332,7 @@
 DocType: Employee,Date of Issue,កាលបរិច្ឆេទនៃបញ្ហា
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","ជាមួយការកំណត់ការទិញប្រសិនបើមានការទិញ Reciept ទាមទារ == &quot;បាទ&quot; ហើយបន្ទាប់មកសម្រាប់ការបង្កើតការទិញវិក័យប័ត្រ, អ្នកប្រើត្រូវតែបង្កើតការទទួលទិញជាលើកដំបូងសម្រាប់ធាតុ {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},ជួរដេក # {0}: កំណត់ផ្គត់ផ្គង់សម្រាប់ធាតុ {1}
+DocType: Global Defaults,Default Distance Unit,ឯកតាចម្ងាយលំនាំដើម
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,ជួរដេក {0}: តម្លៃប៉ុន្មានម៉ោងត្រូវតែធំជាងសូន្យ។
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,គេហទំព័ររូបភាព {0} បានភ្ជាប់ទៅនឹងធាតុ {1} មិនអាចត្រូវបានរកឃើញ
 DocType: Issue,Content Type,ប្រភេទមាតិការ
@@ -6382,7 +6388,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,ឥណពន្ធវីសាទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
 DocType: Asset,Naming Series,ដាក់ឈ្មោះកម្រងឯកសារ
 DocType: Vital Signs,Coated,ថ្នាំកូត
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,ជួរដេក {0}: តម្លៃដែលរំពឹងទុកបន្ទាប់ពីជីវិតមានជីវិតត្រូវតិចជាងចំនួនសរុបនៃការទិញ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,ជួរដេក {0}: តម្លៃដែលរំពឹងទុកបន្ទាប់ពីជីវិតមានជីវិតត្រូវតិចជាងចំនួនសរុបនៃការទិញ
 DocType: GoCardless Settings,GoCardless Settings,ការកំណត់ GoCardless
 DocType: Leave Block List,Leave Block List Name,ទុកឱ្យឈ្មោះបញ្ជីប្លុក
 DocType: Certified Consultant,Certification Validity,សុពលភាពវិញ្ញាបនប័ត្រ
@@ -6451,6 +6457,7 @@
 DocType: Bank Statement Settings Item,Bank Header,បឋមកថាធនាគារ
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,មើលការធ្វើតេស្តមន្ទីរពិសោធន៍
 DocType: Hub Users,Hub Users,អ្នកប្រើហាប់
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមអតិថិជន&gt; ដែនដី
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,ថែទាំកាលបរិច្ឆេទ
 DocType: Purchase Invoice Item,Rejected Serial No,គ្មានសៀរៀលច្រានចោល
@@ -6465,7 +6472,7 @@
 DocType: SG Creation Tool Course,Max Strength,កម្លាំងអតិបរមា
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,ដំឡើងការកំណត់ជាមុន
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-yYYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},គ្មានចំណាំចែកចាយដែលត្រូវបានជ្រើសរើសសម្រាប់អតិថិជន {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},គ្មានចំណាំចែកចាយដែលត្រូវបានជ្រើសរើសសម្រាប់អតិថិជន {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,និយោជិក {0} មិនមានអត្ថប្រយោជន៍អតិបរមាទេ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,ជ្រើសធាតុផ្អែកលើកាលបរិច្ឆេទដឹកជញ្ជូន
 DocType: Grant Application,Has any past Grant Record,មានឯកសារជំនួយឥតសំណងកន្លងមក
@@ -6493,7 +6500,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,កក់បន្ទប់សណ្ឋាគារ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,សេវាបំរើអតិថិជន
 DocType: BOM,Thumbnail,កូនរូបភាព
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,មិនមានទំនាក់ទំនងជាមួយលេខសម្គាល់អ៊ីម៉ែល។
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,មិនមានទំនាក់ទំនងជាមួយលេខសម្គាល់អ៊ីម៉ែល។
 DocType: Item Customer Detail,Item Customer Detail,ពត៌មានរបស់អតិថិជនធាតុ
 DocType: Notification Control,Prompt for Email on Submission of,ប្រអប់បញ្ចូលអ៊ីមែលនៅលើការដាក់
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},ចំនួនប្រាក់អត្ថប្រយោជន៍អតិបរមារបស់បុគ្គលិក {0} លើសពី {1}
@@ -6754,7 +6761,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,មិនអាចសម្ងាត់មួយដើម្បីពូលដោយសារតែប្រភេទគណនីត្រូវបានជ្រើស។
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} បានកែប្រែទេ។ សូមផ្ទុកឡើងវិញ។
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,បញ្ឈប់ការរបស់អ្នកប្រើពីការធ្វើឱ្យកម្មវិធីដែលបានចាកចេញនៅថ្ងៃបន្ទាប់។
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,លេខកូដធាតុ&gt; ក្រុមធាតុ&gt; ម៉ាក
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.",ប្រសិនបើរយៈពេលផុតកំណត់គ្មានដែនកំណត់សម្រាប់ចំណុចភក្ដីភាពនោះទុករយៈពេលផុតកំណត់ទំនេរឬ 0 ។
 DocType: Asset Maintenance Team,Maintenance Team Members,សមាជិកក្រុមថែទាំ
 DocType: Loyalty Point Entry,Purchase Amount,ចំនួនទឹកប្រាក់ការទិញ
@@ -6762,7 +6768,7 @@
 											to fullfill Sales Order {2}",មិនអាចផ្តល់នូវស៊េរីលេខ {0} នៃធាតុ {1} បានទេព្រោះវាត្រូវបានបម្រុងទុក \ បំពេញការបញ្ជាទិញពេញ {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN -YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,សម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់ {0} បង្កើតឡើង
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,ឆ្នាំបញ្ចប់មិនអាចជាការចាប់ផ្តើមឆ្នាំមុន
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,ឆ្នាំបញ្ចប់មិនអាចជាការចាប់ផ្តើមឆ្នាំមុន
 DocType: Employee Benefit Application,Employee Benefits,អត្ថប្រយោជន៍បុគ្គលិក
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},បរិមាណបរិមាណស្មើនឹងត្រូវ packed សម្រាប់ធាតុ {0} នៅក្នុងជួរដេក {1}
 DocType: Work Order,Manufactured Qty,បានផលិត Qty
@@ -6778,6 +6784,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,ជ្រើសលេខបាច់
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,ទៅ GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,វិក័យប័ត្របានលើកឡើងដល់អតិថិជន។
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំប្រព័ន្ធដាក់ឈ្មោះនិយោជិកនៅក្នុងធនធានមនុស្ស&gt; ការកំណត់ធនធានមនុស្ស
 DocType: Healthcare Settings,Invoice Appointments Automatically,ការណាត់ជួបលើវិក័យប័ត្រដោយស្វ័យប្រវត្តិ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,លេខសម្គាល់របស់គម្រោង
 DocType: Salary Component,Variable Based On Taxable Salary,អថេរផ្អែកលើប្រាក់ឈ្នួលជាប់ពន្ធ
@@ -6826,7 +6833,7 @@
 DocType: POS Profile,Account for Change Amount,គណនីសម្រាប់ការផ្លាស់ប្តូរចំនួនទឹកប្រាក់
 DocType: QuickBooks Migrator,Connecting to QuickBooks,ភ្ជាប់ទៅ QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,ប្រាក់ចំណេញ / ចាញ់សរុប
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,ក្រុមហ៊ុនមិនត្រឹមត្រូវសម្រាប់វិក័យប័ត្រក្រុមហ៊ុនអន្តរ។
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,ក្រុមហ៊ុនមិនត្រឹមត្រូវសម្រាប់វិក័យប័ត្រក្រុមហ៊ុនអន្តរ។
 DocType: Purchase Invoice,input service,សេវាកម្មបញ្ចូល
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ជួរដេក {0}: គណបក្ស / គណនីមិនផ្គូផ្គងនឹង {1} / {2} នៅក្នុង {3} {4}
 DocType: Employee Promotion,Employee Promotion,ការលើកកម្ពស់បុគ្គលិក
@@ -6957,7 +6964,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,តំបន់ពេញចិត្តសម្រាប់ការស្នាក់នៅ
 apps/erpnext/erpnext/config/selling.py +184,Analytics,វិធីវិភាគ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,រទេះទទេ
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,សូមបង្កើតប្រព័ន្ធដាក់ឈ្មោះគ្រូបង្រៀននៅក្នុងការអប់រំ&gt; ការកំណត់អប់រំ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",ធាតុ {0} មិនមានលេខស៊េរីឡើយ។ មានតែធាតុ serilialized \ អាចចែកចាយបានដោយផ្អែកលើលេខស៊េរី
 DocType: Vehicle,Model,តារាម៉ូដែល
@@ -6987,7 +6993,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,គ្មានអ្វីត្រូវផ្លាស់ប្តូរ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,សូមជ្រើសឯកសារ csv
 DocType: Holiday List,Total Holidays,ថ្ងៃឈប់សម្រាកសរុប
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,បាត់គំរូអ៊ីមែលសម្រាប់ការបញ្ជូន។ សូមកំណត់មួយក្នុងការកំណត់ការដឹកជញ្ជូន។
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,បាត់គំរូអ៊ីមែលសម្រាប់ការបញ្ជូន។ សូមកំណត់មួយក្នុងការកំណត់ការដឹកជញ្ជូន។
 DocType: Student Leave Application,Mark as Present,សម្គាល់ជាបច្ចុប្បន្ន
 DocType: Supplier Scorecard,Indicator Color,ពណ៌សូចនាករ
 DocType: Purchase Order,To Receive and Bill,ដើម្បីទទួលបាននិង Bill
@@ -6996,7 +7002,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,ជ្រើសលេខស៊េរី
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,អ្នករចនា
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,លក្ខខណ្ឌទំព័រគំរូ
-DocType: Serial No,Delivery Details,ពត៌មានលំអិតដឹកជញ្ជូន
+DocType: Delivery Trip,Delivery Details,ពត៌មានលំអិតដឹកជញ្ជូន
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},មជ្ឈមណ្ឌលការចំណាយគឺត្រូវបានទាមទារនៅក្នុងជួរដេក {0} នៅក្នុងពន្ធតារាងសម្រាប់ប្រភេទ {1}
 DocType: Program,Program Code,កូដកម្មវិធី
 DocType: Terms and Conditions,Terms and Conditions Help,លក្ខខណ្ឌជំនួយ
@@ -7020,7 +7026,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead ពេលថ្ងៃ
 DocType: Cash Flow Mapping,Is Income Tax Expense,គឺជាពន្ធលើប្រាក់ចំណូលពន្ធ
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,ការបញ្ជាទិញរបស់អ្នកគឺសម្រាប់ការដឹកជញ្ជូន!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ជួរដេក # {0}: ប្រកាសកាលបរិច្ឆេទត្រូវតែមានដូចគ្នាកាលបរិច្ឆេទទិញ {1} នៃទ្រព្យសម្បត្តិ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ជួរដេក # {0}: ប្រកាសកាលបរិច្ឆេទត្រូវតែមានដូចគ្នាកាលបរិច្ឆេទទិញ {1} នៃទ្រព្យសម្បត្តិ {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,ធីកប្រអប់នេះបើសិស្សកំពុងរស់នៅនៅឯសណ្ឋាគារវិទ្យាស្ថាននេះ។
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,សូមបញ្ចូលការបញ្ជាទិញលក់នៅក្នុងតារាងខាងលើ
 ,Stock Summary,សង្ខេបភាគហ៊ុន
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index 358329e..1a9b9d9 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,ಅವಧಿ ಹೆಸರು
 DocType: Employee,Salary Mode,ಸಂಬಳ ಫ್ಯಾಷನ್
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,ನೋಂದಣಿ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,ನೋಂದಣಿ
 DocType: Patient,Divorced,ವಿವಾಹವಿಚ್ಛೇದಿತ
 DocType: Support Settings,Post Route Key,ಪೋಸ್ಟ್ ಮಾರ್ಗ ಕೀ
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,ಐಟಂ ಒಂದು ವ್ಯವಹಾರದಲ್ಲಿ ಅನೇಕ ಬಾರಿ ಸೇರಿಸಬೇಕಾಗಿದೆ
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,ಹೊಸ ವಿನಿಮಯ ದರ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},ಕರೆನ್ಸಿ ಬೆಲೆ ಪಟ್ಟಿ ಅಗತ್ಯವಿದೆ {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ಲೆಕ್ಕಾಚಾರ ಮಾಡಲಾಗುತ್ತದೆ ವ್ಯವಹಾರದಲ್ಲಿ ಆಗಿದೆ .
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಪೂರೈಕೆದಾರ ಕೌಟುಂಬಿಕತೆ
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT -YYYY.-
 DocType: Purchase Order,Customer Contact,ಗ್ರಾಹಕ ಸಂಪರ್ಕ
 DocType: Patient Appointment,Check availability,ಲಭ್ಯವಿದೆಯೇ
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,ತೆರೆದ ತೋರಿಸಿ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,ಸರಣಿ ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,ಚೆಕ್ಔಟ್
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} ಸಾಲಿನಲ್ಲಿ {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} ಸಾಲಿನಲ್ಲಿ {1}
 DocType: Asset Finance Book,Depreciation Start Date,ಸವಕಳಿ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 DocType: Pricing Rule,Apply On,ಅನ್ವಯಿಸುತ್ತದೆ
 DocType: Item Price,Multiple Item prices.,ಬಹು ಐಟಂ ಬೆಲೆಗಳು .
@@ -118,7 +117,7 @@
 DocType: Lab Prescription,Lab Prescription,ಲ್ಯಾಬ್ ಪ್ರಿಸ್ಕ್ರಿಪ್ಷನ್
 ,Delay Days,ವಿಳಂಬ ದಿನಗಳು
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ಸೇವೆ ಖರ್ಚು
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},ಕ್ರಮ ಸಂಖ್ಯೆ: {0} ಈಗಾಗಲೇ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಉಲ್ಲೇಖವಿದೆ: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},ಕ್ರಮ ಸಂಖ್ಯೆ: {0} ಈಗಾಗಲೇ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಉಲ್ಲೇಖವಿದೆ: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,ಸರಕುಪಟ್ಟಿ
 DocType: Purchase Invoice Item,Item Weight Details,ಐಟಂ ತೂಕ ವಿವರಗಳು
 DocType: Asset Maintenance Log,Periodicity,ನಿಯತಕಾಲಿಕತೆ
@@ -143,6 +142,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,ಅಕೌಂಟೆಂಟ್
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,ಬೆಲೆ ಪಟ್ಟಿ ಮಾರಾಟ
 DocType: Patient,Tobacco Current Use,ತಂಬಾಕು ಪ್ರಸ್ತುತ ಬಳಕೆ
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","ಆರಂಭದ ದಿನಾಂಕ ಮತ್ತು ಅಂತಿಮ ದಿನಾಂಕವು ಉದ್ಯೋಗ ಕಾರ್ಡ್ನೊಂದಿಗೆ ಅತಿಕ್ರಮಿಸುತ್ತದೆ <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,ದರ ಮಾರಾಟ
 DocType: Cost Center,Stock User,ಸ್ಟಾಕ್ ಬಳಕೆದಾರ
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -162,7 +162,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,ಸಂಬಂಧಿತ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,ಅಟೆಂಡೆನ್ಸ್ ದಿನಾಂಕ ನೌಕರನ ಸೇರುವ ದಿನಾಂಕಕ್ಕಿಂತ ಕಡಿಮೆ ಇರಬಾರದು
 DocType: Grading Scale,Grading Scale Name,ಗ್ರೇಡಿಂಗ್ ಸ್ಕೇಲ್ ಹೆಸರು
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,ಬಳಕೆದಾರರನ್ನು ಮಾರುಕಟ್ಟೆಗೆ ಸೇರಿಸಿ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,ಬಳಕೆದಾರರನ್ನು ಮಾರುಕಟ್ಟೆಗೆ ಸೇರಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,ಈ ಒಂದು ಮೂಲ ಖಾತೆಯನ್ನು ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
 DocType: Sales Invoice,Company Address,ಕಂಪೆನಿ ವಿಳಾಸ
 DocType: BOM,Operations,ಕಾರ್ಯಾಚರಣೆ
@@ -320,7 +320,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,ವ್ಯತ್ಯಾಸದ ಕ್ಯೂಟಿ
 DocType: Production Plan,Material Request Detail,ವಸ್ತು ವಿನಂತಿ ವಿವರ
 DocType: Selling Settings,Default Quotation Validity Days,ಡೀಫಾಲ್ಟ್ ಕೊಟೇಶನ್ ವಾಲಿಡಿಟಿ ಡೇಸ್
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ಸತತವಾಗಿ ತೆರಿಗೆ ಸೇರಿಸಲು {0} ಐಟಂ ಪ್ರಮಾಣದಲ್ಲಿ , ಸಾಲುಗಳಲ್ಲಿ ತೆರಿಗೆ {1} , ಎಂದು ಸೇರಿಸಲೇಬೇಕು"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ಸತತವಾಗಿ ತೆರಿಗೆ ಸೇರಿಸಲು {0} ಐಟಂ ಪ್ರಮಾಣದಲ್ಲಿ , ಸಾಲುಗಳಲ್ಲಿ ತೆರಿಗೆ {1} , ಎಂದು ಸೇರಿಸಲೇಬೇಕು"
 DocType: SMS Center,SMS Center,ಸಂಚಿಕೆ ಸೆಂಟರ್
 DocType: Payroll Entry,Validate Attendance,ಹಾಜರಾತಿ ಮೌಲ್ಯೀಕರಿಸಿ
 DocType: Sales Invoice,Change Amount,ಪ್ರಮಾಣವನ್ನು ಬದಲಾವಣೆ
@@ -439,7 +439,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,ಪದಗಳಲ್ಲಿ ಪ್ರಮಾಣದ ಸಾಲಿನ ಅಂತರ
 DocType: Vehicle,Additional Details,ಹೆಚ್ಚುವರಿ ವಿವರಗಳು
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,ಯಾವುದೇ ವಿವರಣೆ givenName
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,ಪೂರೈಕೆದಾರ&gt; ಪೂರೈಕೆದಾರ ಗುಂಪು
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ಖರೀದಿ ವಿನಂತಿ .
 DocType: POS Closing Voucher Details,Collected Amount,ಸಂಗ್ರಹಿಸಿದ ಮೊತ್ತ
 DocType: Lab Test,Submitted Date,ಸಲ್ಲಿಸಿದ ದಿನಾಂಕ
@@ -484,7 +483,7 @@
 DocType: Student Admission,Student Admission,ವಿದ್ಯಾರ್ಥಿ ಪ್ರವೇಶ
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,ಸವಕಳಿ ಸಾಲು {0}: ಸವಕಳಿ ಆರಂಭ ದಿನಾಂಕ ಕಳೆದ ದಿನಾಂಕದಂತೆ ನಮೂದಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,ಸವಕಳಿ ಸಾಲು {0}: ಸವಕಳಿ ಆರಂಭ ದಿನಾಂಕ ಕಳೆದ ದಿನಾಂಕದಂತೆ ನಮೂದಿಸಲಾಗಿದೆ
 DocType: Contract Template,Fulfilment Terms and Conditions,ಪೂರೈಸುವ ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 DocType: Bank Reconciliation,Update Clearance Date,ಅಪ್ಡೇಟ್ ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ
@@ -541,6 +540,7 @@
 DocType: Accounts Settings,Settings for Accounts,ಖಾತೆಗಳಿಗೆ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ಯಾವುದೇ ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,ಮಾರಾಟಗಾರನ ಟ್ರೀ ನಿರ್ವಹಿಸಿ .
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Google ನಕ್ಷೆಗಳ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದಾಗಿನಿಂದ, ಮಾರ್ಗವನ್ನು ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
 DocType: Job Applicant,Cover Letter,ಕವರ್ ಲೆಟರ್
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ಅತ್ಯುತ್ತಮ ಚೆಕ್ ಮತ್ತು ತೆರವುಗೊಳಿಸಲು ಠೇವಣಿಗಳ
 DocType: Item,Synced With Hub,ಹಬ್ ಸಿಂಕ್
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,ಹೊಸ ಆಸ್ತಿ ಮೌಲ್ಯ
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,ಗ್ರಾಹಕ ಕರೆನ್ಸಿ ದರ ಗ್ರಾಹಕ ಬೇಸ್ ಕರೆನ್ಸಿ ಪರಿವರ್ತನೆ
 DocType: Course Scheduling Tool,Course Scheduling Tool,ಕೋರ್ಸ್ ನಿಗದಿಗೊಳಿಸುವ ಟೂಲ್
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ರೋ # {0} ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಸಾಧ್ಯವಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಆಸ್ತಿಯ ಕುರಿತು ಮಾಡಿದ {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ರೋ # {0} ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಸಾಧ್ಯವಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಆಸ್ತಿಯ ಕುರಿತು ಮಾಡಿದ {1}
 DocType: Crop Cycle,LInked Analysis,ಲಿಂಕ್ಡ್ ಅನಾಲಿಸಿಸ್
 DocType: POS Closing Voucher,POS Closing Voucher,ಪಿಓಎಸ್ ಮುಚ್ಚುವ ವೋಚರ್
 DocType: Contract,Lapsed,ವಿಳಂಬವಾಯಿತು
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} ಕೋರ್ಸ್ ಸೇರಿಕೊಂಡಳು ಇದೆ {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,ವಿದ್ಯಾರ್ಥಿಯ ಹೆಸರು:
 DocType: POS Closing Voucher Details,Difference,ವ್ಯತ್ಯಾಸ
+DocType: Delivery Settings,Delay between Delivery Stops,ಡೆಲಿವರಿ ನಿಲ್ದಾಣಗಳ ನಡುವೆ ವಿಳಂಬ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಡೆಲಿವರಿ ಗಮನಿಸಿ ಸೇರುವುದಿಲ್ಲ {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","ಸರ್ವರ್ನ ಗೋಕಾರ್ಡ್ಲೆಸ್ ಕಾನ್ಫಿಗರೇಶನ್ನಲ್ಲಿ ಸಮಸ್ಯೆ ಕಂಡುಬಂದಿದೆ. ಚಿಂತಿಸಬೇಡಿ, ವೈಫಲ್ಯದ ಸಂದರ್ಭದಲ್ಲಿ, ನಿಮ್ಮ ಖಾತೆಗೆ ಹಣವನ್ನು ಮರುಪಾವತಿಸಲಾಗುತ್ತದೆ."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext ಡೆಮೊ
@@ -695,7 +696,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,ಪ್ರಮಾಣ ಮತ್ತು ದರ
 DocType: Delivery Note,% Installed,% ಅನುಸ್ಥಾಪಿಸಲಾದ
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,ಪಾಠದ / ಲ್ಯಾಬೋರೇಟರೀಸ್ ಇತ್ಯಾದಿ ಉಪನ್ಯಾಸಗಳು ಮಾಡಬಹುದು ನಿಗದಿತ ಅಲ್ಲಿ.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,ಕಂಪನಿಗಳ ಎರಡು ಕಂಪೆನಿಗಳು ಇಂಟರ್ ಕಂಪೆನಿ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ಗೆ ಹೊಂದಾಣಿಕೆಯಾಗಬೇಕು.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,ಕಂಪನಿಗಳ ಎರಡು ಕಂಪೆನಿಗಳು ಇಂಟರ್ ಕಂಪೆನಿ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ಗೆ ಹೊಂದಾಣಿಕೆಯಾಗಬೇಕು.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,ಮೊದಲ ಕಂಪನಿ ಹೆಸರು ನಮೂದಿಸಿ
 DocType: Travel Itinerary,Non-Vegetarian,ಸಸ್ಯಾಹಾರಿ
 DocType: Purchase Invoice,Supplier Name,ಸರಬರಾಜುದಾರ ಹೆಸರು
@@ -782,7 +783,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,ದಿನಾಂಕದಿಂದ ಬಾಡಿಗೆಗೆ ಪಡೆದಿದೆ
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,ಸಾಕಷ್ಟು ಭಾಗಗಳನ್ನು ನಿರ್ಮಿಸಲು
 DocType: POS Profile User,POS Profile User,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಬಳಕೆದಾರ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,ಸಾಲು {0}: ಸವಕಳಿ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,ಸಾಲು {0}: ಸವಕಳಿ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಅಗತ್ಯವಿದೆ
 DocType: Purchase Invoice Item,Service Start Date,ಸೇವೆ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 DocType: Subscription Invoice,Subscription Invoice,ಚಂದಾದಾರಿಕೆ ಸರಕುಪಟ್ಟಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,ನೇರ ಆದಾಯ
@@ -851,7 +852,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,ಸಂಕ್ಷೇಪಣ ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಕಂಪನಿಗೆ ಬಳಸಲಾಗುತ್ತದೆ
 DocType: Selling Settings,Default Customer Group,ಡೀಫಾಲ್ಟ್ ಗ್ರಾಹಕ ಗುಂಪಿನ
 DocType: Employee,IFSC Code,IFSC ಕೋಡ್
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","ಆರಂಭದ ದಿನಾಂಕ ಮತ್ತು ಅಂತಿಮ ದಿನಾಂಕವು ಉದ್ಯೋಗ ಕಾರ್ಡ್ನೊಂದಿಗೆ ಅತಿಕ್ರಮಿಸುತ್ತದೆ <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದಲ್ಲಿ, ' ದುಂಡಾದ ಒಟ್ಟು ' ಕ್ಷೇತ್ರದಲ್ಲಿ ಯಾವುದೇ ವ್ಯವಹಾರದಲ್ಲಿ ಕಾಣಿಸುವುದಿಲ್ಲ"
 DocType: BOM,Operating Cost,ವೆಚ್ಚವನ್ನು
 DocType: Crop,Produced Items,ತಯಾರಿಸಿದ ಐಟಂಗಳು
@@ -903,7 +903,7 @@
 DocType: Supplier,Prevent RFQs,RFQ ಗಳನ್ನು ತಡೆಯಿರಿ
 DocType: Hub User,Hub User,ಹಬ್ ಬಳಕೆದಾರ
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,ಮಾಡಿ ಮಾರಾಟದ ಆರ್ಡರ್
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},{0} ನಿಂದ {1} ವರೆಗಿನ ಅವಧಿಯವರೆಗೆ ಸಂಬಳ ಸ್ಲಿಪ್ ಸಲ್ಲಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},{0} ನಿಂದ {1} ವರೆಗಿನ ಅವಧಿಯವರೆಗೆ ಸಂಬಳ ಸ್ಲಿಪ್ ಸಲ್ಲಿಸಲಾಗಿದೆ
 DocType: Project Task,Project Task,ಪ್ರಾಜೆಕ್ಟ್ ಟಾಸ್ಕ್
 DocType: Loyalty Point Entry Redemption,Redeemed Points,ರಿಡೀಮಿಡ್ ಪಾಯಿಂಟುಗಳು
 ,Lead Id,ಲೀಡ್ ಸಂ
@@ -1035,7 +1035,7 @@
 DocType: Fee Validity,Max number of visit,ಗರಿಷ್ಠ ಸಂಖ್ಯೆಯ ಭೇಟಿ
 ,Hotel Room Occupancy,ಹೋಟೆಲ್ ರೂಮ್ ಆಕ್ಯುಪೆನ್ಸಿ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet ದಾಖಲಿಸಿದವರು:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},ಪಾವತಿಯ ಮಾದರಿಯು ಡೀಫಾಲ್ಟ್ ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಸೆಟ್ ದಯವಿಟ್ಟು {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},ಪಾವತಿಯ ಮಾದರಿಯು ಡೀಫಾಲ್ಟ್ ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಸೆಟ್ ದಯವಿಟ್ಟು {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,ದಾಖಲಾಗಿ
 DocType: GST Settings,GST Settings,ಜಿಎಸ್ಟಿ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},ಕರೆನ್ಸಿ ಬೆಲೆ ಪಟ್ಟಿಗೆ ಸಮಾನವಾಗಿರಬೇಕು: ಕರೆನ್ಸಿ: {0}
@@ -1090,7 +1090,7 @@
 DocType: Vehicle Log,Service Details,ಸೇವೆಯ ವಿವರಗಳು
 DocType: Lab Test Template,Grouped,ಗುಂಪು ಮಾಡಲಾಗಿದೆ
 DocType: Selling Settings,Delivery Note Required,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಅಗತ್ಯ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,ಸಂಬಳ ಸ್ಲಿಪ್ಸ್ ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,ಸಂಬಳ ಸ್ಲಿಪ್ಸ್ ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ ...
 DocType: Bank Guarantee,Bank Guarantee Number,ಬ್ಯಾಂಕ್ ಗ್ಯಾರಂಟಿ ಸಂಖ್ಯೆ
 DocType: Bank Guarantee,Bank Guarantee Number,ಬ್ಯಾಂಕ್ ಗ್ಯಾರಂಟಿ ಸಂಖ್ಯೆ
 DocType: Assessment Criteria,Assessment Criteria,ಅಸೆಸ್ಮೆಂಟ್ ಕ್ರೈಟೀರಿಯಾ
@@ -1116,13 +1116,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,ಪಾವತಿ ಎಂಟ್ರಿ ಈಗಾಗಲೇ ರಚಿಸಲಾಗಿದೆ
 DocType: Request for Quotation,Get Suppliers,ಪೂರೈಕೆದಾರರನ್ನು ಪಡೆಯಿರಿ
 DocType: Purchase Receipt Item Supplied,Current Stock,ಪ್ರಸ್ತುತ ಸ್ಟಾಕ್
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},ರೋ # {0}: ಆಸ್ತಿ {1} ಐಟಂ ಲಿಂಕ್ ಇಲ್ಲ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},ರೋ # {0}: ಆಸ್ತಿ {1} ಐಟಂ ಲಿಂಕ್ ಇಲ್ಲ {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,ಮುನ್ನೋಟ ಸಂಬಳ ಸ್ಲಿಪ್
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,ಖಾತೆ {0} ಅನೇಕ ಬಾರಿ ನಮೂದಿಸಲಾದ
 DocType: Account,Expenses Included In Valuation,ವೆಚ್ಚಗಳು ಮೌಲ್ಯಾಂಕನ ಸೇರಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,ನಿಮ್ಮ ಸದಸ್ಯತ್ವ 30 ದಿನಗಳಲ್ಲಿ ಅವಧಿ ಮೀರಿದರೆ ಮಾತ್ರ ನೀವು ನವೀಕರಿಸಬಹುದು
 DocType: Shopping Cart Settings,Show Stock Availability,ಸ್ಟಾಕ್ ಲಭ್ಯತೆ ತೋರಿಸಿ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},ಆಸ್ತಿ ವರ್ಗದ {1} ಅಥವಾ ಕಂಪನಿಯಲ್ಲಿ {0} ಹೊಂದಿಸಿ {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},ಆಸ್ತಿ ವರ್ಗದ {1} ಅಥವಾ ಕಂಪನಿಯಲ್ಲಿ {0} ಹೊಂದಿಸಿ {2}
 DocType: Location,Longitude,ರೇಖಾಂಶ
 ,Absent Student Report,ಆಬ್ಸೆಂಟ್ ವಿದ್ಯಾರ್ಥಿ ವರದಿ
 DocType: Crop,Crop Spacing UOM,ಕ್ರಾಪ್ ಸ್ಪೇಸಿಂಗ್ UOM
@@ -1195,7 +1195,7 @@
 DocType: Soil Texture,Sand,ಮರಳು
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,ಶಕ್ತಿ
 DocType: Opportunity,Opportunity From,ಅವಕಾಶದಿಂದ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ಸಾಲು {0}: {1} ಐಟಂಗೆ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆಗಳು ಅಗತ್ಯವಿದೆ {2}. ನೀವು {3} ಒದಗಿಸಿದ್ದೀರಿ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ಸಾಲು {0}: {1} ಐಟಂಗೆ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆಗಳು ಅಗತ್ಯವಿದೆ {2}. ನೀವು {3} ಒದಗಿಸಿದ್ದೀರಿ.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,ದಯವಿಟ್ಟು ಟೇಬಲ್ ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 DocType: BOM,Website Specifications,ವೆಬ್ಸೈಟ್ ವಿಶೇಷಣಗಳು
 DocType: Special Test Items,Particulars,ವಿವರಗಳು
@@ -1306,7 +1306,7 @@
 DocType: Item,Items with higher weightage will be shown higher,ಹೆಚ್ಚಿನ ಪ್ರಾಮುಖ್ಯತೆಯನ್ನು ಹೊಂದಿರುವ ಐಟಂಗಳು ಹೆಚ್ಚಿನ ತೋರಿಸಲಾಗುತ್ತದೆ
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,ಲ್ಯಾಬ್ ಪರೀಕ್ಷೆಗಳು ಮತ್ತು ಪ್ರಮುಖ ಚಿಹ್ನೆಗಳು
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ಬ್ಯಾಂಕ್ ಸಾಮರಸ್ಯ ವಿವರ
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,ರೋ # {0}: ಆಸ್ತಿ {1} ಸಲ್ಲಿಸಬೇಕು
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,ರೋ # {0}: ಆಸ್ತಿ {1} ಸಲ್ಲಿಸಬೇಕು
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ಯಾವುದೇ ನೌಕರ
 DocType: Item,If subcontracted to a vendor,ಮಾರಾಟಗಾರರ ಗೆ subcontracted ವೇಳೆ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಈಗಾಗಲೇ ನವೀಕರಿಸಲಾಗಿದೆ.
@@ -1361,7 +1361,6 @@
 DocType: Loyalty Program Collection,Tier Name,ಶ್ರೇಣಿ ಹೆಸರು
 DocType: HR Settings,Enter retirement age in years,ವರ್ಷಗಳಲ್ಲಿ ನಿವೃತ್ತಿ ವಯಸ್ಸು ನಮೂದಿಸಿ
 DocType: Crop,Target Warehouse,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ದಯವಿಟ್ಟು ಸೆಟಪ್&gt; ಸೆಟ್ಟಿಂಗ್ಗಳು&gt; ಹೆಸರಿಸುವ ಸರಣಿ ಮೂಲಕ {0} ಹೆಸರಿಸುವ ಸರಣಿಗಳನ್ನು ಹೊಂದಿಸಿ
 DocType: Payroll Employee Detail,Payroll Employee Detail,ವೇತನದಾರರ ನೌಕರರ ವಿವರ
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,ದಯವಿಟ್ಟು ಗೋದಾಮಿನ ಆಯ್ಕೆ
 DocType: Cheque Print Template,Starting location from left edge,ಎಡ ತುದಿಯಲ್ಲಿ ಸ್ಥಳ ಆರಂಭಗೊಂಡು
@@ -1451,7 +1450,7 @@
 DocType: Work Order,Plan material for sub-assemblies,ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಯೋಜನೆ ವಸ್ತು
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,ಮಾರಾಟದ ಪಾರ್ಟ್ನರ್ಸ್ ಮತ್ತು ಸಂಸ್ಥಾನದ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,ಬಿಒಎಮ್ {0} ಸಕ್ರಿಯ ಇರಬೇಕು
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,ವರ್ಗಾವಣೆಗೆ ಐಟಂಗಳು ಲಭ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,ವರ್ಗಾವಣೆಗೆ ಐಟಂಗಳು ಲಭ್ಯವಿಲ್ಲ
 DocType: Employee Boarding Activity,Activity Name,ಚಟುವಟಿಕೆ ಹೆಸರು
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,ಬಿಡುಗಡೆಯ ದಿನಾಂಕವನ್ನು ಬದಲಾಯಿಸಿ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +250,Closing (Opening + Total),ಮುಚ್ಚುವುದು (ಒಟ್ಟು + ತೆರೆಯುವಿಕೆ)
@@ -1676,6 +1675,7 @@
 DocType: Project,First Email,ಮೊದಲ ಇಮೇಲ್
 DocType: Company,Exception Budget Approver Role,ವಿನಾಯಿತಿ ಬಜೆಟ್ ಅನುಮೋದಕ ಪಾತ್ರ
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","ಒಮ್ಮೆ ಹೊಂದಿಸಿದಲ್ಲಿ, ಈ ಇನ್ವಾಯ್ಸ್ ಸೆಟ್ ದಿನಾಂಕ ತನಕ ಹಿಡಿದುಕೊಳ್ಳಿ"
+DocType: Cashier Closing,POS-CLO-,ಪಿಓಎಸ್- ಕ್ಲೋ-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,ಮಾರಾಟದ ಆರ್ಡರ್ / ಗೂಡ್ಸ್ ಮುಕ್ತಾಯಗೊಂಡ ವೇರ್ಹೌಸ್ ರಿಸರ್ವ್ಡ್ ಗೋದಾಮಿನ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,ಮಾರಾಟ ಪ್ರಮಾಣ
 DocType: Repayment Schedule,Interest Amount,ಬಡ್ಡಿ ಪ್ರಮಾಣ
@@ -1687,7 +1687,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,ದಾಖಲೆಗಳು
 DocType: Asset,Scrapped,ಕೈಬಿಟ್ಟಿತು
 DocType: Item,Item Defaults,ಐಟಂ ಡಿಫಾಲ್ಟ್
-DocType: Purchase Invoice,Returns,ರಿಟರ್ನ್ಸ್
+DocType: Cashier Closing,Returns,ರಿಟರ್ನ್ಸ್
 DocType: Job Card,WIP Warehouse,ವಿಪ್ ವೇರ್ಹೌಸ್
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವರೆಗೆ ನಿರ್ವಹಣೆ ಒಪ್ಪಂದ {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,ನೇಮಕಾತಿ
@@ -1701,7 +1701,6 @@
 DocType: Student,A-,ಎ
 DocType: Share Transfer,Transfer Type,ವರ್ಗಾವಣೆ ಪ್ರಕಾರ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,ಮಾರಾಟ ವೆಚ್ಚಗಳು
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕರ ಗುಂಪು&gt; ಪ್ರದೇಶ
 DocType: Diagnosis,Diagnosis,ರೋಗನಿರ್ಣಯ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ಬೈಯಿಂಗ್
 DocType: Attendance Request,Explanation,ವಿವರಣೆ
@@ -1714,7 +1713,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,ಖರೀದಿ ಆರ್ಡರ್ಸ್ ಐಟಂಗಳು ಮಿತಿಮೀರಿದ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,ZIP ಕೋಡ್
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಯನ್ನು {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},ಸಾಲದಲ್ಲಿ ಬಡ್ಡಿ ಆದಾಯದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},ಸಾಲದಲ್ಲಿ ಬಡ್ಡಿ ಆದಾಯದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ {0}
 DocType: Opportunity,Contact Info,ಸಂಪರ್ಕ ಮಾಹಿತಿ
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,ಸ್ಟಾಕ್ ನಮೂದುಗಳು ಮೇಕಿಂಗ್
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,ನೌಕರರು ಸ್ಥಿತಿಯನ್ನು ಎಡಕ್ಕೆ ಪ್ರಚಾರ ಮಾಡಲಾಗುವುದಿಲ್ಲ
@@ -1726,7 +1725,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,ಶೂನ್ಯ ಬಿಲ್ಲಿಂಗ್ ಗಂಟೆಗಾಗಿ ಸರಕುಪಟ್ಟಿ ಮಾಡಲಾಗುವುದಿಲ್ಲ
 DocType: Company,Date of Commencement,ಆರಂಭದ ದಿನಾಂಕ
 DocType: Sales Person,Select company name first.,ಮೊದಲ ಕಂಪನಿ ಹೆಸರು ಆಯ್ಕೆ ಮಾಡಿ.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},ಕಳುಹಿಸಲಾಗಿದೆ {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},ಕಳುಹಿಸಲಾಗಿದೆ {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ಉಲ್ಲೇಖಗಳು ವಿತರಕರಿಂದ ಪಡೆದ .
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOM ಅನ್ನು ಬದಲಾಯಿಸಿ ಮತ್ತು ಎಲ್ಲಾ BOM ಗಳಲ್ಲಿ ಇತ್ತೀಚಿನ ಬೆಲೆಯನ್ನು ನವೀಕರಿಸಿ
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},ಗೆ {0} | {1} {2}
@@ -1748,7 +1747,7 @@
 DocType: Asset Movement,From Employee,ಉದ್ಯೋಗಗಳು ಗೆ
 DocType: Driver,Cellphone Number,ಸೆಲ್ಫೋನ್ ಸಂಖ್ಯೆ
 DocType: Project,Monitor Progress,ಪ್ರೋಗ್ರೆಸ್ ಮೇಲ್ವಿಚಾರಣೆ
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ಎಚ್ಚರಿಕೆ: ಸಿಸ್ಟಮ್ {0} {1} ಶೂನ್ಯ ರಲ್ಲಿ ಐಟಂ ಪ್ರಮಾಣದ overbilling ರಿಂದ ಪರೀಕ್ಷಿಸುವುದಿಲ್ಲ
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ಎಚ್ಚರಿಕೆ: ಸಿಸ್ಟಮ್ {0} {1} ಶೂನ್ಯ ರಲ್ಲಿ ಐಟಂ ಪ್ರಮಾಣದ overbilling ರಿಂದ ಪರೀಕ್ಷಿಸುವುದಿಲ್ಲ
 DocType: Journal Entry,Make Difference Entry,ವ್ಯತ್ಯಾಸ ಎಂಟ್ರಿ ಮಾಡಿ
 DocType: Supplier Quotation,Auto Repeat Section,ಸ್ವಯಂ ಪುನರಾವರ್ತನೆ ವಿಭಾಗ
 DocType: Upload Attendance,Attendance From Date,ಅಟೆಂಡೆನ್ಸ್ Fromdate
@@ -1851,7 +1850,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,ರೋ # {0}: ಪ್ರಮಾಣ ಖರೀದಿ ರಿಟರ್ನ್ ಪ್ರವೇಶಿಸಿತು ಸಾಧ್ಯವಿಲ್ಲ ತಿರಸ್ಕರಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,ಆಯ್ಕೆಮಾಡಿದ ಗ್ರಾಹಕರಿಗೆ ಗ್ರಾಹಕ ಗುಂಪನ್ನು ಬದಲಾಯಿಸುವುದು ಅನುಮತಿಸುವುದಿಲ್ಲ.
 ,Purchase Order Items To Be Billed,ಪಾವತಿಸಬೇಕಾಗುತ್ತದೆ ಖರೀದಿ ಆದೇಶವನ್ನು ಐಟಂಗಳು
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,ಅಂದಾಜು ಆಗಮನದ ಸಮಯವನ್ನು ನವೀಕರಿಸಲಾಗುತ್ತಿದೆ.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,ಅಂದಾಜು ಆಗಮನದ ಸಮಯವನ್ನು ನವೀಕರಿಸಲಾಗುತ್ತಿದೆ.
 DocType: Program Enrollment Tool,Enrollment Details,ದಾಖಲಾತಿ ವಿವರಗಳು
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,ಕಂಪೆನಿಗಾಗಿ ಬಹು ಐಟಂ ಡೀಫಾಲ್ಟ್ಗಳನ್ನು ಹೊಂದಿಸಲಾಗುವುದಿಲ್ಲ.
 DocType: Purchase Invoice Item,Net Rate,ನೆಟ್ ದರ
@@ -1865,7 +1864,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,ಬಿಡಿ ಪ್ರಕಾರವು ಹುಚ್ಚಾಟವಾಗಿದೆ
 DocType: Support Settings,Close Issue After Days,ದಿನಗಳ ಸಂಚಿಕೆ ಮುಚ್ಚಿ
 ,Eway Bill,ಎವೇ ಬಿಲ್
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,ಬಳಕೆದಾರರನ್ನು ಮಾರುಕಟ್ಟೆ ಸ್ಥಳಕ್ಕೆ ಸೇರಿಸಲು ಸಿಸ್ಟಮ್ ಮ್ಯಾನೇಜರ್ ಮತ್ತು ಐಟಂ ಮ್ಯಾನೇಜರ್ ರೋಲ್ಗಳೊಂದಿಗೆ ನೀವು ಬಳಕೆದಾರರಾಗಿರಬೇಕು.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,ಬಳಕೆದಾರರನ್ನು ಮಾರುಕಟ್ಟೆ ಸ್ಥಳಕ್ಕೆ ಸೇರಿಸಲು ಸಿಸ್ಟಮ್ ಮ್ಯಾನೇಜರ್ ಮತ್ತು ಐಟಂ ಮ್ಯಾನೇಜರ್ ರೋಲ್ಗಳೊಂದಿಗೆ ನೀವು ಬಳಕೆದಾರರಾಗಿರಬೇಕು.
 DocType: Leave Control Panel,Leave blank if considered for all branches,ಎಲ್ಲಾ ಶಾಖೆಗಳನ್ನು ಪರಿಗಣಿಸಲ್ಪಡುವ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
 DocType: Job Opening,Staffing Plan,ಸಿಬ್ಬಂದಿ ಯೋಜನೆ
 DocType: Bank Guarantee,Validity in Days,ಡೇಸ್ ವಾಯಿದೆ
@@ -1887,7 +1886,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},ನಕಲು ಸಾಲು {0} {1} ಒಂದೇ ಜೊತೆ
 DocType: Marketplace Settings,Disable Marketplace,ಮಾರುಕಟ್ಟೆ ಸ್ಥಳವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
 ,Trial Balance,ಟ್ರಯಲ್ ಬ್ಯಾಲೆನ್ಸ್
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,ಹಣಕಾಸಿನ ವರ್ಷ {0} ಕಂಡುಬಂದಿಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,ಹಣಕಾಸಿನ ವರ್ಷ {0} ಕಂಡುಬಂದಿಲ್ಲ
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,ನೌಕರರು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
 DocType: Hotel Room Reservation,Hotel Reservation User,ಹೋಟೆಲ್ ಮೀಸಲಾತಿ ಬಳಕೆದಾರ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,ಮೊದಲ ಪೂರ್ವಪ್ರತ್ಯಯ ಆಯ್ಕೆ ಮಾಡಿ
@@ -1995,7 +1994,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,ಲಾಗಿನ್ ಮಾಡಲು ವಿಫಲವಾಗಿದೆ
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,ಆಸ್ತಿ {0} ರಚಿಸಲಾಗಿದೆ
 DocType: Special Test Items,Special Test Items,ವಿಶೇಷ ಪರೀಕ್ಷಾ ಐಟಂಗಳು
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Marketplace ನಲ್ಲಿ ನೋಂದಾಯಿಸಲು ನೀವು ಸಿಸ್ಟಮ್ ಮ್ಯಾನೇಜರ್ ಮತ್ತು ಐಟಂ ಮ್ಯಾನೇಜರ್ ರೋಲ್ಗಳೊಂದಿಗೆ ಬಳಕೆದಾರರಾಗಿರಬೇಕಾಗುತ್ತದೆ.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Marketplace ನಲ್ಲಿ ನೋಂದಾಯಿಸಲು ನೀವು ಸಿಸ್ಟಮ್ ಮ್ಯಾನೇಜರ್ ಮತ್ತು ಐಟಂ ಮ್ಯಾನೇಜರ್ ರೋಲ್ಗಳೊಂದಿಗೆ ಬಳಕೆದಾರರಾಗಿರಬೇಕಾಗುತ್ತದೆ.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,ಪಾವತಿಯ ಮಾದರಿಯು
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,ನಿಯೋಜಿಸಲಾದ ಸಂಬಳ ರಚನೆಯ ಪ್ರಕಾರ ನೀವು ಪ್ರಯೋಜನಕ್ಕಾಗಿ ಅರ್ಜಿ ಸಲ್ಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,ವೆಬ್ಸೈಟ್ ಚಿತ್ರ ಸಾರ್ವಜನಿಕ ಕಡತ ಅಥವಾ ವೆಬ್ಸೈಟ್ URL ಇರಬೇಕು
@@ -2007,7 +2006,7 @@
 DocType: Warehouse,Warehouse Contact Info,ವೇರ್ಹೌಸ್ ಸಂಪರ್ಕ ಮಾಹಿತಿ
 DocType: Payment Entry,Write Off Difference Amount,ವ್ಯತ್ಯಾಸ ಪ್ರಮಾಣ ಆಫ್ ಬರೆಯಿರಿ
 DocType: Volunteer,Volunteer Name,ಸ್ವಯಂಸೇವಕ ಹೆಸರು
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},ಇತರ ಸಾಲುಗಳಲ್ಲಿ ನಕಲಿ ದಿನಾಂಕಗಳುಳ್ಳ ಸಾಲುಗಳು ಕಂಡುಬಂದಿವೆ: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},ಇತರ ಸಾಲುಗಳಲ್ಲಿ ನಕಲಿ ದಿನಾಂಕಗಳುಳ್ಳ ಸಾಲುಗಳು ಕಂಡುಬಂದಿವೆ: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: ನೌಕರರ ಇಮೇಲ್ ಕಂಡುಬಂದಿಲ್ಲ, ಆದ್ದರಿಂದ ಕಳುಹಿಸಲಾಗಿಲ್ಲ ಇಮೇಲ್"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},ಶಿಪ್ಪಿಂಗ್ ನಿಯಮವು ದೇಶಕ್ಕೆ ಅನ್ವಯಿಸುವುದಿಲ್ಲ {0}
 DocType: Item,Foreign Trade Details,ವಿದೇಶಿ ವ್ಯಾಪಾರ ವಿವರಗಳು
@@ -2097,6 +2096,7 @@
 DocType: Salary Component,Earning,ಗಳಿಕೆ
 DocType: Supplier Scorecard,Scoring Criteria,ಸ್ಕೋರಿಂಗ್ ಮಾನದಂಡ
 DocType: Purchase Invoice,Party Account Currency,ಪಕ್ಷದ ಖಾತೆ ಕರೆನ್ಸಿ
+DocType: Delivery Trip,Total Estimated Distance,ಒಟ್ಟು ಅಂದಾಜು ದೂರ
 ,BOM Browser,BOM ಬ್ರೌಸರ್
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,ದಯವಿಟ್ಟು ಈ ತರಬೇತಿ ಕಾರ್ಯಕ್ರಮಕ್ಕಾಗಿ ನಿಮ್ಮ ಸ್ಥಿತಿಯನ್ನು ನವೀಕರಿಸಿ
 DocType: Item Barcode,EAN,EAN
@@ -2135,7 +2135,7 @@
 DocType: Activity Cost,Projects,ಯೋಜನೆಗಳು
 DocType: Payment Request,Transaction Currency,ವ್ಯವಹಾರ ಕರೆನ್ಸಿ
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},ಗೆ {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,ಕೆಲವು ಇಮೇಲ್ಗಳು ಅಮಾನ್ಯವಾಗಿವೆ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,ಕೆಲವು ಇಮೇಲ್ಗಳು ಅಮಾನ್ಯವಾಗಿವೆ
 DocType: Work Order Operation,Operation Description,OperationDescription
 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.,ಹಣಕಾಸಿನ ವರ್ಷ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಹಣಕಾಸಿನ ವರ್ಷ ಉಳಿಸಲಾಗಿದೆ ಒಮ್ಮೆ ಹಣಕಾಸಿನ ವರ್ಷದ ಅಂತ್ಯ ದಿನಾಂಕ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Quotation,Shopping Cart,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್
@@ -2159,7 +2159,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,ಸ್ಥಿರ ಸಂಪತ್ತಾದ ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,ರೆಕ್ಡ್ ಕ್ವಿಟಿ
 DocType: Leave Control Panel,Leave blank if considered for all designations,ಎಲ್ಲಾ ಅಂಕಿತಗಳು ಪರಿಗಣಿಸಲ್ಪಡುವ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ಮಾದರಿ ಸಾಲು {0} ನಲ್ಲಿ 'ವಾಸ್ತವಿಕ' ಉಸ್ತುವಾರಿ ಐಟಂ ದರದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ಮಾದರಿ ಸಾಲು {0} ನಲ್ಲಿ 'ವಾಸ್ತವಿಕ' ಉಸ್ತುವಾರಿ ಐಟಂ ದರದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},ಮ್ಯಾಕ್ಸ್: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Datetime ಗೆ
 DocType: Shopify Settings,For Company,ಕಂಪನಿ
@@ -2173,7 +2173,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,ಕೋರ್ಸ್ ವೇಳಾಪಟ್ಟಿಯನ್ನು ರಚಿಸುವಲ್ಲಿ ದೋಷಗಳಿವೆ
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,ಪಟ್ಟಿಯಲ್ಲಿರುವ ಮೊದಲ ಖರ್ಚು ಅಪ್ರೋವರ್ ಅನ್ನು ಡೀಫಾಲ್ಟ್ ಖರ್ಚು ಅಪ್ರೋವರ್ ಎಂದು ಹೊಂದಿಸಲಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,ಮಾರ್ಕೆಟ್ಪ್ಲೇಸ್ನಲ್ಲಿ ನೋಂದಾಯಿಸಲು ನೀವು ಸಿಸ್ಟಮ್ ಮ್ಯಾನೇಜರ್ ಮತ್ತು ಐಟಂ ಮ್ಯಾನೇಜರ್ ರೋಲ್ಗಳೊಂದಿಗೆ ನಿರ್ವಾಹಕರನ್ನು ಹೊರತುಪಡಿಸಿ ಬಳಕೆದಾರರಾಗಿರಬೇಕಾಗುತ್ತದೆ.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,ಮಾರ್ಕೆಟ್ಪ್ಲೇಸ್ನಲ್ಲಿ ನೋಂದಾಯಿಸಲು ನೀವು ಸಿಸ್ಟಮ್ ಮ್ಯಾನೇಜರ್ ಮತ್ತು ಐಟಂ ಮ್ಯಾನೇಜರ್ ರೋಲ್ಗಳೊಂದಿಗೆ ನಿರ್ವಾಹಕರನ್ನು ಹೊರತುಪಡಿಸಿ ಬಳಕೆದಾರರಾಗಿರಬೇಕಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC - YYYY.-
 DocType: Maintenance Visit,Unscheduled,ಅನಿಗದಿತ
@@ -2202,7 +2202,7 @@
 DocType: HR Settings,Employee Settings,ನೌಕರರ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,ಪಾವತಿ ವ್ಯವಸ್ಥೆಯನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ
 ,Batch-Wise Balance History,ಬ್ಯಾಚ್ ವೈಸ್ ಬ್ಯಾಲೆನ್ಸ್ ಇತಿಹಾಸ
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,ಸಾಲು # {0}: ಐಟಂ {1} ಗೆ ಬಿಲ್ ಮಾಡಿದ ಮೊತ್ತಕ್ಕಿಂತ ಹೆಚ್ಚಿನ ಮೊತ್ತವನ್ನು ಹೊಂದಿಸಿದರೆ ದರವನ್ನು ಹೊಂದಿಸಲಾಗುವುದಿಲ್ಲ.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,ಸಾಲು # {0}: ಐಟಂ {1} ಗೆ ಬಿಲ್ ಮಾಡಿದ ಮೊತ್ತಕ್ಕಿಂತ ಹೆಚ್ಚಿನ ಮೊತ್ತವನ್ನು ಹೊಂದಿಸಿದರೆ ದರವನ್ನು ಹೊಂದಿಸಲಾಗುವುದಿಲ್ಲ.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,ಮುದ್ರಣ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಆಯಾ ಮುದ್ರಣ ರೂಪದಲ್ಲಿ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 DocType: Package Code,Package Code,ಪ್ಯಾಕೇಜ್ ಕೋಡ್
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,ಹೊಸಗಸುಬಿ
@@ -2435,7 +2435,7 @@
 DocType: Delivery Trip,Optimize Route,ಮಾರ್ಗವನ್ನು ಆಪ್ಟಿಮೈಜ್ ಮಾಡಿ
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ಮುಂಚಿತವಾಗಿ ಎಕ್ಸ್ ದಿನಗಳ ಕಾರ್ಯಾಚರಣೆ ಯೋಜನೆ ಪ್ರಯತ್ನಿಸಿ.
 DocType: HR Settings,Stop Birthday Reminders,ನಿಲ್ಲಿಸಿ ಜನ್ಮದಿನ ಜ್ಞಾಪನೆಗಳು
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},ಕಂಪನಿ ರಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ವೇತನದಾರರ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ ಸೆಟ್ ಮಾಡಿ {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},ಕಂಪನಿ ರಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ವೇತನದಾರರ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ ಸೆಟ್ ಮಾಡಿ {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,ಅಮೆಜಾನ್ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಡೇಟಾದ ಆರ್ಥಿಕ ವಿಘಟನೆಯನ್ನು ಪಡೆಯಿರಿ
 DocType: SMS Center,Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,ಹುಡುಕಾಟ ಐಟಂ
@@ -2505,7 +2505,7 @@
 DocType: Vital Signs,Constipated,ಕಾಲಿಪೇಟೆಡ್
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},ಸರಬರಾಜುದಾರ ವಿರುದ್ಧ ಸರಕುಪಟ್ಟಿ {0} ರ {1}
 DocType: Customer,Default Price List,ಡೀಫಾಲ್ಟ್ ಬೆಲೆ ಪಟ್ಟಿ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,ಆಸ್ತಿ ಚಳವಳಿ ದಾಖಲೆ {0} ದಾಖಲಿಸಿದವರು
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,ಆಸ್ತಿ ಚಳವಳಿ ದಾಖಲೆ {0} ದಾಖಲಿಸಿದವರು
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,ಯಾವುದೇ ಐಟಂಗಳು ಕಂಡುಬಂದಿಲ್ಲ.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,ನೀವು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಹಣಕಾಸಿನ ವರ್ಷದ {0}. ಹಣಕಾಸಿನ ವರ್ಷ {0} ಜಾಗತಿಕ ಸೆಟ್ಟಿಂಗ್ಗಳು ಡೀಫಾಲ್ಟ್ ಆಗಿ ಹೊಂದಿಸಲಾಗಿದೆ
 DocType: Share Transfer,Equity/Liability Account,ಇಕ್ವಿಟಿ / ಹೊಣೆಗಾರಿಕೆ ಖಾತೆ
@@ -2645,6 +2645,7 @@
 DocType: Blanket Order,Order Type,ಆರ್ಡರ್ ಪ್ರಕಾರ
 ,Item-wise Sales Register,ಐಟಂ ಬಲ್ಲ ಮಾರಾಟದ ರಿಜಿಸ್ಟರ್
 DocType: Asset,Gross Purchase Amount,ಒಟ್ಟು ಖರೀದಿಯ ಮೊತ್ತ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗ್ರೂಪ್&gt; ಬ್ರ್ಯಾಂಡ್
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,ಬ್ಯಾಲೆನ್ಸ್ ತೆರೆಯುವುದು
 DocType: Asset,Depreciation Method,ಸವಕಳಿ ವಿಧಾನ
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,ಈ ಮೂಲ ದರದ ತೆರಿಗೆ ಒಳಗೊಂಡಿದೆ?
@@ -2728,7 +2729,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,ವಾರ್ಷಿಕ ಬಜೆಟ್ ಪಿಒಗೆ ಮೀರಿದರೆ ಆಕ್ಷನ್
 DocType: Student Leave Application,Student Leave Application,ವಿದ್ಯಾರ್ಥಿ ಬಿಡಿ ಅಪ್ಲಿಕೇಶನ್
 DocType: Item,Will also apply for variants,ಸಹ ರೂಪಾಂತರಗಳು ಅನ್ವಯವಾಗುವುದು
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}",ಇದು ಈಗಾಗಲೇ ಆಸ್ತಿ ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}",ಇದು ಈಗಾಗಲೇ ಆಸ್ತಿ ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},ನೌಕರರ {0} ಮೇಲೆ ಅರ್ಧ ದಿನ {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},ಒಟ್ಟು ಕೆಲಸದ ಗರಿಷ್ಠ ಕೆಲಸದ ಹೆಚ್ಚು ಮಾಡಬಾರದು {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ಮೇಲೆ
@@ -2752,6 +2753,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,ಡೇಟಾವನ್ನು ಪಡೆದುಕೊಳ್ಳಿ
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},ರಜೆ ವಿಧದಲ್ಲಿ ಅನುಮತಿಸಲಾದ ಗರಿಷ್ಠ ರಜೆ {0} {1} ಆಗಿದೆ
 DocType: SMS Center,Create Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ ರಚಿಸಿ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,ಲಭ್ಯವಿರುವ ದಿನಾಂಕದಂದು ಖರೀದಿ ದಿನಾಂಕದ ನಂತರ ಇರಬೇಕು
 DocType: Vehicle,Wheels,ವೀಲ್ಸ್
 DocType: Packing Slip,To Package No.,ನಂ ಕಟ್ಟಿನ
 DocType: Patient Relation,Family,ಕುಟುಂಬ
@@ -2765,7 +2767,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,ಬಿಲ್ಲಿಂಗ್ ಕರೆನ್ಸಿ ಡೀಫಾಲ್ಟ್ ಕಂಪನಿಯ ಕರೆನ್ಸಿಯ ಅಥವಾ ಪಾರ್ಟಿ ಖಾತೆ ಕರೆನ್ಸಿಗೆ ಸಮನಾಗಿರಬೇಕು
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),ಪ್ಯಾಕೇಜ್ ಈ ವಿತರಣಾ ಒಂದು ಭಾಗ ಎಂದು ಸೂಚಿಸುತ್ತದೆ (ಮಾತ್ರ Draft)
 DocType: Soil Texture,Loam,ಲೊಮ್
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,ಸಾಲು {0}: ದಿನಾಂಕವನ್ನು ಪೋಸ್ಟ್ ಮಾಡುವ ಮೊದಲು ದಿನಾಂಕ ಕಾರಣವಾಗಿರಬಾರದು
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,ಸಾಲು {0}: ದಿನಾಂಕವನ್ನು ಪೋಸ್ಟ್ ಮಾಡುವ ಮೊದಲು ದಿನಾಂಕ ಕಾರಣವಾಗಿರಬಾರದು
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,ಪಾವತಿ ಎಂಟ್ರಿ ಮಾಡಿ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},ಪ್ರಮಾಣ ಐಟಂ {0} ಕಡಿಮೆ ಇರಬೇಕು {1}
 ,Sales Invoice Trends,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಟ್ರೆಂಡ್ಸ್
@@ -2838,7 +2840,7 @@
 DocType: Guardian,Guardian Interests,ಗಾರ್ಡಿಯನ್ ಆಸಕ್ತಿಗಳು
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,ಖಾತೆ ಹೆಸರು / ಸಂಖ್ಯೆ ನವೀಕರಿಸಿ
 DocType: Naming Series,Current Value,ಪ್ರಸ್ತುತ ಮೌಲ್ಯ
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ಬಹು ಹಣಕಾಸಿನ ವರ್ಷಗಳ ದಿನಾಂಕ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ. ದಯವಿಟ್ಟು ವರ್ಷದಲ್ಲಿ ಕಂಪನಿ ಸೆಟ್
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ಬಹು ಹಣಕಾಸಿನ ವರ್ಷಗಳ ದಿನಾಂಕ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ. ದಯವಿಟ್ಟು ವರ್ಷದಲ್ಲಿ ಕಂಪನಿ ಸೆಟ್
 DocType: Education Settings,Instructor Records to be created by,ಇನ್ಸ್ಟ್ರಕ್ಟರ್ ರೆಕಾರ್ಡ್ಸ್ ರಚಿಸಬೇಕಾಗಿದೆ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} ದಾಖಲಿಸಿದವರು
 DocType: GST Account,GST Account,ಜಿಎಸ್ಟಿ ಖಾತೆ
@@ -2856,7 +2858,7 @@
 DocType: Sales Person,Name and Employee ID,ಹೆಸರು ಮತ್ತು ಉದ್ಯೋಗಿಗಳ ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,ಕಾರಣ ದಿನಾಂಕ ದಿನಾಂಕ ಪೋಸ್ಟ್ ಮುನ್ನ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Website Item Group,Website Item Group,ಐಟಂ ಗ್ರೂಪ್ ವೆಬ್ಸೈಟ್
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ಈಗಾಗಲೇ ಆಯ್ಕೆ ಮಾಡಿದ ಮಾನದಂಡಗಳಿಗೆ ಅಥವಾ ಸಂಬಳದ ಸ್ಲಿಪ್ಗೆ ಸಲ್ಲಿಸಲು ಯಾವುದೇ ವೇತನ ಸ್ಲಿಪ್ ಕಂಡುಬಂದಿಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ಈಗಾಗಲೇ ಆಯ್ಕೆ ಮಾಡಿದ ಮಾನದಂಡಗಳಿಗೆ ಅಥವಾ ಸಂಬಳದ ಸ್ಲಿಪ್ಗೆ ಸಲ್ಲಿಸಲು ಯಾವುದೇ ವೇತನ ಸ್ಲಿಪ್ ಕಂಡುಬಂದಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,ಕರ್ತವ್ಯಗಳು ಮತ್ತು ತೆರಿಗೆಗಳು
 DocType: Projects Settings,Projects Settings,ಯೋಜನೆಗಳ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿ
@@ -2865,7 +2867,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,ಸರಬರಾಜು ಪ್ರಮಾಣ
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,ಹೆಚ್ಎಲ್ಸಿ-ಸಿಪಿಆರ್ - .YYYY.-
 DocType: Purchase Order Item,Material Request Item,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಐಟಂ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,ಖರೀದಿಯ ರಸೀದಿ {0} ಅನ್ನು ಮೊದಲು ರದ್ದುಮಾಡಿ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,ಖರೀದಿಯ ರಸೀದಿ {0} ಅನ್ನು ಮೊದಲು ರದ್ದುಮಾಡಿ
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,ಐಟಂ ಗುಂಪುಗಳು ಟ್ರೀ .
 DocType: Production Plan,Total Produced Qty,ಒಟ್ಟು ಉತ್ಪಾದಿತ ಕ್ಯೂಟಿ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,ಈ ಬ್ಯಾಚ್ ಮಾದರಿ ಸಾಲು ಸಂಖ್ಯೆ ಹೆಚ್ಚಿನ ಅಥವಾ ಪ್ರಸ್ತುತ ಸಾಲಿನ ಸಂಖ್ಯೆ ಸಮಾನವಾಗಿರುತ್ತದೆ ಸೂಚಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
@@ -2976,6 +2978,7 @@
 ,Vehicle Expenses,ವಾಹನ ವೆಚ್ಚಗಳು
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಮೇಲೆ ಲ್ಯಾಬ್ ಟೆಸ್ಟ್ (ಗಳನ್ನು) ರಚಿಸಿ ಸಲ್ಲಿಸಿ
 DocType: Serial No,Invoice Details,ಇನ್ವಾಯ್ಸ್ ವಿವರಗಳು
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,ಮಾರ್ಗಸೂಚಿಗಳನ್ನು ಅಂದಾಜು ಮಾಡಲು ಮತ್ತು ಉತ್ತಮಗೊಳಿಸಲು Google ನಕ್ಷೆಗಳ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ
 DocType: Grant Application,Show on Website,ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ತೋರಿಸಿ
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,ಪ್ರಾರಂಭಿಸಿ
 DocType: Hub Tracked Item,Hub Category,ಹಬ್ ವರ್ಗ
@@ -3014,7 +3017,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1797,Get Items from Prescriptions,ಪ್ರಿಸ್ಕ್ರಿಪ್ಷನ್ಗಳಿಂದ ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
 DocType: Patient,Patient Details,ರೋಗಿಯ ವಿವರಗಳು
 DocType: Inpatient Record,B Positive,ಬಿ ಧನಾತ್ಮಕ
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ರೋ # {0}: ಪ್ರಮಾಣ 1, ಐಟಂ ಸ್ಥಿರ ಆಸ್ತಿ ಇರಬೇಕು. ದಯವಿಟ್ಟು ಬಹು ಪ್ರಮಾಣ ಪ್ರತ್ಯೇಕ ಸಾಲು ಬಳಸಿ."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ರೋ # {0}: ಪ್ರಮಾಣ 1, ಐಟಂ ಸ್ಥಿರ ಆಸ್ತಿ ಇರಬೇಕು. ದಯವಿಟ್ಟು ಬಹು ಪ್ರಮಾಣ ಪ್ರತ್ಯೇಕ ಸಾಲು ಬಳಸಿ."
 DocType: Leave Block List Allow,Leave Block List Allow,ಬ್ಲಾಕ್ ಲಿಸ್ಟ್ ಅನುಮತಿಸಿ ಬಿಡಿ
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr ಖಾಲಿ ಅಥವಾ ಜಾಗವನ್ನು ಇರುವಂತಿಲ್ಲ
 DocType: Patient Medical Record,Patient Medical Record,ರೋಗಿಯ ವೈದ್ಯಕೀಯ ದಾಖಲೆ
@@ -3049,7 +3052,7 @@
 DocType: Workstation,Wages per hour,ಗಂಟೆಗೆ ವೇತನ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},ಬ್ಯಾಚ್ ಸ್ಟಾಕ್ ಸಮತೋಲನ {0} ಪರಿಣಮಿಸುತ್ತದೆ ಋಣಾತ್ಮಕ {1} ಕೋಠಿಯಲ್ಲಿ ಐಟಂ {2} ಫಾರ್ {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ಕೆಳಗಿನ ಐಟಂ ಮರು ಆದೇಶ ಮಟ್ಟವನ್ನು ಆಧರಿಸಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಎದ್ದಿವೆ
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},ಖಾತೆ {0} ಅಮಾನ್ಯವಾಗಿದೆ. ಖಾತೆ ಕರೆನ್ಸಿ ಇರಬೇಕು {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},ಖಾತೆ {0} ಅಮಾನ್ಯವಾಗಿದೆ. ಖಾತೆ ಕರೆನ್ಸಿ ಇರಬೇಕು {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},ದಿನಾಂಕದಿಂದ {0} ಉದ್ಯೋಗಿಗಳ ನಿವಾರಣೆ ದಿನಾಂಕದ ನಂತರ ಇರುವಂತಿಲ್ಲ {1}
 DocType: Supplier,Is Internal Supplier,ಆಂತರಿಕ ಪೂರೈಕೆದಾರರು
 DocType: Employee,Create User Permission,ಬಳಕೆದಾರರ ಅನುಮತಿಯನ್ನು ರಚಿಸಿ
@@ -3194,7 +3197,7 @@
 DocType: Account,Fixed Asset,ಸ್ಥಿರಾಸ್ತಿ
 DocType: Amazon MWS Settings,After Date,ದಿನಾಂಕದ ನಂತರ
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,ಧಾರಾವಾಹಿಯಾಗಿ ಇನ್ವೆಂಟರಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,ಇಂಟರ್ ಕಂಪೆನಿ ಸರಕುಪಟ್ಟಿಗಾಗಿ ಅಮಾನ್ಯ {0}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,ಇಂಟರ್ ಕಂಪೆನಿ ಸರಕುಪಟ್ಟಿಗಾಗಿ ಅಮಾನ್ಯ {0}.
 ,Department Analytics,ಇಲಾಖೆ ವಿಶ್ಲೇಷಣೆ
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,ಡೀಫಾಲ್ಟ್ ಸಂಪರ್ಕದಲ್ಲಿ ಇಮೇಲ್ ಕಂಡುಬಂದಿಲ್ಲ
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,ಸೀಕ್ರೆಟ್ ರಚಿಸಿ
@@ -3207,7 +3210,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,ಶುಲ್ಕ ರಚನೆ ಮತ್ತು ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು {0} ನಲ್ಲಿನ ಕಾರ್ಯಕ್ರಮವು ವಿಭಿನ್ನವಾಗಿದೆ.
 DocType: Bank Statement Transaction Entry,Receivable Account,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,ದಿನಾಂಕದಿಂದ ಮಾನ್ಯವಾಗಿರಬೇಕು ದಿನಾಂಕ ವರೆಗೆ ಮಾನ್ಯವಾಗಿರಬೇಕು.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},ರೋ # {0}: ಆಸ್ತಿ {1} ಈಗಾಗಲೇ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},ರೋ # {0}: ಆಸ್ತಿ {1} ಈಗಾಗಲೇ {2}
 DocType: Quotation Item,Stock Balance,ಸ್ಟಾಕ್ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,ಪಾವತಿ ಮಾರಾಟ ಆರ್ಡರ್
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,ಸಿಇಒ
@@ -3249,6 +3252,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,ಡೆಬಿಟ್ ಅಗತ್ಯವಿದೆ
 DocType: Clinical Procedure,Inpatient Record,ಒಳರೋಗಿ ರೆಕಾರ್ಡ್
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ನಿಮ್ಮ ತಂಡದ ಮಾಡಲಾಗುತ್ತದೆ ಚಟುವಟಿಕೆಗಳನ್ನು ಫಾರ್ ಸಮಯ, ವೆಚ್ಚ ಮತ್ತು ಬಿಲ್ಲಿಂಗ್ ಟ್ರ್ಯಾಕ್ ಸಹಾಯ"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಪೂರೈಕೆದಾರ ಕೌಟುಂಬಿಕತೆ
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,ಖರೀದಿ ಬೆಲೆ ಪಟ್ಟಿ
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,ಟ್ರಾನ್ಸಾಕ್ಷನ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,ಪೂರೈಕೆದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಅಸ್ಥಿರಗಳ ಟೆಂಪ್ಲೇಟ್ಗಳು.
@@ -3292,7 +3296,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,ವಿನಿಮಯ ಗಳಿಕೆ / ನಷ್ಟ
 DocType: Opportunity,Lost Reason,ಲಾಸ್ಟ್ ಕಾರಣ
 DocType: Amazon MWS Settings,Enable Amazon,ಅಮೆಜಾನ್ ಸಕ್ರಿಯಗೊಳಿಸಿ
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},ಸಾಲು # {0}: ಖಾತೆ {1} ಕಂಪನಿಗೆ ಸೇರಿಲ್ಲ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},ಸಾಲು # {0}: ಖಾತೆ {1} ಕಂಪನಿಗೆ ಸೇರಿಲ್ಲ {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},ಡಾಕ್ಟೈಪ್ ಅನ್ನು ಹುಡುಕಲಾಗಲಿಲ್ಲ {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,ಹೊಸ ವಿಳಾಸ
 DocType: Quality Inspection,Sample Size,ಸ್ಯಾಂಪಲ್ ಸೈಜ್
@@ -3404,7 +3408,7 @@
 DocType: Water Analysis,Origin,ಮೂಲ
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ಈ ಡಾಕ್ಯುಮೆಂಟ್ ಮೂಲಕ ಮಿತಿಗಿಂತ {0} {1} ಐಟಂ {4}. ನೀವು ಮಾಡುತ್ತಿದ್ದಾರೆ ಇನ್ನೊಂದು ಅದೇ ವಿರುದ್ಧ {3} {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,ಉಳಿಸುವ ನಂತರ ಮರುಕಳಿಸುವ ಸೆಟ್ ಮಾಡಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,ಬದಲಾವಣೆ ಆಯ್ಕೆ ಪ್ರಮಾಣದ ಖಾತೆಯನ್ನು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,ಬದಲಾವಣೆ ಆಯ್ಕೆ ಪ್ರಮಾಣದ ಖಾತೆಯನ್ನು
 DocType: Purchase Invoice,Price List Currency,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ
 DocType: Naming Series,User must always select,ಬಳಕೆದಾರ ಯಾವಾಗಲೂ ಆಯ್ಕೆ ಮಾಡಬೇಕು
 DocType: Stock Settings,Allow Negative Stock,ನಕಾರಾತ್ಮಕ ಸ್ಟಾಕ್ ಅನುಮತಿಸಿ
@@ -3446,7 +3450,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,ಈ ಅಪಾಯಿಂಟ್ಮೆಂಟ್ ರದ್ದುಗೊಳಿಸಲು ನೀವು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,ಹೋಟೆಲ್ ಕೊಠಡಿ ಬೆಲೆ ಪ್ಯಾಕೇಜ್
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,ಮಾರಾಟದ ಪೈಪ್ಲೈನ್
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},ದಯವಿಟ್ಟು ಸಂಬಳ ಕಾಂಪೊನೆಂಟ್ ರಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಖಾತೆಯನ್ನು ಸೆಟ್ {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},ದಯವಿಟ್ಟು ಸಂಬಳ ಕಾಂಪೊನೆಂಟ್ ರಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಖಾತೆಯನ್ನು ಸೆಟ್ {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ಅಗತ್ಯವಿದೆ ರಂದು
 DocType: Rename Tool,File to Rename,ಮರುಹೆಸರಿಸಲು ಫೈಲ್
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},ರೋನಲ್ಲಿ ಐಟಂ ಬಿಒಎಮ್ ಆಯ್ಕೆಮಾಡಿ {0}
@@ -3467,7 +3471,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ಖರೀದಿಸಿದ ವಸ್ತುಗಳ ವೆಚ್ಚ
 DocType: Employee Separation,Employee Separation Template,ಉದ್ಯೋಗಿ ಪ್ರತ್ಯೇಕಿಸುವಿಕೆ ಟೆಂಪ್ಲೇಟು
 DocType: Selling Settings,Sales Order Required,ಮಾರಾಟದ ಆದೇಶ ಅಗತ್ಯವಿರುವ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,ಮಾರಾಟಗಾರರಾಗಿ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,ಮಾರಾಟಗಾರರಾಗಿ
 DocType: Purchase Invoice,Credit To,ಕ್ರೆಡಿಟ್
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,ಸಕ್ರಿಯ ಕಾರಣವಾಗುತ್ತದೆ / ಗ್ರಾಹಕರು
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,ಪ್ರಮಾಣಿತ ಡೆಲಿವರಿ ನೋಟ್ಫಾರ್ಮ್ ಅನ್ನು ಬಳಸಲು ಖಾಲಿ ಬಿಡಿ
@@ -3509,7 +3513,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟ್ ಮಾಡಿ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ಬಳಕೆದಾರ ವೇದಿಕೆ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,ಸಾಲು # {0} (ಪಾವತಿ ಪಟ್ಟಿ): ಮೊತ್ತ ಋಣಾತ್ಮಕವಾಗಿರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,ಸಾಲು # {0} (ಪಾವತಿ ಪಟ್ಟಿ): ಮೊತ್ತ ಋಣಾತ್ಮಕವಾಗಿರಬೇಕು
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","ಸ್ಟಾಕ್ ನವೀಕರಣಗೊಳ್ಳುವುದಿಲ್ಲ, ಸರಕುಪಟ್ಟಿ ಡ್ರಾಪ್ ಹಡಗು ಐಟಂ ಹೊಂದಿದೆ."
 DocType: Contract,Fulfilment Status,ಪೂರೈಸುವ ಸ್ಥಿತಿ
 DocType: Lab Test Sample,Lab Test Sample,ಲ್ಯಾಬ್ ಟೆಸ್ಟ್ ಮಾದರಿ
@@ -3669,7 +3673,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,ಡಾಕ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},ಶುಲ್ಕ ರೆಕಾರ್ಡ್ಸ್ ರಚಿಸಲಾಗಿದೆ - {0}
 DocType: Asset Category Account,Asset Category Account,ಆಸ್ತಿ ವರ್ಗ ಖಾತೆ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,ಸಾಲು # {0} (ಪಾವತಿ ಪಟ್ಟಿ): ಪ್ರಮಾಣ ಧನಾತ್ಮಕವಾಗಿರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,ಸಾಲು # {0} (ಪಾವತಿ ಪಟ್ಟಿ): ಪ್ರಮಾಣ ಧನಾತ್ಮಕವಾಗಿರಬೇಕು
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},ಹೆಚ್ಚು ಐಟಂ ಉತ್ಪಾದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ {0} ಹೆಚ್ಚು ಮಾರಾಟದ ಆರ್ಡರ್ ಪ್ರಮಾಣ {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
 DocType: Purchase Invoice,Reason For Issuing document,ಡಾಕ್ಯುಮೆಂಟ್ ನೀಡುವ ಕಾರಣ
@@ -3724,7 +3728,7 @@
 DocType: Purchase Receipt,Time at which materials were received,ವಸ್ತುಗಳನ್ನು ಸ್ವೀಕರಿಸಿದ ಯಾವ ಸಮಯದಲ್ಲಿ
 DocType: Products Settings,Products per Page,ಪ್ರತಿ ಪುಟಕ್ಕೆ ಉತ್ಪನ್ನಗಳು
 DocType: Stock Ledger Entry,Outgoing Rate,ಹೊರಹೋಗುವ ದರ
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,ಅಥವಾ
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,ಅಥವಾ
 DocType: Sales Order,Billing Status,ಬಿಲ್ಲಿಂಗ್ ಸ್ಥಿತಿ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ಸಮಸ್ಯೆಯನ್ನು ವರದಿಮಾಡಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,ಯುಟಿಲಿಟಿ ವೆಚ್ಚಗಳು
@@ -3752,7 +3756,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,ನೌಕರರ ತೆರಿಗೆ ವಿನಾಯಿತಿ ಘೋಷಣೆ
 DocType: Payment Entry,Cheque/Reference Date,ಚೆಕ್ / ಉಲ್ಲೇಖ ದಿನಾಂಕ
 DocType: Purchase Invoice,Total Taxes and Charges,ಒಟ್ಟು ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,ಲಭ್ಯವಿರುವ ದಿನಾಂಕವನ್ನು ಹಿಂದಿನ ದಿನಾಂಕದಂತೆ ನಮೂದಿಸಲಾಗಿದೆ
 DocType: Employee,Emergency Contact,ತುರ್ತು ಸಂಪರ್ಕ
 DocType: Bank Reconciliation Detail,Payment Entry,ಪಾವತಿ ಎಂಟ್ರಿ
 ,sales-browser,ಮಾರಾಟ ಬ್ರೌಸರ್
@@ -3799,6 +3802,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),ರಿಟರ್ನ್ (ಕ್ರೆಡಿಟ್ ಗಮನಿಸಿ)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,ಜಾಬ್ ಪ್ರಾರಂಭಿಸಿ
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},ಆಸ್ತಿ {0} ಗೆ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ ಅಗತ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ದಯವಿಟ್ಟು ಸೆಟಪ್&gt; ಸೆಟ್ಟಿಂಗ್ಗಳು&gt; ಹೆಸರಿಸುವ ಸರಣಿ ಮೂಲಕ {0} ಹೆಸರಿಸುವ ಸರಣಿಗಳನ್ನು ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ ಟೆಂಪ್ಲೇಟ್ ಡೀಫಾಲ್ಟ್ ಟೆಂಪ್ಲೇಟ್ ಇರಬಾರದು
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,ಸಾಲು {0}: ಯೋಜಿತ qty ಯನ್ನು ನಮೂದಿಸಿ
 DocType: Account,Income Account,ಆದಾಯ ಖಾತೆ
@@ -3812,6 +3816,7 @@
 DocType: Loyalty Program,Help Section,ಸಹಾಯ ವಿಭಾಗ
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,ಹಿಂದಿನದು
 DocType: Appraisal Goal,Key Responsibility Area,ಪ್ರಮುಖ ಜವಾಬ್ದಾರಿ ಪ್ರದೇಶ
+DocType: Delivery Trip,Distance UOM,ದೂರ UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ಗಳು ನೀವು ವಿದ್ಯಾರ್ಥಿಗಳು ಹಾಜರಾತಿ, ಮೌಲ್ಯಮಾಪನಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಟ್ರ್ಯಾಕ್ ಸಹಾಯ"
 DocType: Payment Entry,Total Allocated Amount,ಒಟ್ಟು ನಿಗದಿ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,ಸಾರ್ವಕಾಲಿಕ ದಾಸ್ತಾನು ಹೊಂದಿಸಲಾದ ಪೂರ್ವನಿಯೋಜಿತ ದಾಸ್ತಾನು ಖಾತೆ
@@ -3853,7 +3858,7 @@
 DocType: Item Supplier,Item Supplier,ಐಟಂ ಸರಬರಾಜುದಾರ
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,ಯಾವುದೇ ಐಟಂ ಬ್ಯಾಚ್ ಪಡೆಯಲು ಕೋಡ್ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},{0} {1} quotation_to ಒಂದು ಮೌಲ್ಯವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,ವರ್ಗಾಯಿಸಲು ಯಾವುದೇ ಐಟಂಗಳು ಆಯ್ಕೆಯಾಗಿಲ್ಲ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,ವರ್ಗಾಯಿಸಲು ಯಾವುದೇ ಐಟಂಗಳು ಆಯ್ಕೆಯಾಗಿಲ್ಲ
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ಎಲ್ಲಾ ವಿಳಾಸಗಳನ್ನು .
 DocType: Company,Stock Settings,ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","ಕೆಳಗಿನ ಲಕ್ಷಣಗಳು ದಾಖಲೆಗಳಲ್ಲಿ ಅದೇ ವೇಳೆ ಮರ್ಜಿಂಗ್ ಮಾತ್ರ ಸಾಧ್ಯ. ಗ್ರೂಪ್, ರೂಟ್ ಕೌಟುಂಬಿಕತೆ, ಕಂಪನಿ"
@@ -4151,7 +4156,7 @@
 DocType: Patient,Personal and Social History,ವೈಯಕ್ತಿಕ ಮತ್ತು ಸಾಮಾಜಿಕ ಇತಿಹಾಸ
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,ಬಳಕೆದಾರ {0} ರಚಿಸಲಾಗಿದೆ
 DocType: Fee Schedule,Fee Breakup for each student,ಪ್ರತಿ ವಿದ್ಯಾರ್ಥಿಗಳಿಗೆ ಶುಲ್ಕ ವಿಭಜನೆ
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ಒಟ್ಟು ಮುಂಚಿತವಾಗಿ ({0}) ಆರ್ಡರ್ ವಿರುದ್ಧ {1} ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಅಧಿಕವಾಗಿರುತ್ತದೆ ಸಾಧ್ಯವಿಲ್ಲ ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ಒಟ್ಟು ಮುಂಚಿತವಾಗಿ ({0}) ಆರ್ಡರ್ ವಿರುದ್ಧ {1} ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಅಧಿಕವಾಗಿರುತ್ತದೆ ಸಾಧ್ಯವಿಲ್ಲ ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ಅಸಮಾನವಾಗಿ ತಿಂಗಳ ಅಡ್ಡಲಾಗಿ ಗುರಿಗಳನ್ನು ವಿತರಿಸಲು ಮಾಸಿಕ ವಿತರಣೆ ಆಯ್ಕೆ.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,ಕೋಡ್ ಬದಲಿಸಿ
 DocType: Purchase Invoice Item,Valuation Rate,ಮೌಲ್ಯಾಂಕನ ದರ
@@ -4160,7 +4165,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,ಐಟಿಸಿ ಸೆಸ್ ಪಡೆದುಕೊಂಡಿದೆ
 ,Student Monthly Attendance Sheet,ವಿದ್ಯಾರ್ಥಿ ಮಾಸಿಕ ಅಟೆಂಡೆನ್ಸ್ ಶೀಟ್
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,ಶಿಪ್ಪಿಂಗ್ ನಿಯಮವು ಮಾರಾಟಕ್ಕೆ ಮಾತ್ರ ಅನ್ವಯಿಸುತ್ತದೆ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,ಸವಕಳಿ ಸಾಲು {0}: ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಖರೀದಿಯ ದಿನಾಂಕಕ್ಕಿಂತ ಮೊದಲು ಇರುವಂತಿಲ್ಲ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,ಸವಕಳಿ ಸಾಲು {0}: ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಖರೀದಿಯ ದಿನಾಂಕಕ್ಕಿಂತ ಮೊದಲು ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,ಪ್ರಾಜೆಕ್ಟ್ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,ರವರೆಗೆ
 DocType: Rename Tool,Rename Log,ಲಾಗ್ ಮರುಹೆಸರಿಸು
@@ -4178,12 +4183,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,ಮಾರಾಟದ ವಹಿವಾಟುಗಳನ್ನು ಆಧರಿಸಿ ಎಷ್ಟು ಬಾರಿ ಯೋಜನೆ ಮತ್ತು ಕಂಪನಿ ನವೀಕರಿಸಬೇಕು.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ರಂದು ಅವಧಿ ಮೀರುತ್ತದೆ
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,ವಿದ್ಯಾರ್ಥಿಗಳು ಸೇರಿಸಿ
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","ಈ ಡಾಕ್ಯುಮೆಂಟ್ ಅನ್ನು ರದ್ದುಮಾಡಲು ಉದ್ಯೋಗಿ <a href=""#Form/Employee/{0}"">{0} ಅನ್ನು</a> ಅಳಿಸಿ"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},ಆಯ್ಕೆಮಾಡಿ {0}
 DocType: C-Form,C-Form No,ಸಿ ಫಾರ್ಮ್ ನಂ
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,ದೂರ
+DocType: Delivery Stop,Distance,ದೂರ
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,ನೀವು ಖರೀದಿ ಅಥವಾ ಮಾರಾಟ ಮಾಡುವ ನಿಮ್ಮ ಉತ್ಪನ್ನಗಳು ಅಥವಾ ಸೇವೆಗಳನ್ನು ಪಟ್ಟಿ ಮಾಡಿ.
 DocType: Water Analysis,Storage Temperature,ಶೇಖರಣಾ ತಾಪಮಾನ
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD - .YYYY.-
@@ -4210,7 +4213,7 @@
 DocType: Homepage,Company Description for website homepage,ವೆಬ್ಸೈಟ್ ಮುಖಪುಟಕ್ಕೆ ಕಂಪನಿ ವಿವರಣೆ
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ಗ್ರಾಹಕರ ಅನುಕೂಲಕ್ಕಾಗಿ, ಪ್ರಬಂಧ ಸಂಕೇತಗಳು ಇನ್ವಾಯ್ಸ್ ಮತ್ತು ಡೆಲಿವರಿ ಟಿಪ್ಪಣಿಗಳು ರೀತಿಯ ಮುದ್ರಣ ಸ್ವರೂಪಗಳು ಬಳಸಬಹುದು"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier ಹೆಸರು
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,{0} ಗಾಗಿ ಮಾಹಿತಿಯನ್ನು ಹಿಂಪಡೆಯಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,{0} ಗಾಗಿ ಮಾಹಿತಿಯನ್ನು ಹಿಂಪಡೆಯಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,ಪ್ರವೇಶ ಪ್ರವೇಶ ಜರ್ನಲ್
 DocType: Contract,Fulfilment Terms,ಪೂರೈಸುವ ನಿಯಮಗಳು
 DocType: Sales Invoice,Time Sheet List,ಟೈಮ್ ಶೀಟ್ ಪಟ್ಟಿ
@@ -4393,7 +4396,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,ಚಟುವಟಿಕೆ ಆಧಾರಿತ ಗ್ರೂಪ್ ಕೈಯಾರೆ ವಿದ್ಯಾರ್ಥಿಗಳು ಆಯ್ಕೆ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,ಚಟುವಟಿಕೆ ಆಧಾರಿತ ಗ್ರೂಪ್ ಕೈಯಾರೆ ವಿದ್ಯಾರ್ಥಿಗಳು ಆಯ್ಕೆ
 DocType: Journal Entry,User Remark,ಬಳಕೆದಾರ ಟೀಕಿಸು
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,ಮಾರ್ಗಗಳನ್ನು ಉತ್ತಮಗೊಳಿಸುವುದು.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,ಮಾರ್ಗಗಳನ್ನು ಉತ್ತಮಗೊಳಿಸುವುದು.
 DocType: Travel Itinerary,Non Diary,ಮಾಂಸಾಹಾರಿ ಡೈರಿ
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,ಎಡ ನೌಕರರಿಗೆ ಧಾರಣ ಬೋನಸ್ ರಚಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Lead,Market Segment,ಮಾರುಕಟ್ಟೆ ವಿಭಾಗ
@@ -4424,7 +4427,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,ಲಾಯಲ್ಟಿ ಪ್ರೋಗ್ರಾಂ
 DocType: Student Guardian,Father,ತಂದೆ
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,ಬೆಂಬಲ ಟಿಕೆಟ್ಗಳು
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;ಅಪ್ಡೇಟ್ ಸ್ಟಾಕ್&#39; ಸ್ಥಿರ ಸಂಪತ್ತಾದ ಮಾರಾಟ ಪರಿಶೀಲಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;ಅಪ್ಡೇಟ್ ಸ್ಟಾಕ್&#39; ಸ್ಥಿರ ಸಂಪತ್ತಾದ ಮಾರಾಟ ಪರಿಶೀಲಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Bank Reconciliation,Bank Reconciliation,ಬ್ಯಾಂಕ್ ಸಾಮರಸ್ಯ
 DocType: Attendance,On Leave,ರಜೆಯ ಮೇಲೆ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ಅಪ್ಡೇಟ್ಗಳು ಪಡೆಯಿರಿ
@@ -4469,7 +4472,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,ಸೀರಿಯಲ್ ಯಾವುದೇ ಮತ್ತು ಬ್ಯಾಚ್
 DocType: Warranty Claim,From Company,ಕಂಪನಿ
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,ಅಸೆಸ್ಮೆಂಟ್ ಕ್ರೈಟೀರಿಯಾ ಅಂಕಗಳು ಮೊತ್ತ {0} ಎಂದು ಅಗತ್ಯವಿದೆ.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,ದಯವಿಟ್ಟು ಸೆಟ್ Depreciations ಸಂಖ್ಯೆ ಬುಕ್ಡ್
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,ದಯವಿಟ್ಟು ಸೆಟ್ Depreciations ಸಂಖ್ಯೆ ಬುಕ್ಡ್
 DocType: Supplier Scorecard Period,Calculations,ಲೆಕ್ಕಾಚಾರಗಳು
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,ಮೌಲ್ಯ ಅಥವಾ ಪ್ರಮಾಣ
 DocType: Payment Terms Template,Payment Terms,ಪಾವತಿ ನಿಯಮಗಳು
@@ -4489,7 +4492,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,ಮೇಲಿನ ಅಂಚು ಜೊತೆ ಬೆಲೆ ಪಟ್ಟಿ ದರ ರಿಯಾಯಿತಿ (%)
 DocType: Healthcare Service Unit Type,Rate / UOM,ದರ / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,ಎಲ್ಲಾ ಗೋದಾಮುಗಳು
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,ಇಂಟರ್ ಕಂಪೆನಿ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ಗೆ ಯಾವುದೇ {0} ಕಂಡುಬಂದಿಲ್ಲ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,ಇಂಟರ್ ಕಂಪೆನಿ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ಗೆ ಯಾವುದೇ {0} ಕಂಡುಬಂದಿಲ್ಲ.
 DocType: Travel Itinerary,Rented Car,ಬಾಡಿಗೆ ಕಾರು
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,ನಿಮ್ಮ ಕಂಪನಿ ಬಗ್ಗೆ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
@@ -4591,6 +4594,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,ಸಸ್ಯ ವಿಶ್ಲೇಷಣೆ ಮಾನದಂಡ
 DocType: Cheque Print Template,Cheque Height,ಚೆಕ್ ಎತ್ತರ
 DocType: Supplier,Supplier Details,ಪೂರೈಕೆದಾರರ ವಿವರಗಳು
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್&gt; ಸಂಖ್ಯಾ ಸರಣಿಗಳ ಮೂಲಕ ಹಾಜರಾತಿಗಾಗಿ ಸೆಟಪ್ ಸಂಖ್ಯೆಯ ಸರಣಿ
 DocType: Setup Progress,Setup Progress,ಸೆಟಪ್ ಪ್ರೋಗ್ರೆಸ್
 DocType: Expense Claim,Approval Status,ಅನುಮೋದನೆ ಸ್ಥಿತಿ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},ಮೌಲ್ಯದಿಂದ ಸತತವಾಗಿ ಮೌಲ್ಯಕ್ಕೆ ಕಡಿಮೆ ಇರಬೇಕು {0}
@@ -4684,7 +4688,6 @@
 DocType: Travel Request,Fully Sponsored,ಸಂಪೂರ್ಣವಾಗಿ ಪ್ರಾಯೋಜಿತ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,ರಿವರ್ಸ್ ಜರ್ನಲ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ಗ್ರಾಹಕ {0} ರಚಿಸಲಾಗಿದೆ.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,ಮಾನವ ಸಂಪನ್ಮೂಲ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಉದ್ಯೋಗಿ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಸಿದ್ಧಗೊಳಿಸಿ
 DocType: Stock Settings,Limit Percent,ಮಿತಿ ಪರ್ಸೆಂಟ್
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,ಪ್ರಸ್ತುತ ಯಾವುದೇ ವೇರಾಹೌಸ್‌ನಲ್ಲಿ ಸ್ಟಾಕ್ ಲಭ್ಯವಿಲ್ಲ
 ,Payment Period Based On Invoice Date,ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕವನ್ನು ಆಧರಿಸಿ ಪಾವತಿ ಅವಧಿ
@@ -4743,7 +4746,7 @@
 DocType: BOM Explosion Item,Source Warehouse,ಮೂಲ ವೇರ್ಹೌಸ್
 DocType: Installation Note,Installation Date,ಅನುಸ್ಥಾಪನ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,ಲೆಡ್ಜರ್ ಹಂಚಿಕೊಳ್ಳಿ
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},ರೋ # {0}: ಆಸ್ತಿ {1} ಕಂಪನಿಗೆ ಇಲ್ಲ ಸೇರುವುದಿಲ್ಲ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},ರೋ # {0}: ಆಸ್ತಿ {1} ಕಂಪನಿಗೆ ಇಲ್ಲ ಸೇರುವುದಿಲ್ಲ {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,ಮಾರಾಟ ಸರಕುಪಟ್ಟಿ {0} ರಚಿಸಲಾಗಿದೆ
 DocType: Employee,Confirmation Date,ದೃಢೀಕರಣ ದಿನಾಂಕ
 DocType: Inpatient Occupancy,Check Out,ಪರಿಶೀಲಿಸಿ
@@ -4763,6 +4766,7 @@
 DocType: Production Plan,Sales Orders Detail,ಮಾರಾಟದ ಆದೇಶ ವಿವರ
 DocType: Bin,Requested Quantity,ವಿನಂತಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE - .YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,ದಯವಿಟ್ಟು ಶೈಕ್ಷಣಿಕ&gt; ಶಿಕ್ಷಣ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ತರಬೇತುದಾರ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಸಿದ್ಧಗೊಳಿಸಿ
 DocType: Patient,Marital Status,ವೈವಾಹಿಕ ಸ್ಥಿತಿ
 DocType: Stock Settings,Auto Material Request,ಆಟೋ ಉತ್ಪನ್ನ ವಿನಂತಿ
 DocType: Woocommerce Settings,API consumer secret,API ಗ್ರಾಹಕ ರಹಸ್ಯ
@@ -4815,7 +4819,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,ದಿನಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
 DocType: Academic Term,Term Name,ಟರ್ಮ್ ಹೆಸರು
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),ಕ್ರೆಡಿಟ್ ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,ಸಂಬಳ ಸ್ಲಿಪ್ಸ್ ರಚಿಸಲಾಗುತ್ತಿದೆ ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,ಸಂಬಳ ಸ್ಲಿಪ್ಸ್ ರಚಿಸಲಾಗುತ್ತಿದೆ ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,ನೀವು ರೂಟ್ ನೋಡ್ ಅನ್ನು ಸಂಪಾದಿಸಲಾಗುವುದಿಲ್ಲ.
 DocType: Buying Settings,Purchase Order Required,ಆದೇಶ ಅಗತ್ಯವಿರುವ ಖರೀದಿಸಿ
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,ಟೈಮರ್
@@ -4853,7 +4857,7 @@
 DocType: Account,Rate at which this tax is applied,ದರ ಈ ತೆರಿಗೆ ಅನ್ವಯಿಸಲಾಗುತ್ತದೆ ನಲ್ಲಿ
 DocType: Cash Flow Mapper,Section Name,ವಿಭಾಗ ಹೆಸರು
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},ಸವಕಳಿ ಸಾಲು {0}: ಉಪಯುಕ್ತ ಜೀವನ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯವು {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},ಸವಕಳಿ ಸಾಲು {0}: ಉಪಯುಕ್ತ ಜೀವನ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯವು {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,ಪ್ರಸ್ತುತ ಉದ್ಯೋಗ ಅವಕಾಶಗಳನ್ನು
 DocType: Company,Stock Adjustment Account,ಸ್ಟಾಕ್ ಹೊಂದಾಣಿಕೆ ಖಾತೆ
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ಆಫ್ ಬರೆಯಿರಿ
@@ -4900,7 +4904,7 @@
 DocType: Program Enrollment,School House,ಸ್ಕೂಲ್ ಹೌಸ್
 DocType: Serial No,Out of AMC,ಎಎಂಸಿ ಔಟ್
 DocType: Opportunity,Opportunity Amount,ಅವಕಾಶ ಮೊತ್ತ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ಬುಕ್ಡ್ Depreciations ಸಂಖ್ಯೆ ಒಟ್ಟು ಸಂಖ್ಯೆ Depreciations ಕ್ಕೂ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ಬುಕ್ಡ್ Depreciations ಸಂಖ್ಯೆ ಒಟ್ಟು ಸಂಖ್ಯೆ Depreciations ಕ್ಕೂ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Purchase Order,Order Confirmation Date,ಆರ್ಡರ್ ದೃಢೀಕರಣ ದಿನಾಂಕ
 DocType: Driver,HR-DRI-.YYYY.-,ಎಚ್ಆರ್-ಡಿಆರ್ಐ .YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,ನಿರ್ವಹಣೆ ಭೇಟಿ ಮಾಡಿ
@@ -4941,7 +4945,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,ಬ್ಯಾಚ್:
 DocType: Volunteer,Afternoon,ಮಧ್ಯಾಹ್ನ
 DocType: Loyalty Program,Loyalty Program Help,ಲಾಯಲ್ಟಿ ಪ್ರೋಗ್ರಾಂ ಸಹಾಯ
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ಓಪನ್ ಹೊಂದಿಸಿ
 DocType: Cheque Print Template,Scanned Cheque,ಸ್ಕ್ಯಾನ್ ಚೆಕ್
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ ವ್ಯವಹಾರಗಳ ಮೇಲೆ ಸಂಪರ್ಕಗಳು ಸ್ವಯಂಚಾಲಿತ ಕಳುಹಿಸು.
@@ -4954,7 +4958,7 @@
 DocType: Warranty Claim,Item and Warranty Details,ಐಟಂ ಮತ್ತು ಖಾತರಿ ವಿವರಗಳು
 DocType: Chapter,Chapter Members,ಅಧ್ಯಾಯ ಸದಸ್ಯರು
 DocType: Sales Team,Contribution (%),ಕೊಡುಗೆ ( % )
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ಗಮನಿಸಿ : ಪಾವತಿ ಎಂಟ್ರಿ 'ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ' ಏನು ನಿರ್ದಿಷ್ಟಪಡಿಸಿಲ್ಲ ರಿಂದ ರಚಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ಗಮನಿಸಿ : ಪಾವತಿ ಎಂಟ್ರಿ 'ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ' ಏನು ನಿರ್ದಿಷ್ಟಪಡಿಸಿಲ್ಲ ರಿಂದ ರಚಿಸಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,ಪ್ರಾಜೆಕ್ಟ್ {0} ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 DocType: Clinical Procedure,Nursing User,ನರ್ಸಿಂಗ್ ಬಳಕೆದಾರ
 DocType: Employee Benefit Application,Payroll Period,ವೇತನದಾರರ ಅವಧಿ
@@ -4962,6 +4966,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},ಸರಣಿ ಇಲ್ಲ {0} ಬ್ಯಾಚ್ಗೆ ಸೇರಿಲ್ಲ {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,ಜವಾಬ್ದಾರಿಗಳನ್ನು
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,ಈ ಉದ್ಧರಣದ ಮಾನ್ಯತೆಯ ಅವಧಿಯು ಕೊನೆಗೊಂಡಿದೆ.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","ಈ ಡಾಕ್ಯುಮೆಂಟ್ ಅನ್ನು ರದ್ದುಮಾಡಲು ಉದ್ಯೋಗಿ <a href=""#Form/Employee/{0}"">{0} ಅನ್ನು</a> ಅಳಿಸಿ"
 DocType: Expense Claim Account,Expense Claim Account,ಖರ್ಚು ಹಕ್ಕು ಖಾತೆ
 DocType: Account,Capital Work in Progress,ಕ್ಯಾಪಿಟಲ್ ವರ್ಕ್ ಪ್ರೋಗ್ರೆಸ್
 DocType: Accounts Settings,Allow Stale Exchange Rates,ಸ್ಟಾಲ್ ಎಕ್ಸ್ಚೇಂಜ್ ದರಗಳನ್ನು ಅನುಮತಿಸಿ
@@ -5043,7 +5049,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,ಸಂಚಿಕೆ ಮೆಟೀರಿಯಲ್
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,ERPNext ನೊಂದಿಗೆ Shopify ಅನ್ನು ಸಂಪರ್ಕಿಸಿ
 DocType: Material Request Item,For Warehouse,ಗೋದಾಮಿನ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,ವಿತರಣಾ ಟಿಪ್ಪಣಿಗಳು {0} ನವೀಕರಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,ವಿತರಣಾ ಟಿಪ್ಪಣಿಗಳು {0} ನವೀಕರಿಸಲಾಗಿದೆ
 DocType: Employee,Offer Date,ಆಫರ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,ಉಲ್ಲೇಖಗಳು
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,ಆಫ್ಲೈನ್ ಕ್ರಮದಲ್ಲಿ ಇವೆ. ನೀವು ಜಾಲಬಂಧ ತನಕ ರಿಲೋಡ್ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.
@@ -5094,7 +5100,7 @@
 DocType: Shipping Rule,Calculate Based On,ಆಧರಿಸಿದ ಲೆಕ್ಕ
 DocType: Contract,Unfulfilled,ಅತೃಪ್ತಿಗೊಂಡಿದೆ
 DocType: Delivery Note Item,From Warehouse,ಗೋದಾಮಿನ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,ಪ್ರಸ್ತಾಪಿತ ಮಾನದಂಡಗಳಿಗೆ ಉದ್ಯೋಗಿಗಳು ಇಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,ಪ್ರಸ್ತಾಪಿತ ಮಾನದಂಡಗಳಿಗೆ ಉದ್ಯೋಗಿಗಳು ಇಲ್ಲ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,ಮೆಟೀರಿಯಲ್ಸ್ ಬಿಲ್ ಯಾವುದೇ ವಸ್ತುಗಳು ತಯಾರಿಸಲು
 DocType: Shopify Settings,Default Customer,ಡೀಫಾಲ್ಟ್ ಗ್ರಾಹಕ
 DocType: Sales Stage,Stage Name,ವೇದಿಕೆಯ ಹೆಸರು
@@ -5137,7 +5143,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ಡಿಸ್ಕೌಂಟ್ ಪ್ರಮಾಣ ನಂತರ ತೆರಿಗೆ ಪ್ರಮಾಣ
 DocType: Patient,Inpatient Status,ಒಳರೋಗಿ ಸ್ಥಿತಿ
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,ದೈನಂದಿನ ಕೆಲಸ ಸಾರಾಂಶ ಸೆಟ್ಟಿಂಗ್ಗಳು
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,ಆಯ್ದ ಧಾರಣೆ ಪಟ್ಟಿ ಪರಿಶೀಲಿಸಿದ ಕ್ಷೇತ್ರಗಳನ್ನು ಖರೀದಿಸಿ ಮಾರಾಟ ಮಾಡಬೇಕು.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,ಆಯ್ದ ಧಾರಣೆ ಪಟ್ಟಿ ಪರಿಶೀಲಿಸಿದ ಕ್ಷೇತ್ರಗಳನ್ನು ಖರೀದಿಸಿ ಮಾರಾಟ ಮಾಡಬೇಕು.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,ದಯವಿಟ್ಟು ದಿನಾಂಕದಂದು Reqd ಯನ್ನು ನಮೂದಿಸಿ
 DocType: Payment Entry,Internal Transfer,ಆಂತರಿಕ ಟ್ರಾನ್ಸ್ಫರ್
 DocType: Asset Maintenance,Maintenance Tasks,ನಿರ್ವಹಣಾ ಕಾರ್ಯಗಳು
@@ -5174,7 +5180,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,ಗುಂಪಿನ
 DocType: Guardian,Interests,ಆಸಕ್ತಿಗಳು
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,/ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ ಕರೆನ್ಸಿಗಳ ಸಕ್ರಿಯಗೊಳಿಸಿ .
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,ಕೆಲವು ವೇತನ ಸ್ಲಿಪ್ಗಳನ್ನು ಸಲ್ಲಿಸಲಾಗಲಿಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,ಕೆಲವು ವೇತನ ಸ್ಲಿಪ್ಗಳನ್ನು ಸಲ್ಲಿಸಲಾಗಲಿಲ್ಲ
 DocType: Exchange Rate Revaluation,Get Entries,ನಮೂದುಗಳನ್ನು ಪಡೆಯಿರಿ
 DocType: Production Plan,Get Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,ಅಂಚೆ ವೆಚ್ಚಗಳು
@@ -5261,7 +5267,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ಐಟಂ ಕಡ್ಡಾಯ {0}
 DocType: BOM,Website Description,ವೆಬ್ಸೈಟ್ ವಿವರಣೆ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,ಇಕ್ವಿಟಿ ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ರದ್ದು ಮೊದಲು
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ರದ್ದು ಮೊದಲು
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,ಅನುಮತಿಸಲಾಗಿಲ್ಲ. ದಯವಿಟ್ಟು ಸೇವೆಯ ಘಟಕ ಪ್ರಕಾರವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ಇಮೇಲ್ ವಿಳಾಸ, ಅನನ್ಯ ಇರಬೇಕು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}"
 DocType: Serial No,AMC Expiry Date,ಎಎಂಸಿ ಅಂತ್ಯ ದಿನಾಂಕ
@@ -5301,7 +5307,7 @@
 DocType: Hotel Room,Hotel Room,ಹೋಟೆಲ್ ಕೊಠಡಿ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},ಖಾತೆ {0} ಮಾಡುತ್ತದೆ ಕಂಪನಿ ಸೇರಿದೆ ಅಲ್ಲ {1}
 DocType: Leave Type,Rounding,ಪೂರ್ಣಾಂಕವನ್ನು
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,ಸಾಲು {0} ಸರಣಿ ಸಂಖ್ಯೆಗಳು ಡೆಲಿವರಿ ಗಮನಿಸಿ ಹೊಂದುವುದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,ಸಾಲು {0} ಸರಣಿ ಸಂಖ್ಯೆಗಳು ಡೆಲಿವರಿ ಗಮನಿಸಿ ಹೊಂದುವುದಿಲ್ಲ
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),ವಿತರಿಸಲಾದ ಮೊತ್ತ (ಪ್ರೊ ರೇಟ್)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","ನಂತರ ಗ್ರಾಹಕ ನಿಯಮಗಳು, ಗ್ರಾಹಕರು, ಪ್ರದೇಶ, ಸರಬರಾಜುದಾರರು, ಪೂರೈಕೆದಾರರ ಗುಂಪು, ಕ್ಯಾಂಪೇನ್, ಮಾರಾಟದ ಸಂಗಾತಿ ಇತ್ಯಾದಿಗಳನ್ನು ಆಧರಿಸಿ ಬೆಲೆ ನಿಯಮಗಳನ್ನು ಫಿಲ್ಟರ್ ಮಾಡಲಾಗುತ್ತದೆ."
 DocType: Student,Guardian Details,ಗಾರ್ಡಿಯನ್ ವಿವರಗಳು
@@ -5356,7 +5362,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},ಸ್ಟಾಕ್ ಐಟಂ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
 DocType: Leave Allocation,Unused leaves,ಬಳಕೆಯಾಗದ ಎಲೆಗಳು
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,ಮರುಪಾವತಿ ನಮೂದನ್ನು ಮಾಡಿ
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,ಎಲ್ಲಾ ವಿಭಾಗಗಳು
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,ಎಲ್ಲಾ ವಿಭಾಗಗಳು
 DocType: Healthcare Service Unit,Vacant,ಖಾಲಿ
 DocType: Patient,Alcohol Past Use,ಆಲ್ಕೊಹಾಲ್ ಪಾಸ್ಟ್ ಯೂಸ್
 DocType: Fertilizer Content,Fertilizer Content,ರಸಗೊಬ್ಬರ ವಿಷಯ
@@ -5367,7 +5373,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದು ಮಾಡುವ ಮೊದಲು ವರ್ಕ್ ಆರ್ಡರ್ {0} ಅನ್ನು ರದ್ದುಗೊಳಿಸಬೇಕು
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),( ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಸೇರಿದಂತೆ ) ಸ್ಫೋಟಿಸಿತು BOM ಪಡೆದುಕೊಳ್ಳಿ
 DocType: Authorization Rule,Applicable To (Employee),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಉದ್ಯೋಗಗಳು)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,ಕಾರಣ ದಿನಾಂಕ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,ಕಾರಣ ದಿನಾಂಕ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,ಗುಣಲಕ್ಷಣ ಹೆಚ್ಚಳವನ್ನು {0} 0 ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Employee Benefit Claim,Benefit Type and Amount,ಪ್ರಯೋಜನ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಮೊತ್ತ
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,ಬುಕ್ ಮಾಡಲಾದ ಕೊಠಡಿಗಳು
@@ -5516,7 +5522,7 @@
 DocType: Purchase Invoice Item,Total Weight,ಒಟ್ಟು ತೂಕ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,ಮಾರಾಟದ ಮೇಲೆ ಕಮಿಷನ್
 DocType: Job Offer Term,Value / Description,ಮೌಲ್ಯ / ವಿವರಣೆ
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ರೋ # {0}: ಆಸ್ತಿ {1} ಮಾಡಬಹುದು ಸಲ್ಲಿಸಲಾಗುತ್ತದೆ, ಇದು ಈಗಾಗಲೇ {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ರೋ # {0}: ಆಸ್ತಿ {1} ಮಾಡಬಹುದು ಸಲ್ಲಿಸಲಾಗುತ್ತದೆ, ಇದು ಈಗಾಗಲೇ {2}"
 DocType: Tax Rule,Billing Country,ಬಿಲ್ಲಿಂಗ್ ಕಂಟ್ರಿ
 DocType: Purchase Order Item,Expected Delivery Date,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ
 DocType: Restaurant Order Entry,Restaurant Order Entry,ರೆಸ್ಟೋರೆಂಟ್ ಆರ್ಡರ್ ಎಂಟ್ರಿ
@@ -5555,12 +5561,13 @@
 DocType: Maintenance Visit,Breakdown,ಅನಾರೋಗ್ಯದಿಂದ ಕುಸಿತ
 DocType: Travel Itinerary,Vegetarian,ಸಸ್ಯಾಹಾರಿ
 DocType: Patient Encounter,Encounter Date,ಎನ್ಕೌಂಟರ್ ದಿನಾಂಕ
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,ಖಾತೆ: {0} ಕರೆನ್ಸಿಗೆ: {1} ಆಯ್ಕೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,ಖಾತೆ: {0} ಕರೆನ್ಸಿಗೆ: {1} ಆಯ್ಕೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Bank Statement Transaction Settings Item,Bank Data,ಬ್ಯಾಂಕ್ ಡೇಟಾ
 DocType: Purchase Receipt Item,Sample Quantity,ಮಾದರಿ ಪ್ರಮಾಣ
 DocType: Bank Guarantee,Name of Beneficiary,ಫಲಾನುಭವಿಯ ಹೆಸರು
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",ಕಚ್ಚಾ ವಸ್ತುಗಳ ಇತ್ತೀಚಿನ ಮೌಲ್ಯಮಾಪನ ದರ / ಬೆಲೆ ಪಟ್ಟಿ ದರ / ಕೊನೆಯ ಖರೀದಿಯ ದರವನ್ನು ಆಧರಿಸಿ ವೇಳಾಪಟ್ಟಿ ಮೂಲಕ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ನವೀಕರಿಸಿ BOM ವೆಚ್ಚ.
 DocType: Supplier,SUP-.YYYY.-,ಸಪ್-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,ಪೂರೈಕೆದಾರ&gt; ಪೂರೈಕೆದಾರ ಗುಂಪು
 DocType: Bank Reconciliation Detail,Cheque Date,ಚೆಕ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},ಖಾತೆ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,ಯಶಸ್ವಿಯಾಗಿ ಈ ಕಂಪನಿಗೆ ಸಂಬಂಧಿಸಿದ ಎಲ್ಲಾ ವ್ಯವಹಾರಗಳನ್ನು ಅಳಿಸಲಾಗಿದೆ!
@@ -5588,7 +5595,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,ಚೈಲ್ಡ್ ನೋಡ್ಗಳ ಮಾತ್ರ &#39;ಗುಂಪು&#39; ರೀತಿಯ ಗ್ರಂಥಿಗಳು ಅಡಿಯಲ್ಲಿ ರಚಿಸಬಹುದಾಗಿದೆ
 DocType: Attendance Request,Half Day Date,ಅರ್ಧ ದಿನ ದಿನಾಂಕ
 DocType: Academic Year,Academic Year Name,ಶೈಕ್ಷಣಿಕ ವರ್ಷದ ಹೆಸರು
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} {1} ನೊಂದಿಗೆ ವರ್ಗಾವಣೆ ಮಾಡಲು ಅನುಮತಿಸಲಾಗಿಲ್ಲ. ದಯವಿಟ್ಟು ಕಂಪನಿ ಬದಲಿಸಿ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} {1} ನೊಂದಿಗೆ ವರ್ಗಾವಣೆ ಮಾಡಲು ಅನುಮತಿಸಲಾಗಿಲ್ಲ. ದಯವಿಟ್ಟು ಕಂಪನಿ ಬದಲಿಸಿ.
 DocType: Sales Partner,Contact Desc,ಸಂಪರ್ಕಿಸಿ DESC
 DocType: Email Digest,Send regular summary reports via Email.,ಇಮೇಲ್ ಮೂಲಕ ಸಾಮಾನ್ಯ ಸಾರಾಂಶ ವರದಿ ಕಳುಹಿಸಿ.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},ದಯವಿಟ್ಟು ಖರ್ಚು ಹಕ್ಕು ಪ್ರಕಾರ ಡೀಫಾಲ್ಟ್ ಖಾತೆಯನ್ನು ಸೆಟ್ {0}
@@ -5621,7 +5628,7 @@
 DocType: Hotel Room,Hotel Manager,ಹೋಟೆಲ್ ವ್ಯವಸ್ಥಾಪಕ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ತೆರಿಗೆಯ ರೂಲ್
 DocType: Purchase Invoice,Taxes and Charges Added,ಸೇರಿಸಲಾಗಿದೆ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,ಸವಕಳಿ ಸಾಲು {0}: ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಲಭ್ಯವಾಗುವ ದಿನಾಂಕದ ಮೊದಲು ಇರಬಾರದು
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,ಸವಕಳಿ ಸಾಲು {0}: ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಲಭ್ಯವಾಗುವ ದಿನಾಂಕದ ಮೊದಲು ಇರಬಾರದು
 ,Sales Funnel,ಮಾರಾಟ ಕೊಳವೆಯನ್ನು
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,ಸಂಕ್ಷೇಪಣ ಕಡ್ಡಾಯ
 DocType: Project,Task Progress,ಟಾಸ್ಕ್ ಪ್ರೋಗ್ರೆಸ್
@@ -5635,7 +5642,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,ಎಲ್ಲಾ ಗ್ರಾಹಕ ಗುಂಪುಗಳು
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,ಕ್ರೋಢಿಕೃತ ಮಾಸಿಕ
 DocType: Attendance Request,On Duty,ಕರ್ತವ್ಯದ ಮೇಲೆ
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ಕಡ್ಡಾಯ. ಬಹುಶಃ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದಾಖಲೆ {2} ಗೆ {1} ದಾಖಲಿಸಿದವರು ಇದೆ.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ಕಡ್ಡಾಯ. ಬಹುಶಃ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದಾಖಲೆ {2} ಗೆ {1} ದಾಖಲಿಸಿದವರು ಇದೆ.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},ಸಿಬ್ಬಂದಿ ಯೋಜನೆ {0} ಈಗಾಗಲೇ ಸ್ಥಾನೀಕರಣಕ್ಕೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು ಕಡ್ಡಾಯವಾಗಿದೆ.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,ಖಾತೆ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
@@ -5716,11 +5723,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,ಕನಿಷ್ಠ ಒಂದು ಗೋದಾಮಿನ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","UOM, ಐಟಂ ಗ್ರೂಪ್, ವಿವರಣೆ ಮತ್ತು ಗಂಟೆಗಳ ಸಂಖ್ಯೆ ಮುಂತಾದ ಐಟಂ ಕ್ಷೇತ್ರಗಳನ್ನು ಕಾನ್ಫಿಗರ್ ಮಾಡಿ."
 DocType: Certification Application,Certification Status,ಪ್ರಮಾಣೀಕರಣ ಸ್ಥಿತಿ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,ಮಾರುಕಟ್ಟೆ ಸ್ಥಳ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,ಮಾರುಕಟ್ಟೆ ಸ್ಥಳ
 DocType: Travel Itinerary,Travel Advance Required,ಪ್ರಯಾಣ ಅಡ್ವಾನ್ಸ್ ಅಗತ್ಯವಿದೆ
 DocType: Subscriber,Subscriber Name,ಚಂದಾದಾರ ಹೆಸರು
 DocType: Serial No,Out of Warranty,ಖಾತರಿ ಹೊರಗೆ
-DocType: Cashier Closing,Cashier-closing-,ಕ್ಯಾಷಿಯರ್-ಕ್ಲೋಸಿಂಗ್-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,ಮ್ಯಾಪ್ ಮಾಡಲಾದ ಡೇಟಾ ಪ್ರಕಾರ
 DocType: BOM Update Tool,Replace,ಬದಲಾಯಿಸಿ
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,ಯಾವುದೇ ಉತ್ಪನ್ನಗಳು ಕಂಡುಬಂದಿಲ್ಲ.
@@ -5808,7 +5814,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,ಮಾರಾಟ ಮತ್ತು ಖರೀದಿಯ ಡೀಫಾಲ್ಟ್ ತೆರಿಗೆ ಟೆಂಪ್ಲೆಟ್ಗಳನ್ನು ರಚಿಸಲಾಗಿದೆ.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,ಅಸೆಸ್ಮೆಂಟ್ ಫಲಿತಾಂಶ ದಾಖಲೆ {0} ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","ಉದಾಹರಣೆ: ಎಬಿಸಿಡಿ #####. ಸರಣಿಯನ್ನು ಹೊಂದಿಸಿದ್ದರೆ ಮತ್ತು ವ್ಯವಹಾರದಲ್ಲಿ ಬ್ಯಾಚ್ ನನ್ನು ಉಲ್ಲೇಖಿಸದಿದ್ದರೆ, ಈ ಸರಣಿಯ ಆಧಾರದ ಮೇಲೆ ಸ್ವಯಂಚಾಲಿತ ಬ್ಯಾಚ್ ಸಂಖ್ಯೆಯನ್ನು ರಚಿಸಲಾಗುತ್ತದೆ. ಈ ಐಟಂಗಾಗಿ ಬ್ಯಾಚ್ ಸಂಖ್ಯೆ ಅನ್ನು ಸ್ಪಷ್ಟವಾಗಿ ನಮೂದಿಸಲು ನೀವು ಯಾವಾಗಲೂ ಬಯಸಿದರೆ, ಇದನ್ನು ಖಾಲಿ ಬಿಡಿ. ಗಮನಿಸಿ: ಈ ಸೆಟ್ಟಿಂಗ್ ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಹೆಸರಿಸುವ ಸರಣಿ ಪೂರ್ವಪ್ರತ್ಯಯದ ಮೇಲೆ ಪ್ರಾಶಸ್ತ್ಯ ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್&gt; ಸಂಖ್ಯಾ ಸರಣಿಗಳ ಮೂಲಕ ಹಾಜರಾತಿಗಾಗಿ ಸೆಟಪ್ ಸಂಖ್ಯೆಯ ಸರಣಿ
 DocType: BOM,Materials Required (Exploded),ಬೇಕಾದ ಸಾಮಗ್ರಿಗಳು (ಸ್ಫೋಟಿಸಿತು )
 DocType: Contract,Party User,ಪಾರ್ಟಿ ಬಳಕೆದಾರ
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',ಕಂಪನಿ ಖಾಲಿ ಫಿಲ್ಟರ್ ಸೆಟ್ ದಯವಿಟ್ಟು ಗುಂಪಿನ ಕಂಪೆನಿ &#39;ಆಗಿದೆ
@@ -6011,7 +6016,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,ಎದುರು ಕೌಂಟ್
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,ಪ್ರಾಯೋಗಿಕ ಅವಧಿಯ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಪ್ರಯೋಗ ಅವಧಿ ಅಂತ್ಯ ದಿನಾಂಕವನ್ನು ಹೊಂದಿಸಬೇಕು
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,ಸರಾಸರಿ ದರ
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ಪಾವತಿ ವೇಳಾಪಟ್ಟಿಗಳಲ್ಲಿ ಒಟ್ಟು ಪಾವತಿ ಮೊತ್ತವು ಗ್ರ್ಯಾಂಡ್ / ದುಂಡಾದ ಒಟ್ಟು ಮೊತ್ತಕ್ಕೆ ಸಮನಾಗಿರಬೇಕು
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ಪಾವತಿ ವೇಳಾಪಟ್ಟಿಗಳಲ್ಲಿ ಒಟ್ಟು ಪಾವತಿ ಮೊತ್ತವು ಗ್ರ್ಯಾಂಡ್ / ದುಂಡಾದ ಒಟ್ಟು ಮೊತ್ತಕ್ಕೆ ಸಮನಾಗಿರಬೇಕು
 DocType: Subscription Plan Detail,Plan,ಯೋಜನೆ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,ಜನರಲ್ ಲೆಡ್ಜರ್ ಪ್ರಕಾರ ಬ್ಯಾಂಕ್ ಹೇಳಿಕೆ ಸಮತೋಲನ
 DocType: Job Applicant,Applicant Name,ಅರ್ಜಿದಾರರ ಹೆಸರು
@@ -6080,7 +6085,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,ಸಾಬೂನು ಹಾಗೂ ಮಾರ್ಜಕ
 DocType: BOM,Show Items,ಐಟಂಗಳನ್ನು ತೋರಿಸಿ
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,ಟೈಮ್ ಟೈಮ್ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,ಎಲ್ಲಾ ಗ್ರಾಹಕರಿಗೆ ಇಮೇಲ್ ಮೂಲಕ ತಿಳಿಸಲು ನೀವು ಬಯಸುವಿರಾ?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,ಎಲ್ಲಾ ಗ್ರಾಹಕರಿಗೆ ಇಮೇಲ್ ಮೂಲಕ ತಿಳಿಸಲು ನೀವು ಬಯಸುವಿರಾ?
 DocType: Subscription Plan,Billing Interval,ಬಿಲ್ಲಿಂಗ್ ಇಂಟರ್ವಲ್
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,ಚಲನಚಿತ್ರ ಮತ್ತು ವೀಡಿಯೊ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ಆದೇಶ
@@ -6089,9 +6094,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,ಸಾಲು {0}: {1} 0 ಗಿಂತಲೂ ದೊಡ್ಡದಾಗಿರಬೇಕು
 DocType: Assessment Criteria,Assessment Criteria Group,ಅಸೆಸ್ಮೆಂಟ್ ಕ್ರೈಟೀರಿಯಾ ಗ್ರೂಪ್
 DocType: Healthcare Settings,Patient Name By,ರೋಗಿಯ ಹೆಸರು ಇವರಿಂದ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},{0} ರಿಂದ {1} ಗೆ ಸಂಬಳಕ್ಕಾಗಿ ಅಕ್ರುಯಲ್ ಜರ್ನಲ್ ಎಂಟ್ರಿ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},{0} ರಿಂದ {1} ಗೆ ಸಂಬಳಕ್ಕಾಗಿ ಅಕ್ರುಯಲ್ ಜರ್ನಲ್ ಎಂಟ್ರಿ
 DocType: Sales Invoice Item,Enable Deferred Revenue,ಮುಂದೂಡಲ್ಪಟ್ಟ ಆದಾಯವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},ಕ್ರೋಢಿಕೃತ ಸವಕಳಿ ತೆರೆಯುವ ಸಮಾನವಾಗಿರುತ್ತದೆ ಕಡಿಮೆ ಇರಬೇಕು {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},ಕ್ರೋಢಿಕೃತ ಸವಕಳಿ ತೆರೆಯುವ ಸಮಾನವಾಗಿರುತ್ತದೆ ಕಡಿಮೆ ಇರಬೇಕು {0}
 DocType: Warehouse,Warehouse Name,ವೇರ್ಹೌಸ್ ಹೆಸರು
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,ನಿಜವಾದ ಪ್ರಾರಂಭ ದಿನಾಂಕವು ನಿಜವಾದ ಅಂತಿಮ ದಿನಾಂಕಕ್ಕಿಂತ ಕಡಿಮೆ ಇರಬೇಕು
 DocType: Naming Series,Select Transaction,ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಆಯ್ಕೆ
@@ -6243,7 +6248,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,{0} ದರ್ಜೆಯ ಉದ್ಯೋಗಿ {0} ಡೀಫಾಲ್ಟ್ ರಜೆ ನೀತಿಯನ್ನು ಹೊಂದಿಲ್ಲ
 DocType: Salary Detail,Salary Detail,ಸಂಬಳ ವಿವರ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,ಮೊದಲ {0} ಆಯ್ಕೆ ಮಾಡಿ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,{0} ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,{0} ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","ಮಲ್ಟಿ-ಟೈರ್ ಪ್ರೋಗ್ರಾಂನ ಸಂದರ್ಭದಲ್ಲಿ, ಗ್ರಾಹಕರು ತಮ್ಮ ಖರ್ಚುಗೆ ಅನುಗುಣವಾಗಿ ಆಯಾ ಶ್ರೇಣಿಗೆ ಸ್ವಯಂ ನಿಯೋಜಿಸಲಾಗುವುದು"
 DocType: Appointment Type,Physician,ವೈದ್ಯ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,ಐಟಂ ಬ್ಯಾಚ್ {0} {1} ಮುಗಿದಿದೆ.
@@ -6388,7 +6393,7 @@
 DocType: Asset,Custodian,ರಕ್ಷಕ
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,ಪಾಯಿಂಟ್ ಯಾ ಮಾರಾಟಕ್ಕೆ ವಿವರ
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} 0 ಮತ್ತು 100 ರ ನಡುವಿನ ಮೌಲ್ಯವಾಗಿರಬೇಕು
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},{1} ರಿಂದ {1} ಗೆ {2} ಗೆ ಪಾವತಿ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},{1} ರಿಂದ {1} ಗೆ {2} ಗೆ ಪಾವತಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,ಅಸುರಕ್ಷಿತ ಸಾಲ
 DocType: Cost Center,Cost Center Name,ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ಹೆಸರು
 DocType: Student,B+,ಬಿ +
@@ -6420,6 +6425,7 @@
 DocType: Employee,Date of Issue,ಸಂಚಿಕೆ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","ಖರೀದಿ Reciept ಅಗತ್ಯವಿದೆ == &#39;ಹೌದು&#39;, ನಂತರ ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ರಚಿಸಲು, ಬಳಕೆದಾರ ಐಟಂ ಮೊದಲ ಖರೀದಿ ರಸೀತಿ ರಚಿಸಬೇಕಾಗಿದೆ ವೇಳೆ ಬೈಯಿಂಗ್ ಸೆಟ್ಟಿಂಗ್ಗಳು ಪ್ರಕಾರ {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},ರೋ # {0}: ಐಟಂ ಹೊಂದಿಸಿ ಸರಬರಾಜುದಾರ {1}
+DocType: Global Defaults,Default Distance Unit,ಡೀಫಾಲ್ಟ್ ದೂರ ಘಟಕ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,ರೋ {0}: ಗಂಟೆಗಳು ಮೌಲ್ಯವನ್ನು ಶೂನ್ಯ ಹೆಚ್ಚು ಇರಬೇಕು.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,ಐಟಂ {1} ಜೋಡಿಸಲಾದ ವೆಬ್ಸೈಟ್ ಚಿತ್ರ {0} ದೊರೆಯುತ್ತಿಲ್ಲ
 DocType: Issue,Content Type,ವಿಷಯ ಪ್ರಕಾರ
@@ -6475,7 +6481,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
 DocType: Asset,Naming Series,ಸರಣಿ ಹೆಸರಿಸುವ
 DocType: Vital Signs,Coated,ಕೋಟೆಡ್
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,ಸಾಲು {0}: ಉಪಯುಕ್ತ ಜೀವನ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯವು ಒಟ್ಟು ಮೊತ್ತದ ಮೊತ್ತಕ್ಕಿಂತ ಕಡಿಮೆಯಿರಬೇಕು
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,ಸಾಲು {0}: ಉಪಯುಕ್ತ ಜೀವನ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯವು ಒಟ್ಟು ಮೊತ್ತದ ಮೊತ್ತಕ್ಕಿಂತ ಕಡಿಮೆಯಿರಬೇಕು
 DocType: GoCardless Settings,GoCardless Settings,GoCardless ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Leave Block List,Leave Block List Name,ಖಂಡ ಬಿಡಿ ಹೆಸರು
 DocType: Certified Consultant,Certification Validity,ಪ್ರಮಾಣೀಕರಣ ವಾಯಿದೆ
@@ -6544,6 +6550,7 @@
 DocType: Bank Statement Settings Item,Bank Header,ಬ್ಯಾಂಕ್ ಶಿರೋಲೇಖ
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,ಲ್ಯಾಬ್ ಪರೀಕ್ಷೆಗಳನ್ನು ವೀಕ್ಷಿಸಿ
 DocType: Hub Users,Hub Users,ಹಬ್ ಬಳಕೆದಾರರು
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕರ ಗುಂಪು&gt; ಪ್ರದೇಶ
 DocType: Purchase Invoice,Y,ವೈ
 DocType: Maintenance Visit,Maintenance Date,ನಿರ್ವಹಣೆ ದಿನಾಂಕ
 DocType: Purchase Invoice Item,Rejected Serial No,ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ
@@ -6559,7 +6566,7 @@
 DocType: SG Creation Tool Course,Max Strength,ಮ್ಯಾಕ್ಸ್ ಸಾಮರ್ಥ್ಯ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,ಪೂರ್ವನಿಗದಿಗಳು ಅನುಸ್ಥಾಪಿಸುವುದು
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH - .YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},ಗ್ರಾಹಕರಲ್ಲಿ ಯಾವುದೇ ಡೆಲಿವರಿ ಸೂಚನೆ ಆಯ್ಕೆ ಮಾಡಲಾಗಿಲ್ಲ {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},ಗ್ರಾಹಕರಲ್ಲಿ ಯಾವುದೇ ಡೆಲಿವರಿ ಸೂಚನೆ ಆಯ್ಕೆ ಮಾಡಲಾಗಿಲ್ಲ {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,ಉದ್ಯೋಗಿ {0} ಗರಿಷ್ಠ ಲಾಭದ ಮೊತ್ತವನ್ನು ಹೊಂದಿಲ್ಲ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,ಡೆಲಿವರಿ ದಿನಾಂಕವನ್ನು ಆಧರಿಸಿ ಐಟಂಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
 DocType: Grant Application,Has any past Grant Record,ಯಾವುದೇ ಹಿಂದಿನ ಗ್ರಾಂಟ್ ರೆಕಾರ್ಡ್ ಇದೆ
@@ -6587,7 +6594,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,ಹೋಟೆಲ್ ಕೊಠಡಿ ಮೀಸಲಾತಿ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,ಗ್ರಾಹಕ ಸೇವೆ
 DocType: BOM,Thumbnail,ಥಂಬ್ನೇಲ್
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,ಇಮೇಲ್ ID ಗಳೊಂದಿಗಿನ ಯಾವುದೇ ಸಂಪರ್ಕಗಳು ಕಂಡುಬಂದಿಲ್ಲ.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,ಇಮೇಲ್ ID ಗಳೊಂದಿಗಿನ ಯಾವುದೇ ಸಂಪರ್ಕಗಳು ಕಂಡುಬಂದಿಲ್ಲ.
 DocType: Item Customer Detail,Item Customer Detail,ಗ್ರಾಹಕ ಐಟಂ ವಿವರ
 DocType: Notification Control,Prompt for Email on Submission of,ಸಲ್ಲಿಕೆ ಇಮೇಲ್ ಪ್ರಾಂಪ್ಟಿನಲ್ಲಿ
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},ಉದ್ಯೋಗಿಗಳ ಗರಿಷ್ಠ ಲಾಭದ ಮೊತ್ತವು {0} ಮೀರುತ್ತದೆ {1}
@@ -6848,7 +6855,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,ಖಾತೆ ಕೌಟುಂಬಿಕತೆ ಆಯ್ಕೆ ಏಕೆಂದರೆ ಗ್ರೂಪ್ ನಿಗೂಢ ಸಾಧ್ಯವಿಲ್ಲ.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} ಮಾರ್ಪಡಿಸಲಾಗಿದೆ. ರಿಫ್ರೆಶ್ ಮಾಡಿ.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,ಕೆಳಗಿನ ದಿನಗಳಲ್ಲಿ ಲೀವ್ ಅಪ್ಲಿಕೇಶನ್ ಮಾಡುವ ಬಳಕೆದಾರರನ್ನು ನಿಲ್ಲಿಸಿ .
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗ್ರೂಪ್&gt; ಬ್ರ್ಯಾಂಡ್
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","ಲಾಯಲ್ಟಿ ಪಾಯಿಂಟ್ಗಳಿಗಾಗಿ ಅನಿಯಮಿತ ಅವಧಿ ವೇಳೆ, ಮುಕ್ತಾಯ ಅವಧಿ ಖಾಲಿ ಅಥವಾ 0 ಅನ್ನು ಇರಿಸಿ."
 DocType: Asset Maintenance Team,Maintenance Team Members,ನಿರ್ವಹಣೆ ತಂಡ ಸದಸ್ಯರು
 DocType: Loyalty Point Entry,Purchase Amount,ಖರೀದಿಯ ಮೊತ್ತ
@@ -6856,7 +6862,7 @@
 											to fullfill Sales Order {2}",ಸೀರಿಯಲ್ ಅನ್ನು {0} ಐಟಂನಲ್ಲ {1} ವಿತರಿಸಲಾಗುವುದಿಲ್ಲ ಏಕೆಂದರೆ ಇದು ಪೂರ್ಣ ತುಂಬಿದ ಮಾರಾಟದ ಆದೇಶಕ್ಕೆ {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN -YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ {0} ದಾಖಲಿಸಿದವರು
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,ಅಂತ್ಯ ವರ್ಷ ಪ್ರಾರಂಭ ವರ್ಷ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,ಅಂತ್ಯ ವರ್ಷ ಪ್ರಾರಂಭ ವರ್ಷ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Employee Benefit Application,Employee Benefits,ಉದ್ಯೋಗಿ ಸೌಲಭ್ಯಗಳು
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},{0} ಸತತವಾಗಿ {1} ಪ್ಯಾಕ್ಡ್ ಪ್ರಮಾಣ ಐಟಂ ಪ್ರಮಾಣ ಸಮ
 DocType: Work Order,Manufactured Qty,ತಯಾರಿಸಲ್ಪಟ್ಟ ಪ್ರಮಾಣ
@@ -6872,6 +6878,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,ಬ್ಯಾಚ್ ಸಂಖ್ಯೆಗಳು ಆಯ್ಕೆ
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,GSTIN ಗೆ
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ಗ್ರಾಹಕರು ಬೆಳೆದ ಬಿಲ್ಲುಗಳನ್ನು .
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,ಮಾನವ ಸಂಪನ್ಮೂಲ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಉದ್ಯೋಗಿ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಸಿದ್ಧಗೊಳಿಸಿ
 DocType: Healthcare Settings,Invoice Appointments Automatically,ಸರಕುಪಟ್ಟಿ ನೇಮಕಾತಿಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ಪ್ರಾಜೆಕ್ಟ್ ಐಡಿ
 DocType: Salary Component,Variable Based On Taxable Salary,ತೆರಿಗೆ ಸಂಬಳದ ಮೇಲೆ ವೇರಿಯೇಬಲ್ ಆಧರಿಸಿ
@@ -6920,7 +6927,7 @@
 DocType: POS Profile,Account for Change Amount,ಪ್ರಮಾಣ ಚೇಂಜ್ ಖಾತೆ
 DocType: QuickBooks Migrator,Connecting to QuickBooks,ಕ್ವಿಕ್ಬುಕ್ಸ್ನಲ್ಲಿ ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ
 DocType: Exchange Rate Revaluation,Total Gain/Loss,ಒಟ್ಟು ಲಾಭ / ನಷ್ಟ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,ಇಂಟರ್ ಕಂಪೆನಿ ಸರಕುಪಟ್ಟಿಗಾಗಿ ಅಮಾನ್ಯ ಕಂಪನಿ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,ಇಂಟರ್ ಕಂಪೆನಿ ಸರಕುಪಟ್ಟಿಗಾಗಿ ಅಮಾನ್ಯ ಕಂಪನಿ.
 DocType: Purchase Invoice,input service,ಇನ್ಪುಟ್ ಸೇವೆ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ಸಾಲು {0}: ಪಕ್ಷದ / ಖಾತೆ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {1} / {2} ನಲ್ಲಿ {3} {4}
 DocType: Employee Promotion,Employee Promotion,ನೌಕರರ ಪ್ರಚಾರ
@@ -7050,7 +7057,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,ವಸತಿಗಾಗಿ ಆದ್ಯತೆಯ ಪ್ರದೇಶ
 apps/erpnext/erpnext/config/selling.py +184,Analytics,ಅನಾಲಿಟಿಕ್ಸ್
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,ಕಾರ್ಟ್ ಖಾಲಿಯಾಗಿದೆ
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,ದಯವಿಟ್ಟು ಶೈಕ್ಷಣಿಕ&gt; ಶಿಕ್ಷಣ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ತರಬೇತುದಾರ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಸಿದ್ಧಗೊಳಿಸಿ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",ಐಟಂ {0} ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ ಇಲ್ಲ. ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ ಮಾತ್ರ ಆಧರಿಸಿ ವಿತರಣಾ ವಸ್ತುಗಳನ್ನು ಮಾತ್ರ ಪೂರೈಸಬಹುದು
 DocType: Vehicle,Model,ಮಾದರಿ
@@ -7080,7 +7086,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,ಬದಲಿಸಲು ಏನೂ ಇಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,ಒಂದು CSV ಕಡತ ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Holiday List,Total Holidays,ಒಟ್ಟು ರಜಾದಿನಗಳು
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,ರವಾನೆಗಾಗಿ ಇಮೇಲ್ ಟೆಂಪ್ಲೇಟ್ ಕಳೆದುಹೋಗಿದೆ. ದಯವಿಟ್ಟು ಡೆಲಿವರಿ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಒಂದನ್ನು ಹೊಂದಿಸಿ.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,ರವಾನೆಗಾಗಿ ಇಮೇಲ್ ಟೆಂಪ್ಲೇಟ್ ಕಳೆದುಹೋಗಿದೆ. ದಯವಿಟ್ಟು ಡೆಲಿವರಿ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಒಂದನ್ನು ಹೊಂದಿಸಿ.
 DocType: Student Leave Application,Mark as Present,ಪ್ರೆಸೆಂಟ್ ಮಾರ್ಕ್
 DocType: Supplier Scorecard,Indicator Color,ಸೂಚಕ ಬಣ್ಣ
 DocType: Purchase Order,To Receive and Bill,ಸ್ವೀಕರಿಸಿ ಮತ್ತು ಬಿಲ್
@@ -7089,7 +7095,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,ಡಿಸೈನರ್
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ಟೆಂಪ್ಲೇಟು
-DocType: Serial No,Delivery Details,ಡೆಲಿವರಿ ವಿವರಗಳು
+DocType: Delivery Trip,Delivery Details,ಡೆಲಿವರಿ ವಿವರಗಳು
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},ವೆಚ್ಚ ಸೆಂಟರ್ ಸಾಲು ಅಗತ್ಯವಿದೆ {0} ತೆರಿಗೆಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾದರಿ {1}
 DocType: Program,Program Code,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ಕೋಡ್
 DocType: Terms and Conditions,Terms and Conditions Help,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ಸಹಾಯ
@@ -7113,7 +7119,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ಟೈಮ್ ಡೇಸ್ ಲೀಡ್
 DocType: Cash Flow Mapping,Is Income Tax Expense,ಆದಾಯ ತೆರಿಗೆ ಖರ್ಚು
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,ವಿತರಣೆಗಾಗಿ ನಿಮ್ಮ ಆದೇಶ ಹೊರಗಿದೆ!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ರೋ # {0}: ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಖರೀದಿ ದಿನಾಂಕ ಅದೇ ಇರಬೇಕು {1} ಸ್ವತ್ತಿನ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ರೋ # {0}: ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಖರೀದಿ ದಿನಾಂಕ ಅದೇ ಇರಬೇಕು {1} ಸ್ವತ್ತಿನ {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,ವಿದ್ಯಾರ್ಥಿ ಇನ್ಸ್ಟಿಟ್ಯೂಟ್ನ ಹಾಸ್ಟೆಲ್ ನಲ್ಲಿ ವಾಸಿಸುವ ಇದೆ ಎಂಬುದನ್ನು ಪರಿಶೀಲಿಸಿ.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,ದಯವಿಟ್ಟು ಮೇಲಿನ ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ನಮೂದಿಸಿ
 ,Stock Summary,ಸ್ಟಾಕ್ ಸಾರಾಂಶ
diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv
index 5b4c91a..f47e0ca 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,기간 이름
 DocType: Employee,Salary Mode,급여 모드
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,레지스터
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,레지스터
 DocType: Patient,Divorced,이혼
 DocType: Support Settings,Post Route Key,경로 키 게시
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,항목은 트랜잭션에 여러 번 추가 할 수
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,새로운 환율
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},환율은 가격 목록에 필요한 {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* 트랜잭션에서 계산됩니다.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT- .YYYY.-
 DocType: Purchase Order,Customer Contact,고객 연락처
 DocType: Patient Appointment,Check availability,이용 가능 여부 확인
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,오픈보기
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,시리즈가 업데이트
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,점검
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{1} 행의 {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{1} 행의 {0}
 DocType: Asset Finance Book,Depreciation Start Date,감가 상각비 기일
 DocType: Pricing Rule,Apply On,에 적용
 DocType: Item Price,Multiple Item prices.,여러 품목의 가격.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,실험실 처방전
 ,Delay Days,지연 일
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,서비스 비용
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},일련 번호 : {0}은 (는) 판매 송장에서 이미 참조되었습니다. {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},일련 번호 : {0}은 (는) 판매 송장에서 이미 참조되었습니다. {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,송장
 DocType: Purchase Invoice Item,Item Weight Details,품목 무게 세부 사항
 DocType: Asset Maintenance Log,Periodicity,주기성
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,회계사
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,판매 가격리스트
 DocType: Patient,Tobacco Current Use,담배 현재 사용
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","시작일 및 종료일이 직업 카드 <a href=""#Form/Job Card/{0}"">{1} (으</a> )로 겹쳐 있습니다."
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,판매율
 DocType: Cost Center,Stock User,재고 사용자
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,관련
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,출석 날짜는 직원의 입사 날짜보다 작을 수 없습니다
 DocType: Grading Scale,Grading Scale Name,등급 스케일 이름
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,마켓 플레이스에 사용자 추가
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,마켓 플레이스에 사용자 추가
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,이 루트 계정 및 편집 할 수 없습니다.
 DocType: Sales Invoice,Company Address,회사 주소
 DocType: BOM,Operations,운영
@@ -322,7 +322,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,비교 수량
 DocType: Production Plan,Material Request Detail,자재 요청 세부 사항
 DocType: Selling Settings,Default Quotation Validity Days,기본 견적 유효 기간
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","행에있는 세금을 포함하려면 {0} 항목의 요금에, 행의 세금은 {1}도 포함되어야한다"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","행에있는 세금을 포함하려면 {0} 항목의 요금에, 행의 세금은 {1}도 포함되어야한다"
 DocType: SMS Center,SMS Center,SMS 센터
 DocType: Payroll Entry,Validate Attendance,출석 확인
 DocType: Sales Invoice,Change Amount,변화량
@@ -441,7 +441,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,즉 양에 대한 줄 간격
 DocType: Vehicle,Additional Details,추가 세부 사항
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,주어진 설명이 없습니다
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,공급 업체&gt; 공급 업체 그룹
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,구입 요청합니다.
 DocType: POS Closing Voucher Details,Collected Amount,징수 금액
 DocType: Lab Test,Submitted Date,제출 날짜
@@ -486,7 +485,7 @@
 DocType: Student Admission,Student Admission,학생 입학
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,{0} 항목 취소
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,감가 상각 행 {0} : 감가 상각 시작일이 과거 날짜로 입력됩니다.
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,감가 상각 행 {0} : 감가 상각 시작일이 과거 날짜로 입력됩니다.
 DocType: Contract Template,Fulfilment Terms and Conditions,이행 조건
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,자료 요청
 DocType: Bank Reconciliation,Update Clearance Date,업데이트 통관 날짜
@@ -543,6 +542,7 @@
 DocType: Accounts Settings,Settings for Accounts,계정에 대한 설정
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},공급 업체 송장 번호는 구매 송장에 존재 {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,판매 인 나무를 관리합니다.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.",Google지도 설정이 사용 중지되어 있으므로 경로를 처리 할 수 없습니다.
 DocType: Job Applicant,Cover Letter,커버 레터
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,뛰어난 수표 및 취소 예금
 DocType: Item,Synced With Hub,허브와 동기화
@@ -602,7 +602,7 @@
 DocType: Asset Value Adjustment,New Asset Value,새로운 자산 가치
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,고객 통화는 고객의 기본 통화로 변환하는 속도에
 DocType: Course Scheduling Tool,Course Scheduling Tool,코스 일정 도구
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},행 # {0} : 구매 송장 기존 자산에 대해 할 수 없습니다 {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},행 # {0} : 구매 송장 기존 자산에 대해 할 수 없습니다 {1}
 DocType: Crop Cycle,LInked Analysis,LInked 분석
 DocType: POS Closing Voucher,POS Closing Voucher,POS 클로징 바우처
 DocType: Contract,Lapsed,지나간
@@ -637,6 +637,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1}이 (가) 과정에 등록되지 않았습니다. {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,학생 이름:
 DocType: POS Closing Voucher Details,Difference,차
+DocType: Delivery Settings,Delay between Delivery Stops,배달 중단 사이의 지연
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},일련 번호 {0} 배달 주에 속하지 않는 {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.",서버의 GoCardless 구성에 문제가있는 것 같습니다. 실패 할 경우 걱정하지 마십시오. 금액이 귀하의 계정으로 환급됩니다.
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext 데모
@@ -697,7 +698,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,수량 및 평가
 DocType: Delivery Note,% Installed,% 설치
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,교실 / 강의는 예약 할 수 있습니다 연구소 등.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,두 회사의 회사 통화는 Inter Company Transactions와 일치해야합니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,두 회사의 회사 통화는 Inter Company Transactions와 일치해야합니다.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,첫 번째 회사 이름을 입력하십시오
 DocType: Travel Itinerary,Non-Vegetarian,비 채식주의 자
 DocType: Purchase Invoice,Supplier Name,공급 업체 이름
@@ -784,7 +785,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,날짜에서 대여 됨
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,충분한 부품 작성하기
 DocType: POS Profile User,POS Profile User,POS 프로필 사용자
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,행 {0} : 감가 상각 시작일이 필요합니다.
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,행 {0} : 감가 상각 시작일이 필요합니다.
 DocType: Purchase Invoice Item,Service Start Date,서비스 시작 날짜
 DocType: Subscription Invoice,Subscription Invoice,구독 송장
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,직접 수입
@@ -853,7 +854,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,약어는 이미 다른 회사에 사용
 DocType: Selling Settings,Default Customer Group,기본 고객 그룹
 DocType: Employee,IFSC Code,IFSC 코드
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","시작일 및 종료일이 직업 카드 <a href=""#Form/Job Card/{0}"">{1} (으</a> )로 겹쳐 있습니다."
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","사용하지 않으면, '둥근 총'이 필드는 모든 트랜잭션에서 볼 수 없습니다"
 DocType: BOM,Operating Cost,운영 비용
 DocType: Crop,Produced Items,생산 품목
@@ -905,7 +905,7 @@
 DocType: Supplier,Prevent RFQs,RFQ 방지
 DocType: Hub User,Hub User,허브 사용자
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,확인 판매 주문
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},급여 전표가 {0}에서 {1}까지 기간 동안 제출되었습니다.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},급여 전표가 {0}에서 {1}까지 기간 동안 제출되었습니다.
 DocType: Project Task,Project Task,프로젝트 작업
 DocType: Loyalty Point Entry Redemption,Redeemed Points,상환 포인트
 ,Lead Id,리드 아이디
@@ -1037,7 +1037,7 @@
 DocType: Fee Validity,Max number of visit,최대 방문 횟수
 ,Hotel Room Occupancy,호텔 객실 점유
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,작업 표 작성 :
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},지불 모드로 기본 현금 또는 은행 계정을 설정하십시오 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},지불 모드로 기본 현금 또는 은행 계정을 설정하십시오 {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,싸다
 DocType: GST Settings,GST Settings,GST 설정
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},통화는 가격표 통화와 같아야합니다 통화 : {0}
@@ -1092,7 +1092,7 @@
 DocType: Vehicle Log,Service Details,서비스 세부 정보
 DocType: Lab Test Template,Grouped,그룹화 된
 DocType: Selling Settings,Delivery Note Required,배송 참고 필요한
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,급여 전표 제출 중 ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,급여 전표 제출 중 ...
 DocType: Bank Guarantee,Bank Guarantee Number,은행 보증 번호
 DocType: Assessment Criteria,Assessment Criteria,평가 기준
 DocType: BOM Item,Basic Rate (Company Currency),기본 요금 (회사 통화)
@@ -1117,13 +1117,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,결제 항목이 이미 생성
 DocType: Request for Quotation,Get Suppliers,공급 업체 얻기
 DocType: Purchase Receipt Item Supplied,Current Stock,현재 재고
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},행 번호는 {0} : {1} 자산이 항목에 연결되지 않는 {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},행 번호는 {0} : {1} 자산이 항목에 연결되지 않는 {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,미리보기 연봉 슬립
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,계정 {0} 여러 번 입력 된
 DocType: Account,Expenses Included In Valuation,비용은 평가에 포함
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,회원 자격이 30 일 이내에 만료되는 경우에만 갱신 할 수 있습니다.
 DocType: Shopping Cart Settings,Show Stock Availability,재고 상태 표시
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},자산 카테고리 {1} 또는 회사 {2}에서 {0}을 (를)
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},자산 카테고리 {1} 또는 회사 {2}에서 {0}을 (를)
 DocType: Location,Longitude,경도
 ,Absent Student Report,결석 한 학생 보고서
 DocType: Crop,Crop Spacing UOM,자르기 간격 UOM
@@ -1196,7 +1196,7 @@
 DocType: Soil Texture,Sand,모래
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,에너지
 DocType: Opportunity,Opportunity From,기회에서
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,행 {0} : {1} 품목 {2}에 필요한 일련 번호. 귀하는 {3}을 (를) 제공했습니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,행 {0} : {1} 품목 {2}에 필요한 일련 번호. 귀하는 {3}을 (를) 제공했습니다.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,표를 선택하십시오.
 DocType: BOM,Website Specifications,웹 사이트 사양
 DocType: Special Test Items,Particulars,상세
@@ -1307,7 +1307,7 @@
 DocType: Item,Items with higher weightage will be shown higher,높은 weightage와 항목에서 높은 표시됩니다
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,실험실 검사 및 활력 징후
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,은행 계정조정 세부 정보
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,행 번호 {0} 자산이 {1} 제출해야합니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,행 번호 {0} 자산이 {1} 제출해야합니다
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,검색된 직원이 없습니다
 DocType: Item,If subcontracted to a vendor,공급 업체에 하청하는 경우
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,학생 그룹이 이미 업데이트되었습니다.
@@ -1362,7 +1362,6 @@
 DocType: Loyalty Program Collection,Tier Name,계층 이름
 DocType: HR Settings,Enter retirement age in years,년에 은퇴 연령을 입력
 DocType: Crop,Target Warehouse,목표웨어 하우스
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,설정&gt; 설정&gt; 이름 지정 시리즈를 통해 이름 지정 시리즈를 {0}으로 설정하십시오.
 DocType: Payroll Employee Detail,Payroll Employee Detail,급여 직원 세부 정보
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,창고를 선택하십시오.
 DocType: Cheque Print Template,Starting location from left edge,왼쪽 가장자리에서 위치 시작
@@ -1452,7 +1451,7 @@
 DocType: Work Order,Plan material for sub-assemblies,서브 어셈블리 계획 물질
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,판매 파트너 및 지역
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0}이 활성화되어 있어야합니다
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,전송 가능한 항목이 없습니다.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,전송 가능한 항목이 없습니다.
 DocType: Employee Boarding Activity,Activity Name,활동 이름
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,출시일 변경
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,완제품 수량 <b>{0}</b> 및 수량 <b>{1}</b> 은 다를 수 없습니다.
@@ -1682,6 +1681,7 @@
 DocType: Project,First Email,첫 번째 이메일
 DocType: Company,Exception Budget Approver Role,예외 예산 승인자 역할
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date",일단 설정되면이 송장은 설정된 날짜까지 보류 상태가됩니다.
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,판매 주문 / 완제품 창고에서 예약 창고
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,판매 금액
 DocType: Repayment Schedule,Interest Amount,이자 금액
@@ -1693,7 +1693,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,기록
 DocType: Asset,Scrapped,폐기
 DocType: Item,Item Defaults,항목 기본값
-DocType: Purchase Invoice,Returns,보고
+DocType: Cashier Closing,Returns,보고
 DocType: Job Card,WIP Warehouse,WIP 창고
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},일련 번호는 {0}까지 유지 보수 계약에 따라 {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,신병 모집
@@ -1707,7 +1707,6 @@
 DocType: Student,A-,에이-
 DocType: Share Transfer,Transfer Type,전송 유형
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,영업 비용
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,고객&gt; 고객 그룹&gt; 지역
 DocType: Diagnosis,Diagnosis,진단
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,표준 구매
 DocType: Attendance Request,Explanation,설명
@@ -1720,7 +1719,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,구매 오더 품목 마감
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,우편 번호
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},판매 주문 {0}를 {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},대출 {0}에서이자 소득 계좌를 선택하십시오.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},대출 {0}에서이자 소득 계좌를 선택하십시오.
 DocType: Opportunity,Contact Info,연락처 정보
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,재고 항목 만들기
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,상태가 왼쪽 인 직원을 승격 할 수 없습니다.
@@ -1732,7 +1731,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,결제 시간이 0 인 경우 인보이스를 작성할 수 없습니다.
 DocType: Company,Date of Commencement,시작 날짜
 DocType: Sales Person,Select company name first.,첫 번째 회사 이름을 선택합니다.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},이메일로 전송 {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},이메일로 전송 {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,인용문은 공급 업체에서 받았다.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,모든 BOM에서 BOM 교체 및 최신 가격 업데이트
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},에 {0} | {1} {2}
@@ -1754,7 +1753,7 @@
 DocType: Asset Movement,From Employee,직원에서
 DocType: Driver,Cellphone Number,핸드폰 번호
 DocType: Project,Monitor Progress,진행 상황 모니터링
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,경고 : 시스템이 {0} {1} 제로의 항목에 대한 금액 때문에 과다 청구를 확인하지 않습니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,경고 : 시스템이 {0} {1} 제로의 항목에 대한 금액 때문에 과다 청구를 확인하지 않습니다
 DocType: Journal Entry,Make Difference Entry,차액 항목을 만듭니다
 DocType: Supplier Quotation,Auto Repeat Section,자동 반복 섹션
 DocType: Upload Attendance,Attendance From Date,날짜부터 출석
@@ -1857,7 +1856,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,행 번호 {0} : 수량은 구매 대가로 입력 할 수 없습니다 거부
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,선택한 고객에 대한 고객 그룹 변경은 허용되지 않습니다.
 ,Purchase Order Items To Be Billed,청구 할 수 구매 주문 아이템
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,예상 도착 시간 업데이트.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,예상 도착 시간 업데이트.
 DocType: Program Enrollment Tool,Enrollment Details,등록 세부 정보
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,한 회사에 대해 여러 개의 항목 기본값을 설정할 수 없습니다.
 DocType: Purchase Invoice Item,Net Rate,인터넷 속도
@@ -1871,7 +1870,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,탈퇴 유형은 madatory이다.
 DocType: Support Settings,Close Issue After Days,일 후 닫기 문제
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,마켓 플레이스에 사용자를 추가하려면 System Manager 및 Item Manager 역할이있는 사용자 여야합니다.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,마켓 플레이스에 사용자를 추가하려면 System Manager 및 Item Manager 역할이있는 사용자 여야합니다.
 DocType: Leave Control Panel,Leave blank if considered for all branches,모든 지점을 고려하는 경우 비워 둡니다
 DocType: Job Opening,Staffing Plan,인력 충원 계획
 DocType: Bank Guarantee,Validity in Days,유효 기간
@@ -1893,7 +1892,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},중복 행 {0}과 같은 {1}
 DocType: Marketplace Settings,Disable Marketplace,마켓 플레이스 사용 중지
 ,Trial Balance,시산표
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,찾을 수 없습니다 회계 연도 {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,찾을 수 없습니다 회계 연도 {0}
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,직원 설정
 DocType: Hotel Room Reservation,Hotel Reservation User,호텔 예약 사용자
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,첫 번째 접두사를 선택하세요
@@ -2001,7 +2000,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,로그인 실패
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,저작물 {0}이 생성되었습니다.
 DocType: Special Test Items,Special Test Items,특별 시험 항목
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,마켓 플레이스에 등록하려면 System Manager 및 Item Manager 역할이있는 사용자 여야합니다.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,마켓 플레이스에 등록하려면 System Manager 및 Item Manager 역할이있는 사용자 여야합니다.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,결제 방식
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,지정된 급여 구조에 따라 혜택을 신청할 수 없습니다
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,웹 사이트의 이미지가 공개 파일 또는 웹 사이트 URL이어야합니다
@@ -2013,7 +2012,7 @@
 DocType: Warehouse,Warehouse Contact Info,창고 연락처 정보
 DocType: Payment Entry,Write Off Difference Amount,차이 금액 오프 쓰기
 DocType: Volunteer,Volunteer Name,자원 봉사자 이름
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},다른 행에 중복 만기일이있는 행이 발견되었습니다 : {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},다른 행에 중복 만기일이있는 행이 발견되었습니다 : {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0} : 직원의 이메일을 찾을 수 없습니다, 따라서 보낸 이메일이 아닌"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},주어진 날짜 {1}에 직원 {0}에게 지정된 급여 구조가 없습니다.
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},국가 {0}에는 배송 규칙이 적용되지 않습니다.
@@ -2104,6 +2103,7 @@
 DocType: Salary Component,Earning,당기순이익
 DocType: Supplier Scorecard,Scoring Criteria,득점 기준
 DocType: Purchase Invoice,Party Account Currency,파티 계정 환율
+DocType: Delivery Trip,Total Estimated Distance,총 예상 거리
 ,BOM Browser,BOM 브라우저
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,이 교육 이벤트의 상태를 업데이트하십시오.
 DocType: Item Barcode,EAN,EAN
@@ -2142,7 +2142,7 @@
 DocType: Activity Cost,Projects,프로젝트
 DocType: Payment Request,Transaction Currency,거래 통화
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},에서 {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,일부 이메일이 유효하지 않습니다.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,일부 이메일이 유효하지 않습니다.
 DocType: Work Order Operation,Operation Description,작업 설명
 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.,회계 연도 시작 날짜와 회계 연도가 저장되면 회계 연도 종료 날짜를 변경할 수 없습니다.
 DocType: Quotation,Shopping Cart,쇼핑 카트
@@ -2166,7 +2166,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,고정 자산의 순 변화
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,요구 수량
 DocType: Leave Control Panel,Leave blank if considered for all designations,모든 지정을 고려하는 경우 비워 둡니다
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,유형 행 {0}에있는 '실제'의 책임은 상품 요금에 포함 할 수 없습니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,유형 행 {0}에있는 '실제'의 책임은 상품 요금에 포함 할 수 없습니다
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},최대 : {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,날짜 시간에서
 DocType: Shopify Settings,For Company,회사
@@ -2180,7 +2180,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,수업 일정을 만드는 중에 오류가 발생했습니다.
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,목록의 첫 번째 비용 승인자가 기본 비용 승인자로 설정됩니다.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,100보다 큰 수 없습니다
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,마켓 플레이스에 등록하려면 System Manager 및 Item Manager 역할이있는 관리자 이외의 사용자 여야합니다.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,마켓 플레이스에 등록하려면 System Manager 및 Item Manager 역할이있는 관리자 이외의 사용자 여야합니다.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC- .YYYY.-
 DocType: Maintenance Visit,Unscheduled,예약되지 않은
@@ -2209,7 +2209,7 @@
 DocType: HR Settings,Employee Settings,직원 설정
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,결제 시스템로드 중
 ,Batch-Wise Balance History,배치 식 밸런스 역사
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Row # {0} : 금액이 Item {1}의 청구 금액보다 큰 경우 Rate를 설정할 수 없습니다.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Row # {0} : 금액이 Item {1}의 청구 금액보다 큰 경우 Rate를 설정할 수 없습니다.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,인쇄 설정은 각각의 인쇄 형식 업데이트
 DocType: Package Code,Package Code,패키지 코드
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,도제
@@ -2444,7 +2444,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{3}의 자회사에 이미 계획되어있는 {2}의 {0} 공석 및 {1} 예산. \ 모기업 {3}에 대한 인력 계획 {6}만큼만 {4} 개의 공석 및 예산 {5}까지 계획 할 수 있습니다.
 DocType: HR Settings,Stop Birthday Reminders,정지 생일 알림
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},회사에서 기본 급여 채무 계정을 설정하십시오 {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},회사에서 기본 급여 채무 계정을 설정하십시오 {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,아마존에 의한 세금 및 요금 데이터의 재정적 인 해체
 DocType: SMS Center,Receiver List,수신기 목록
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,검색 항목
@@ -2514,7 +2514,7 @@
 DocType: Vital Signs,Constipated,변비
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},공급 업체 청구서를 {0} 일자 {1}
 DocType: Customer,Default Price List,기본 가격리스트
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,자산 이동 기록 {0} 작성
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,자산 이동 기록 {0} 작성
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,제품을 찾지 못했습니다.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,당신은 삭제할 수 없습니다 회계 연도 {0}. 회계 연도 {0} 전역 설정에서 기본값으로 설정
 DocType: Share Transfer,Equity/Liability Account,지분 / 책임 계정
@@ -2654,6 +2654,7 @@
 DocType: Blanket Order,Order Type,주문 유형
 ,Item-wise Sales Register,상품이 많다는 판매 등록
 DocType: Asset,Gross Purchase Amount,총 구매 금액
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 상품 그룹&gt; 브랜드
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,기초 잔액
 DocType: Asset,Depreciation Method,감가 상각 방법
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,이 세금은 기본 요금에 포함되어 있습니까?
@@ -2735,7 +2736,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,연간 예산이 PO에 초과하는 경우의 조치
 DocType: Student Leave Application,Student Leave Application,학생 휴가 신청
 DocType: Item,Will also apply for variants,또한 변형 적용됩니다
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}",이미 같이 자산은 취소 할 수 없습니다 {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}",이미 같이 자산은 취소 할 수 없습니다 {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},에 반나절에 직원 {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},총 근무 시간은 최대 근무 시간보다 더 안 {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,켜기
@@ -2759,6 +2760,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,데이터 가져 오기
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},탈퇴 유형 {0}에 허용되는 최대 휴가 시간은 {1}입니다.
 DocType: SMS Center,Create Receiver List,수신기 목록 만들기
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,사용 가능일은 구매 날짜 이후 여야합니다.
 DocType: Vehicle,Wheels,휠
 DocType: Packing Slip,To Package No.,번호를 패키지에
 DocType: Patient Relation,Family,가족
@@ -2772,7 +2774,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,결제 통화는 기본 회사의 통화 또는 당좌 계좌 통화와 같아야합니다.
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),패키지이 배달의 일부임을 나타냅니다 (만 안)
 DocType: Soil Texture,Loam,옥토
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,행 {0} : 만기일은 게시일 이전 일 수 없습니다.
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,행 {0} : 만기일은 게시일 이전 일 수 없습니다.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,지불 항목을 만듭니다
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},수량 항목에 대한 {0}보다 작아야합니다 {1}
 ,Sales Invoice Trends,견적서 동향
@@ -2844,7 +2846,7 @@
 DocType: Guardian,Guardian Interests,가디언 관심
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,계정 이름 / 번호 업데이트
 DocType: Naming Series,Current Value,현재 값
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,여러 회계 연도 날짜 {0} 존재한다. 회계 연도에 회사를 설정하세요
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,여러 회계 연도 날짜 {0} 존재한다. 회계 연도에 회사를 설정하세요
 DocType: Education Settings,Instructor Records to be created by,에 의해 생성되는 강사 기록
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} 생성
 DocType: GST Account,GST Account,GST 계정
@@ -2862,7 +2864,7 @@
 DocType: Sales Person,Name and Employee ID,이름 및 직원 ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,기한 날짜를 게시하기 전에 할 수 없습니다
 DocType: Website Item Group,Website Item Group,웹 사이트 상품 그룹
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,위의 선정 기준에 대한 급여 전표가 발견되지 않았거나 이미 제출 된 급여 전표
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,위의 선정 기준에 대한 급여 전표가 발견되지 않았거나 이미 제출 된 급여 전표
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,관세 및 세금
 DocType: Projects Settings,Projects Settings,프로젝트 설정
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,참고 날짜를 입력 해주세요
@@ -2871,7 +2873,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,납품 수량
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR- .YYYY.-
 DocType: Purchase Order Item,Material Request Item,자료 요청 항목
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,먼저 영수증 {0}을 취소하십시오.
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,먼저 영수증 {0}을 취소하십시오.
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,항목 그룹의 나무.
 DocType: Production Plan,Total Produced Qty,총 생산 수량
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,이 충전 유형에 대한보다 크거나 현재의 행의 수와 동일한 행 번호를 참조 할 수 없습니다
@@ -2982,6 +2984,7 @@
 ,Vehicle Expenses,차량 비용
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Sales Invoice에 Lab Test (s) 작성
 DocType: Serial No,Invoice Details,인보이스 세부 정보
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,경로를 예측하고 최적화하려면 Google지도 설정을 사용하십시오.
 DocType: Grant Application,Show on Website,웹 사이트에 표시
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,시작하다
 DocType: Hub Tracked Item,Hub Category,허브 카테고리
@@ -3022,7 +3025,7 @@
 DocType: Inpatient Record,B Positive,B 양성
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",직원 {0}의 최대 이익이 {1}을 (를) 초과하는 이전 청구 금액의 합으로 {2}
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",행 번호 {0} 항목이 고정 자산이기 때문에 수량은 1이어야합니다. 여러 수량에 대해 별도의 행을 사용하십시오.
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",행 번호 {0} 항목이 고정 자산이기 때문에 수량은 1이어야합니다. 여러 수량에 대해 별도의 행을 사용하십시오.
 DocType: Leave Block List Allow,Leave Block List Allow,차단 목록은 허용 남겨
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,약어는 비워둘수 없습니다
 DocType: Patient Medical Record,Patient Medical Record,환자의 의료 기록
@@ -3057,7 +3060,7 @@
 DocType: Workstation,Wages per hour,시간당 임금
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},일괄 재고 잔액은 {0}이 될 것이다 부정적인 {1}의 창고에서 상품 {2}에 대한 {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,자료 요청에 이어 항목의 재 주문 레벨에 따라 자동으로 제기되고있다
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},계정 {0} 유효하지 않습니다. 계정 통화가 있어야합니다 {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},계정 {0} 유효하지 않습니다. 계정 통화가 있어야합니다 {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},직원이 {{1} 날짜를 해고 한 후에 {0} 날짜를 사용할 수 없습니다.
 DocType: Supplier,Is Internal Supplier,내부 공급 업체인가
 DocType: Employee,Create User Permission,사용자 권한 생성
@@ -3203,7 +3206,7 @@
 DocType: Account,Fixed Asset,고정 자산
 DocType: Amazon MWS Settings,After Date,날짜 이후
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,직렬화 된 재고
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,회사 간 송장에 대해 {0}이 (가) 잘못되었습니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,회사 간 송장에 대해 {0}이 (가) 잘못되었습니다.
 ,Department Analytics,부서 분석
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,기본 연락처에 이메일이 없습니다.
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,비밀 생성
@@ -3216,7 +3219,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,학비 구조 및 학생 그룹 {0}의 프로그램은 다릅니다.
 DocType: Bank Statement Transaction Entry,Receivable Account,채권 계정
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Valid From Date는 Valid Upto Date보다 작아야합니다.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},행 번호 {0} 자산이 {1} 이미 {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},행 번호 {0} 자산이 {1} 이미 {2}
 DocType: Quotation Item,Stock Balance,재고 대차
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,지불에 판매 주문
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,최고 경영자
@@ -3258,6 +3261,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,직불 카드에 대한이 필요합니다
 DocType: Clinical Procedure,Inpatient Record,입원 기록
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","작업 표는 팀에 의해 수행하는 행동이 시간, 비용 및 결제 추적 할 수 있도록"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,구매 가격 목록
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,거래 날짜
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,공급자 스코어 카드 변수의 템플릿.
@@ -3301,7 +3305,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,교환 이득 / 손실
 DocType: Opportunity,Lost Reason,분실 된 이유
 DocType: Amazon MWS Settings,Enable Amazon,Amazon 사용
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},행 # {0} : 계정 {1}이 (가) 회사 {2}에 속해 있지 않습니다.
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},행 # {0} : 계정 {1}이 (가) 회사 {2}에 속해 있지 않습니다.
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType {0}을 (를) 찾을 수 없습니다.
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,새 주소
 DocType: Quality Inspection,Sample Size,표본 크기
@@ -3410,7 +3414,7 @@
 DocType: Water Analysis,Origin,유래
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,이 문서에 의해 제한을 초과 {0} {1} 항목 {4}. 당신은하고 있습니다 동일에 대한 또 다른 {3} {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,저장 한 후 반복 설정하십시오
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,선택 변화량 계정
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,선택 변화량 계정
 DocType: Purchase Invoice,Price List Currency,가격리스트 통화
 DocType: Naming Series,User must always select,사용자는 항상 선택해야합니다
 DocType: Stock Settings,Allow Negative Stock,음의 재고 허용
@@ -3452,7 +3456,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,이 약속을 취소 하시겠습니까?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,호텔 객실 가격 패키지
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,판매 파이프 라인
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},급여 구성 요소에서 기본 계정을 설정하십시오 {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},급여 구성 요소에서 기본 계정을 설정하십시오 {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,필요에
 DocType: Rename Tool,File to Rename,이름 바꾸기 파일
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},행에 항목에 대한 BOM을 선택하세요 {0}
@@ -3473,7 +3477,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,구입 한 항목의 비용
 DocType: Employee Separation,Employee Separation Template,직원 분리 템플릿
 DocType: Selling Settings,Sales Order Required,판매 주문 필수
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,판매자되기
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,판매자되기
 DocType: Purchase Invoice,Credit To,신용에
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,액티브 리드 / 고객
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,표준 배달 참고 형식을 사용하려면 비워 둡니다.
@@ -3515,7 +3519,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,세금 템플릿 만들기
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,사용자 포럼
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,원료는 비워 둘 수 없습니다.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,행 # {0} (결제 표) : 금액은 음수 여야합니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,행 # {0} (결제 표) : 금액은 음수 여야합니다.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","주식을 업데이트 할 수 없습니다, 송장은 하락 선박 항목이 포함되어 있습니다."
 DocType: Contract,Fulfilment Status,이행 상태
 DocType: Lab Test Sample,Lab Test Sample,실험실 테스트 샘플
@@ -3674,7 +3678,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,문서 날짜
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},요금 기록 작성 - {0}
 DocType: Asset Category Account,Asset Category Account,자산 분류 계정
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,행 # {0} (지급 표) : 금액은 양수 여야합니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,행 # {0} (지급 표) : 금액은 양수 여야합니다.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},더 많은 항목을 생성 할 수 없습니다 {0}보다 판매 주문 수량 {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,속성 값 선택
 DocType: Purchase Invoice,Reason For Issuing document,문서 발행 사유
@@ -3729,7 +3733,7 @@
 DocType: Purchase Receipt,Time at which materials were received,재료가 수신 된 시간입니다
 DocType: Products Settings,Products per Page,페이지 당 제품 수
 DocType: Stock Ledger Entry,Outgoing Rate,보내는 속도
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,또는
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,또는
 DocType: Sales Order,Billing Status,결제 상태
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,문제 신고
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,광열비
@@ -3757,7 +3761,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,종업원 면제 선언
 DocType: Payment Entry,Cheque/Reference Date,수표 / 참조 날짜
 DocType: Purchase Invoice,Total Taxes and Charges,총 세금 및 요금
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,사용 가능한 날짜가 과거 날짜로 입력됩니다.
 DocType: Employee,Emergency Contact,비상 연락처
 DocType: Bank Reconciliation Detail,Payment Entry,결제 항목
 ,sales-browser,판매 브라우저
@@ -3804,6 +3807,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),돌아온다 (신용 정보)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,작업 시작
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},자산 {0}에 일련 번호가 필요합니다.
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,설정&gt; 설정&gt; 이름 지정 시리즈를 통해 이름 지정 시리즈를 {0}으로 설정하십시오.
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,장애인 템플릿은 기본 템플릿이 아니어야합니다
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,행 {0} : 계획 수량 입력
 DocType: Account,Income Account,수익 계정
@@ -3817,6 +3821,7 @@
 DocType: Loyalty Program,Help Section,도움말 섹션
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,예전
 DocType: Appraisal Goal,Key Responsibility Area,주요 책임 지역
+DocType: Delivery Trip,Distance UOM,거리 UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","학생 배치는 학생에 대한 출석, 평가 및 비용을 추적하는 데 도움이"
 DocType: Payment Entry,Total Allocated Amount,총 할당 된 금액
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,영구 인벤토리에 대한 기본 재고 계정 설정
@@ -3858,7 +3863,7 @@
 DocType: Item Supplier,Item Supplier,부품 공급 업체
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,더 배치를 얻을 수 상품 코드를 입력하시기 바랍니다
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},값을 선택하세요 {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,전송 항목을 선택하지 않았습니다.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,전송 항목을 선택하지 않았습니다.
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,모든 주소.
 DocType: Company,Stock Settings,재고 설정
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","다음과 같은 속성이 모두 기록에 같은 경우 병합에만 가능합니다. 그룹, 루트 유형, 회사는"
@@ -4156,7 +4161,7 @@
 DocType: Patient,Personal and Social History,개인 및 사회 역사
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,사용자가 {0}이 (가) 생성되었습니다.
 DocType: Fee Schedule,Fee Breakup for each student,각 학생에 대한 비용 해체
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),전체 사전 ({0})의 순서에 대하여 {1} 총합계보다 클 수 없습니다 ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),전체 사전 ({0})의 순서에 대하여 {1} 총합계보다 클 수 없습니다 ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,고르지 개월에 걸쳐 목표를 배포하는 월별 분포를 선택합니다.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,코드 변경
 DocType: Purchase Invoice Item,Valuation Rate,평가 평가
@@ -4165,7 +4170,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,제공되는 ITC Cess
 ,Student Monthly Attendance Sheet,학생 월별 출석 시트
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,판매에만 적용되는 배송 규칙
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,감가 상각 행 {0} : 다음 감가 상각 날짜는 구입일 이전 일 수 없습니다.
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,감가 상각 행 {0} : 다음 감가 상각 날짜는 구입일 이전 일 수 없습니다.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,프로젝트 시작 날짜
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,까지
 DocType: Rename Tool,Rename Log,로그인에게 이름 바꾸기
@@ -4183,12 +4188,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,판매 트랜잭션을 기준으로 프로젝트 및 회사를 얼마나 자주 업데이트해야합니까?
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,에 만료
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,학생들 추가
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","이 문서를 취소하려면 사원 <a href=""#Form/Employee/{0}"">{0}</a> \을 (를) 삭제하십시오."
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},선택하세요 {0}
 DocType: C-Form,C-Form No,C-양식 없음
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,거리
+DocType: Delivery Stop,Distance,거리
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,구매 또는 판매하는 제품 또는 서비스를 나열하십시오.
 DocType: Water Analysis,Storage Temperature,보관 온도
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4215,7 +4218,7 @@
 DocType: Homepage,Company Description for website homepage,웹 사이트 홈페이지에 대한 회사 설명
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","고객의 편의를 위해, 이러한 코드는 송장 배송 메모와 같은 인쇄 포맷으로 사용될 수있다"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier 이름
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,{0}에 대한 정보를 검색 할 수 없습니다.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,{0}에 대한 정보를 검색 할 수 없습니다.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,엔트리 저널 열기
 DocType: Contract,Fulfilment Terms,이행 조건
 DocType: Sales Invoice,Time Sheet List,타임 시트 목록
@@ -4398,7 +4401,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,활동 기반 그룹을 위해 학생들을 수동으로 선택하십시오.
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,활동 기반 그룹을 위해 학생들을 수동으로 선택하십시오.
 DocType: Journal Entry,User Remark,사용자 비고
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,경로 최적화.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,경로 최적화.
 DocType: Travel Itinerary,Non Diary,비 일기
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,왼쪽 직원에 대해 보유 보너스를 생성 할 수 없음
 DocType: Lead,Market Segment,시장 세분
@@ -4429,7 +4432,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,충성도 프로그램
 DocType: Student Guardian,Father,아버지
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,티켓 지원
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;업데이트 증권은&#39;고정 자산의 판매 확인할 수 없습니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;업데이트 증권은&#39;고정 자산의 판매 확인할 수 없습니다
 DocType: Bank Reconciliation,Bank Reconciliation,은행 계정 조정
 DocType: Attendance,On Leave,휴가로
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,업데이트 받기
@@ -4474,7 +4477,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,일련 번호 및 배치
 DocType: Warranty Claim,From Company,회사에서
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,평가 기준의 점수의 합 {0} 할 필요가있다.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,감가 상각 수 예약을 설정하십시오
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,감가 상각 수 예약을 설정하십시오
 DocType: Supplier Scorecard Period,Calculations,계산
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,값 또는 수량
 DocType: Payment Terms Template,Payment Terms,지불 조건
@@ -4494,7 +4497,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,증거금율과 할인율 (%)
 DocType: Healthcare Service Unit Type,Rate / UOM,요율 / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,모든 창고
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,회사 간 거래에 대해 {0}이 (가) 없습니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,회사 간 거래에 대해 {0}이 (가) 없습니다.
 DocType: Travel Itinerary,Rented Car,렌트카
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,회사 소개
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,계정에 신용은 대차 대조표 계정이어야합니다
@@ -4596,6 +4599,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,식물 분석 기준
 DocType: Cheque Print Template,Cheque Height,수표 높이
 DocType: Supplier,Supplier Details,공급 업체의 상세 정보
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,셋업&gt; 번호 매기기 시리즈를 통해 출석을위한 번호 매기기 시리즈를 설정하십시오.
 DocType: Setup Progress,Setup Progress,설치 진행률
 DocType: Expense Claim,Approval Status,승인 상태
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},값에서 행의 값보다 작아야합니다 {0}
@@ -4689,7 +4693,6 @@
 DocType: Travel Request,Fully Sponsored,후원사
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,역 분개 항목
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,고객 {0}이 (가) 생성되었습니다.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,인력&gt; 인사말 설정에서 Employee Naming System을 설정하십시오.
 DocType: Stock Settings,Limit Percent,제한 비율
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,현재 어떤 창고에서도 재고가 없습니다.
 ,Payment Period Based On Invoice Date,송장의 날짜를 기준으로 납부 기간
@@ -4748,7 +4751,7 @@
 DocType: BOM Explosion Item,Source Warehouse,자료 창고
 DocType: Installation Note,Installation Date,설치 날짜
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,공유 원장
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},행 번호 {0} 자산이 {1} 회사에 속하지 않는 {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},행 번호 {0} 자산이 {1} 회사에 속하지 않는 {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,판매 송장 {0}이 생성되었습니다.
 DocType: Employee,Confirmation Date,확인 일자
 DocType: Inpatient Occupancy,Check Out,체크 아웃
@@ -4768,6 +4771,7 @@
 DocType: Production Plan,Sales Orders Detail,판매 주문 세부 정보
 DocType: Bin,Requested Quantity,요청한 수량
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE- .YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,강사 네이밍 시스템&gt; 교육 환경 설정
 DocType: Patient,Marital Status,결혼 여부
 DocType: Stock Settings,Auto Material Request,자동 자료 요청
 DocType: Woocommerce Settings,API consumer secret,API 소비자 비밀
@@ -4820,7 +4824,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,일 선택
 DocType: Academic Term,Term Name,용어 이름
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),신용 ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,급여 전표 작성 중 ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,급여 전표 작성 중 ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,루트 노드는 편집 할 수 없습니다.
 DocType: Buying Settings,Purchase Order Required,주문 필수에게 구입
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,시간제 노동자
@@ -4858,7 +4862,7 @@
 DocType: Account,Rate at which this tax is applied,요금이 세금이 적용되는
 DocType: Cash Flow Mapper,Section Name,섹션 이름
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,재주문 수량
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},감가 상각 행 {0} : 유효 수명 후 예상 값은 {1}보다 크거나 같아야합니다.
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},감가 상각 행 {0} : 유효 수명 후 예상 값은 {1}보다 크거나 같아야합니다.
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,현재 채용
 DocType: Company,Stock Adjustment Account,재고 조정 계정
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,탕치다
@@ -4905,7 +4909,7 @@
 DocType: Program Enrollment,School House,학교 하우스
 DocType: Serial No,Out of AMC,AMC의 아웃
 DocType: Opportunity,Opportunity Amount,기회 금액
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,예약 감가 상각의 수는 감가 상각의 총 수보다 클 수 없습니다
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,예약 감가 상각의 수는 감가 상각의 총 수보다 클 수 없습니다
 DocType: Purchase Order,Order Confirmation Date,주문 확인 날짜
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI- .YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,유지 보수 방문을합니다
@@ -4946,7 +4950,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,일괄:
 DocType: Volunteer,Afternoon,대낮
 DocType: Loyalty Program,Loyalty Program Help,충성도 프로그램 도움말
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' 사용할 수 없습니다.
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' 사용할 수 없습니다.
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,열기로 설정
 DocType: Cheque Print Template,Scanned Cheque,스캔 한 수표
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,제출 거래에 연락처에 자동으로 이메일을 보내십시오.
@@ -4959,7 +4963,7 @@
 DocType: Warranty Claim,Item and Warranty Details,상품 및 보증의 자세한 사항
 DocType: Chapter,Chapter Members,지부 회원들
 DocType: Sales Team,Contribution (%),기여도 (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,참고 : 결제 항목이 '현금 또는 은행 계좌'이 지정되지 않았기 때문에 생성되지 않습니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,참고 : 결제 항목이 '현금 또는 은행 계좌'이 지정되지 않았기 때문에 생성되지 않습니다
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,프로젝트 {0}이 (가) 이미 있습니다.
 DocType: Clinical Procedure,Nursing User,간호 사용자
 DocType: Employee Benefit Application,Payroll Period,급여 기간
@@ -4967,6 +4971,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},일련 번호 {0}이 배치 {1}에 속해 있지 않습니다.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,책임
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,이 견적의 유효 기간이 종료되었습니다.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","이 문서를 취소하려면 사원 <a href=""#Form/Employee/{0}"">{0}</a> \을 (를) 삭제하십시오."
 DocType: Expense Claim Account,Expense Claim Account,경비 청구서 계정
 DocType: Account,Capital Work in Progress,자본 작업 진행 중
 DocType: Accounts Settings,Allow Stale Exchange Rates,부실 환율 허용
@@ -5048,7 +5054,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,문제의 소재
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Shopify를 ERPNext와 연결하십시오.
 DocType: Material Request Item,For Warehouse,웨어 하우스
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,배송 노트 {0}이 업데이트되었습니다.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,배송 노트 {0}이 업데이트되었습니다.
 DocType: Employee,Offer Date,제공 날짜
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,견적
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,당신은 오프라인 모드에 있습니다. 당신은 당신이 네트워크를 때까지 다시로드 할 수 없습니다.
@@ -5099,7 +5105,7 @@
 DocType: Shipping Rule,Calculate Based On,에 의거에게 계산
 DocType: Contract,Unfulfilled,완성되지 않은
 DocType: Delivery Note Item,From Warehouse,창고에서
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,언급 된 기준에 해당하는 직원 없음
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,언급 된 기준에 해당하는 직원 없음
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,재료 명세서 (BOM)와 어떤 항목은 제조 없습니다
 DocType: Shopify Settings,Default Customer,기본 고객
 DocType: Sales Stage,Stage Name,예명
@@ -5142,7 +5148,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,할인 금액 후 세액
 DocType: Patient,Inpatient Status,입원 환자 현황
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,매일 작업 요약 설정
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,선택된 가격 목록에는 매매 필드를 점검해야합니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,선택된 가격 목록에는 매매 필드를 점검해야합니다.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Reqd by Date를 입력하십시오.
 DocType: Payment Entry,Internal Transfer,내부 전송
 DocType: Asset Maintenance,Maintenance Tasks,유지 관리 작업
@@ -5179,7 +5185,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,그룹으로
 DocType: Guardian,Interests,이해
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,/ 비활성화 통화를 사용합니다.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,일부 급여 전표를 제출할 수 없습니다.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,일부 급여 전표를 제출할 수 없습니다.
 DocType: Exchange Rate Revaluation,Get Entries,항목 가져 오기
 DocType: Production Plan,Get Material Request,자료 요청을 받으세요
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,우편 비용
@@ -5266,7 +5272,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},비용 계정 항목에 대한 필수 {0}
 DocType: BOM,Website Description,웹 사이트 설명
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,자본에 순 변경
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,첫 번째 구매 송장 {0}을 취소하십시오
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,첫 번째 구매 송장 {0}을 취소하십시오
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,허용되지 않습니다. 서비스 단위 유형을 비활성화하십시오.
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","이메일 주소는 이미 존재, 고유해야합니다 {0}"
 DocType: Serial No,AMC Expiry Date,AMC 유효 날짜
@@ -5306,7 +5312,7 @@
 DocType: Hotel Room,Hotel Room,호텔 방
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},계정 {0} 수행은 회사 소유하지 {1}
 DocType: Leave Type,Rounding,반올림
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,행 {0}의 일련 번호가 배달 참고와 일치하지 않습니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,행 {0}의 일련 번호가 배달 참고와 일치하지 않습니다.
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),분배 된 금액 (비례 계산 된 금액)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","그런 다음 고객, 고객 그룹, 지역, 공급 업체, 공급 업체 그룹, 캠페인, 영업 파트너 등을 기준으로 가격 규칙이 필터링됩니다."
 DocType: Student,Guardian Details,가디언의 자세한 사항
@@ -5361,7 +5367,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},재고 품목에 필요한 창고 {0}
 DocType: Leave Allocation,Unused leaves,사용하지 않는 잎
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,상환 엔트리 만들기
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,모든 부서
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,모든 부서
 DocType: Healthcare Service Unit,Vacant,빈
 DocType: Patient,Alcohol Past Use,알콜 과거 사용
 DocType: Fertilizer Content,Fertilizer Content,비료 내용
@@ -5372,7 +5378,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,이 판매 오더를 취소하기 전에 작업 공정 {0}을 취소해야합니다.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),(서브 어셈블리 포함) 폭발 BOM 가져 오기
 DocType: Authorization Rule,Applicable To (Employee),에 적용 (직원)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,마감일은 필수입니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,마감일은 필수입니다
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,속성에 대한 증가는 {0} 0이 될 수 없습니다
 DocType: Employee Benefit Claim,Benefit Type and Amount,혜택 유형 및 금액
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,예약 된 방
@@ -5521,7 +5527,7 @@
 DocType: Purchase Invoice Item,Total Weight,총 무게
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,판매에 대한 수수료
 DocType: Job Offer Term,Value / Description,값 / 설명
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","행 번호 {0} 자산이 {1} 제출할 수 없습니다, 그것은 이미 {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","행 번호 {0} 자산이 {1} 제출할 수 없습니다, 그것은 이미 {2}"
 DocType: Tax Rule,Billing Country,결제 나라
 DocType: Purchase Order Item,Expected Delivery Date,예상 배송 날짜
 DocType: Restaurant Order Entry,Restaurant Order Entry,레스토랑 주문 입력
@@ -5560,12 +5566,13 @@
 DocType: Maintenance Visit,Breakdown,고장
 DocType: Travel Itinerary,Vegetarian,채식주의 자
 DocType: Patient Encounter,Encounter Date,만남의 날짜
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,계정 : {0} 통화로 : {1}을 선택할 수 없습니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,계정 : {0} 통화로 : {1}을 선택할 수 없습니다
 DocType: Bank Statement Transaction Settings Item,Bank Data,은행 데이터
 DocType: Purchase Receipt Item,Sample Quantity,샘플 수량
 DocType: Bank Guarantee,Name of Beneficiary,수혜자 성명
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",최신 평가 률 / 가격 목록 비율 / 원자재의 최종 구매 률을 기반으로 Scheduler를 통해 자동으로 BOM 비용을 업데이트합니다.
 DocType: Supplier,SUP-.YYYY.-,SUP-YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,공급 업체&gt; 공급 업체 그룹
 DocType: Bank Reconciliation Detail,Cheque Date,수표 날짜
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},계정 {0} : 부모 계정 {1} 회사에 속하지 않는 {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,성공적으로이 회사에 관련된 모든 트랜잭션을 삭제!
@@ -5593,7 +5600,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,자식 노드은 &#39;그룹&#39;유형 노드에서 생성 할 수 있습니다
 DocType: Attendance Request,Half Day Date,하프 데이 데이트
 DocType: Academic Year,Academic Year Name,학년 이름
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0}은 (는) {1} (으)로 거래 할 수 없습니다. 회사를 변경하십시오.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0}은 (는) {1} (으)로 거래 할 수 없습니다. 회사를 변경하십시오.
 DocType: Sales Partner,Contact Desc,연락처 제품 설명
 DocType: Email Digest,Send regular summary reports via Email.,이메일을 통해 정기적으로 요약 보고서를 보냅니다.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},경비 요청 유형에 기본 계정을 설정하십시오 {0}
@@ -5626,7 +5633,7 @@
 DocType: Hotel Room,Hotel Manager,호텔 매니저
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,쇼핑 카트에 설정 세금 규칙
 DocType: Purchase Invoice,Taxes and Charges Added,추가 세금 및 수수료
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,감가 상각 행 {0} : 다음 감가 상각 날짜는 사용 가능일 이전 일 수 없습니다.
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,감가 상각 행 {0} : 다음 감가 상각 날짜는 사용 가능일 이전 일 수 없습니다.
 ,Sales Funnel,판매 퍼넬
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,약자는 필수입니다
 DocType: Project,Task Progress,작업 진행
@@ -5640,7 +5647,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,모든 고객 그룹
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,누적 월별
 DocType: Attendance Request,On Duty,근무중인
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} 필수입니다.아마 통화 기록은 {2}로 {1}에 만들어지지 않습니다.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} 필수입니다.아마 통화 기록은 {2}로 {1}에 만들어지지 않습니다.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},직원 지정 계획 {0}은 (는) 지정 {1}에 이미 존재합니다.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,세금 템플릿은 필수입니다.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,계정 {0} : 부모 계정 {1}이 (가) 없습니다
@@ -5720,11 +5727,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,이어야 한 창고는 필수입니다
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","UOM, Item Group, Description, No of Hours와 같은 항목 필드를 구성하십시오."
 DocType: Certification Application,Certification Status,인증 상태
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,시장
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,시장
 DocType: Travel Itinerary,Travel Advance Required,여행 사전 요청
 DocType: Subscriber,Subscriber Name,구독자 이름
 DocType: Serial No,Out of Warranty,보증 기간 만료
-DocType: Cashier Closing,Cashier-closing-,캐셔 - 클로징 -
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,매핑 된 데이터 형식
 DocType: BOM Update Tool,Replace,교체
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,제품을 찾을 수 없습니다.
@@ -5812,7 +5818,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,판매 및 구매에 대한 기본 세금 템플릿이 생성됩니다.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,평가 결과 레코드 {0}이 (가) 이미 있습니다.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",예 : ABCD. #####. 계열이 설정되고 트랜잭션에서 일괄 처리 번호가 언급되지 않은 경우이 계열을 기반으로 자동 배치 번호가 생성됩니다. 이 항목에 대해 Batch No를 명시 적으로 언급하려면이 항목을 비워 두십시오. 참고 :이 설정은 재고 설정의 명명 시리즈 접두사보다 우선합니다.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,설치&gt; 번호 매기기 시리즈를 통해 출석을위한 번호 매기기 시리즈를 설정하십시오.
 DocType: BOM,Materials Required (Exploded),필요한 재료 (분해)
 DocType: Contract,Party User,파티 사용자
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',그룹화 기준이 &#39;회사&#39;인 경우 회사 필터를 비워 두십시오.
@@ -6015,7 +6020,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,평가판 기간 시작일과 평가판 종료일을 모두 설정해야합니다.
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,평균 속도
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,지불 일정의 총 지불 금액은 대 / 반올림 합계와 같아야합니다.
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,지불 일정의 총 지불 금액은 대 / 반올림 합계와 같아야합니다.
 DocType: Subscription Plan Detail,Plan,계획
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,총계정 원장에 따라 은행 잔고 잔액
 DocType: Job Applicant,Applicant Name,신청자 이름
@@ -6084,7 +6089,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,비누 및 세제
 DocType: BOM,Show Items,표시 항목
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,때때로보다 클 수 없습니다.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,모든 고객에게 이메일로 알려 드리고 싶습니까?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,모든 고객에게 이메일로 알려 드리고 싶습니까?
 DocType: Subscription Plan,Billing Interval,청구 간격
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,영화 및 비디오
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,주문
@@ -6093,9 +6098,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,행 {0} : {1}은 0보다 커야합니다.
 DocType: Assessment Criteria,Assessment Criteria Group,평가 기준 그룹
 DocType: Healthcare Settings,Patient Name By,환자 이름 작성자
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},{0}에서 {1}까지의 급여에 대한 발생 분개 항목
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},{0}에서 {1}까지의 급여에 대한 발생 분개 항목
 DocType: Sales Invoice Item,Enable Deferred Revenue,지연된 수익 사용
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},감가 상각 누계액을 열면 동일 미만이어야합니다 {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},감가 상각 누계액을 열면 동일 미만이어야합니다 {0}
 DocType: Warehouse,Warehouse Name,창고의 이름
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,실제 시작일은 실제 종료일보다 짧아야합니다.
 DocType: Naming Series,Select Transaction,거래 선택
@@ -6247,7 +6252,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,{1} 학년의 {0} 직원은 기본 휴가 정책이 없습니다.
 DocType: Salary Detail,Salary Detail,급여 세부 정보
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,먼저 {0}를 선택하세요
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,{0} 명의 사용자가 추가되었습니다.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,{0} 명의 사용자가 추가되었습니다.
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",다중 계층 프로그램의 경우 고객은 지출 한대로 해당 계층에 자동으로 할당됩니다.
 DocType: Appointment Type,Physician,내과 의사
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,항목의 일괄 {0} {1} 만료되었습니다.
@@ -6392,7 +6397,7 @@
 DocType: Asset,Custodian,후견인
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,판매 시점 프로필
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0}은 0과 100 사이의 값이어야합니다.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},{1}에서 {2} (으)로 {0} 지불
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},{1}에서 {2} (으)로 {0} 지불
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,무담보 대출
 DocType: Cost Center,Cost Center Name,코스트 센터의 이름
 DocType: Student,B+,B의 +
@@ -6424,6 +6429,7 @@
 DocType: Employee,Date of Issue,발행일
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","구매 요청이 필요한 경우 구매 설정에 따라 == &#39;예&#39;, 구매 송장 생성을 위해 사용자는 {0} 품목의 구매 영수증을 먼저 생성해야합니다."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},행 번호 {0} 항목에 대한 설정 공급 업체 {1}
+DocType: Global Defaults,Default Distance Unit,기본 거리 단위
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,행 {0} : 시간의 값은 0보다 커야합니다.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,부품 {1}에 연결된 웹 사이트 콘텐츠 {0}를 찾을 수없는
 DocType: Issue,Content Type,컨텐츠 유형
@@ -6479,7 +6485,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,계정에 직불는 대차 대조표 계정이어야합니다
 DocType: Asset,Naming Series,시리즈 이름 지정
 DocType: Vital Signs,Coated,코팅
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,행 {0} : 유효 수명 후 총 가치가 총 구매 금액보다 적어야합니다.
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,행 {0} : 유효 수명 후 총 가치가 총 구매 금액보다 적어야합니다.
 DocType: GoCardless Settings,GoCardless Settings,GoCardless 설정
 DocType: Leave Block List,Leave Block List Name,차단 목록의 이름을 남겨주세요
 DocType: Certified Consultant,Certification Validity,인증 유효 기간
@@ -6548,6 +6554,7 @@
 DocType: Bank Statement Settings Item,Bank Header,은행 헤더
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,실험실 테스트보기
 DocType: Hub Users,Hub Users,허브 사용자
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,고객&gt; 고객 그룹&gt; 지역
 DocType: Purchase Invoice,Y,와이
 DocType: Maintenance Visit,Maintenance Date,유지 보수 날짜
 DocType: Purchase Invoice Item,Rejected Serial No,시리얼 No 거부
@@ -6563,7 +6570,7 @@
 DocType: SG Creation Tool Course,Max Strength,최대 강도
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,사전 설정 설치
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},고객 {}에 대해 배달 노트가 선택되지 않았습니다.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},고객 {}에 대해 배달 노트가 선택되지 않았습니다.
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,직원 {0}에게는 최대 혜택 금액이 없습니다.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,배달 날짜를 기준으로 품목 선택
 DocType: Grant Application,Has any past Grant Record,과거의 보조금 기록이 있습니까?
@@ -6591,7 +6598,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,호텔 룸 예약
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,고객 서비스
 DocType: BOM,Thumbnail,미리보기
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,이메일 ID가있는 연락처가 없습니다.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,이메일 ID가있는 연락처가 없습니다.
 DocType: Item Customer Detail,Item Customer Detail,항목을 고객의 세부 사항
 DocType: Notification Control,Prompt for Email on Submission of,제출의 전자 우편을위한 프롬프트
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},직원의 최대 혜택 금액 {0}이 (가) {1}을 (를) 초과했습니다.
@@ -6852,7 +6859,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,계정 유형을 선택하기 때문에 그룹을 변환 할 수 없습니다.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} 수정되었습니다.새로 고침하십시오.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,다음과 같은 일에 허가 신청을하는 사용자가 중지합니다.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 상품 그룹&gt; 브랜드
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.",충성도 포인트가 무제한으로 만료되는 경우 만료 기간을 비워 두거나 0으로 설정하십시오.
 DocType: Asset Maintenance Team,Maintenance Team Members,유지 보수 팀원
 DocType: Loyalty Point Entry,Purchase Amount,구매 금액
@@ -6860,7 +6866,7 @@
 											to fullfill Sales Order {2}",판매 주문 {2}을 (를) 전체 예약하려면 \ {1} 품목의 일련 번호 {0}을 (를)
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,공급 업체의 견적 {0} 작성
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,종료 연도는 시작 연도 이전 될 수 없습니다
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,종료 연도는 시작 연도 이전 될 수 없습니다
 DocType: Employee Benefit Application,Employee Benefits,종업원 급여
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},{0} 행에서 {1} 포장 수량의 수량을 동일해야합니다
 DocType: Work Order,Manufactured Qty,제조 수량
@@ -6876,6 +6882,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,배치 번호 선택
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,하려면 GSTIN하려면
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,고객에게 제기 지폐입니다.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,인력&gt; 인사말 설정에서 Employee Naming System을 설정하십시오.
 DocType: Healthcare Settings,Invoice Appointments Automatically,송장 예약 자동
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,프로젝트 ID
 DocType: Salary Component,Variable Based On Taxable Salary,과세 급여에 따른 변수
@@ -6924,7 +6931,7 @@
 DocType: POS Profile,Account for Change Amount,변경 금액에 대한 계정
 DocType: QuickBooks Migrator,Connecting to QuickBooks,QuickBooks에 연결
 DocType: Exchange Rate Revaluation,Total Gain/Loss,총 손익
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,회사 간 인보이스에 대한 회사가 잘못되었습니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,회사 간 인보이스에 대한 회사가 잘못되었습니다.
 DocType: Purchase Invoice,input service,입력 서비스
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},행 {0} : 파티 / 계정과 일치하지 않는 {1} / {2}에서 {3} {4}
 DocType: Employee Promotion,Employee Promotion,직원 홍보
@@ -7055,7 +7062,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,숙박을위한 선호 구역
 apps/erpnext/erpnext/config/selling.py +184,Analytics,분석
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,바구니가 비어 있습니다
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,강사 네이밍 시스템&gt; 교육 환경 설정
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",{0} 항목에는 일련 번호가 없습니다. 일련 번호가 지정된 항목 만 \ 제품 번호를 기반으로 배달 할 수 있습니다.
 DocType: Vehicle,Model,모델
@@ -7085,7 +7091,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,변경 사항 없음
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,CSV 파일을 선택하세요
 DocType: Holiday List,Total Holidays,총 휴일
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,발송을위한 누락 된 이메일 템플릿. 배달 설정에서 하나를 설정하십시오.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,발송을위한 누락 된 이메일 템플릿. 배달 설정에서 하나를 설정하십시오.
 DocType: Student Leave Application,Mark as Present,현재로 표시
 DocType: Supplier Scorecard,Indicator Color,표시기 색상
 DocType: Purchase Order,To Receive and Bill,수신 및 법안
@@ -7094,7 +7100,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,일련 번호 선택
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,디자이너
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,이용 약관 템플릿
-DocType: Serial No,Delivery Details,납품 세부 사항
+DocType: Delivery Trip,Delivery Details,납품 세부 사항
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},비용 센터가 행에 필요한 {0} 세금 테이블의 유형에 대한 {1}
 DocType: Program,Program Code,프로그램 코드
 DocType: Terms and Conditions,Terms and Conditions Help,이용 약관 도움말
@@ -7118,7 +7124,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,시간 일 리드
 DocType: Cash Flow Mapping,Is Income Tax Expense,소득세 비용
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,귀하의 주문은 배송되지 않습니다!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},행 # {0} : 날짜를 게시하면 구입 날짜와 동일해야합니다 {1} 자산의 {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},행 # {0} : 날짜를 게시하면 구입 날짜와 동일해야합니다 {1} 자산의 {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,학생이 연구소의 숙소에 거주하고 있는지 확인하십시오.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,위의 표에 판매 주문을 입력하세요
 ,Stock Summary,재고 요약
diff --git a/erpnext/translations/ku.csv b/erpnext/translations/ku.csv
index 5e4e201..a007544 100644
--- a/erpnext/translations/ku.csv
+++ b/erpnext/translations/ku.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Dîroka Navîn
 DocType: Employee,Salary Mode,Mode meaş
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Fêhrist
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Fêhrist
 DocType: Patient,Divorced,berdayî
 DocType: Support Settings,Post Route Key,Mîhengên Key Post
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Destûrê babet ji bo çend caran bê zêdekirin di mêjera
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Guhertina New Exchange
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Pereyan ji bo List Price pêwîst e {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Dê di mêjera hejmartin.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Supplier&gt; Supplier Type
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-YYYY-
 DocType: Purchase Order,Customer Contact,mişterî Contact
 DocType: Patient Appointment,Check availability,Peyda bikin
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,nîşan vekirî
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Series Demê serket
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Lêkolîn
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} di rêza {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} di rêza {1}
 DocType: Asset Finance Book,Depreciation Start Date,Bersaziya Destpêk Dîrok
 DocType: Pricing Rule,Apply On,Apply ser
 DocType: Item Price,Multiple Item prices.,bihayê babet Multiple.
@@ -118,7 +117,7 @@
 DocType: Lab Prescription,Lab Prescription,Lab prescription
 ,Delay Days,Dereng Rojan
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Expense Service
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Hejmara Serial: {0} jixwe li Sales bi fatûreyên referans: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Hejmara Serial: {0} jixwe li Sales bi fatûreyên referans: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Biha
 DocType: Purchase Invoice Item,Item Weight Details,Pirtûka giran
 DocType: Asset Maintenance Log,Periodicity,Periodicity
@@ -143,6 +142,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Hesabdar
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Lîsteya bihayê bihayê
 DocType: Patient,Tobacco Current Use,Bikaranîna Pêdivî ye
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Dîroka destpêkê û roja dawîn bi kartê karker re zêde dike. <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Rêjeya firotanê
 DocType: Cost Center,Stock User,Stock Bikarhêner
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -162,7 +162,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Related
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,date Beşdariyê nikare bibe kêmtir ji date tevlî karker ya
 DocType: Grading Scale,Grading Scale Name,Qarneya Name Scale
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Bikarhênerên li Marketplace zêde bikin
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Bikarhênerên li Marketplace zêde bikin
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Ev hesabê root e û ne jî dikarim di dahatûyê de were.
 DocType: Sales Invoice,Company Address,Company Address
 DocType: BOM,Operations,operasyonên
@@ -319,7 +319,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Qty
 DocType: Production Plan,Material Request Detail,Pêdivî ye
 DocType: Selling Settings,Default Quotation Validity Days,Rojên Dersa Nermalav
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To de baca li row {0} di rêjeya Babetê, bacên li rêzên {1} divê jî di nav de bê"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To de baca li row {0} di rêjeya Babetê, bacên li rêzên {1} divê jî di nav de bê"
 DocType: SMS Center,SMS Center,Navenda SMS
 DocType: Payroll Entry,Validate Attendance,Attendance
 DocType: Sales Invoice,Change Amount,Change Mîqdar
@@ -438,7 +438,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,spacing Line ji bo mîktarê li gotinên
 DocType: Vehicle,Additional Details,Details Additional
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,No description dayîn
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Supplier&gt; Supplier Group
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ji bo kirînê bixwaze.
 DocType: POS Closing Voucher Details,Collected Amount,Amûdê Collect Collect
 DocType: Lab Test,Submitted Date,Dîroka Submitted
@@ -483,7 +482,7 @@
 DocType: Student Admission,Student Admission,Admission Student
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Babetê {0} betal e
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Rêjeya Bexşandina Rûber {0}:: Bersaziya Destpêk Dîrok wek roja ku paşîn çû
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Rêjeya Bexşandina Rûber {0}:: Bersaziya Destpêk Dîrok wek roja ku paşîn çû
 DocType: Contract Template,Fulfilment Terms and Conditions,Şert û mercên xurtkirî
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Daxwaza maddî
 DocType: Bank Reconciliation,Update Clearance Date,Update Date Clearance
@@ -540,6 +539,7 @@
 DocType: Accounts Settings,Settings for Accounts,Mîhengên ji bo Accounts
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Supplier bi fatûreyên No li Purchase bi fatûreyên heye {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Manage Sales Person Tree.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Ji rê ve nekin, ji ber ku Nexweşên Nexşeya Google de qedexekirin."
 DocType: Job Applicant,Cover Letter,Paldana ser
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cheques Outstanding û meden ji bo paqijkirina
 DocType: Item,Synced With Hub,Senkronîzekirin Bi Hub
@@ -599,7 +599,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Nirxên New Asset
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Rate li ku Mişterî Exchange ji bo pereyan base mişterî bîya
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kurs Scheduling Tool
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Purchase bi fatûreyên nikare li hemberî sermaye heyî ne bên kirin {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Purchase bi fatûreyên nikare li hemberî sermaye heyî ne bên kirin {1}
 DocType: Crop Cycle,LInked Analysis,LInked Analysis
 DocType: POS Closing Voucher,POS Closing Voucher,POS Closing Voucher
 DocType: Contract,Lapsed,Kêmkirin
@@ -634,6 +634,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} ku di Kurs jimartin ne {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Navê Şagirt:
 DocType: POS Closing Voucher Details,Difference,Ferq
+DocType: Delivery Settings,Delay between Delivery Stops,Di navbera Dezgeha Hilbijartinê de bimîne
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial No {0} nayê to Delivery Têbînî girêdayî ne {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Vê xuya dibe ku pirsgirêkek sazkirina GoCardless server. Ne xemgîn bin, di rewşek nerazîbûnê de, hejmar dê vegerê hesabê we."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -694,7 +695,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Quantity û Rate
 DocType: Delivery Note,% Installed,% firin
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,Sinifên / kolîja hwd ku ders dikare bê destnîşankirin.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Fînansaziya şirketên herdu şîrketan divê ji bo Transfarkirina Navneteweyî ya Hevpeyivînê bi hev re bibin.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Fînansaziya şirketên herdu şîrketan divê ji bo Transfarkirina Navneteweyî ya Hevpeyivînê bi hev re bibin.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Ji kerema xwe re navê şîrketa binivîse
 DocType: Travel Itinerary,Non-Vegetarian,Non Vegetarian
 DocType: Purchase Invoice,Supplier Name,Supplier Name
@@ -781,7 +782,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Ji Berê Rented
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Parts bes ji bo Build
 DocType: POS Profile User,POS Profile User,POS Profîl User
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Row {0}: Bêguman Destpêk Dîrok pêwîst e
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Row {0}: Bêguman Destpêk Dîrok pêwîst e
 DocType: Purchase Invoice Item,Service Start Date,Destûra Destpêk Destnîşankirin
 DocType: Subscription Invoice,Subscription Invoice,Alîkariya Barkirina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Dahata rasterast
@@ -850,7 +851,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Kurtenivîsên SYR ji berê ve ji bo şîrketa din tê bikaranîn
 DocType: Selling Settings,Default Customer Group,Default Mişterî Group
 DocType: Employee,IFSC Code,Kodê IFSC
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Dîroka destpêkê û roja dawîn bi kartê karker re zêde dike. <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Heke neçalak bike, qada &#39;Rounded Total&#39; wê ne di tu mêjera xuya"
 DocType: BOM,Operating Cost,Cost Operating
 DocType: Crop,Produced Items,Produced Items
@@ -902,7 +902,7 @@
 DocType: Supplier,Prevent RFQs,Rakirina RFQ
 DocType: Hub User,Hub User,Bikarhêner
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Make Sales Order
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Salary Slip ji bo demjimêr ji {0} heta {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Salary Slip ji bo demjimêr ji {0} heta {1}
 DocType: Project Task,Project Task,Project Task
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Points points redeemed
 ,Lead Id,Lead Id
@@ -1034,7 +1034,7 @@
 DocType: Fee Validity,Max number of visit,Hejmareke zêde ya serdana
 ,Hotel Room Occupancy,Odeya Otelê
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet tên afirandin:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Ji kerema xwe ve Cash default an account Bank set li Mode of Payment {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Ji kerema xwe ve Cash default an account Bank set li Mode of Payment {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Nivîsîn
 DocType: GST Settings,GST Settings,Settings gst
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Pêwîste wekhev Lîsteya Bacê ye: {0}
@@ -1089,7 +1089,7 @@
 DocType: Vehicle Log,Service Details,Details Service
 DocType: Lab Test Template,Grouped,Grouped
 DocType: Selling Settings,Delivery Note Required,Delivery Têbînî pêwîst
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Piştgiriya Salary Slips ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Piştgiriya Salary Slips ...
 DocType: Bank Guarantee,Bank Guarantee Number,Bank Hejmara garantiyalênêrînê
 DocType: Bank Guarantee,Bank Guarantee Number,Bank Hejmara garantiyalênêrînê
 DocType: Assessment Criteria,Assessment Criteria,Krîterên nirxandina
@@ -1115,13 +1115,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Peyam di peredana ji nuha ve tên afirandin
 DocType: Request for Quotation,Get Suppliers,Harmend bibin
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock niha:
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ne ji Babetê girêdayî ne {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ne ji Babetê girêdayî ne {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Preview Bikini Salary
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Account {0} hatiye bicihkirin çend caran
 DocType: Account,Expenses Included In Valuation,Mesrefên di nav Valuation
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Hûn dikarin tenê nûve bikin ku endametiya we di nav 30 rojan de derbas dibe
 DocType: Shopping Cart Settings,Show Stock Availability,Hilbijêre Stock Stock
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Set in {0} li kategoriya {1} de an şîrket {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Set in {0} li kategoriya {1} de an şîrket {2}
 DocType: Location,Longitude,Dirêjî
 ,Absent Student Report,Absent Report Student
 DocType: Crop,Crop Spacing UOM,UOM
@@ -1194,7 +1194,7 @@
 DocType: Soil Texture,Sand,Qûm
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Înercî
 DocType: Opportunity,Opportunity From,derfet ji
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Hejmarên Serial Ji bo {2} Pêdivî ye. Te destnîşan kir {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Hejmarên Serial Ji bo {2} Pêdivî ye. Te destnîşan kir {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Ji kerema xwe sifrê hilbijêrin
 DocType: BOM,Website Specifications,Specifications Website
 DocType: Special Test Items,Particulars,Peyvên
@@ -1285,7 +1285,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Nawy bi weightage mezintir dê mezintir li banî tê
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Lîsteyên Tebûr û Nîşaneyên Navneteweyî
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detail Bank Lihevkirinê
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} de divê bê şandin
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} de divê bê şandin
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,No karker dîtin
 DocType: Item,If subcontracted to a vendor,Eger ji bo vendor subcontracted
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Xwendekarên Pol ji xwe ve.
@@ -1340,7 +1340,6 @@
 DocType: Loyalty Program Collection,Tier Name,Navê Tier
 DocType: HR Settings,Enter retirement age in years,temenê teqawidîyê Enter di salên
 DocType: Crop,Target Warehouse,Warehouse target
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ji kerema xwe veşartî ji bo {0} bi Sîstema Setup&gt; Settings&gt; Naming Series
 DocType: Payroll Employee Detail,Payroll Employee Detail,Daxistina karmendê karmendê
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Ji kerema xwe re warehouse hilbijêre
 DocType: Cheque Print Template,Starting location from left edge,Guherandinên location ji devê hiştin
@@ -1430,7 +1429,7 @@
 DocType: Work Order,Plan material for sub-assemblies,maddî Plan ji bo sub-meclîsên
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partners Sales û Herêmê
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} divê çalak be
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Naveroka ku ji bo veguhestinê nîne
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Naveroka ku ji bo veguhestinê nîne
 DocType: Employee Boarding Activity,Activity Name,Navê Çalakiyê
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Guherandina Release Date
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Hilberîna hilberê <b>{0}</b> û Ji bo Hejmar <b>{1}</b> nikarin cûda ne
@@ -1660,6 +1659,7 @@
 DocType: Project,First Email,Yekem E-mail
 DocType: Company,Exception Budget Approver Role,Tevgeriya Derfeta Reza Tevgerî
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Dema ku careke din, ev bargav wê heta roja danîn"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Warehouse Reserved li Sales Order / Qediya Goods Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Şêwaz firotin
 DocType: Repayment Schedule,Interest Amount,Şêwaz Interest
@@ -1671,7 +1671,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Radyo
 DocType: Asset,Scrapped,belav
 DocType: Item,Item Defaults,Defterên Şîfre
-DocType: Purchase Invoice,Returns,vegere
+DocType: Cashier Closing,Returns,vegere
 DocType: Job Card,WIP Warehouse,Warehouse WIP
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serial No {0} e di bin peymana parastina upto {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,pistgirîya
@@ -1685,7 +1685,6 @@
 DocType: Student,A-,YEK-
 DocType: Share Transfer,Transfer Type,Tîpa Transfer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Mesref Sales
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Giştî&gt; Giştî ya Giştî&gt; Herêmî
 DocType: Diagnosis,Diagnosis,Teşhîs
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Buying Standard
 DocType: Attendance Request,Explanation,Daxûyanî
@@ -1698,7 +1697,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Pirtûka Birêvebirina Peldankan
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Kode ya postî
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Sales Order {0} e {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Hesabê dahatina hesabê li lênerê {3}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Hesabê dahatina hesabê li lênerê {3}
 DocType: Opportunity,Contact Info,Têkilî
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Making Stock Arşîva
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Kes nikare karûbarê çepê ya Çep bigirin
@@ -1710,7 +1709,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Bêguman nikare saet ji bo sisiyan bêdeng nabe
 DocType: Company,Date of Commencement,Dîroka Destpêk
 DocType: Sales Person,Select company name first.,Hilbijêre navê kompaniya yekemîn a me.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},Email bişîne {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},Email bişîne {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Quotations ji Suppliers wergirt.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOM re biguherînin û buhayên herî dawî yên li BOMs nû bikin
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},{0} | {1} {2}
@@ -1731,7 +1730,7 @@
 DocType: Asset Movement,From Employee,ji xebatkara
 DocType: Driver,Cellphone Number,Hejmara Telefonê
 DocType: Project,Monitor Progress,Pêşveçûna Çavdêriyê
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Hişyarî: System wê overbilling ji ber ku mîqdara ji bo babet ne bi {0} li {1} sifir e
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Hişyarî: System wê overbilling ji ber ku mîqdara ji bo babet ne bi {0} li {1} sifir e
 DocType: Journal Entry,Make Difference Entry,Make Peyam Cudahiya
 DocType: Supplier Quotation,Auto Repeat Section,Auto Repeat Section
 DocType: Upload Attendance,Attendance From Date,Alîkarîkirinê ji Date
@@ -1832,7 +1831,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Redkirin Qty ne dikarin li Purchase Return ketin were
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Guhertina Xerîdarê ji bo Mişterek bijartî nayê destûr kirin.
 ,Purchase Order Items To Be Billed,Buy Order Nawy ye- Be
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Guherandinên demjimêr bistînin.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Guherandinên demjimêr bistînin.
 DocType: Program Enrollment Tool,Enrollment Details,Agahdarkirina Navnîşan
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Dibe ku ji bo şirketek pir ji hêla şîfreyê veguherînin.
 DocType: Purchase Invoice Item,Net Rate,Rate net
@@ -1846,7 +1845,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Tîpa vekin
 DocType: Support Settings,Close Issue After Days,Close Doza Piştî Rojan
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Hûn hewce ne ku bikarhêner bi Rêveberê Gerînendeyê û Rêveberê Rêveberê Birêvebir bidin ku bikarhênerên li Marketplace zêde bikin.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Hûn hewce ne ku bikarhêner bi Rêveberê Gerînendeyê û Rêveberê Rêveberê Birêvebir bidin ku bikarhênerên li Marketplace zêde bikin.
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Vala bihêlin, eger ji bo hemû şaxên nirxandin"
 DocType: Job Opening,Staffing Plan,Plana karmendiyê
 DocType: Bank Guarantee,Validity in Days,Validity li Rojan
@@ -1868,7 +1867,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Pekana row {0} bi heman {1}
 DocType: Marketplace Settings,Disable Marketplace,Bazara Bazarê
 ,Trial Balance,Balance trial
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Sal malî {0} nehate dîtin
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Sal malî {0} nehate dîtin
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Avakirina Karmendên
 DocType: Hotel Room Reservation,Hotel Reservation User,User Reservation
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Ji kerema xwe ve yekem prefix hilbijêre
@@ -1975,7 +1974,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Têketin têkevin
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Asset {0} hat afirandin
 DocType: Special Test Items,Special Test Items,Tîmên Taybet
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Pêdivî ye ku hûn bikar bîne ku bikarhênerên Rêveberê Gerînendeyê û Rêveberê Rêveberê Şîfre bikin ku li ser bazarê Marketplace bikin.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Pêdivî ye ku hûn bikar bîne ku bikarhênerên Rêveberê Gerînendeyê û Rêveberê Rêveberê Şîfre bikin ku li ser bazarê Marketplace bikin.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Mode of Payment
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Li gorî Performasyona Wezareta we ya ku hûn nikarin ji bo berjewendiyan neynin
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,"Website Wêne, divê pel giştî an URL malpera be"
@@ -1987,7 +1986,7 @@
 DocType: Warehouse,Warehouse Contact Info,Warehouse Têkilî
 DocType: Payment Entry,Write Off Difference Amount,Hewe Off Mîqdar Cudahiya
 DocType: Volunteer,Volunteer Name,Navê Dilxwaz
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Rows with duplicates dates in other rows found in: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Rows with duplicates dates in other rows found in: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: email Employee dîtin ne, yanî email şandin ne"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Pêvek Mûçeya No Salary ji bo {1} roja xuyakirin {0}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Destûra Rêveçûnê ne ji bo welatê {0}
@@ -2078,6 +2077,7 @@
 DocType: Salary Component,Earning,Earning
 DocType: Supplier Scorecard,Scoring Criteria,Krîza Scoring
 DocType: Purchase Invoice,Party Account Currency,Partiya Account Exchange
+DocType: Delivery Trip,Total Estimated Distance,Tevahiya Dûr Dîtin
 ,BOM Browser,BOM Browser
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Ji kerema xwe ji bo çalakiya vê perwerdehiya xwe nû bike
 DocType: Item Barcode,EAN,EAN
@@ -2116,7 +2116,7 @@
 DocType: Activity Cost,Projects,projeyên
 DocType: Payment Request,Transaction Currency,muameleyan Exchange
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Ji {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Hin emails ne çewt e
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Hin emails ne çewt e
 DocType: Work Order Operation,Operation Description,operasyona Description
 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.,Can Date Fiscal Sal Start û Fiscal Sal End Date nayê guhertin carekê sala diravî xilas kirin.
 DocType: Quotation,Shopping Cart,Têxe selikê
@@ -2140,7 +2140,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Change Net di Asset Fixed
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Vala bihêlin, eger ji bo hemû deverî nirxandin"
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Pere ji type &#39;Actual&#39; li row {0} ne bi were di Rate babetî di nav de
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Pere ji type &#39;Actual&#39; li row {0} ne bi were di Rate babetî di nav de
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,ji DateTime
 DocType: Shopify Settings,For Company,ji bo Company
@@ -2154,7 +2154,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Gelek şaş bûne çêbikin
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Serê yekem ya nêzîkî di lîsteyê de dê wek xerca pêşdûreyê ya nêzîkî dakêşin.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,dikarin bibin mezintir 100 ne
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Pêdivî ye ku hûn bikarhêner ji bilî Rêvebirê din re bi rêveberê Rêveberê Gerînendinê û Rêveberê Rêveberê Birêvebirin ku li ser qada Markazê bikin.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Pêdivî ye ku hûn bikarhêner ji bilî Rêvebirê din re bi rêveberê Rêveberê Gerînendinê û Rêveberê Rêveberê Birêvebirin ku li ser qada Markazê bikin.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Babetê {0} e a stock babete ne
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-YYYY-
 DocType: Maintenance Visit,Unscheduled,rayis
@@ -2183,7 +2183,7 @@
 DocType: HR Settings,Employee Settings,Settings karker
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Pergala Paydayê
 ,Batch-Wise Balance History,Batch-Wise Dîroka Balance
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Row # {0}: Ger hejmar ji mesref {1} ji mûçeyê mezintir e.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Row # {0}: Ger hejmar ji mesref {1} ji mûçeyê mezintir e.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,mîhengên çaperê ve di formata print respective
 DocType: Package Code,Package Code,Code package
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Şagird
@@ -2413,7 +2413,7 @@
 DocType: Delivery Trip,Optimize Route,Rêvebirinê
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Try plan operasyonên ji bo rojên X di pêş.
 DocType: HR Settings,Stop Birthday Reminders,Stop Birthday Reminders
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Ji kerema xwe ve Default payroll cîhde Account set li Company {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Ji kerema xwe ve Default payroll cîhde Account set li Company {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Bersaziya fînansî ya Bacê û daneyên bihayên Amazonê
 DocType: SMS Center,Receiver List,Lîsteya Receiver
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Search babetî
@@ -2481,7 +2481,7 @@
 DocType: Vital Signs,Constipated,Vexwendin
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Li dijî Supplier bi fatûreyên {0} dîroka {1}
 DocType: Customer,Default Price List,Default List Price
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,record Tevgera Asset {0} tên afirandin
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,record Tevgera Asset {0} tên afirandin
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Ti tişt nehat dîtin.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Tu nikarî bibî Fiscal Sal {0}. Sal malî {0} wek default li Settings Global danîn
 DocType: Share Transfer,Equity/Liability Account,Hesabê / Rewşa Ewlekariyê
@@ -2621,6 +2621,7 @@
 DocType: Blanket Order,Order Type,Order Type
 ,Item-wise Sales Register,Babetê-şehreza Sales Register
 DocType: Asset,Gross Purchase Amount,Şêwaz Purchase Gross
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kodê Asayîş&gt; Tîpa Group&gt; Brand
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Hilbijartina Balance
 DocType: Asset,Depreciation Method,Method Farhad.
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ma ev Tax di nav Rate Basic?
@@ -2703,7 +2704,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Çalakiya ku hejmarê salane ya li PO
 DocType: Student Leave Application,Student Leave Application,Xwendekarên Leave Application
 DocType: Item,Will also apply for variants,jî wê ji bo Guhertoyên serî
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Sermaye ne bi dikarin bên îptal kirin, wekî ku ji niha ve {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Sermaye ne bi dikarin bên îptal kirin, wekî ku ji niha ve {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Xebatkarê {0} roja Half li ser {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},"Total dema xebatê ne, divê ji bilî dema xebatê max be mezintir {0}"
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Li
@@ -2727,6 +2728,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Fetch Data
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Destûra herî qedexeya di nav vala vala {0} de {1}
 DocType: SMS Center,Create Receiver List,Create Lîsteya Receiver
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Ji bo bikaranîna Dîroka Dîroka kirînê be
 DocType: Vehicle,Wheels,wheels
 DocType: Packing Slip,To Package No.,Ji bo pakêta No.
 DocType: Patient Relation,Family,Malbat
@@ -2740,7 +2742,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Pêdivî ye ku pêdivî ye ku pêdivî ye ku ew an jî an jî kredî ya şîrketê an diravê hesabê partiyê be
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Nîşan dide ku, pakêta beşek ji vê delivery (Tenê bi Pêşnûmeya) e"
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Row {0}: Beriya Dîroka Berî beriya paşînkirina posteyê
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Row {0}: Beriya Dîroka Berî beriya paşînkirina posteyê
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Make Peyam Payment
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Dorpêçê de ji bo babet {0} gerek kêmtir be {1}
 ,Sales Invoice Trends,Sales Trends bi fatûreyên
@@ -2813,7 +2815,7 @@
 DocType: Guardian,Guardian Interests,Guardian Interests
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Navekî Nav / Navnîşan Dikarin
 DocType: Naming Series,Current Value,Nirx niha:
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,salan malî Multiple ji bo roja {0} hene. Ji kerema xwe ve şîrketa ku di sala diravî
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,salan malî Multiple ji bo roja {0} hene. Ji kerema xwe ve şîrketa ku di sala diravî
 DocType: Education Settings,Instructor Records to be created by,Danûstandinên Mamosteyan ku ji hêla tên afirandin
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} tên afirandin
 DocType: GST Account,GST Account,Account GST
@@ -2830,7 +2832,7 @@
 DocType: Sales Person,Name and Employee ID,Name û Xebatkarê ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Date ji ber nikarim li ber Mesaj Date be
 DocType: Website Item Group,Website Item Group,Website babetî Pula
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Ne pûçek hebê nedîtiye ku ji bo pîvanên jorîn hejmar an jî heqê heqê heqê xwe vekirî pêşkêş kir
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Ne pûçek hebê nedîtiye ku ji bo pîvanên jorîn hejmar an jî heqê heqê heqê xwe vekirî pêşkêş kir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Erk û Baca
 DocType: Projects Settings,Projects Settings,Projeyên Settings
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Ji kerema xwe ve date Çavkanî binivîse
@@ -2839,7 +2841,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Supplied Qty
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-YYYY-
 DocType: Purchase Order Item,Material Request Item,Babetê Daxwaza maddî
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Ji kerema xwe ya yekem a {1} şîfreya kirînê bikî
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Ji kerema xwe ya yekem a {1} şîfreya kirînê bikî
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Tree of Groups Babetê.
 DocType: Production Plan,Total Produced Qty,Qutata Tiştê Hatîn
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Can hejmara row mezintir an wekhev ji bo hejmara row niha ji bo vî cureyê Charge kirîza ne
@@ -2950,6 +2952,7 @@
 ,Vehicle Expenses,Mesref Vehicle
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Li Têbaza Bazirganiyê ya Lab Labê çêbikin Submit Submit
 DocType: Serial No,Invoice Details,Details bi fatûreyên
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Ji kerema xwe veguhestina Nexşeya Google-ê bikar bînin ku ji rêyên pêşniyar û pêşniyaz bike
 DocType: Grant Application,Show on Website,Li ser Malperê nîşan bide
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Destpê bike
 DocType: Hub Tracked Item,Hub Category,Kategorî
@@ -2990,7 +2993,7 @@
 DocType: Inpatient Record,B Positive,B Positive
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Gelek feydend a karmendê {0} ji alîyê {2} ji hêla pejirandinê ve hejmarê {2} dûr dike
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty divê 1 be, wek babete a hebûnê sabît e. Ji kerema xwe ve row cuda ji bo QTY multiple bi kar tînin."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty divê 1 be, wek babete a hebûnê sabît e. Ji kerema xwe ve row cuda ji bo QTY multiple bi kar tînin."
 DocType: Leave Block List Allow,Leave Block List Allow,Dev ji Lîsteya Block Destûrê bide
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Kurte nikare bibe vala an space
 DocType: Patient Medical Record,Patient Medical Record,Radyoya Tenduristî
@@ -3025,7 +3028,7 @@
 DocType: Workstation,Wages per hour,"Mûçe, di saetekê de"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},balance Stock li Batch {0} dê bibe neyînî {1} ji bo babet {2} li Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Piştî Requests Material hatine automatically li ser asta re-da babete rabûye
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Account {0} ne derbasdar e. Account Exchange divê {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Account {0} ne derbasdar e. Account Exchange divê {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Ji Dîroka {0} piştî karûbarê karmendê karker nikare {1}
 DocType: Supplier,Is Internal Supplier,Derveyî Derveyî ye
 DocType: Employee,Create User Permission,Destûra bikarhêner hilbijêre
@@ -3170,7 +3173,7 @@
 DocType: Account,Fixed Asset,Asset Fixed
 DocType: Amazon MWS Settings,After Date,Piştî dîrokê
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Inventory weşandin
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Invalid {0} ji bo ji bo Kompaniya Navnetewî.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Invalid {0} ji bo ji bo Kompaniya Navnetewî.
 ,Department Analytics,Analytics
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-mail di navnîşa navekî nayê dîtin
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Secret secret
@@ -3182,7 +3185,7 @@
 DocType: Sales Invoice,Total Billing Amount,Şêwaz Total Billing
 DocType: Bank Statement Transaction Entry,Receivable Account,Account teleb
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Dîrok Ji Dest Pêdivî ye Dîroka Dîroka Neteweyek Dîroka Dîrok.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} berê ji {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} berê ji {2}
 DocType: Quotation Item,Stock Balance,Balance Stock
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Firotina ji bo Payment
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,CEO
@@ -3224,6 +3227,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Debit To pêwîst e
 DocType: Clinical Procedure,Inpatient Record,Qeydkirî ya Nexweş
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets alîkariya şopandibe, dem, mesrefa û fatûre ji bo activites kirin ji aliyê ekîba xwe"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Supplier&gt; Supplier Type
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Buy List Price
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Dîroka Transaction
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Templates of supplier variables variables.
@@ -3378,7 +3382,7 @@
 DocType: Water Analysis,Origin,Reh
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ev belge li ser sînor ji aliyê {0} {1} ji bo em babete {4}. Ma tu ji yekî din {3} li dijî heman {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Ji kerema xwe ve set dubare piştî tomarkirinê
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Hilbijêre guhertina account mîqdara
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Hilbijêre guhertina account mîqdara
 DocType: Purchase Invoice,Price List Currency,List Price Exchange
 DocType: Naming Series,User must always select,Bikarhêner her tim divê hilbijêre
 DocType: Stock Settings,Allow Negative Stock,Destûrê bide Stock Negative
@@ -3420,7 +3424,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Ma hûn bawer dikin ku hûn bixwazin vê serdanê betal bikin?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Package packing price Room
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,pipeline Sales
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Ji kerema xwe ve account default set li Salary Component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Ji kerema xwe ve account default set li Salary Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,required ser
 DocType: Rename Tool,File to Rename,File to Rename
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Ji kerema xwe ve BOM li Row hilbijêre ji bo babet {0}
@@ -3441,7 +3445,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Cost ji Nawy Purchased
 DocType: Employee Separation,Employee Separation Template,Template Separation
 DocType: Selling Settings,Sales Order Required,Sales Order Required
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Bazirgan bibin
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Bazirgan bibin
 DocType: Purchase Invoice,Credit To,Credit To
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Leads çalak / muşteriyan
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Ji bo vala bihêlin ku forma hişyariya şîfreya standard bikar bînin
@@ -3483,7 +3487,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Şablon
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum Bikarhêner
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Madeyên xav nikare bibe vala.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Row # {0} (Payment Table): Divê gerek nerazî be
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Row # {0} (Payment Table): Divê gerek nerazî be
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Gelo stock update ne, fatûra dihewîne drop babete shipping."
 DocType: Contract,Fulfilment Status,Rewşa Xurt
 DocType: Lab Test Sample,Lab Test Sample,Sample Lab Lab
@@ -3622,7 +3626,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Doc Dîrok
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Records Fee Created - {0}
 DocType: Asset Category Account,Asset Category Account,Account Asset Kategorî
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Row # {0} (Payment Table): Divê heqê girîng be
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Row # {0} (Payment Table): Divê heqê girîng be
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Can babet zêdetir {0} ji Sales Order dorpêçê de hilberandina ne {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Nirxên taybetmendiyê hilbijêrin
 DocType: Purchase Invoice,Reason For Issuing document,Sedema belge belgeyê
@@ -3677,7 +3681,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Time li ku materyalên pêşwazî kirin
 DocType: Products Settings,Products per Page,Products per Page
 DocType: Stock Ledger Entry,Outgoing Rate,Rate nikarbe
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,an
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,an
 DocType: Sales Order,Billing Status,Rewş Billing
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Report an Dozî Kurd
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Mesref Bikaranîn
@@ -3704,7 +3708,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Daxuyaniya Xweseriya Bacê
 DocType: Payment Entry,Cheque/Reference Date,Cheque / Date Reference
 DocType: Purchase Invoice,Total Taxes and Charges,"Total Bac, û doz li"
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Dîrok-ji-bikaranîn Dîroka ku roja dahat-yê hatî derbas kirin
 DocType: Employee,Emergency Contact,Emergency Contact
 DocType: Bank Reconciliation Detail,Payment Entry,Peyam di peredana
 ,sales-browser,firotina-browser
@@ -3751,6 +3754,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Vegerîn (Têbînî Kredî)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Karê Destpêk
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Serial no ji bo şirketa {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ji kerema xwe veşartî ji bo {0} bi Sîstema Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,şablonê seqet ne divê şablonê default
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Ji bo row {0}
 DocType: Account,Income Account,Account hatina
@@ -3764,6 +3768,7 @@
 DocType: Loyalty Program,Help Section,Alîkariya Beşê
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Borî
 DocType: Appraisal Goal,Key Responsibility Area,Area Berpirsiyariya Key
+DocType: Delivery Trip,Distance UOM,UOM dûr
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Lekerên Student alîkarîya we bişopîne hazirbûn, nirxandinên û xercên ji bo xwendekaran"
 DocType: Payment Entry,Total Allocated Amount,Temamê meblaxa veqetandin
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Set account ambaran de default bo ambaran de perpetual
@@ -3804,7 +3809,7 @@
 DocType: Item Supplier,Item Supplier,Supplier babetî
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Tikaye kodî babet bikeve ji bo hevîrê tune
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Ji kerema xwe re nirx ji bo {0} quotation_to hilbijêre {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Naveroka hilbijartinê ji bo veguhastinê tune
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Naveroka hilbijartinê ji bo veguhastinê tune
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Hemû Navnîşan.
 DocType: Company,Stock Settings,Settings Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Yedega tenê mimkun e, eger taybetiyên jêrîn heman in hem records in. E Group, Type Root, Company"
@@ -4090,7 +4095,7 @@
 DocType: Patient,Personal and Social History,Dîroka Kesane û Civakî
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Bikarhêner {0} hat afirandin
 DocType: Fee Schedule,Fee Breakup for each student,Ji bo her xwendekaran ji bo şermezarkirina xerîb
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total pêşwext ({0}) li dijî Order {1} nikare were mezintir li Grand Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total pêşwext ({0}) li dijî Order {1} nikare were mezintir li Grand Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Select Belavkariya mehane ya ji bo yeksan belavkirin armancên li seranserî mehan.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Kodê Guherandinê
 DocType: Purchase Invoice Item,Valuation Rate,Rate Valuation
@@ -4099,7 +4104,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,ITC Cess
 ,Student Monthly Attendance Sheet,Xwendekarên mihasebeya Beşdariyê Ayda
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Qanûna Rêvebirin tenê tenê ji bo firotina kirînê
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Berê Nerazîbûnê Rûber {0}: Piştre Dîroka Nirxandina Dîroka Berî Berê kirîna Dîroka
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Berê Nerazîbûnê Rûber {0}: Piştre Dîroka Nirxandina Dîroka Berî Berê kirîna Dîroka
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Project Serî Date
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Ta
 DocType: Rename Tool,Rename Log,Rename bike Têkeve Têkeve
@@ -4117,12 +4122,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Divê pir caran divê projeyê û firotanê li ser Guhertina Kirêdariyên Demkî bêne nûkirin.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ketin ser
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,lê zêde bike Xwendekarên
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Ji kerema xwe kerema xwe ya karmendê <a href=""#Form/Employee/{0}"">{0}</a> \ ji bo belgeya vê betal bike"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},{0} ji kerema xwe hilbijêre
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Dûrî
+DocType: Delivery Stop,Distance,Dûrî
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Berhemên xwe yan xizmetên ku hûn bikirin an firotanê lîsteya xwe bikin.
 DocType: Water Analysis,Storage Temperature,Temperature
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-YYYY-
@@ -4149,7 +4152,7 @@
 DocType: Homepage,Company Description for website homepage,Description Company bo homepage malpera
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Ji bo hevgirtinê tê ji mişterî, van kodên dikare di formatên print wek hisab û Delivery Notes bikaranîn"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Navê Suplier
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Agahdarî ji bo {0} agahdar nekir.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Agahdarî ji bo {0} agahdar nekir.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Vebijêrtina Navnîşana Çandî
 DocType: Contract,Fulfilment Terms,Şertên Fîlm
 DocType: Sales Invoice,Time Sheet List,Time Lîsteya mihasebeya
@@ -4332,7 +4335,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,xwendekarên bi destan ji bo Activity bingeha Pol Hilbijêre
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,xwendekarên bi destan ji bo Activity bingeha Pol Hilbijêre
 DocType: Journal Entry,User Remark,Remark Bikarhêner
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Rêyên çêtirîn.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Rêyên çêtirîn.
 DocType: Travel Itinerary,Non Diary,Non Diary
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Bo karûbarên çepgir ên çepê nehate afirandin
 DocType: Lead,Market Segment,Segment Market
@@ -4363,7 +4366,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Program
 DocType: Student Guardian,Father,Bav
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Kolanên piştevanîya
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; dikarin for sale sermaye sabît nayê kontrolkirin
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; dikarin for sale sermaye sabît nayê kontrolkirin
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Lihevkirinê
 DocType: Attendance,On Leave,li ser Leave
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Get rojanekirî
@@ -4408,7 +4411,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serial No û Batch
 DocType: Warranty Claim,From Company,ji Company
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Sum ji Jimareke Krîterên Nirxandina divê {0} be.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Ji kerema xwe ve set Hejmara Depreciations civanan
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Ji kerema xwe ve set Hejmara Depreciations civanan
 DocType: Supplier Scorecard Period,Calculations,Pawlos
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Nirx an Qty
 DocType: Payment Terms Template,Payment Terms,Şertên Payan
@@ -4427,7 +4430,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Discount (%) li: List Price Rate bi Kenarê
 DocType: Healthcare Service Unit Type,Rate / UOM,Rêjeya / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Hemû enbar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,No {0} ji bo Kompaniya Navnetewî ve tê dîtin.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,No {0} ji bo Kompaniya Navnetewî ve tê dîtin.
 DocType: Travel Itinerary,Rented Car,Car Hire
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Der barê şirketa we
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,"Credit To account, divê hesabekî Bîlançoya be"
@@ -4529,6 +4532,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Çareseriya Cotmehê
 DocType: Cheque Print Template,Cheque Height,Bilindahiya Cheque
 DocType: Supplier,Supplier Details,Details Supplier
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ji kerema xwe veşartina nimûne ji bo Tevlêbûnê ya Setup&gt; Pirtûka Nimûne
 DocType: Setup Progress,Setup Progress,Pêşveçûna Pêşveçûn
 DocType: Expense Claim,Approval Status,Rewş erêkirina
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Ji nirxê gerek kêmtir ji bo nirxê di rêza be {0}
@@ -4622,7 +4626,6 @@
 DocType: Travel Request,Fully Sponsored,Fully Sponsored
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Navnîşana rojnamevanê veguhestin
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Têkilî {0} hatiye afirandin.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ji kerema xwe veguhastina Sîstema Sîstema Navnetewî di Çavkaniya Mirovan&gt; HR Set
 DocType: Stock Settings,Limit Percent,Sedî Sînora
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Niha tu firotek li her wareyê heye
 ,Payment Period Based On Invoice Date,Period tezmînat li ser Date bi fatûreyên
@@ -4681,7 +4684,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Warehouse Source
 DocType: Installation Note,Installation Date,Date installation
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Share Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne ji şîrketa girêdayî ne {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne ji şîrketa girêdayî ne {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Daxwaza firotanê {0} hat afirandin
 DocType: Employee,Confirmation Date,Date piştrastkirinê
 DocType: Inpatient Occupancy,Check Out,Lêkolîn
@@ -4701,6 +4704,7 @@
 DocType: Production Plan,Sales Orders Detail,Guhertoyên Bazirganî
 DocType: Bin,Requested Quantity,Quantity xwestin
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Ji kerema xwe li Sîstema Perwerdehiya Perwerdehiya Navneteweyî ya Mamosteyê sazkirinê saz bikin
 DocType: Patient,Marital Status,Rewşa zewacê
 DocType: Stock Settings,Auto Material Request,Daxwaza Auto Material
 DocType: Woocommerce Settings,API consumer secret,API-yê veşartî
@@ -4752,7 +4756,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Rojên Hilbijêre
 DocType: Academic Term,Term Name,Navê term
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Kredê ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Creating Salary Slips ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Creating Salary Slips ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Hûn nikarin node root root biguherînin.
 DocType: Buying Settings,Purchase Order Required,Bikirin Order Required
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Timer
@@ -4790,7 +4794,7 @@
 DocType: Account,Rate at which this tax is applied,Rate at ku ev tax sepandin
 DocType: Cash Flow Mapper,Section Name,Navekî Navîn
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,DIRTYHERTZ Qty
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Rêjeya Rêjeya {0}: Piştî ku jiyanê kêrhatî divê hêvîdar be hêvîkirin ji bilî an jî wekhevî {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Rêjeya Rêjeya {0}: Piştî ku jiyanê kêrhatî divê hêvîdar be hêvîkirin ji bilî an jî wekhevî {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Openings Job niha:
 DocType: Company,Stock Adjustment Account,Account Adjustment Stock
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,hewe Off
@@ -4837,7 +4841,7 @@
 DocType: Program Enrollment,School House,House School
 DocType: Serial No,Out of AMC,Out of AMC
 DocType: Opportunity,Opportunity Amount,Amûdê Dike
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Hejmara Depreciations civanan ne dikarin bibin mezintir Hejmara Depreciations
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Hejmara Depreciations civanan ne dikarin bibin mezintir Hejmara Depreciations
 DocType: Purchase Order,Order Confirmation Date,Dîroka Biryara Daxuyaniyê
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-YYYY-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Make Maintenance Visit
@@ -4878,7 +4882,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Batch:
 DocType: Volunteer,Afternoon,Piştînîvroj
 DocType: Loyalty Program,Loyalty Program Help,Alîkar Program Program
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} &#39;{1}&#39; neçalak e
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} &#39;{1}&#39; neçalak e
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Set as Open
 DocType: Cheque Print Template,Scanned Cheque,Scanned Cheque
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Send emails otomatîk ji Têkilî li ser danûstandinên Radestkirina.
@@ -4891,7 +4895,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Babetê û Warranty Details
 DocType: Chapter,Chapter Members,Endamên Beşê
 DocType: Sales Team,Contribution (%),Alîkarên (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Têbînî: em Peyam Pere dê ji ber ku tên afirandin, ne bê &#39;Cash an Account Bank&#39; ne diyar bû"
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Têbînî: em Peyam Pere dê ji ber ku tên afirandin, ne bê &#39;Cash an Account Bank&#39; ne diyar bû"
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Projeya {0} berê heye
 DocType: Clinical Procedure,Nursing User,Nursing User
 DocType: Employee Benefit Application,Payroll Period,Dema Payroll
@@ -4899,6 +4903,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},No Serial No {0} ne girêdayî ye {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,berpirsiyariya
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Dema valahiyê ya vê kursiyê qediya.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Ji kerema xwe kerema xwe ya karmendê <a href=""#Form/Employee/{0}"">{0}</a> \ ji bo belgeya vê betal bike"
 DocType: Expense Claim Account,Expense Claim Account,Account mesrefan
 DocType: Account,Capital Work in Progress,Karê Kapîtaliyê di Pêşveçûnê de
 DocType: Accounts Settings,Allow Stale Exchange Rates,Allow Stale Exchange Rates
@@ -4980,7 +4986,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Doza Material
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,ConnectPage with ERPNext Connect Connect
 DocType: Material Request Item,For Warehouse,ji bo Warehouse
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Daxuyaniya şandin {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Daxuyaniya şandin {0}
 DocType: Employee,Offer Date,Pêşkêşiya Date
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Quotations
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,"Tu di moda negirêdayî ne. Tu nikarî wê ji nû ve, heta ku hûn torê."
@@ -5031,7 +5037,7 @@
 DocType: Shipping Rule,Calculate Based On,Calcolo li ser
 DocType: Contract,Unfulfilled,Neheq
 DocType: Delivery Note Item,From Warehouse,ji Warehouse
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Ji bo krîterên nirxên ne karmendan tune
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Ji bo krîterên nirxên ne karmendan tune
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,No babet bi Bill ji materyalên ji bo Manufacture
 DocType: Shopify Settings,Default Customer,Berpirsiyarê Default
 DocType: Sales Stage,Stage Name,Stage Navê
@@ -5074,7 +5080,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Şêwaz Bacê Piştî Mîqdar Discount
 DocType: Patient,Inpatient Status,Rewşa Nexweş
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Settings Nasname Work rojane
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Lîsteya bihayê bijartî divê pêdiviyên kirîna firotanê û firotanê kontrol bikin
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Lîsteya bihayê bijartî divê pêdiviyên kirîna firotanê û firotanê kontrol bikin
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Ji kerema xwe re Reqd bi dahatinê binivîse
 DocType: Payment Entry,Internal Transfer,Transfer navxweyî
 DocType: Asset Maintenance,Maintenance Tasks,Tîmên Parastinê
@@ -5111,7 +5117,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Pol By
 DocType: Guardian,Interests,berjewendiyên
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Çalak / currencies astengkirin.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Nikarî çend salary slênan nekarin
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Nikarî çend salary slênan nekarin
 DocType: Exchange Rate Revaluation,Get Entries,Bixwînin
 DocType: Production Plan,Get Material Request,Get Daxwaza Material
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Mesref postal
@@ -5197,7 +5203,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},account Expense bo em babete wêneke e {0}
 DocType: BOM,Website Description,Website Description
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Change Net di Sebra min
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Ji kerema xwe ve poşmaniya kirînê bi fatûreyên {0} pêşîn
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Ji kerema xwe ve poşmaniya kirînê bi fatûreyên {0} pêşîn
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Nayê destûr kirin. Ji kerema xwe binivîse navenda yekîneyê
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Email Address divê yekta be, ji niha ve ji bo heye {0}"
 DocType: Serial No,AMC Expiry Date,AMC Expiry Date
@@ -5237,7 +5243,7 @@
 DocType: Hotel Room,Hotel Room,Room Room
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Account {0} nayê ji şîrketa endamê ne {1}
 DocType: Leave Type,Rounding,Rounding
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Numbers Serial li row {0} nayê bi Delivery Têbînî hev nagirin
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Numbers Serial li row {0} nayê bi Delivery Têbînî hev nagirin
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Gelek Amûr (Pro-rated)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Piştre Qanûna Barkirina Qanûna Xerîdar, Têkilî Giştî, Territory, Xizmetkar, Gelek Giştî, Koma Kampanyayê, Pargîdanî û Niştimanî."
 DocType: Student,Guardian Details,Guardian Details
@@ -5292,7 +5298,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Warehouse pêwîst ji bo vî babetî stock {0}
 DocType: Leave Allocation,Unused leaves,pelên Unused
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Bixwîne Endamê Reşbûnê
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,All Departments
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,All Departments
 DocType: Healthcare Service Unit,Vacant,Vala
 DocType: Patient,Alcohol Past Use,Bikaranîna Pêdivî ya Alkol
 DocType: Fertilizer Content,Fertilizer Content,Naveroka Fertilizer
@@ -5303,7 +5309,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Berî karûbarê vê firotinê ya betal bike ji bo karûbarê karûbar {0} divê betal bike
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Fetch BOM teqiya (di nav wan de sub-meclîs)
 DocType: Authorization Rule,Applicable To (Employee),To wergirtinê (Xebatkarê)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Date ji ber wêneke e
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Date ji ber wêneke e
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Increment bo Pêşbîr {0} nikare bibe 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Tîpa Xweyê û Amûdê
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Odeyên pirtûkan
@@ -5449,7 +5455,7 @@
 DocType: Purchase Invoice Item,Total Weight,Total Weight
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Komîsyona li ser Sales
 DocType: Job Offer Term,Value / Description,Nirx / Description
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ne dikarin bên şandin, ev e jixwe {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ne dikarin bên şandin, ev e jixwe {2}"
 DocType: Tax Rule,Billing Country,Billing Country
 DocType: Purchase Order Item,Expected Delivery Date,Hêvîkirin Date Delivery
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurant Order Entry
@@ -5488,12 +5494,13 @@
 DocType: Maintenance Visit,Breakdown,Qeza
 DocType: Travel Itinerary,Vegetarian,Vegetarian
 DocType: Patient Encounter,Encounter Date,Dîrok Dike
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Account: {0} bi currency: {1} ne bên hilbijartin
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Account: {0} bi currency: {1} ne bên hilbijartin
 DocType: Bank Statement Transaction Settings Item,Bank Data,Data Data
 DocType: Purchase Receipt Item,Sample Quantity,Hêjeya nimûne
 DocType: Bank Guarantee,Name of Beneficiary,Navevaniya Niştimanî
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","BOM bi otomatîk bi otomotîfê xwe bixweber bike, li ser rêjeya bihayê bihayê / bihayê rêjeya bihayê / rêjeya kirînê ya bihayê rawestî."
 DocType: Supplier,SUP-.YYYY.-,SUP-YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Supplier&gt; Supplier Group
 DocType: Bank Reconciliation Detail,Cheque Date,Date Cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Account {0}: account Parent {1} ne aîdî ji şîrketa: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Bi serkeftin hat hemû muameleyên girêdayî vê şîrketê!
@@ -5521,7 +5528,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,hucûma zarok dikare bi tenê di bin &#39;Group&#39; type hucûma tên afirandin
 DocType: Attendance Request,Half Day Date,Date nîv Day
 DocType: Academic Year,Academic Year Name,Navê Year (Ekadîmî)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} destûr nekir ku bi {1} veguherîne. Ji kerema xwe şîrketê biguherînin.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} destûr nekir ku bi {1} veguherîne. Ji kerema xwe şîrketê biguherînin.
 DocType: Sales Partner,Contact Desc,Contact Desc
 DocType: Email Digest,Send regular summary reports via Email.,Send raporên summary nîzamî bi rêya Email.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Ji kerema xwe ve account default set li Type mesrefan {0}
@@ -5554,7 +5561,7 @@
 DocType: Hotel Room,Hotel Manager,Rêveberê Hotel
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Set Rule Bacê ji bo Têxe selikê
 DocType: Purchase Invoice,Taxes and Charges Added,Bac û tawana Ev babete ji layê
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Berê Nerazîbûnê Rûber {0}: Piştre Dîroka Nirxandina Berî Berî Berî Berî Bikaranîna Dîrok-pey-be
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Berê Nerazîbûnê Rûber {0}: Piştre Dîroka Nirxandina Berî Berî Berî Berî Bikaranîna Dîrok-pey-be
 ,Sales Funnel,govekeke Sales
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Abbreviation wêneke e
 DocType: Project,Task Progress,Task Progress
@@ -5568,7 +5575,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Hemû Groups Mişterî
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,Accumulated Ayda
 DocType: Attendance Request,On Duty,Li ser kar
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} de bivênevê ye. Dibe ku rekor Exchange ji bo {1} ji bo {2} tên afirandin ne.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} de bivênevê ye. Dibe ku rekor Exchange ji bo {1} ji bo {2} tên afirandin ne.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Pîlana Karmendê {0} ji berê ve tête navnîşan heye {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Şablon Bacê de bivênevê ye.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Account {0}: account Parent {1} tune
@@ -5648,11 +5655,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Li Hindîstan û yek warehouse wêneke e
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Peldanka Girêdanê wekî UOM, Gelek Giştî, Pirtûka û Na Naîreyan."
 DocType: Certification Application,Certification Status,Status Status
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Marketplace
 DocType: Travel Itinerary,Travel Advance Required,Agahiya Pêşîn
 DocType: Subscriber,Subscriber Name,Navê Nûnerê
 DocType: Serial No,Out of Warranty,Out of Warranty
-DocType: Cashier Closing,Cashier-closing-,Cashier-closing-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Dîteya Data Mapped
 DocType: BOM Update Tool,Replace,Diberdaxistin
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,No berhemên dîtin.
@@ -5740,7 +5746,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Saziyên bacê yên ji bo firotin û kirînê ji nû ve tên afirandin.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Nirxandina encamê {0} jixwe heye.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Nimûne: ABCD. #####. Heke ku rêzikek vekirî ye û Batch Na ne di nav veguhestinê de nirxandin, hingê hejmarek navnîşa otobusê otomatîk li ser vê pirtûkê hatiye afirandin. Heke hûn herdem herdem ji bo vê yekê tiştek balkêş binivîsin, ji vê derê vekin. Têbînî: ev sazkirinê dê li ser Sîsteyên Sûkê li ser Nameya Cîhanê ya Sermaseyê pêşniyar bibin."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ji kerema xwe veşartina nimûne ji bo Tevlêbûnê ya Setup&gt; Pirtûka Nimûne
 DocType: BOM,Materials Required (Exploded),Materyalên pêwîst (teqandin)
 DocType: Contract,Party User,Partiya Bikarhêner
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Xêra xwe Company wêr&#39;a vala eger Pol By e &#39;Company&#39;
@@ -5943,7 +5948,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,View opp
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Dema Dema Dibistana Dema Dîroka Destpêk û Dema Têkoşîna Trialê Divê Dîroka Destpêk Dabeş bikin
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Rêjeya Navîn
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Gava Tiştê Tevî Di nav deynê şertê divê divê tevahî Gund / Gundî be
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Gava Tiştê Tevî Di nav deynê şertê divê divê tevahî Gund / Gundî be
 DocType: Subscription Plan Detail,Plan,Pîlan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,balance Statement Bank wek per General Ledger
 DocType: Job Applicant,Applicant Name,Navê Applicant
@@ -6012,7 +6017,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sabûn &amp; Detergent
 DocType: BOM,Show Items,Show babetî
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Ji Time ne dikarin bibin mezintir To Time.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Ma hûn dixwazin ku hemî mişteriyan bi e-nameyê agahdar bikin?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Ma hûn dixwazin ku hemî mişteriyan bi e-nameyê agahdar bikin?
 DocType: Subscription Plan,Billing Interval,Navendiya Navîn
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,emir kir
@@ -6021,9 +6026,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Row {0}: {1} ji 0 re mezintir be
 DocType: Assessment Criteria,Assessment Criteria Group,Şertên Nirxandina Group
 DocType: Healthcare Settings,Patient Name By,Navê Nûnerê
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Entry Journal of Accrual ji bo hejmarên {0} heta {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Entry Journal of Accrual ji bo hejmarên {0} heta {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Revenue Deferred Disabled
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Vekirina Farhad. Accumulated gerek kêmtir ji bo ku bibe yeksan û {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Vekirina Farhad. Accumulated gerek kêmtir ji bo ku bibe yeksan û {0}
 DocType: Warehouse,Warehouse Name,Navê warehouse
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Dîroka destpêka rastîn divê roja dawiya rastîn kêmtir be
 DocType: Naming Series,Select Transaction,Hilbijêre Transaction
@@ -6175,7 +6180,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Karmend {0} ya grade {1} ne polîtîkaya derengî tune
 DocType: Salary Detail,Salary Detail,Detail meaş
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Ji kerema xwe {0} hilbijêre yekem
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Bikarhênerên {0} zêde kirin
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Bikarhênerên {0} zêde kirin
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","Di rewşê de bernameya pir-tier, Ewrûpa dê ji hêla xercê xwe ve girêdayî xerîb be"
 DocType: Appointment Type,Physician,Bijîşk
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Batch {0} yên babet {1} xelas bûye.
@@ -6319,7 +6324,7 @@
 DocType: Asset,Custodian,Custodian
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Point-ji-Sale Profile
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,Divê {0} nirxek di navbera 0 û 100 de
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Payment ji {0} ji {1} heta {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Payment ji {0} ji {1} heta {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Loans bê çarerserkirin.
 DocType: Cost Center,Cost Center Name,Mesrefa Name Navenda
 DocType: Student,B+,B +
@@ -6351,6 +6356,7 @@
 DocType: Employee,Date of Issue,Date of Dozî Kurd
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Li gor Settings Buying eger Buy reciept gireke == &#39;ERÊ&#39;, piştre ji bo afirandina Buy bi fatûreyên, bikarhêner ji bo afirandina Meqbûz Buy yekem bo em babete {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Row # {0}: Set Supplier bo em babete {1}
+DocType: Global Defaults,Default Distance Unit,Default Distance Unit
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Row {0}: value Hours divê ji sifirê mezintir be.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Website Wêne {0} girêdayî babet {1} nayê dîtin
 DocType: Issue,Content Type,Content Type
@@ -6406,7 +6412,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,"Debit To account, divê hesabekî Bîlançoya be"
 DocType: Asset,Naming Series,Series Bidin
 DocType: Vital Signs,Coated,Vekirî
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Row {0}: Hêjeya Expected Value Piştî Piştî Jiyana Karên Bikaranîna Divê Ji Gelek Kirîna Grossê kêmtir be
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Row {0}: Hêjeya Expected Value Piştî Piştî Jiyana Karên Bikaranîna Divê Ji Gelek Kirîna Grossê kêmtir be
 DocType: GoCardless Settings,GoCardless Settings,Guhertoyên GoCardless
 DocType: Leave Block List,Leave Block List Name,Dev ji Lîsteya Block Name
 DocType: Certified Consultant,Certification Validity,Pêvekirin
@@ -6475,6 +6481,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Bank Header
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Vebijêrkên Lab Laban
 DocType: Hub Users,Hub Users,Bikarhênerên Hub
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Giştî&gt; Giştî ya Giştî&gt; Herêmî
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Date Maintenance
 DocType: Purchase Invoice Item,Rejected Serial No,No Serial red
@@ -6488,7 +6495,7 @@
 DocType: SG Creation Tool Course,Max Strength,Max Hêz
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Pêşniyarên sazkirinê
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Naveroka Hilbijartinê Na ku ji bo Meriv {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Naveroka Hilbijartinê Na ku ji bo Meriv {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Karmend {0} tune ye heqê herî zêde tune
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Li gor danûstandinên Navnîşê li ser hilbijêre
 DocType: Grant Application,Has any past Grant Record,Gelek Grant Record
@@ -6516,7 +6523,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Reservation Room Hotel
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Balkeş bûn
 DocType: BOM,Thumbnail,Thumbnail
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Têkilî bi nasnameyên email-ê nehat dîtin.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Têkilî bi nasnameyên email-ê nehat dîtin.
 DocType: Item Customer Detail,Item Customer Detail,Babetê Detail Mişterî
 DocType: Notification Control,Prompt for Email on Submission of,"Bibêje, ji bo Email li ser Şandekê ji"
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Gelek xercê karmendê {0} zêde dike {1}
@@ -6776,7 +6783,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,"ne dikarin bi Pol nepenî, ji ber Type Account hilbijartî ye."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} hate guherandin. Ji kerema xwe nû dikin.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Dev ji bikarhêneran ji çêkirina Applications Leave li ser van rojan de.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kodê Asayîş&gt; Tîpa Group&gt; Brand
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Ger hejmara betalîfên ji bo Hevpeymaniya bêkêmasî nebe, bidawîbûna demdêriya vala an jî 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Endamên Tenduristiyê
 DocType: Loyalty Point Entry,Purchase Amount,Asta kirîn
@@ -6784,7 +6790,7 @@
 											to fullfill Sales Order {2}",Nikarî Serial No {0} ya {1} ji ber ku ew rakêş e \ n tije razdariya firotanê {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-YYYY-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Supplier Quotation {0} tên afirandin
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,End Sal nikarim li ber Serî Sal be
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,End Sal nikarim li ber Serî Sal be
 DocType: Employee Benefit Application,Employee Benefits,Qezenca kardarîyê
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},"dorpêçê de bi timamî, divê dorpêçê de ji bo babet {0} li row pêşya {1}"
 DocType: Work Order,Manufactured Qty,Manufactured Qty
@@ -6800,6 +6806,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Numbers Batch Hilbijêre
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,"Fatûrayên xwe rakir, ji bo muşteriyan."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ji kerema xwe veguhastina Sîstema Sîstema Navnetewî di Çavkaniya Mirovan&gt; HR Set
 DocType: Healthcare Settings,Invoice Appointments Automatically,Destnîşankirina Tevlêkirinê otomatîk
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
 DocType: Salary Component,Variable Based On Taxable Salary,Li ser Dabeşkirina Bacê ya Bacgir
@@ -6848,7 +6855,7 @@
 DocType: POS Profile,Account for Change Amount,Account ji bo Guhertina Mîqdar
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Girêdana QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Baweriya Giştî / Gelek
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Kompaniya nexşeya ji bo Rêxistina Inter Company.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Kompaniya nexşeya ji bo Rêxistina Inter Company.
 DocType: Purchase Invoice,input service,xizmetê
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partiya / Account nayê bi hev nagirin {1} / {2} li {3} {4}
 DocType: Employee Promotion,Employee Promotion,Pêşveçûna Karmendiyê
@@ -6979,7 +6986,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Area for Preferred for Lodging
 apps/erpnext/erpnext/config/selling.py +184,Analytics,analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Têxe vala ye
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Ji kerema xwe li Sîstema Perwerdehiya Perwerdehiya Navneteweyî ya Mamosteyê sazkirinê saz bikin
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Naverokê {0} tune ye Serial No. Hejmarên tenê serilialized \ dikare li ser Serial No li ser bingeha xwarina xweşînek heye
 DocType: Vehicle,Model,Cins
@@ -7009,7 +7015,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Tiştek guhartin
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Ji kerema xwe re file CSV hilbijêre
 DocType: Holiday List,Total Holidays,Hemû betlaneyên
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Şîfreya emailê ji bo belavkirinê. Ji kerema xwe veguhastin li Settings Settings.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Şîfreya emailê ji bo belavkirinê. Ji kerema xwe veguhastin li Settings Settings.
 DocType: Student Leave Application,Mark as Present,Mark wek Present
 DocType: Supplier Scorecard,Indicator Color,Indicator Color
 DocType: Purchase Order,To Receive and Bill,To bistînin û Bill
@@ -7018,7 +7024,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Hilbijêre Serial No
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Şikilda
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Şert û mercan Şablon
-DocType: Serial No,Delivery Details,Details Delivery
+DocType: Delivery Trip,Delivery Details,Details Delivery
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Navenda Cost li row pêwîst e {0} Bac sifrê ji bo cureyê {1}
 DocType: Program,Program Code,Code Program
 DocType: Terms and Conditions,Terms and Conditions Help,Şert û mercan Alîkarî
@@ -7042,7 +7048,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Rê Time Rojan
 DocType: Cash Flow Mapping,Is Income Tax Expense,Xerca Bacê ye
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Fermana we ji bo vexwarinê ye!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Mesaj Date divê eynî wek tarîxa kirînê be {1} ji sermaye {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Mesaj Date divê eynî wek tarîxa kirînê be {1} ji sermaye {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"vê kontrol bike, eger ku xwendevan û geştê li Hostel a Enstîtuyê ye."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Ji kerema xwe ve Orders Sales li ser sifrê li jor binivîse
 ,Stock Summary,Stock Nasname
diff --git a/erpnext/translations/lo.csv b/erpnext/translations/lo.csv
index 4ff6e95..55f7478 100644
--- a/erpnext/translations/lo.csv
+++ b/erpnext/translations/lo.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,ຊື່ໄລຍະເວລາ
 DocType: Employee,Salary Mode,Mode ເງິນເດືອນ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,ລົງທະບຽນ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,ລົງທະບຽນ
 DocType: Patient,Divorced,ການຢ່າຮ້າງ
 DocType: Support Settings,Post Route Key,Post Route Key
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,ອະນຸຍາດໃຫ້ສິນຄ້າທີ່ຈະເພີ່ມເວລາຫຼາຍໃນການເປັນ
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,ອັດຕາແລກປ່ຽນໃຫມ່
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},ສະກຸນເງິນແມ່ນຕ້ອງການສໍາລັບລາຄາ {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ຈະໄດ້ຮັບການຄິດໄລ່ໃນການໄດ້.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Supplier&gt; Supplier Type
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-YYYY.-
 DocType: Purchase Order,Customer Contact,ຕິດຕໍ່ລູກຄ້າ
 DocType: Patient Appointment,Check availability,ກວດເບິ່ງທີ່ມີຢູ່
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,ສະແດງໃຫ້ເຫັນການເປີດ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,ຊຸດອັບເດດຮຽບຮ້ອຍ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,ກວດເບິ່ງ
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} ໃນແຖວ {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} ໃນແຖວ {1}
 DocType: Asset Finance Book,Depreciation Start Date,ວັນເລີ່ມຕົ້ນຄ່າເສື່ອມລາຄາ
 DocType: Pricing Rule,Apply On,ສະຫມັກຕໍາກ່ຽວກັບ
 DocType: Item Price,Multiple Item prices.,ລາຄາສິນຄ້າທີ່ຫຼາກຫຼາຍ.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Lab Prescription
 ,Delay Days,Delay Days
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ຄ່າໃຊ້ຈ່າຍໃນການບໍລິການ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} ອ້າງອິງແລ້ວໃນ Sales ໃບເກັບເງິນ: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} ອ້າງອິງແລ້ວໃນ Sales ໃບເກັບເງິນ: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,ໃບເກັບເງິນ
 DocType: Purchase Invoice Item,Item Weight Details,Item Weight Details
 DocType: Asset Maintenance Log,Periodicity,ໄລຍະເວລາ
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,ບັນຊີ
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,ລາຄາຂາຍລາຄາ
 DocType: Patient,Tobacco Current Use,Tobacco Current Use
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","ວັນທີເລີ່ມຕົ້ນແລະວັນທີສິ້ນສຸດແມ່ນການເຮັດວຽກທີ່ລ້າສະໄຫມກັບບັດວຽກ <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,ອັດຕາການຂາຍ
 DocType: Cost Center,Stock User,User Stock
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,ທີ່ກ່ຽວຂ້ອງ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,ວັນຜູ້ເຂົ້າຮ່ວມບໍ່ສາມາດຈະຫນ້ອຍກ່ວາວັນເຂົ້າຮ່ວມຂອງພະນັກງານ
 DocType: Grading Scale,Grading Scale Name,ການຈັດລໍາດັບຊື່ Scale
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,ເພີ່ມຜູ້ໃຊ້ໃນຕະຫຼາດ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,ເພີ່ມຜູ້ໃຊ້ໃນຕະຫຼາດ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,ນີ້ແມ່ນບັນຊີຮາກແລະບໍ່ສາມາດໄດ້ຮັບການແກ້ໄຂ.
 DocType: Sales Invoice,Company Address,ທີ່ຢູ່ບໍລິສັດ
 DocType: BOM,Operations,ການດໍາເນີນງານ
@@ -322,7 +322,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Qty
 DocType: Production Plan,Material Request Detail,Material Request Detail
 DocType: Selling Settings,Default Quotation Validity Days,ວັນທີ Validity Default Quotation
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ເພື່ອປະກອບມີພາສີໃນການຕິດຕໍ່ກັນ {0} ໃນອັດຕາການສິນຄ້າ, ພາສີອາກອນໃນແຖວເກັດທີ່ຢູ່ {1} ຍັງຕ້ອງໄດ້ຮັບການປະກອບ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ເພື່ອປະກອບມີພາສີໃນການຕິດຕໍ່ກັນ {0} ໃນອັດຕາການສິນຄ້າ, ພາສີອາກອນໃນແຖວເກັດທີ່ຢູ່ {1} ຍັງຕ້ອງໄດ້ຮັບການປະກອບ"
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Payroll Entry,Validate Attendance,Validate Attendance
 DocType: Sales Invoice,Change Amount,ການປ່ຽນແປງຈໍານວນເງິນ
@@ -441,7 +441,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,ສະຖານທີ່ອອນໄລນ໌ສໍາລັບການຈໍານວນເງິນໃນຄໍາສັບຕ່າງໆ
 DocType: Vehicle,Additional Details,ລາຍລະອຽດເພີ່ມເຕີມ
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,ບໍ່ໄດ້ຮັບການອະທິບາຍ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Supplier&gt; Supplier Group
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ຮ້ອງຂໍໃຫ້ມີສໍາລັບການຊື້.
 DocType: POS Closing Voucher Details,Collected Amount,ຈໍານວນເງິນທີ່ໄດ້ເກັບກໍາ
 DocType: Lab Test,Submitted Date,Submitted Date
@@ -486,7 +485,7 @@
 DocType: Student Admission,Student Admission,ຮັບສະຫມັກນັກສຶກສາ
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,ລາຍການ {0} ຈະຖືກຍົກເລີກ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,ໄລຍະຫັກຄ່າທໍານຽມ {0}: ວັນທີເລີ່ມຕົ້ນການເສື່ອມລາຄາຖືກລົງເປັນວັນທີ່ຜ່ານມາ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,ໄລຍະຫັກຄ່າທໍານຽມ {0}: ວັນທີເລີ່ມຕົ້ນການເສື່ອມລາຄາຖືກລົງເປັນວັນທີ່ຜ່ານມາ
 DocType: Contract Template,Fulfilment Terms and Conditions,ຂໍ້ກໍານົດແລະເງື່ອນໄຂໃນການປະຕິບັດ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,ຂໍອຸປະກອນການ
 DocType: Bank Reconciliation,Update Clearance Date,ວັນທີ່ປັບປຸງການເກັບກູ້
@@ -543,6 +542,7 @@
 DocType: Accounts Settings,Settings for Accounts,ການຕັ້ງຄ່າສໍາລັບການບັນຊີ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Supplier Invoice ບໍ່ມີລາຄາໃນການຊື້ Invoice {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,ການຄຸ້ມຄອງການຂາຍສ່ວນບຸກຄົນເປັນໄມ້ຢືນຕົ້ນ.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","ບໍ່ສາມາດຈັດການເສັ້ນທາງ, ເນື່ອງຈາກການຕັ້ງຄ່າ Google Maps ຖືກປິດການໃຊ້ງານ."
 DocType: Job Applicant,Cover Letter,ການປົກຫຸ້ມຂອງຈົດຫມາຍສະບັບ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ເຊັກທີ່ຍັງຄ້າງຄາແລະຄ່າມັດຈໍາເພື່ອອະນາໄມ
 DocType: Item,Synced With Hub,ຊິ້ງຂໍ້ມູນກັບ Hub
@@ -602,7 +602,7 @@
 DocType: Asset Value Adjustment,New Asset Value,ມູນຄ່າຊັບສິນໃຫມ່
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,ອັດຕາທີ່ສະກຸນເງິນຂອງລູກຄ້າຈະຖືກແປງເປັນສະກຸນເງິນຂອງລູກຄ້າຂອງພື້ນຖານ
 DocType: Course Scheduling Tool,Course Scheduling Tool,ຂອງລາຍວິຊາເຄື່ອງມືການຕັ້ງເວລາ
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},"ຕິດຕໍ່ກັນ, {0}: Purchase Invoice ບໍ່ສາມາດຈະດໍາເນີນຕໍ່ຊັບສິນທີ່ມີຢູ່ແລ້ວ {1}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},"ຕິດຕໍ່ກັນ, {0}: Purchase Invoice ບໍ່ສາມາດຈະດໍາເນີນຕໍ່ຊັບສິນທີ່ມີຢູ່ແລ້ວ {1}"
 DocType: Crop Cycle,LInked Analysis,LInked Analysis
 DocType: POS Closing Voucher,POS Closing Voucher,POS Closing Voucher
 DocType: Contract,Lapsed,ຫາຍໄປ
@@ -637,6 +637,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} ບໍ່ໄດ້ລົງທະບຽນໃນວິຊາທີ່ {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,ຊື່ນັກຮຽນ:
 DocType: POS Closing Voucher Details,Difference,ຄວາມແຕກຕ່າງ
+DocType: Delivery Settings,Delay between Delivery Stops,ການຊັກຊ້າລະຫວ່າງການຈັດສົ່ງຢຸດ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial No {0} ບໍ່ໄດ້ຂຶ້ນກັບການສົ່ງເງິນ {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","ເບິ່ງຄືວ່າຈະມີບັນຫາກັບການຕັ້ງຄ່າ GoCardless ຂອງເຄື່ອງແມ່ຂ່າຍ. ຢ່າກັງວົນ, ໃນກໍລະນີຂອງການລົ້ມເຫຼວ, ຈໍານວນເງິນທີ່ຈະໄດ້ຮັບເງິນຄືນກັບບັນຊີຂອງທ່ານ."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -697,7 +698,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,ປະລິມານແລະອັດຕາການ
 DocType: Delivery Note,% Installed,% ການຕິດຕັ້ງ
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,ຫ້ອງຮຽນ / ຫ້ອງປະຕິບັດແລະອື່ນໆທີ່ບັນຍາຍສາມາດໄດ້ຮັບການກໍານົດ.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,ເງິນສະກຸນຂອງບໍລິສັດຂອງບໍລິສັດທັງສອງຄວນຈະທຽບກັບບໍລິສັດ Inter Company Transactions.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,ເງິນສະກຸນຂອງບໍລິສັດຂອງບໍລິສັດທັງສອງຄວນຈະທຽບກັບບໍລິສັດ Inter Company Transactions.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,ກະລຸນາໃສ່ຊື່ບໍລິສັດທໍາອິດ
 DocType: Travel Itinerary,Non-Vegetarian,ບໍ່ແມ່ນຜັກກາດ
 DocType: Purchase Invoice,Supplier Name,ຊື່ຜູ້ຜະລິດ
@@ -784,7 +785,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,ເຊົ່າຈາກວັນທີ່
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Parts ພຽງພໍທີ່ຈະກໍ່ສ້າງ
 DocType: POS Profile User,POS Profile User,POS User Profile
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,ແຖວ {0}: ຕ້ອງມີວັນເລີ່ມຕົ້ນຄ່າໃຊ້ຈ່າຍ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,ແຖວ {0}: ຕ້ອງມີວັນເລີ່ມຕົ້ນຄ່າໃຊ້ຈ່າຍ
 DocType: Purchase Invoice Item,Service Start Date,ວັນເລີ່ມຕົ້ນບໍລິການ
 DocType: Subscription Invoice,Subscription Invoice,ໃບສະຫມັກໃບສະຫມັກ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,ລາຍໄດ້ໂດຍກົງ
@@ -853,7 +854,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,ຕົວຫຍໍ້ທີ່ໃຊ້ສໍາລັບການບໍລິສັດອື່ນ
 DocType: Selling Settings,Default Customer Group,ມາດຕະຖານກຸ່ມລູກຄ້າ
 DocType: Employee,IFSC Code,IFSC Code
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","ວັນທີເລີ່ມຕົ້ນແລະວັນທີສິ້ນສຸດລົງແມ່ນການເຮັດວຽກລ້າສຸດທີ່ມີບັດວຽກ <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","ຖ້າຫາກວ່າປິດການໃຊ້ງານ, ພາກສະຫນາມ &#39;ມົນລວມຈະບໍ່ສັງເກດເຫັນໃນການໂອນເງີນ"
 DocType: BOM,Operating Cost,ຄ່າໃຊ້ຈ່າຍປະຕິບັດການ
 DocType: Crop,Produced Items,ຜະລິດສິນຄ້າ
@@ -905,7 +905,7 @@
 DocType: Supplier,Prevent RFQs,Prevent RFQs
 DocType: Hub User,Hub User,User Hub
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,ເຮັດໃຫ້ຂາຍສິນຄ້າ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},ໃບສະເຫນີລາຄາທີ່ຖືກສົ່ງສໍາລັບໄລຍະເວລາຈາກ {0} ກັບ {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},ໃບສະເຫນີລາຄາທີ່ຖືກສົ່ງສໍາລັບໄລຍະເວລາຈາກ {0} ກັບ {1}
 DocType: Project Task,Project Task,ໂຄງການ Task
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Redeemed Points
 ,Lead Id,Id ນໍາ
@@ -1037,7 +1037,7 @@
 DocType: Fee Validity,Max number of visit,ຈໍານວນການຢ້ຽມຢາມສູງສຸດ
 ,Hotel Room Occupancy,Hotel Room Occupancy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet ສ້າງ:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},ກະລຸນາທີ່ກໍານົດໄວ້ເງິນສົດໃນຕອນຕົ້ນຫຼືບັນຊີທະນາຄານໃນຮູບແບບການຊໍາລະເງິນ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},ກະລຸນາທີ່ກໍານົດໄວ້ເງິນສົດໃນຕອນຕົ້ນຫຼືບັນຊີທະນາຄານໃນຮູບແບບການຊໍາລະເງິນ {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,ລົງທະບຽນ
 DocType: GST Settings,GST Settings,ການຕັ້ງຄ່າສີມູນຄ່າເພີ່ມ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},ເງິນສະກຸນເງິນຄວນຄືກັນກັບລາຄາລາຄາສະກຸນເງິນ: {0}
@@ -1092,7 +1092,7 @@
 DocType: Vehicle Log,Service Details,ລາຍລະອຽດການບໍລິການ
 DocType: Lab Test Template,Grouped,Grouped
 DocType: Selling Settings,Delivery Note Required,ສົ່ງຂໍ້ທີ່ກໍານົດ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Submitting Salary Slips ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Submitting Salary Slips ...
 DocType: Bank Guarantee,Bank Guarantee Number,ທະນາຄານຈໍານວນການຮັບປະກັນ
 DocType: Bank Guarantee,Bank Guarantee Number,ທະນາຄານຈໍານວນການຮັບປະກັນ
 DocType: Assessment Criteria,Assessment Criteria,ເງື່ອນໄຂການປະເມີນຜົນ
@@ -1118,13 +1118,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Entry ການຈ່າຍເງິນແມ່ນສ້າງຮຽບຮ້ອຍແລ້ວ
 DocType: Request for Quotation,Get Suppliers,ຮັບ Suppliers
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock ປັດຈຸບັນ
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},"ຕິດຕໍ່ກັນ, {0}: Asset {1} ບໍ່ໄດ້ຕິດພັນກັບການ Item {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},"ຕິດຕໍ່ກັນ, {0}: Asset {1} ບໍ່ໄດ້ຕິດພັນກັບການ Item {2}"
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,ສະແດງຄວາມຜິດພາດພຽງເງິນເດືອນ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,ບັນຊີ {0} ໄດ້ຮັບການປ້ອນເວລາຫຼາຍ
 DocType: Account,Expenses Included In Valuation,ຄ່າໃຊ້ຈ່າຍລວມຢູ່ໃນການປະເມີນຄ່າ
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,ທ່ານພຽງແຕ່ສາມາດຕໍ່ອາຍຸຖ້າວ່າສະມາຊິກຂອງທ່ານຫມົດອາຍຸພາຍໃນ 30 ວັນ
 DocType: Shopping Cart Settings,Show Stock Availability,Show Availability Availability
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},ຕັ້ງ {0} ໃນຫມວດສິນຊັບ {1} ຫຼືບໍລິສັດ {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},ຕັ້ງ {0} ໃນຫມວດສິນຊັບ {1} ຫຼືບໍລິສັດ {2}
 DocType: Location,Longitude,Longitude
 ,Absent Student Report,ບົດລາຍງານນັກສຶກສາບໍ່
 DocType: Crop,Crop Spacing UOM,ການຂະຫຍາຍ Spacing UOM
@@ -1197,7 +1197,7 @@
 DocType: Soil Texture,Sand,Sand
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,ພະລັງງານ
 DocType: Opportunity,Opportunity From,ໂອກາດຈາກ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ແຖວ {0}: {1} ຈໍານວນ Serial ຈໍາເປັນສໍາລັບລາຍການ {2}. ທ່ານໄດ້ສະຫນອງ {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,ແຖວ {0}: {1} ຈໍານວນ Serial ຈໍາເປັນສໍາລັບລາຍການ {2}. ທ່ານໄດ້ສະຫນອງ {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,ກະລຸນາເລືອກຕາຕະລາງ
 DocType: BOM,Website Specifications,ຂໍ້ມູນຈໍາເພາະເວັບໄຊທ໌
 DocType: Special Test Items,Particulars,Particulars
@@ -1289,7 +1289,7 @@
 DocType: Item,Items with higher weightage will be shown higher,ລາຍການທີ່ມີ weightage ສູງຂຶ້ນຈະໄດ້ຮັບການສະແດງໃຫ້ເຫັນສູງກວ່າ
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,ທົດລອງຫ້ອງທົດລອງແລະອາການທີ່ສໍາຄັນ
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ທະນາຄານ Reconciliation ຂໍ້ມູນ
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,"ຕິດຕໍ່ກັນ, {0}: Asset {1} ຕ້ອງໄດ້ຮັບການສົ່ງ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,"ຕິດຕໍ່ກັນ, {0}: Asset {1} ຕ້ອງໄດ້ຮັບການສົ່ງ"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ພະນັກງານທີ່ບໍ່ມີພົບເຫັນ
 DocType: Item,If subcontracted to a vendor,ຖ້າຫາກວ່າເຫມົາຊ່ວງກັບຜູ້ຂາຍ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Group ນັກສຶກສາມີການປັບປຸງແລ້ວ.
@@ -1344,7 +1344,6 @@
 DocType: Loyalty Program Collection,Tier Name,Tier Name
 DocType: HR Settings,Enter retirement age in years,ກະລຸນາໃສ່ອາຍຸບໍານານໃນປີ
 DocType: Crop,Target Warehouse,Warehouse ເປົ້າຫມາຍ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ກະລຸນາຕັ້ງຊື່ຊຸດຊື່ສໍາລັບ {0} ຜ່ານ Setup&gt; Settings&gt; Naming Series
 DocType: Payroll Employee Detail,Payroll Employee Detail,Payroll Employee Detail
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,ກະລຸນາເລືອກສາງໄດ້
 DocType: Cheque Print Template,Starting location from left edge,ເລີ່ມຕົ້ນສະຖານທີ່ຈາກແຂບໄວ້
@@ -1434,7 +1433,7 @@
 DocType: Work Order,Plan material for sub-assemblies,ອຸປະກອນການວາງແຜນສໍາລັບອະນຸສະພາແຫ່ງ
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partners ການຂາຍແລະອານາເຂດ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} ຕ້ອງມີການເຄື່ອນໄຫວ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,ບໍ່ມີລາຍະການສໍາຫລັບການໂອນ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,ບໍ່ມີລາຍະການສໍາຫລັບການໂອນ
 DocType: Employee Boarding Activity,Activity Name,ຊື່ກິດຈະກໍາ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,ປ່ຽນວັນທີປ່ອຍ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,ປະລິມານຜະລິດຕະພັນສໍາເລັດແລ້ວ <b>{0}</b> ແລະສໍາລັບ Quantity <b>{1}</b> ບໍ່ສາມາດແຕກຕ່າງກັນ
@@ -1664,6 +1663,7 @@
 DocType: Project,First Email,Email ທໍາອິດ
 DocType: Company,Exception Budget Approver Role,ບົດບາດຂອງຜູ້ພິພາກສາງົບປະມານຍົກເວັ້ນ
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","ເມື່ອໄດ້ກໍານົດແລ້ວ, ໃບແຈ້ງຫນີ້ນີ້ຈະຖືກຖືຈົນເຖິງວັນທີທີ່ກໍານົດໄວ້"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Warehouse ໄວ້ໃນ Sales Order / Finished Goods Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,ຈໍານວນການຂາຍ
 DocType: Repayment Schedule,Interest Amount,ຈໍານວນເງິນທີ່ຫນ້າສົນໃຈ
@@ -1675,7 +1675,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,ບັນທຶກ
 DocType: Asset,Scrapped,ທະເລາະວິວາດ
 DocType: Item,Item Defaults,Default Items
-DocType: Purchase Invoice,Returns,ຜົນຕອບແທນ
+DocType: Cashier Closing,Returns,ຜົນຕອບແທນ
 DocType: Job Card,WIP Warehouse,Warehouse WIP
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serial No {0} ແມ່ນຢູ່ພາຍໃຕ້ສັນຍາບໍາລຸງຮັກສາບໍ່ເກີນ {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,ການທົດແທນທີ່
@@ -1689,7 +1689,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Transfer Type
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,ຄ່າໃຊ້ຈ່າຍຂາຍ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ລູກຄ້າ&gt; ກຸ່ມລູກຄ້າ&gt; ອານາເຂດ
 DocType: Diagnosis,Diagnosis,Diagnosis
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,ຊື້ມາດຕະຖານ
 DocType: Attendance Request,Explanation,ຄໍາອະທິບາຍ
@@ -1702,7 +1701,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,ຊື້ສິນຄ້າຄໍາສັ່ງຊື້ສິນຄ້າລ້າສຸດ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,ລະຫັດໄປສະນີ
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},ໃບສັ່ງຂາຍ {0} ເປັນ {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},ເລືອກບັນຊີລາຍຮັບດອກເບ້ຍໃນການກູ້ຢືມເງິນ {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},ເລືອກບັນຊີລາຍຮັບດອກເບ້ຍໃນການກູ້ຢືມເງິນ {0}
 DocType: Opportunity,Contact Info,ຂໍ້ມູນຕິດຕໍ່
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,ເຮັດໃຫ້ການອອກສຽງ Stock
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,ບໍ່ສາມາດສົ່ງເສີມພະນັກງານທີ່ມີສະຖານະພາບໄວ້
@@ -1714,7 +1713,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,ບໍ່ສາມາດໂອນໃບເກັບເງິນໄດ້ສໍາລັບຊົ່ວໂມງໂອນເງິນບໍ່
 DocType: Company,Date of Commencement,Date of Commencement
 DocType: Sales Person,Select company name first.,ເລືອກຊື່ບໍລິສັດທໍາອິດ.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},ອີເມວຖືກສົ່ງໄປທີ່ {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},ອີເມວຖືກສົ່ງໄປທີ່ {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ສະເຫນີລາຄາທີ່ໄດ້ຮັບຈາກຜູ້ຜະລິດ.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,ແທນທີ່ BOM ແລະປັບປຸງລາຄາຫລ້າສຸດໃນ Boms ທັງຫມົດ
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},ເພື່ອ {0} | {1} {2}
@@ -1736,7 +1735,7 @@
 DocType: Asset Movement,From Employee,ຈາກພະນັກງານ
 DocType: Driver,Cellphone Number,ຫມາຍເລກໂທລະສັບມືຖື
 DocType: Project,Monitor Progress,Monitor Progress
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ການເຕືອນໄພ: ລະບົບຈະບໍ່ກວດສອບ overbilling ນັບຕັ້ງແຕ່ຈໍານວນເງິນສໍາລັບລາຍການ {0} ໃນ {1} ເປັນສູນ
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ການເຕືອນໄພ: ລະບົບຈະບໍ່ກວດສອບ overbilling ນັບຕັ້ງແຕ່ຈໍານວນເງິນສໍາລັບລາຍການ {0} ໃນ {1} ເປັນສູນ
 DocType: Journal Entry,Make Difference Entry,ເຮັດໃຫ້ການເຂົ້າຄວາມແຕກຕ່າງ
 DocType: Supplier Quotation,Auto Repeat Section,Auto Repeat Section
 DocType: Upload Attendance,Attendance From Date,ຜູ້ເຂົ້າຮ່ວມຈາກວັນທີ່
@@ -1839,7 +1838,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,"ຕິດຕໍ່ກັນ, {0}: ປະຕິເສດຈໍານວນບໍ່ສາມາດໄດ້ຮັບເຂົ້າໄປໃນກັບຄືນຊື້"
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,ການປ່ຽນກຸ່ມລູກຄ້າສໍາລັບລູກຄ້າທີ່ເລືອກບໍ່ຖືກອະນຸຍາດ.
 ,Purchase Order Items To Be Billed,ລາຍການສັ່ງຊື້ເພື່ອໄດ້ຮັບການ billed
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,ອັບເດດເວລາມາຮອດປະມານ.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,ອັບເດດເວລາມາຮອດປະມານ.
 DocType: Program Enrollment Tool,Enrollment Details,ລາຍລະອຽດການລົງທະບຽນ
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,ບໍ່ສາມາດຕັ້ງຄ່າ Defaults ຂອງສິນຄ້າຈໍານວນຫລາຍສໍາລັບບໍລິສັດ.
 DocType: Purchase Invoice Item,Net Rate,ອັດຕາສຸດທິ
@@ -1853,7 +1852,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,ອອກຈາກປະເພດແມ່ນ madatory
 DocType: Support Settings,Close Issue After Days,ປິດບັນຫາຫຼັງຈາກວັນ
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,ທ່ານຈໍາເປັນຕ້ອງເປັນຜູ້ໃຊ້ທີ່ມີລະບົບການຈັດການລະບົບແລະການຈັດການ Item Manager ເພື່ອເພີ່ມຜູ້ໃຊ້ເຂົ້າໃນ Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,ທ່ານຈໍາເປັນຕ້ອງເປັນຜູ້ໃຊ້ທີ່ມີລະບົບການຈັດການລະບົບແລະການຈັດການ Item Manager ເພື່ອເພີ່ມຜູ້ໃຊ້ເຂົ້າໃນ Marketplace.
 DocType: Leave Control Panel,Leave blank if considered for all branches,ໃຫ້ຫວ່າງໄວ້ຖ້າພິຈາລະນາສໍາລັບການທັງຫມົດສາຂາ
 DocType: Job Opening,Staffing Plan,Staffing Plan
 DocType: Bank Guarantee,Validity in Days,ຕັ້ງແຕ່ວັນທີ່ໃນວັນ
@@ -1875,7 +1874,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},ຕິດຕໍ່ກັນຊ້ໍາກັນ {0} ກັບດຽວກັນ {1}
 DocType: Marketplace Settings,Disable Marketplace,ປິດການໃຊ້ງານຕະຫຼາດ
 ,Trial Balance,trial Balance
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,ປີງົບປະມານ {0} ບໍ່ໄດ້ພົບເຫັນ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,ປີງົບປະມານ {0} ບໍ່ໄດ້ພົບເຫັນ
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,ການສ້າງຕັ້ງພະນັກງານ
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel Reservation User
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,ກະລຸນາເລືອກຄໍານໍາຫນ້າທໍາອິດ
@@ -1983,7 +1982,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,ບໍ່ສາມາດເຂົ້າສູ່ລະບົບໄດ້
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Asset {0} ສ້າງ
 DocType: Special Test Items,Special Test Items,Special Test Items
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,ທ່ານຈໍາເປັນຕ້ອງເປັນຜູ້ໃຊ້ທີ່ມີລະບົບຈັດການລະບົບແລະການຈັດການ Item Manager ເພື່ອລົງທະບຽນໃນ Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,ທ່ານຈໍາເປັນຕ້ອງເປັນຜູ້ໃຊ້ທີ່ມີລະບົບຈັດການລະບົບແລະການຈັດການ Item Manager ເພື່ອລົງທະບຽນໃນ Marketplace.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,ຮູບແບບການຊໍາລະເງິນ
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,ຕາມການກໍານົດຄ່າເງິນເດືອນທີ່ທ່ານໄດ້ມອບໃຫ້ທ່ານບໍ່ສາມາດສະຫມັກຂໍຜົນປະໂຫຍດໄດ້
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,ເວັບໄຊທ໌ຮູບພາບຄວນຈະເປັນເອກະສານສາທາລະນະຫຼືທີ່ຢູ່ເວັບເວັບໄຊທ໌
@@ -1995,7 +1994,7 @@
 DocType: Warehouse,Warehouse Contact Info,Warehouse ຂໍ້ມູນຕິດຕໍ່
 DocType: Payment Entry,Write Off Difference Amount,ຂຽນ Off ຈໍານວນທີ່ແຕກຕ່າງກັນ
 DocType: Volunteer,Volunteer Name,ຊື່ອາສາສະຫມັກ
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},ບັນດາແຖວທີ່ມີວັນທີ່ຄົບຖ້ວນຍ້ອນກັບໃນແຖວອື່ນພົບ: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},ບັນດາແຖວທີ່ມີວັນທີ່ຄົບຖ້ວນຍ້ອນກັບໃນແຖວອື່ນພົບ: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: ບໍ່ໄດ້ພົບເຫັນ email ພະນັກງານ, ເພາະສະນັ້ນອີເມວບໍ່ໄດ້ສົ່ງ"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},ບໍ່ມີໂຄງສ້າງເງິນເດືອນທີ່ມອບຫມາຍໃຫ້ພະນັກງານ {0} ໃນວັນທີ່ກໍານົດ {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},ກົດລະບຽບການສົ່ງສິນຄ້າບໍ່ສາມາດໃຊ້ໄດ້ສໍາລັບປະເທດ {0}
@@ -2086,6 +2085,7 @@
 DocType: Salary Component,Earning,ໄດ້ຮັບ
 DocType: Supplier Scorecard,Scoring Criteria,ເງື່ອນໄຂການໃຫ້ຄະແນນ
 DocType: Purchase Invoice,Party Account Currency,ສະກຸນເງິນບັນຊີພັກ
+DocType: Delivery Trip,Total Estimated Distance,ໄລຍະການຄາດຄະເນທັງຫມົດ
 ,BOM Browser,BOM ຂອງຕົວທ່ອງເວັບ
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,ກະລຸນາປັບປຸງສະຖານະພາບຂອງທ່ານສໍາລັບການຝຶກອົບຮົມນີ້
 DocType: Item Barcode,EAN,EAN
@@ -2124,7 +2124,7 @@
 DocType: Activity Cost,Projects,ໂຄງການ
 DocType: Payment Request,Transaction Currency,ການສະກຸນເງິນ
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},ຈາກ {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,ບາງອີເມວບໍ່ຖືກຕ້ອງ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,ບາງອີເມວບໍ່ຖືກຕ້ອງ
 DocType: Work Order Operation,Operation Description,ການດໍາເນີນງານລາຍລະອຽດ
 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.,ບໍ່ສາມາດມີການປ່ຽນແປງປະຈໍາປີເລີ່ມວັນແລະປີງົບປະມານສິ້ນສຸດວັນທີ່ເມື່ອປີງົບປະມານໄດ້ຖືກບັນທືກ.
 DocType: Quotation,Shopping Cart,ໂຄງຮ່າງການໄປຊື້ເຄື່ອງ
@@ -2148,7 +2148,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,ການປ່ຽນແປງສຸດທິໃນຊັບສິນຄົງທີ່
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,ໃຫ້ຫວ່າງໄວ້ຖ້າພິຈາລະນາສໍາລັບການອອກແບບທັງຫມົດ
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ຮັບຜິດຊອບຂອງປະເພດ &#39;ທີ່ແທ້ຈິງໃນການຕິດຕໍ່ກັນ {0} ບໍ່ສາມາດລວມຢູ່ໃນລາຄາສິນຄ້າ
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ຮັບຜິດຊອບຂອງປະເພດ &#39;ທີ່ແທ້ຈິງໃນການຕິດຕໍ່ກັນ {0} ບໍ່ສາມາດລວມຢູ່ໃນລາຄາສິນຄ້າ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},ສູງສຸດທີ່ເຄຍ: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,ຈາກ DATETIME
 DocType: Shopify Settings,For Company,ສໍາລັບບໍລິສັດ
@@ -2162,7 +2162,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,ມີຂໍ້ຜິດພາດໃນການສ້າງຕາຕະລາງເວລາ
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,ຜູ້ອະນຸມັດຄ່າໃຊ້ຈ່າຍໃນບັນຊີລາຍຊື່ຄັ້ງທໍາອິດຈະຖືກກໍານົດເປັນຜູ້ອະນຸມັດຄ່າໃຊ້ຈ່າຍຕົ້ນຕໍ.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,ບໍ່ສາມາດຈະຫຼາຍກ່ວາ 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,ທ່ານຈໍາເປັນຕ້ອງເປັນຜູ້ໃຊ້ນອກເຫນືອຈາກຜູ້ເບິ່ງແຍງລະບົບຜູ້ຈັດການລະບົບແລະບົດບາດຂອງຜູ້ຈັດການລາຍການເພື່ອລົງທະບຽນໃນ Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,ທ່ານຈໍາເປັນຕ້ອງເປັນຜູ້ໃຊ້ນອກເຫນືອຈາກຜູ້ເບິ່ງແຍງລະບົບຜູ້ຈັດການລະບົບແລະບົດບາດຂອງຜູ້ຈັດການລາຍການເພື່ອລົງທະບຽນໃນ Marketplace.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,ລາຍການ {0} ບໍ່ແມ່ນຫົວຂໍ້ຫຼັກຊັບ
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,ນອກເຫນືອຈາກ
@@ -2191,7 +2191,7 @@
 DocType: HR Settings,Employee Settings,ການຕັ້ງຄ່າພະນັກງານ
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Loading System Payment
 ,Batch-Wise Balance History,"batch, Wise History Balance"
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,ແຖວ # {0}: ບໍ່ສາມາດກໍານົດອັດຕາຖ້າຈໍານວນເງິນຫຼາຍກ່ວາຈໍານວນໃບບິນສໍາລັບລາຍການ {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,ແຖວ # {0}: ບໍ່ສາມາດກໍານົດອັດຕາຖ້າຈໍານວນເງິນຫຼາຍກ່ວາຈໍານວນໃບບິນສໍາລັບລາຍການ {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,ຕັ້ງຄ່າການພິມການປັບປຸງໃນຮູບແບບພິມທີ່ກ່ຽວຂ້ອງ
 DocType: Package Code,Package Code,ລະຫັດ Package
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,ຝຶກຫັດງານ
@@ -2425,7 +2425,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} vacancies ແລະ {1} ງົບປະມານສໍາລັບ {2} ແລ້ວໄດ້ມີການວາງແຜນສໍາລັບບໍລິສັດຍ່ອຍຂອງ {3}. \ ທ່ານພຽງແຕ່ສາມາດວາງແຜນໄວ້ສໍາລັບ {4} ຫວ່າງງານແລະງົບປະມານ {5} ຕໍ່ແຜນການພະນັກງານ {6} ສໍາລັບບໍລິສັດແມ່ {3}.
 DocType: HR Settings,Stop Birthday Reminders,ຢຸດວັນເດືອນປີເກີດເຕືອນ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},ກະລຸນາທີ່ກໍານົດໄວ້ມາດຕະຖານ Payroll Account Payable ໃນບໍລິສັດ {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},ກະລຸນາທີ່ກໍານົດໄວ້ມາດຕະຖານ Payroll Account Payable ໃນບໍລິສັດ {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,ໄດ້ຮັບການແບ່ງປັນທາງດ້ານການເງິນຂອງພາສີແລະຂໍ້ມູນຄ່າບໍລິການໂດຍ Amazon
 DocType: SMS Center,Receiver List,ບັນຊີຮັບ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,ຄົ້ນຫາສິນຄ້າ
@@ -2495,7 +2495,7 @@
 DocType: Vital Signs,Constipated,Constipated
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},ຕໍ່ Supplier Invoice {0} ວັນ {1}
 DocType: Customer,Default Price List,ລາຄາມາດຕະຖານ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,ການບັນທຶກການເຄື່ອນໄຫວຊັບສິນ {0} ສ້າງ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,ການບັນທຶກການເຄື່ອນໄຫວຊັບສິນ {0} ສ້າງ
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,ບໍ່ພົບລາຍການ.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,ທ່ານບໍ່ສາມາດລົບປະຈໍາປີ {0}. ປີງົບປະມານ {0} ກໍານົດເປັນມາດຕະຖານໃນການຕັ້ງຄ່າ Global
 DocType: Share Transfer,Equity/Liability Account,ບັນຊີ Equity / Liability
@@ -2635,6 +2635,7 @@
 DocType: Blanket Order,Order Type,ປະເພດຄໍາສັ່ງ
 ,Item-wise Sales Register,ລາຍການສະຫລາດ Sales ຫມັກສະມາຊິກ
 DocType: Asset,Gross Purchase Amount,ການຊື້ທັງຫມົດ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມສິນຄ້າ&gt; ຍີ່ຫໍ້
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,ເປີດເຄື່ອງຊັ່ງ
 DocType: Asset,Depreciation Method,ວິທີການຄ່າເສື່ອມລາຄາ
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,ເປັນພາສີນີ້ລວມຢູ່ໃນອັດຕາພື້ນຖານ?
@@ -2718,7 +2719,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,ການປະຕິບັດຖ້າຫາກວ່າງົບປະມານປະຈໍາປີເກີນກ່ວາເກົ່າ
 DocType: Student Leave Application,Student Leave Application,ຄໍາຮ້ອງສະຫມັກອອກຈາກນັກສຶກສາ
 DocType: Item,Will also apply for variants,ຍັງຈະນໍາໃຊ້ສໍາລັບການ variants
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","ຊັບສິນບໍ່ສາມາດໄດ້ຮັບການຍົກເລີກ, ເປັນມັນແມ່ນແລ້ວ {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","ຊັບສິນບໍ່ສາມາດໄດ້ຮັບການຍົກເລີກ, ເປັນມັນແມ່ນແລ້ວ {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Employee {0} ວັນເຄິ່ງຫນຶ່ງໃນ {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},ຊົ່ວໂມງການເຮັດວຽກທັງຫມົດບໍ່ຄວນຈະມີຫຼາຍກ່ວາຊົ່ວໂມງເຮັດວຽກສູງສຸດ {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ກ່ຽວກັບ
@@ -2742,6 +2743,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Fetch Data
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},ການອະນຸຍາດທີ່ສູງສຸດໃນປະເພດການປະຕິບັດ {0} ແມ່ນ {1}
 DocType: SMS Center,Create Receiver List,ສ້າງບັນຊີຮັບ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,ວັນທີ່ມີຢູ່ສໍາລັບການນໍາໃຊ້ຄວນຈະມີຫຼັງຈາກວັນທີຊື້
 DocType: Vehicle,Wheels,ຂັບລົດ
 DocType: Packing Slip,To Package No.,ການຫຸ້ມຫໍ່ສະບັບເລກທີ
 DocType: Patient Relation,Family,ຄອບຄົວ
@@ -2755,7 +2757,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,ສະກຸນເງິນໃບຢັ້ງຢືນຕ້ອງມີເງີນເທົ່າກັບສະກຸນເງິນຂອງສະກຸນເງິນຂອງບໍລິສັດຫຼືເງິນສະກຸນເງິນຂອງບໍລິສັດ
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),ຊີ້ໃຫ້ເຫັນວ່າຊຸດແມ່ນສ່ວນຫນຶ່ງຂອງການຈັດສົ່ງ (ພຽງແຕ່ Draft) ນີ້
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,ໄລຍະຫ່າງ {0}: ວັນທີ່ກໍານົດບໍ່ສາມາດເປັນມື້ກ່ອນວັນທີສົ່ງ
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,ໄລຍະຫ່າງ {0}: ວັນທີ່ກໍານົດບໍ່ສາມາດເປັນມື້ກ່ອນວັນທີສົ່ງ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,ເຮັດໃຫ້ການເຂົ້າການຊໍາລະເງິນ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},ປະລິມານສໍາລັບລາຍການ {0} ຕ້ອງຫນ້ອຍກ່ວາ {1}
 ,Sales Invoice Trends,Sales ແນວໂນ້ມ Invoice
@@ -2828,7 +2830,7 @@
 DocType: Guardian,Guardian Interests,ຄວາມສົນໃຈຜູ້ປົກຄອງ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,ປັບປຸງຊື່ / ເລກບັນຊີ
 DocType: Naming Series,Current Value,ມູນຄ່າປະຈຸບັນ
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ປີງົບປະມານຫຼາຍມີສໍາລັບວັນທີ {0}. ກະລຸນາຕັ້ງບໍລິສັດໃນປີງົບປະມານ
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ປີງົບປະມານຫຼາຍມີສໍາລັບວັນທີ {0}. ກະລຸນາຕັ້ງບໍລິສັດໃນປີງົບປະມານ
 DocType: Education Settings,Instructor Records to be created by,ບັນທຶກສອນທີ່ຈະສ້າງຂຶ້ນໂດຍ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} ສ້າງ
 DocType: GST Account,GST Account,ບັນຊີ GST
@@ -2845,7 +2847,7 @@
 DocType: Sales Person,Name and Employee ID,ຊື່ແລະລະຫັດພະນັກງານ
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,ເນື່ອງຈາກວັນທີບໍ່ສາມາດກ່ອນທີ່ໂພດວັນທີ່
 DocType: Website Item Group,Website Item Group,ກຸ່ມສິນຄ້າເວັບໄຊທ໌
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ບໍ່ມີໃບຮັບເງິນເດືອນທີ່ສົ່ງຫາສໍາລັບເກນມາດຕະຖານທີ່ເລືອກໄວ້ຂ້າງເທິງຫຼືໃບປະກາດລາຄາແລ້ວ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ບໍ່ມີໃບຮັບເງິນເດືອນທີ່ສົ່ງຫາສໍາລັບເກນມາດຕະຖານທີ່ເລືອກໄວ້ຂ້າງເທິງຫຼືໃບປະກາດລາຄາແລ້ວ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,ຫນ້າທີ່ແລະພາສີອາກອນ
 DocType: Projects Settings,Projects Settings,ໂຄງການຕັ້ງຄ່າ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,ກະລຸນາໃສ່ວັນທີເອກະສານ
@@ -2854,7 +2856,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Supplied ຈໍານວນ
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR -YYYY.-
 DocType: Purchase Order Item,Material Request Item,ອຸປະກອນການຈອງສິນຄ້າ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,ກະລຸນາຍົກເລີກໃບຢັ້ງຢືນການຊື້ {0} ກ່ອນ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,ກະລຸນາຍົກເລີກໃບຢັ້ງຢືນການຊື້ {0} ກ່ອນ
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,ເປັນໄມ້ຢືນຕົ້ນຂອງກຸ່ມສິນຄ້າ.
 DocType: Production Plan,Total Produced Qty,Total Produced Qty
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,ບໍ່ສາມາດສົ່ງຈໍານວນການຕິດຕໍ່ກັນຫຼາຍກ່ວາຫຼືເທົ່າກັບຈໍານວນການຕິດຕໍ່ກັນໃນປັດຈຸບັນສໍາລັບປະເພດຄ່າໃຊ້ຈ່າຍນີ້
@@ -2965,6 +2967,7 @@
 ,Vehicle Expenses,ຄ່າໃຊ້ຈ່າຍຍານພາຫະນະ
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,ສ້າງທົດລອງທົດລອງ (s) ໃນໃບແຈ້ງຍອດຂາຍສົ່ງ
 DocType: Serial No,Invoice Details,ລາຍລະອຽດໃບແຈ້ງຫນີ້
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,ກະລຸນາເປີດໃຊ້ Google Maps Settings ເພື່ອປະເມີນແລະ optimize ເສັ້ນທາງ
 DocType: Grant Application,Show on Website,ສະແດງເທິງເວັບໄຊທ໌
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,ເລີ່ມຕົ້ນສຸດ
 DocType: Hub Tracked Item,Hub Category,Category Hub
@@ -3005,7 +3008,7 @@
 DocType: Inpatient Record,B Positive,B Positive
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",ຜົນປະໂຫຍດສູງສຸດຂອງພະນັກງານ {0} ແມ່ນສູງກວ່າ {1} ໂດຍລວມ {2} ຂອງຂໍ້ມູນກ່ອນຫນ້ານີ້
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ຕິດຕໍ່ກັນ, {0}: ຈໍານວນປະມານ 1 ປີ, ເປັນລາຍການເປັນສິນຊັບຖາວອນ. ກະລຸນາໃຊ້ຕິດຕໍ່ກັນທີ່ແຍກຕ່າງຫາກສໍາລັບການຈໍານວນຫຼາຍ."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ຕິດຕໍ່ກັນ, {0}: ຈໍານວນປະມານ 1 ປີ, ເປັນລາຍການເປັນສິນຊັບຖາວອນ. ກະລຸນາໃຊ້ຕິດຕໍ່ກັນທີ່ແຍກຕ່າງຫາກສໍາລັບການຈໍານວນຫຼາຍ."
 DocType: Leave Block List Allow,Leave Block List Allow,ອອກຈາກສະໄຫມອະນຸຍາດໃຫ້
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,abbr ບໍ່ສາມາດມີຊ່ອງຫວ່າງຫຼືຊ່ອງ
 DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
@@ -3040,7 +3043,7 @@
 DocType: Workstation,Wages per hour,ຄ່າແຮງງານຕໍ່ຊົ່ວໂມງ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock ຄວາມສົມດູນໃນ Batch {0} ຈະກາຍເປັນກະທົບທາງລົບ {1} ສໍາລັບລາຍການ {2} ທີ່ Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,ປະຕິບັດຕາມການຮ້ອງຂໍການວັດສະດຸໄດ້ຮັບການຍົກຂຶ້ນມາອັດຕະໂນມັດອີງຕາມລະດັບ Re: ສັ່ງຊື້ສິນຄ້າຂອງ
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},ບັນຊີ {0} ບໍ່ຖືກຕ້ອງ. ບັນຊີສະກຸນເງິນຈະຕ້ອງ {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},ບັນຊີ {0} ບໍ່ຖືກຕ້ອງ. ບັນຊີສະກຸນເງິນຈະຕ້ອງ {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},ຈາກວັນ {0} ບໍ່ສາມາດຢູ່ພາຍຫຼັງວັນທີ່ Relieving ຂອງພະນັກງານ {1}
 DocType: Supplier,Is Internal Supplier,ແມ່ນຜູ້ຊື້ພາຍໃນ
 DocType: Employee,Create User Permission,ສ້າງການອະນຸຍາດໃຫ້ຜູ້ໃຊ້
@@ -3186,7 +3189,7 @@
 DocType: Account,Fixed Asset,ຊັບສິນຄົງທີ່
 DocType: Amazon MWS Settings,After Date,ຫຼັງຈາກວັນທີ
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Inventory ຕໍ່ເນື່ອງ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,ບໍ່ຖືກຕ້ອງ {0} ສໍາລັບ Inter Company Invoice.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,ບໍ່ຖືກຕ້ອງ {0} ສໍາລັບ Inter Company Invoice.
 ,Department Analytics,ກົມການວິເຄາະ
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,ອີເມວບໍ່ພົບໃນຕິດຕໍ່ແບບເລີ່ມຕົ້ນ
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,ສ້າງຄວາມລັບ
@@ -3199,7 +3202,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,ໂຄງການໃນໂຄງປະກອບຄ່າທໍານຽມແລະກຸ່ມນັກສຶກສາ {0} ແມ່ນແຕກຕ່າງກັນ.
 DocType: Bank Statement Transaction Entry,Receivable Account,Account Receivable
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,ວັນທີ່ຖືກຕ້ອງແມ່ນຕ້ອງນ້ອຍກວ່າວັນທີ່ຖືກຕ້ອງ.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},"ຕິດຕໍ່ກັນ, {0}: Asset {1} ແມ່ນແລ້ວ {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},"ຕິດຕໍ່ກັນ, {0}: Asset {1} ແມ່ນແລ້ວ {2}"
 DocType: Quotation Item,Stock Balance,ຍອດ Stock
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,ໃບສັ່ງຂາຍການຊໍາລະເງິນ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,CEO
@@ -3241,6 +3244,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,ເດບິດການຈໍາເປັນຕ້ອງ
 DocType: Clinical Procedure,Inpatient Record,Inpatient Record
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ຊ່ວຍຮັກສາຕິດຕາມຂອງທີ່ໃຊ້ເວລາ, ຄ່າໃຊ້ຈ່າຍແລະການເອີ້ນເກັບເງິນສໍາລັບກິດຈະກໍາເຮັດໄດ້ໂດຍທີມງານຂອງທ່ານ"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Supplier&gt; Supplier Type
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,ລາຄາຊື້
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Date of Transaction
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,ແມ່ແບບຂອງຕົວປ່ຽນແປງຈໍາຫນ່າຍດັດນີຊີ້ວັດ.
@@ -3284,7 +3288,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,ແລກປ່ຽນເງິນຕາໄດ້ຮັບ / ການສູນເສຍ
 DocType: Opportunity,Lost Reason,ລືມເຫດຜົນ
 DocType: Amazon MWS Settings,Enable Amazon,ເປີດໃຊ້ Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},ແຖວ # {0}: ບັນຊີ {1} ບໍ່ຂຶ້ນກັບບໍລິສັດ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},ແຖວ # {0}: ບັນຊີ {1} ບໍ່ຂຶ້ນກັບບໍລິສັດ {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},ບໍ່ສາມາດຊອກຫາ DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,ທີ່ຢູ່ໃຫມ່
 DocType: Quality Inspection,Sample Size,ຂະຫນາດຕົວຢ່າງ
@@ -3396,7 +3400,7 @@
 DocType: Water Analysis,Origin,ຕົ້ນກໍາເນີດ
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ເອກະສານນີ້ແມ່ນໃນໄລຍະຂອບເຂດຈໍາກັດໂດຍ {0} {1} ສໍາລັບ item {4}. ທ່ານກໍາລັງເຮັດໃຫ້ຄົນອື່ນ {3} ຕໍ່ຕ້ານດຽວກັນ {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,ກະລຸນາທີ່ກໍານົດໄວ້ໄດ້ເກີດຂຶ້ນຫລັງຈາກບັນທຶກ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,ບັນຊີຈໍານວນເລືອກການປ່ຽນແປງ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,ບັນຊີຈໍານວນເລືອກການປ່ຽນແປງ
 DocType: Purchase Invoice,Price List Currency,ລາຄາສະກຸນເງິນ
 DocType: Naming Series,User must always select,ຜູ້ໃຊ້ຕ້ອງໄດ້ເລືອກ
 DocType: Stock Settings,Allow Negative Stock,ອະນຸຍາດໃຫ້ລົບ Stock
@@ -3438,7 +3442,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,ທ່ານແນ່ໃຈວ່າທ່ານຕ້ອງການຍົກເລີກການນັດຫມາຍນີ້ບໍ?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Hotel Room Pricing Package
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,ແຜນການຂາຍ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},ກະລຸນາທີ່ກໍານົດໄວ້ບັນຊີມາດຕະຖານເງິນເດືອນ Component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},ກະລຸນາທີ່ກໍານົດໄວ້ບັນຊີມາດຕະຖານເງິນເດືອນ Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ຄວາມຕ້ອງການໃນ
 DocType: Rename Tool,File to Rename,ເອກະສານການປ່ຽນຊື່
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},ກະລຸນາເລືອກ BOM ສໍາລັບລາຍການໃນແຖວ {0}
@@ -3459,7 +3463,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ຄ່າໃຊ້ຈ່າຍຂອງສິນຄ້າທີ່ຊື້
 DocType: Employee Separation,Employee Separation Template,ແມ່ແບບການແຍກແຮງງານ
 DocType: Selling Settings,Sales Order Required,ຕ້ອງການຂາຍສິນຄ້າ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,ກາຍເປັນຜູ້ຂາຍ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,ກາຍເປັນຜູ້ຂາຍ
 DocType: Purchase Invoice,Credit To,ການປ່ອຍສິນເຊື່ອເພື່ອ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Leads Active / ລູກຄ້າ
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,ປ່ອຍໃຫ້ເປົ່າເພື່ອນໍາໃຊ້ຮູບແບບການສົ່ງມອບມາດຕະຖານ
@@ -3501,7 +3505,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,ເຮັດແບບແມ່ພິມພາສີ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,ວັດຖຸດິບບໍ່ສາມາດມີຊ່ອງຫວ່າງ.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,ແຖວ # {0} (ຕາຕະລາງການຈ່າຍເງິນ): ຈໍານວນເງິນຕ້ອງເປັນການລົບ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,ແຖວ # {0} (ຕາຕະລາງການຈ່າຍເງິນ): ຈໍານວນເງິນຕ້ອງເປັນການລົບ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","ບໍ່ສາມາດປັບປຸງຫຼັກຊັບ, ໃບເກັບເງິນປະກອບດ້ວຍການຫຼຸດລົງລາຍການການຂົນສົ່ງ."
 DocType: Contract,Fulfilment Status,ສະຖານະການປະຕິບັດ
 DocType: Lab Test Sample,Lab Test Sample,Lab Test Sample
@@ -3641,7 +3645,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Doc Date
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},ຄ່າບໍລິການບັນທຶກຂຽນເມື່ອຫລາຍ - {0}
 DocType: Asset Category Account,Asset Category Account,ບັນຊີຊັບສິນປະເພດ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,ແຖວ # {0} (ຕາລາງຈ່າຍ): ຈໍານວນເງິນຕ້ອງເປັນບວກ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,ແຖວ # {0} (ຕາລາງຈ່າຍ): ຈໍານວນເງິນຕ້ອງເປັນບວກ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},ບໍ່ສາມາດຜະລິດສິນຄ້າຫຼາຍ {0} ກ່ວາປະລິມານສັ່ງຂາຍ {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Select Values Attribute
 DocType: Purchase Invoice,Reason For Issuing document,ເຫດຜົນສໍາລັບການອອກເອກະສານ
@@ -3696,7 +3700,7 @@
 DocType: Purchase Receipt,Time at which materials were received,ເວລາທີ່ອຸປະກອນທີ່ໄດ້ຮັບ
 DocType: Products Settings,Products per Page,ຜະລິດຕະພັນຕໍ່ຫນ້າ
 DocType: Stock Ledger Entry,Outgoing Rate,ອັດຕາລາຍຈ່າຍ
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,ຫຼື
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,ຫຼື
 DocType: Sales Order,Billing Status,ສະຖານະການເອີ້ນເກັບເງິນ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ລາຍງານສະບັບທີ່ເປັນ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,ຄ່າໃຊ້ຈ່າຍຜົນປະໂຫຍດ
@@ -3724,7 +3728,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,ຂໍ້ກໍານົດການຍົກເວັ້ນພາສີຂອງພະນັກງານ
 DocType: Payment Entry,Cheque/Reference Date,ກະແສລາຍວັນ / ວັນທີ່ເອກະສານ
 DocType: Purchase Invoice,Total Taxes and Charges,ພາສີອາກອນທັງຫມົດແລະຄ່າບໍລິການ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,ວັນທີ່ມີຢູ່ສໍາລັບການນໍາໃຊ້ເຂົ້າມາເປັນວັນທີ່ຜ່ານມາ
 DocType: Employee,Emergency Contact,ຕິດຕໍ່ສຸກເສີນ
 DocType: Bank Reconciliation Detail,Payment Entry,Entry ການຊໍາລະເງິນ
 ,sales-browser,ຂາຍຂອງຕົວທ່ອງເວັບ
@@ -3771,6 +3774,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),ແມ່ນກັບຄືນ (ຫມາຍເຫດການປ່ອຍສິນເຊື່ອ)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,ເລີ່ມຕົ້ນວຽກ
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},ບໍ່ຈໍາເປັນຕ້ອງມີ Serial No for asset {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ກະລຸນາຕັ້ງຊື່ຊຸດຊື່ສໍາລັບ {0} ຜ່ານ Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,ແມ່ແບບຄົນພິການຈະຕ້ອງບໍ່ແມ່ແບບມາດຕະຖານ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,ສໍາຫລັບແຖວ {0}: ກະລຸນາໃສ່ qty ວາງແຜນ
 DocType: Account,Income Account,ບັນຊີລາຍໄດ້
@@ -3784,6 +3788,7 @@
 DocType: Loyalty Program,Help Section,Help Section
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,ຄວາມຮັບຜິດຊອບທີ່ສໍາຄັນ
+DocType: Delivery Trip,Distance UOM,Distance UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","ສໍາຫລັບຂະບວນນັກສຶກສາຊ່ວຍໃຫ້ທ່ານຕິດຕາມການເຂົ້າຮຽນ, ການປະເມີນຜົນແລະຄ່າທໍານຽມສໍາລັບນັກສຶກສາ"
 DocType: Payment Entry,Total Allocated Amount,ນວນການຈັດສັນທັງຫມົດ
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,ກໍານົດບັນຊີສິນຄ້າຄົງຄັງໃນຕອນຕົ້ນສໍາລັບການສິນຄ້າຄົງຄັງ perpetual
@@ -3825,7 +3830,7 @@
 DocType: Item Supplier,Item Supplier,ຜູ້ຜະລິດລາຍການ
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,ກະລຸນາໃສ່ລະຫັດສິນຄ້າເພື່ອໃຫ້ໄດ້ຮັບ batch ທີ່ບໍ່ມີ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},ກະລຸນາເລືອກຄ່າ {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,ບໍ່ມີລາຍການທີ່ເລືອກສໍາລັບການໂອນ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,ບໍ່ມີລາຍການທີ່ເລືອກສໍາລັບການໂອນ
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ທີ່ຢູ່ທັງຫມົດ.
 DocType: Company,Stock Settings,ການຕັ້ງຄ່າ Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","ການລວມເປັນໄປໄດ້ພຽງແຕ່ຖ້າຫາກວ່າມີຄຸນສົມບັດດັ່ງຕໍ່ໄປນີ້ແມ່ນອັນດຽວກັນໃນການບັນທຶກການທັງສອງ. ເປັນກຸ່ມ, ປະເພດຮາກ, ບໍລິສັດ"
@@ -4111,7 +4116,7 @@
 DocType: Patient,Personal and Social History,ປະວັດສາດສ່ວນບຸກຄົນແລະສັງຄົມ
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,User {0} ສ້າງແລ້ວ
 DocType: Fee Schedule,Fee Breakup for each student,ຄ່າທໍານຽມສໍາລັບນັກຮຽນແຕ່ລະຄົນ
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ທັງຫມົດລ່ວງຫນ້າ ({0}) ຕໍ່ Order {1} ບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດ ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ທັງຫມົດລ່ວງຫນ້າ ({0}) ຕໍ່ Order {1} ບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດ ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ເລືອກການແຜ່ກະຈາຍລາຍເດືອນກັບ unevenly ແຈກຢາຍເປົ້າຫມາຍໃນທົ່ວເດືອນ.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,ປ່ຽນລະຫັດ
 DocType: Purchase Invoice Item,Valuation Rate,ອັດຕາປະເມີນມູນຄ່າ
@@ -4120,7 +4125,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,ໄດ້ຮັບສິນຄ້າ ITC Cess
 ,Student Monthly Attendance Sheet,ນັກສຶກສາ Sheet ເຂົ້າຮ່ວມລາຍເດືອນ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,ກົດລະບຽບການສົ່ງສິນຄ້າໃຊ້ໄດ້ສໍາລັບການຂາຍ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,ໄລຍະຫັກຄ່າທໍານຽມ {0}: ວັນທີເສຍຄ່າໃຊ້ຈ່າຍຕໍ່ໄປບໍ່ສາມາດກ່ອນວັນຊື້
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,ໄລຍະຫັກຄ່າທໍານຽມ {0}: ວັນທີເສຍຄ່າໃຊ້ຈ່າຍຕໍ່ໄປບໍ່ສາມາດກ່ອນວັນຊື້
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,ວັນທີ່ສະຫມັກໂຄງການເລີ່ມຕົ້ນ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,ຈົນກ່ວາ
 DocType: Rename Tool,Rename Log,ປ່ຽນຊື່ເຂົ້າສູ່ລະບົບ
@@ -4138,12 +4143,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,ບໍລິສັດແລະບໍລິສັດຄວນຈະໄດ້ຮັບການປັບປຸງໂດຍວິທີການຂາຍໄລຍະເວລາເທົ່າໃດ.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ທີ່ຫມົດອາຍຸ
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,ຕື່ມການນັກສຶກສາ
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","ກະລຸນາລົບ Employee <a href=""#Form/Employee/{0}"">{0}</a> \ ເພື່ອຍົກເລີກເອກະສານນີ້"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},ກະລຸນາເລືອກ {0}
 DocType: C-Form,C-Form No,C ແບບຟອມ No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,ໄລຍະທາງ
+DocType: Delivery Stop,Distance,ໄລຍະທາງ
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,ລາຍຊື່ຜະລິດຕະພັນຫຼືການບໍລິການຂອງທ່ານທີ່ທ່ານຈະຊື້ຫຼືຂາຍ.
 DocType: Water Analysis,Storage Temperature,Storage Temperature
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD -YYYY.-
@@ -4170,7 +4173,7 @@
 DocType: Homepage,Company Description for website homepage,ລາຍລະອຽດເກມບໍລິສັດສໍາລັບການຫນ້າທໍາອິດເວັບໄຊທ໌
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ເພື່ອຄວາມສະດວກຂອງລູກຄ້າ, ລະຫັດເຫຼົ່ານີ້ສາມາດຖືກນໍາໃຊ້ໃນຮູບແບບການພິມເຊັ່ນ: ໃບແຈ້ງຫນີ້ແລະການສົ່ງເງິນ"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,ຊື່ Suplier
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,ບໍ່ສາມາດດຶງຂໍ້ມູນສໍາລັບ {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,ບໍ່ສາມາດດຶງຂໍ້ມູນສໍາລັບ {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Opening Entry Journal
 DocType: Contract,Fulfilment Terms,ເງື່ອນໄຂການປະຕິບັດ
 DocType: Sales Invoice,Time Sheet List,ທີ່ໃຊ້ເວລາຊີ Sheet
@@ -4353,7 +4356,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,ເລືອກນັກສຶກສາດ້ວຍຕົນເອງສໍາລັບກຸ່ມບໍລິສັດກິດຈະກໍາຕາມ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,ເລືອກນັກສຶກສາດ້ວຍຕົນເອງສໍາລັບກຸ່ມບໍລິສັດກິດຈະກໍາຕາມ
 DocType: Journal Entry,User Remark,User ຂໍ້ສັງເກດ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Optimizing routes
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Optimizing routes
 DocType: Travel Itinerary,Non Diary,Non Diary
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,ບໍ່ສາມາດສ້າງເງິນຊົດເຊີຍ Retention ສໍາລັບພະນັກງານຊ້າຍ
 DocType: Lead,Market Segment,ສ່ວນຕະຫຼາດ
@@ -4384,7 +4387,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,ໂຄງການຄວາມພັກດີ
 DocType: Student Guardian,Father,ພຣະບິດາ
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,ສະຫນັບສະຫນູນປີ້
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;ປັບປຸງ Stock&#39; ບໍ່ສາມາດໄດ້ຮັບການກວດສອບສໍາລັບການຂາຍຊັບສົມບັດຄົງ
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;ປັບປຸງ Stock&#39; ບໍ່ສາມາດໄດ້ຮັບການກວດສອບສໍາລັບການຂາຍຊັບສົມບັດຄົງ
 DocType: Bank Reconciliation,Bank Reconciliation,ທະນາຄານສ້າງຄວາມປອງດອງ
 DocType: Attendance,On Leave,ໃບ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ໄດ້ຮັບການປັບປຸງ
@@ -4429,7 +4432,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,ບໍ່ມີ Serial ແລະ Batch
 DocType: Warranty Claim,From Company,ຈາກບໍລິສັດ
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,ຜົນບວກຂອງຄະແນນຂອງເງື່ອນໄຂການປະເມີນຜົນທີ່ຕ້ອງການຈະ {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,ກະລຸນາທີ່ກໍານົດໄວ້ຈໍານວນຂອງການອ່ອນຄ່າຈອງ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,ກະລຸນາທີ່ກໍານົດໄວ້ຈໍານວນຂອງການອ່ອນຄ່າຈອງ
 DocType: Supplier Scorecard Period,Calculations,ການຄິດໄລ່
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,ມູນຄ່າຫຼືຈໍານວນ
 DocType: Payment Terms Template,Payment Terms,ເງື່ອນໄຂການຊໍາລະເງິນ
@@ -4449,7 +4452,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,ສ່ວນລົດ (%) ໃນລາຄາອັດຕາກັບ Margin
 DocType: Healthcare Service Unit Type,Rate / UOM,ອັດຕາ / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,ຄັງສິນຄ້າທັງຫມົດ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,ບໍ່ພົບ {0} ສໍາລັບ Inter Company Transactions.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,ບໍ່ພົບ {0} ສໍາລັບ Inter Company Transactions.
 DocType: Travel Itinerary,Rented Car,ເຊົ່າລົດ
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,ກ່ຽວກັບບໍລິສັດຂອງທ່ານ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,ການປ່ອຍສິນເຊື່ອການບັນຊີຈະຕ້ອງບັນຊີງົບດຸນ
@@ -4551,6 +4554,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Plant Criteria Analysis
 DocType: Cheque Print Template,Cheque Height,ກະແສລາຍວັນສູງ
 DocType: Supplier,Supplier Details,ລາຍລະອຽດສະຫນອງ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ກະລຸນາຕິດຕັ້ງຈໍານວນຊຸດສໍາລັບການເຂົ້າຮ່ວມໂດຍຜ່ານ Setup&gt; ເລກລໍາດັບ
 DocType: Setup Progress,Setup Progress,setup ຄວາມຄືບຫນ້າ
 DocType: Expense Claim,Approval Status,ສະຖານະການອະນຸມັດ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},ຈາກມູນຄ່າຕ້ອງບໍ່ເກີນມູນຄ່າໃນການຕິດຕໍ່ກັນ {0}
@@ -4644,7 +4648,6 @@
 DocType: Travel Request,Fully Sponsored,Fully Sponsored
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ລູກຄ້າ {0} ຖືກສ້າງຂຶ້ນ.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕັ້ງລະບົບການຕັ້ງຊື່ພະນັກງານໃນຊັບພະຍາກອນມະນຸດ&gt; HR Settings
 DocType: Stock Settings,Limit Percent,ເປີເຊັນຂອບເຂດຈໍາກັດ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,ໃນປະຈຸບັນບໍ່ມີຫຼັກຊັບໃນຄັງສິນຄ້າໃດໆ
 ,Payment Period Based On Invoice Date,ໄລຍະເວລາການຊໍາລະເງິນໂດຍອີງໃສ່ວັນ Invoice
@@ -4703,7 +4706,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Warehouse Source
 DocType: Installation Note,Installation Date,ວັນທີ່ສະຫມັກການຕິດຕັ້ງ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Share Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},"ຕິດຕໍ່ກັນ, {0}: Asset {1} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},"ຕິດຕໍ່ກັນ, {0}: Asset {1} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {2}"
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,ໃບແຈ້ງຍອດຂາຍສ້າງ {0}
 DocType: Employee,Confirmation Date,ວັນທີ່ສະຫມັກການຢັ້ງຢືນ
 DocType: Inpatient Occupancy,Check Out,ເຊັກເອົາ
@@ -4723,6 +4726,7 @@
 DocType: Production Plan,Sales Orders Detail,ລາຍະລະອຽດການຂາຍຄໍາສັ່ງ
 DocType: Bin,Requested Quantity,ຈໍານວນການຮ້ອງຂໍ
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,ກະລຸນາຕັ້ງຊື່ລະບົບການໃຫ້ຄໍາແນະນໍາໃນການສຶກສາ&gt; ການສຶກສາການສຶກສາ
 DocType: Patient,Marital Status,ສະຖານະພາບ
 DocType: Stock Settings,Auto Material Request,ວັດສະດຸອັດຕະໂນມັດຄໍາຮ້ອງຂໍ
 DocType: Woocommerce Settings,API consumer secret,ຄວາມລັບຂອງຜູ້ບໍລິໂພກ API
@@ -4775,7 +4779,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,ເລືອກວັນ
 DocType: Academic Term,Term Name,ຊື່ໃນໄລຍະ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),ເຄດິດ ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,ສ້າງລາຍຈ່າຍເງິນເດືອນ ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,ສ້າງລາຍຈ່າຍເງິນເດືອນ ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,ທ່ານບໍ່ສາມາດແກ້ໄຂຮາກຮາກ.
 DocType: Buying Settings,Purchase Order Required,ການສັ່ງຊື້ຕ້ອງການ
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Timer
@@ -4813,7 +4817,7 @@
 DocType: Account,Rate at which this tax is applied,ອັດຕາການທີ່ພາສີນີ້ແມ່ນໄດ້ນໍາໃຊ້
 DocType: Cash Flow Mapper,Section Name,ຊື່ພາກສ່ວນ
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,ລໍາດັບຈໍານວນ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},ໄລຍະຫັກຄ່າທໍານຽມ {0}: ມູນຄ່າທີ່ຄາດໄວ້ຫຼັງຈາກອາຍຸການໃຊ້ງານຕ້ອງສູງກວ່າຫຼືເທົ່າກັບ {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},ໄລຍະຫັກຄ່າທໍານຽມ {0}: ມູນຄ່າທີ່ຄາດໄວ້ຫຼັງຈາກອາຍຸການໃຊ້ງານຕ້ອງສູງກວ່າຫຼືເທົ່າກັບ {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,ເປີດຮັບສະຫມັກໃນປະຈຸບັນ
 DocType: Company,Stock Adjustment Account,ບັນຊີການປັບ Stock
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ຂຽນ Off
@@ -4860,7 +4864,7 @@
 DocType: Program Enrollment,School House,ໂຮງຮຽນບ້ານ
 DocType: Serial No,Out of AMC,ອອກຈາກ AMC
 DocType: Opportunity,Opportunity Amount,Opportunity Amount
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ຈໍານວນຂອງການອ່ອນຄ່າຈອງບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດຂອງຄ່າເສື່ອມລາຄາ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ຈໍານວນຂອງການອ່ອນຄ່າຈອງບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດຂອງຄ່າເສື່ອມລາຄາ
 DocType: Purchase Order,Order Confirmation Date,ວັນທີທີ່ຢືນຢັນການສັ່ງຊື້
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,ເຮັດໃຫ້ບໍາລຸງຮັກສາ Visit
@@ -4901,7 +4905,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Batch:
 DocType: Volunteer,Afternoon,ຕອນບ່າຍ
 DocType: Loyalty Program,Loyalty Program Help,ຄວາມຊ່ວຍເຫລືອໂຄງການຄວາມຍຸດຕິທໍາ
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} {1} &#39;ແມ່ນຄົນພິການ
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} {1} &#39;ແມ່ນຄົນພິການ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ກໍານົດເປັນທຸກ
 DocType: Cheque Print Template,Scanned Cheque,ສະແກນກະແສລາຍວັນ
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ສົ່ງອີເມວອັດຕະໂນມັດທີ່ຈະຕິດຕໍ່ພົວພັນກ່ຽວກັບການໂອນສົ່ງ.
@@ -4914,7 +4918,7 @@
 DocType: Warranty Claim,Item and Warranty Details,ລາຍການແລະການຮັບປະກັນລາຍລະອຽດ
 DocType: Chapter,Chapter Members,ຫມວດຫມູ່ສະມາຊິກ
 DocType: Sales Team,Contribution (%),ການປະກອບສ່ວນ (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ຫມາຍເຫດ: ແບບການຊໍາລະເງິນຈະບໍ່ໄດ້ຮັບການສ້າງຂຶ້ນຕັ້ງແຕ່ &#39;ເງິນສົດຫຼືບັນຊີທະນາຄານບໍ່ໄດ້ລະບຸ
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ຫມາຍເຫດ: ແບບການຊໍາລະເງິນຈະບໍ່ໄດ້ຮັບການສ້າງຂຶ້ນຕັ້ງແຕ່ &#39;ເງິນສົດຫຼືບັນຊີທະນາຄານບໍ່ໄດ້ລະບຸ
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,ໂຄງການ {0} ມີຢູ່ແລ້ວ
 DocType: Clinical Procedure,Nursing User,ຜູ້ໃຊ້ພະຍາບານ
 DocType: Employee Benefit Application,Payroll Period,ເວລາຊໍາລະເງິນ
@@ -4922,6 +4926,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Serial No {0} ບໍ່ແມ່ນຂອງ {B} {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,ຄວາມຮັບຜິດຊອບ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,ໄລຍະເວລາຕັ້ງແຕ່ວັນທີ່ຂອງວົງຢືມນີ້ໄດ້ສິ້ນສຸດລົງ.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","ກະລຸນາລົບ Employee <a href=""#Form/Employee/{0}"">{0}</a> \ ເພື່ອຍົກເລີກເອກະສານນີ້"
 DocType: Expense Claim Account,Expense Claim Account,ບັນຊີຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍ
 DocType: Account,Capital Work in Progress,ທຶນການເຮັດວຽກໃນຂະບວນການ
 DocType: Accounts Settings,Allow Stale Exchange Rates,ອະນຸຍາດໃຫ້ອັດຕາແລກປ່ຽນຂອງ Stale
@@ -5003,7 +5009,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,ວັດສະດຸບັນຫາ
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,ເຊື່ອມຕໍ່ Shopify ກັບ ERPNext
 DocType: Material Request Item,For Warehouse,ສໍາລັບການຄັງສິນຄ້າ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,ຫມາຍເຫດການສົ່ງ {0} ຖືກປັບປຸງ
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,ຫມາຍເຫດການສົ່ງ {0} ຖືກປັບປຸງ
 DocType: Employee,Offer Date,ວັນທີ່ສະຫມັກສະເຫນີ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,ການຊື້ຂາຍ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,ທ່ານຢູ່ໃນຮູບແບບອອຟໄລ. ທ່ານຈະບໍ່ສາມາດທີ່ຈະໂຫລດຈົນກ່ວາທ່ານມີເຄືອຂ່າຍ.
@@ -5054,7 +5060,7 @@
 DocType: Shipping Rule,Calculate Based On,ຄິດໄລ່ພື້ນຖານກ່ຽວກັບ
 DocType: Contract,Unfulfilled,ບໍ່ພໍໃຈ
 DocType: Delivery Note Item,From Warehouse,ຈາກ Warehouse
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,ບໍ່ມີພະນັກງານສໍາລັບເງື່ອນໄຂທີ່ໄດ້ລະບຸໄວ້
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,ບໍ່ມີພະນັກງານສໍາລັບເງື່ອນໄຂທີ່ໄດ້ລະບຸໄວ້
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,ບໍ່ມີສິນຄ້າທີ່ມີບັນຊີລາຍການຂອງວັດສະດຸໃນການຜະລິດ
 DocType: Shopify Settings,Default Customer,Customer Default
 DocType: Sales Stage,Stage Name,Stage Name
@@ -5097,7 +5103,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ຈໍານວນເງິນພາສີຫຼັງຈາກຈໍານວນສ່ວນລົດ
 DocType: Patient,Inpatient Status,ສະຖານະພາບຜູ້ປ່ວຍນອກ
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,ການຕັ້ງຄ່າເຮັດ Summary ປະຈໍາວັນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,ລາຄາທີ່ເລືອກທີ່ຈະຕ້ອງມີການຊື້ແລະການຂາຍທົ່ງນາທີ່ຖືກກວດສອບ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,ລາຄາທີ່ເລືອກທີ່ຈະຕ້ອງມີການຊື້ແລະການຂາຍທົ່ງນາທີ່ຖືກກວດສອບ.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,ກະລຸນາໃສ່ Reqd ຕາມວັນທີ
 DocType: Payment Entry,Internal Transfer,ພາຍໃນການຖ່າຍໂອນ
 DocType: Asset Maintenance,Maintenance Tasks,ວຽກງານບໍາລຸງຮັກສາ
@@ -5134,7 +5140,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,ກຸ່ມໂດຍ
 DocType: Guardian,Interests,ຜົນປະໂຫຍດ
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,ເຮັດໃຫ້ສາມາດ / ປິດການໃຊ້ງານສະກຸນເງິນ.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,ບໍ່ສາມາດສົ່ງບາງລາຍຈ່າຍເງິນເດືອນ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,ບໍ່ສາມາດສົ່ງບາງລາຍຈ່າຍເງິນເດືອນ
 DocType: Exchange Rate Revaluation,Get Entries,Get Entries
 DocType: Production Plan,Get Material Request,ໄດ້ຮັບການວັດສະດຸຂໍ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,ຄ່າໃຊ້ຈ່າຍການໄປສະນີ
@@ -5221,7 +5227,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},ບັນຊີຄ່າໃຊ້ຈ່າຍເປັນການບັງຄັບສໍາລັບ item {0}
 DocType: BOM,Website Description,ລາຍລະອຽດເວັບໄຊທ໌
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,ການປ່ຽນແປງສຸດທິໃນການລົງທຶນ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,ກະລຸນາຍົກເລີກການຊື້ Invoice {0} ທໍາອິດ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,ກະລຸນາຍົກເລີກການຊື້ Invoice {0} ທໍາອິດ
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,ບໍ່ອະນຸຍາດ. ໂປດປິດປະເພດຫນ່ວຍບໍລິການ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ທີ່ຢູ່ອີເມວຈະຕ້ອງເປັນເອກະລັກ, ລາຄາສໍາລັບ {0}"
 DocType: Serial No,AMC Expiry Date,AMC ຫມົດເຂດ
@@ -5261,7 +5267,7 @@
 DocType: Hotel Room,Hotel Room,Hotel Room
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},ບັນຊີ {0} ບໍ່ໄດ້ເປັນບໍລິສັດ {1}
 DocType: Leave Type,Rounding,Rounding
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,ຈໍານວນ serial ໃນແຖວ {0} ບໍ່ກົງກັບກັບການຈັດສົ່ງຫມາຍເຫດ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,ຈໍານວນ serial ໃນແຖວ {0} ບໍ່ກົງກັບກັບການຈັດສົ່ງຫມາຍເຫດ
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),ຈໍານວນເງິນທີ່ບໍ່ປະຕິເສດ (Pro-rated)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","ຫຼັງຈາກນັ້ນກົດລະບຽບການກໍານົດລາຄາແມ່ນຖືກກັ່ນຕອງອອກໂດຍອີງໃສ່ລູກຄ້າ, ກຸ່ມລູກຄ້າ, ທີ່ດິນ, ຜູ້ໃຫ້ບໍລິການ, ກຸ່ມຜູ້ຜະລິດ, ແຄມເປນ, ຝ່າຍຂາຍແລະອື່ນໆ."
 DocType: Student,Guardian Details,ລາຍລະອຽດຜູ້ປົກຄອງ
@@ -5316,7 +5322,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Warehouse ຕ້ອງການສໍາລັບສິນຄ້າຫຼັກຊັບ {0}
 DocType: Leave Allocation,Unused leaves,ໃບທີ່ບໍ່ໄດ້ໃຊ້
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,ເຮັດໃຫ້ການຊໍາລະເງິນເຂົ້າ
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,ທຸກໆພະແນກ
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,ທຸກໆພະແນກ
 DocType: Healthcare Service Unit,Vacant,Vacant
 DocType: Patient,Alcohol Past Use,Alcohol Past Use
 DocType: Fertilizer Content,Fertilizer Content,ເນື້ອຫາປຸ໋ຍ
@@ -5327,7 +5333,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,ຕ້ອງໄດ້ຍົກເລີກການເຮັດວຽກ {0} ກ່ອນທີ່ຈະຍົກເລີກຄໍາສັ່ງຂາຍນີ້
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),ມາດດຶງຂໍ້ມູນລະເບີດ BOM (ລວມທັງອະນຸປະກອບ)
 DocType: Authorization Rule,Applicable To (Employee),ສາມາດນໍາໃຊ້ການ (ພະນັກງານ)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,ອັນເນື່ອງມາຈາກວັນທີ່ເປັນການບັງຄັບ
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,ອັນເນື່ອງມາຈາກວັນທີ່ເປັນການບັງຄັບ
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,ເພີ່ມຂຶ້ນສໍາລັບຄຸນສົມບັດ {0} ບໍ່ສາມາດຈະເປັນ 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,ປະເພດຜົນປະໂຫຍດແລະຈໍານວນເງິນ
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Rooms Booked
@@ -5476,7 +5482,7 @@
 DocType: Purchase Invoice Item,Total Weight,ນ້ໍາຫນັກລວມ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,ຄະນະກໍາມະການຂາຍ
 DocType: Job Offer Term,Value / Description,ມູນຄ່າ / ລາຍລະອຽດ
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ຕິດຕໍ່ກັນ, {0}: Asset {1} ບໍ່ສາມາດໄດ້ຮັບການສົ່ງ, ມັນແມ່ນແລ້ວ {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ຕິດຕໍ່ກັນ, {0}: Asset {1} ບໍ່ສາມາດໄດ້ຮັບການສົ່ງ, ມັນແມ່ນແລ້ວ {2}"
 DocType: Tax Rule,Billing Country,ປະເທດໃບບິນ
 DocType: Purchase Order Item,Expected Delivery Date,ວັນທີຄາດວ່າການຈັດສົ່ງ
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurant Order Entry
@@ -5515,12 +5521,13 @@
 DocType: Maintenance Visit,Breakdown,ລາຍລະອຽດ
 DocType: Travel Itinerary,Vegetarian,Vegetarian
 DocType: Patient Encounter,Encounter Date,Encounter Date
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,ບັນຊີ: {0} ກັບສະກຸນເງິນ: {1} ບໍ່ສາມາດໄດ້ຮັບການຄັດເລືອກ
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,ບັນຊີ: {0} ກັບສະກຸນເງິນ: {1} ບໍ່ສາມາດໄດ້ຮັບການຄັດເລືອກ
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bank Data
 DocType: Purchase Receipt Item,Sample Quantity,ຕົວຢ່າງຈໍານວນ
 DocType: Bank Guarantee,Name of Beneficiary,ຊື່ຜູ້ຮັບຜົນປະໂຫຍດ
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","ຄ່າໃຊ້ຈ່າຍການປັບປຸງອັດຕະໂນມັດ BOM ຜ່ານ Scheduler, ໂດຍອີງໃສ່ບັນຊີລາຍຊື່ອັດຕາມູນຄ່າ / ລາຄາອັດຕາການ / ອັດຕາການຊື້ຫລ້າສຸດທີ່ຜ່ານມາຂອງວັດຖຸດິບ."
 DocType: Supplier,SUP-.YYYY.-,SUP -YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Supplier&gt; Supplier Group
 DocType: Bank Reconciliation Detail,Cheque Date,ວັນທີ່ສະຫມັກ Cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},ບັນຊີ {0}: ບັນຊີຂອງພໍ່ແມ່ {1} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,ສົບຜົນສໍາເລັດການລຶບເຮັດທຸລະກໍາທັງຫມົດທີ່ກ່ຽວຂ້ອງກັບບໍລິສັດນີ້!
@@ -5548,7 +5555,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,ຂໍ້ເດັກນ້ອຍສາມາດໄດ້ຮັບການສ້າງຕັ້ງພຽງແຕ່ພາຍໃຕ້ &#39;ຂອງກຸ່ມຂໍ້ປະເພດ
 DocType: Attendance Request,Half Day Date,ເຄິ່ງຫນຶ່ງຂອງວັນທີວັນ
 DocType: Academic Year,Academic Year Name,ຊື່ປີທາງວິຊາການ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} ບໍ່ອະນຸຍາດໃຫ້ໂຕ້ຕອບກັບ {1}. ກະລຸນາປ່ຽນບໍລິສັດ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} ບໍ່ອະນຸຍາດໃຫ້ໂຕ້ຕອບກັບ {1}. ກະລຸນາປ່ຽນບໍລິສັດ.
 DocType: Sales Partner,Contact Desc,ຕິດຕໍ່ Desc
 DocType: Email Digest,Send regular summary reports via Email.,ສົ່ງບົດລາຍງານສະຫຼຸບສັງລວມເປັນປົກກະຕິໂດຍຜ່ານ Email.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},ກະລຸນາທີ່ກໍານົດໄວ້ບັນຊີມາດຕະຖານຢູ່ໃນປະເພດຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍ {0}
@@ -5581,7 +5588,7 @@
 DocType: Hotel Room,Hotel Manager,ຜູ້ຈັດການໂຮງແຮມ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,ກໍານົດກົດລະບຽບພາສີສໍາລັບສິນຄ້າ
 DocType: Purchase Invoice,Taxes and Charges Added,ພາສີອາກອນແລະຄ່າບໍລິການເພີ່ມ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,ໄລຍະຫັກຄ່າທໍານຽມ {0}: ວັນທີຄ່າເສື່ອມລາຄາຕໍ່ໄປບໍ່ສາມາດຢູ່ໃນວັນທີ່ມີຢູ່
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,ໄລຍະຫັກຄ່າທໍານຽມ {0}: ວັນທີຄ່າເສື່ອມລາຄາຕໍ່ໄປບໍ່ສາມາດຢູ່ໃນວັນທີ່ມີຢູ່
 ,Sales Funnel,ຊ່ອງທາງການຂາຍ
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,ຊື່ຫຍໍ້ເປັນການບັງຄັບ
 DocType: Project,Task Progress,ຄວາມຄືບຫນ້າວຽກງານ
@@ -5595,7 +5602,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,ກຸ່ມສົນທະນາຂອງລູກຄ້າທັງຫມົດ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,ສະສົມລາຍເດືອນ
 DocType: Attendance Request,On Duty,On Duty
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ເປັນການບັງຄັບ. ບາງທີບັນທຶກຕາແລກປ່ຽນເງິນບໍ່ໄດ້ສ້າງຂື້ນສໍາລັບ {1} ກັບ {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ເປັນການບັງຄັບ. ບາງທີບັນທຶກຕາແລກປ່ຽນເງິນບໍ່ໄດ້ສ້າງຂື້ນສໍາລັບ {1} ກັບ {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},ແຜນພັດທະນາພະນັກງານ {0} ມີຢູ່ແລ້ວສໍາລັບການກໍານົດ {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,ແມ່ແບບພາສີເປັນການບັງຄັບ.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,ບັນຊີ {0}: ບັນຊີຂອງພໍ່ແມ່ {1} ບໍ່ມີ
@@ -5675,11 +5682,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,atleast ຫນຶ່ງ warehouse ເປັນການບັງຄັບ
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","ການກໍານົດເຂດຂໍ້ມູນສະຖານທີ່ເຊັ່ນ UOM, ກຸ່ມສິນຄ້າ, ລາຍລະອຽດແລະຈໍານວນຊົ່ວໂມງ."
 DocType: Certification Application,Certification Status,ສະຖານະການຮັບຮອງ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Marketplace
 DocType: Travel Itinerary,Travel Advance Required,ການເດີນທາງລ່ວງຫນ້າຕ້ອງມີ
 DocType: Subscriber,Subscriber Name,ຊື່ຜູ້ສະຫມັກ
 DocType: Serial No,Out of Warranty,ອອກຈາກການຮັບປະກັນ
-DocType: Cashier Closing,Cashier-closing-,Cashier-closing-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Mapped Data Type
 DocType: BOM Update Tool,Replace,ທົດແທນ
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,ບໍ່ມີສິນຄ້າພົບ.
@@ -5767,7 +5773,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,ແມ່ແບບພາສີມາດຕະຖານສໍາລັບການຂາຍແລະການຊື້ໄດ້ຖືກສ້າງຂຶ້ນ.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,ບັນທຶກການປະເມີນຜົນ {0} ມີຢູ່ແລ້ວ.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",ຕົວຢ່າງ: ABCD #####. ຖ້າຊຸດໄດ້ຖືກກໍານົດແລະ Batch No ບໍ່ໄດ້ກ່າວເຖິງໃນການເຮັດທຸລະກໍາແລ້ວຈໍານວນ batch ອັດຕະໂນມັດຈະຖືກສ້າງຂຶ້ນໂດຍອີງໃສ່ຊຸດນີ້. ຖ້າທ່ານຕ້ອງການທີ່ຈະກ່າວຢ່າງລະອຽດກ່ຽວກັບເຄື່ອງຫມາຍການຜະລິດສໍາລັບສິນຄ້ານີ້ໃຫ້ປ່ອຍໃຫ້ມັນຫວ່າງ. ຫມາຍເຫດ: ການຕັ້ງຄ່ານີ້ຈະມີຄວາມສໍາຄັນກວ່າຊື່ຊຸດຊື່ໃນການຕັ້ງຄ່າຫຼັກຊັບ.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ກະລຸນາຕິດຕັ້ງຈໍານວນຊຸດສໍາລັບການເຂົ້າຮ່ວມໂດຍຜ່ານ Setup&gt; ເລກລໍາດັບ
 DocType: BOM,Materials Required (Exploded),ອຸປະກອນທີ່ຕ້ອງການ (ລະເບີດ)
 DocType: Contract,Party User,ພັກຜູ້ໃຊ້
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',ກະລຸນາຕັ້ງບໍລິສັດກັ່ນຕອງ blank ຖ້າ Group By ແມ່ນ &#39;Company&#39;
@@ -5970,7 +5975,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,ນັບ Opp
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,ວັນທີເລີ່ມຕົ້ນແລະໄລຍະເວລາໄລຍະເວລາການທົດລອງຕ້ອງຖືກກໍານົດໄວ້ທັງສອງໄລຍະເວລາທົດລອງ
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,ອັດຕາເສລີ່ຍ
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ຈໍານວນເງິນຈ່າຍທັງຫມົດໃນຕາຕະລາງການຊໍາລະເງິນຕ້ອງເທົ່າກັບ Grand / Total Rounded
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ຈໍານວນເງິນຈ່າຍທັງຫມົດໃນຕາຕະລາງການຊໍາລະເງິນຕ້ອງເທົ່າກັບ Grand / Total Rounded
 DocType: Subscription Plan Detail,Plan,ແຜນການ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,ທະນາຄານການດຸ່ນດ່ຽງງົບເປັນຕໍ່ຊີແຍກປະເພດທົ່ວໄປ
 DocType: Job Applicant,Applicant Name,ຊື່ຜູ້ສະຫມັກ
@@ -6039,7 +6044,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,ສະບູ່ແລະຜົງຊັກຟອກ
 DocType: BOM,Show Items,ສະແດງລາຍການ
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,ຈາກທີ່ໃຊ້ເວລາບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາທີ່ໃຊ້ເວລາ.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,ທ່ານຕ້ອງການແຈ້ງໃຫ້ລູກຄ້າທຸກຄົນຜ່ານທາງອີເມວບໍ?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,ທ່ານຕ້ອງການແຈ້ງໃຫ້ລູກຄ້າທຸກຄົນຜ່ານທາງອີເມວບໍ?
 DocType: Subscription Plan,Billing Interval,ໄລຍະເວລາການເອີ້ນເກັບເງິນ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture ແລະວິດີໂອ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ຄໍາສັ່ງ
@@ -6048,9 +6053,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,ແຖວ {0}: {1} ຕ້ອງຫຼາຍກວ່າ 0
 DocType: Assessment Criteria,Assessment Criteria Group,Group ເງື່ອນໄຂການປະເມີນຜົນ
 DocType: Healthcare Settings,Patient Name By,Name Patient By
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},ບັນຊີລາຍການຂອງ Accrual ສໍາລັບເງິນເດືອນຈາກ {0} ກັບ {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},ບັນຊີລາຍການຂອງ Accrual ສໍາລັບເງິນເດືອນຈາກ {0} ກັບ {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,ເປີດໃຊ້ວຽກລາຍຮັບທີ່ຄ້າງຊໍາລະ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},ເປີດຄ່າເສື່ອມລາຄາສະສົມຕ້ອງຫນ້ອຍກ່ວາເທົ່າກັບ {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},ເປີດຄ່າເສື່ອມລາຄາສະສົມຕ້ອງຫນ້ອຍກ່ວາເທົ່າກັບ {0}
 DocType: Warehouse,Warehouse Name,ຊື່ Warehouse
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,ວັນເລີ່ມຕົ້ນທີ່ແທ້ຈິງຕ້ອງຫນ້ອຍກວ່າວັນທີສຸດທ້າຍ
 DocType: Naming Series,Select Transaction,ເລືອກເຮັດທຸລະກໍາ
@@ -6202,7 +6207,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,ພະນັກງານ {0} ຂອງຊັ້ນຮຽນ {1} ບໍ່ມີນະໂຍບາຍໄວ້ໃນຕອນຕົ້ນ
 DocType: Salary Detail,Salary Detail,ຂໍ້ມູນເງິນເດືອນ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,ກະລຸນາເລືອກ {0} ທໍາອິດ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,ເພີ່ມຜູ້ໃຊ້ {0}
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,ເພີ່ມຜູ້ໃຊ້ {0}
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","ໃນກໍລະນີຂອງໂຄງການຫຼາຍຂັ້ນ, ລູກຄ້າຈະໄດ້ຮັບການມອບຫມາຍໂດຍອັດຕະໂນມັດໃຫ້ກັບຂັ້ນຕອນທີ່ກ່ຽວຂ້ອງຕາມການໃຊ້ຈ່າຍຂອງເຂົາເຈົ້າ"
 DocType: Appointment Type,Physician,ແພດ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Batch {0} ຂໍ້ມູນ {1} ໄດ້ຫມົດອາຍຸແລ້ວ.
@@ -6347,7 +6352,7 @@
 DocType: Asset,Custodian,ຜູ້ປົກຄອງ
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,ຈຸດຂອງການຂາຍຂໍ້ມູນ
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} ຄວນເປັນຄ່າລະຫວ່າງ 0 ແລະ 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},ການຈ່າຍເງິນຂອງ {0} ຈາກ {1} ກັບ {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},ການຈ່າຍເງິນຂອງ {0} ຈາກ {1} ກັບ {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,ເງິນກູ້ຢືມທີ່ບໍ່ປອດໄພ
 DocType: Cost Center,Cost Center Name,ມີລາຄາຖືກຊື່ Center
 DocType: Student,B+,B +
@@ -6379,6 +6384,7 @@
 DocType: Employee,Date of Issue,ວັນທີຂອງການຈົດທະບຽນ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","ໂດຍອີງຕາມການຕັ້ງຄ່າຊື້ຖ້າຊື້ Reciept ຕ້ອງ == &#39;ໃຊ່&#39;, ຫຼັງຈາກນັ້ນສໍາລັບການສ້າງ Purchase ໃບເກັບເງິນ, ຜູ້ໃຊ້ຈໍາເປັນຕ້ອງໄດ້ສ້າງໃບຊື້ຄັ້ງທໍາອິດສໍາລັບລາຍການ {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},"ຕິດຕໍ່ກັນ, {0} ຕັ້ງຄ່າການຜະລິດສໍາລັບການ item {1}"
+DocType: Global Defaults,Default Distance Unit,Default Distance Unit
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,ຕິດຕໍ່ກັນ {0}: ມູນຄ່າຊົ່ວໂມງຕ້ອງມີຄ່າຫລາຍກ່ວາສູນ.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Image ເວັບໄຊທ໌ {0} ຕິດກັບ Item {1} ບໍ່ສາມາດໄດ້ຮັບການພົບເຫັນ
 DocType: Issue,Content Type,ປະເພດເນື້ອຫາ
@@ -6434,7 +6440,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,ເດບິດການບັນຊີຈະຕ້ອງບັນຊີງົບດຸນ
 DocType: Asset,Naming Series,ການຕັ້ງຊື່ Series
 DocType: Vital Signs,Coated,ເຄືອບ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,ແຖວ {0}: ມູນຄ່າທີ່ຄາດໄວ້ຫຼັງຈາກການມີຊີວິດທີ່ມີປະໂຫຍດຕ້ອງຫນ້ອຍກວ່າຍອດຊື້ລວມ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,ແຖວ {0}: ມູນຄ່າທີ່ຄາດໄວ້ຫຼັງຈາກການມີຊີວິດທີ່ມີປະໂຫຍດຕ້ອງຫນ້ອຍກວ່າຍອດຊື້ລວມ
 DocType: GoCardless Settings,GoCardless Settings,ການຕັ້ງຄາ GoCardless
 DocType: Leave Block List,Leave Block List Name,ອອກຈາກຊື່ Block ຊີ
 DocType: Certified Consultant,Certification Validity,Validation Validity
@@ -6503,6 +6509,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Bank Header
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,ເບິ່ງການທົດລອງຫ້ອງທົດລອງ
 DocType: Hub Users,Hub Users,ຜູ້ໃຊ້ Hub
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ລູກຄ້າ&gt; ກຸ່ມລູກຄ້າ&gt; ອານາເຂດ
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,ວັນທີ່ສະຫມັກບໍາລຸງຮັກສາ
 DocType: Purchase Invoice Item,Rejected Serial No,ປະຕິເສດບໍ່ມີ Serial
@@ -6517,7 +6524,7 @@
 DocType: SG Creation Tool Course,Max Strength,ຄວາມສູງສຸດທີ່ເຄຍ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,ການຕິດຕັ້ງ presets
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-yYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},ບໍ່ມີການຈັດສົ່ງຂໍ້ມູນສໍາລັບລູກຄ້າ {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},ບໍ່ມີການຈັດສົ່ງຂໍ້ມູນສໍາລັບລູກຄ້າ {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,ພະນັກງານ {0} ບໍ່ມີເງິນຊ່ວຍເຫຼືອສູງສຸດ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,ເລືອກລາຍການໂດຍອີງໃສ່ວັນທີ່ສົ່ງ
 DocType: Grant Application,Has any past Grant Record,ມີບັນຊີລາຍການ Grant ໃດຫນຶ່ງຜ່ານມາ
@@ -6545,7 +6552,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Hotel Reservation
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,ການບໍລິການລູກຄ້າ
 DocType: BOM,Thumbnail,Thumbnail
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,ບໍ່ມີຜູ້ຕິດຕໍ່ທີ່ມີ ID ອີເມວພົບ.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,ບໍ່ມີຜູ້ຕິດຕໍ່ທີ່ມີ ID ອີເມວພົບ.
 DocType: Item Customer Detail,Item Customer Detail,ລາຍການຂໍ້ມູນລູກຄ້າ
 DocType: Notification Control,Prompt for Email on Submission of,ການກະຕຸ້ນເຕືອນສໍາລັບອີເມວໃນການຍື່ນສະເຫນີຂອງ
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},ຈໍານວນເງິນປະກັນໄພສູງສຸດຂອງພະນັກງານ {0} ແມ່ນສູງກວ່າ {1}
@@ -6806,7 +6813,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,ບໍ່ສາມາດ covert ກັບ Group ເນື່ອງຈາກວ່າປະເພດບັນຊີໄດ້ຖືກຄັດເລືອກ.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} ໄດ້ຮັບການແກ້ໄຂ. ກະລຸນາໂຫຼດຫນ້າຈໍຄືນ.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,ຢຸດເຊົາການຜູ້ໃຊ້ຈາກການເຮັດໃຫ້ຄໍາຮ້ອງສະຫມັກອອກຈາກໃນມື້ດັ່ງຕໍ່ໄປນີ້.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມສິນຄ້າ&gt; ຍີ່ຫໍ້
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","ຖ້າເວລາຫມົດອາຍຸບໍ່ຈໍາກັດສໍາລັບຈຸດທີ່ມີຄວາມພັກດີ, ໃຫ້ໄລຍະເວລາໄລຍະເວລາຫວ່າງຫຼືຫວ່າງ 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,ສະມາຊິກທີມງານບໍາລຸງຮັກສາ
 DocType: Loyalty Point Entry,Purchase Amount,ການຊື້
@@ -6814,7 +6820,7 @@
 											to fullfill Sales Order {2}",ບໍ່ສາມາດສົ່ງ Serial No {0} ຂອງລາຍະການ {1} ຍ້ອນວ່າມັນຖືກຈອງໄວ້ \ to Full Order Sales Order {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN -YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,ສະເຫນີລາຄາຜູ້ຜະລິດ {0} ສ້າງ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,ປີສຸດທ້າຍບໍ່ສາມາດກ່ອນທີ່ Start ປີ
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,ປີສຸດທ້າຍບໍ່ສາມາດກ່ອນທີ່ Start ປີ
 DocType: Employee Benefit Application,Employee Benefits,ຜົນປະໂຫຍດພະນັກງານ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},ປະລິມານບັນຈຸຕ້ອງເທົ່າກັບປະລິມານສໍາລັບລາຍການ {0} ຕິດຕໍ່ກັນ {1}
 DocType: Work Order,Manufactured Qty,ຜະລິດຕະພັນຈໍານວນ
@@ -6830,6 +6836,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,ເລືອກເລກ Batch
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,ເພື່ອ GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ໃບບິນຄ່າໄດ້ຍົກຂຶ້ນມາໃຫ້ກັບລູກຄ້າ.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕັ້ງລະບົບການຕັ້ງຊື່ຂອງພະນັກງານໃນຊັບພະຍາກອນມະນຸດ&gt; HR Settings
 DocType: Healthcare Settings,Invoice Appointments Automatically,ການມອບໃບຍືມເງິນໃບສະຫມັກໂດຍອັດຕະໂນມັດ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id ໂຄງການ
 DocType: Salary Component,Variable Based On Taxable Salary,Variable Based On Salary Taxable
@@ -6878,7 +6885,7 @@
 DocType: POS Profile,Account for Change Amount,ບັນຊີສໍາລັບການປ່ຽນແປງຈໍານວນເງິນ
 DocType: QuickBooks Migrator,Connecting to QuickBooks,ເຊື່ອມຕໍ່ກັບ QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,ລວມ Gain / Loss
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,ໃບອະນຸຍາດບໍລິສັດບໍ່ຖືກຕ້ອງສໍາລັບຄ່າບໍລິການຂອງບໍລິສັດ Inter.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,ໃບອະນຸຍາດບໍລິສັດບໍ່ຖືກຕ້ອງສໍາລັບຄ່າບໍລິການຂອງບໍລິສັດ Inter.
 DocType: Purchase Invoice,input service,input service
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ຕິດຕໍ່ກັນ {0}: ພັກ / ບັນຊີບໍ່ກົງກັບ {1} / {2} ໃນ {3} {4}
 DocType: Employee Promotion,Employee Promotion,ພະນັກງານສົ່ງເສີມ
@@ -7009,7 +7016,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,ພື້ນທີ່ທີ່ຕ້ອງການສໍາລັບທີ່ພັກອາໄສ
 apps/erpnext/erpnext/config/selling.py +184,Analytics,ການວິເຄາະ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,ໂຄງຮ່າງການແມ່ນບໍ່ມີ
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,ກະລຸນາຕັ້ງຊື່ລະບົບການໃຫ້ຄໍາແນະນໍາໃນການສຶກສາ&gt; ການສຶກສາການສຶກສາ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Item {0} ບໍ່ມີ Serial No. ພຽງແຕ່ລາຍການ serilialized \ ສາມາດມີການຈັດສົ່ງໂດຍອີງຕາມ Serial No
 DocType: Vehicle,Model,ຮູບແບບ
@@ -7039,7 +7045,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,ບໍ່ມີຫຍັງປ່ຽນແປງ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,ກະລຸນາເລືອກໄຟລ໌ CSV
 DocType: Holiday List,Total Holidays,ວັນຢຸດລວມ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,ຂາດແມ່ແບບອີເມວສໍາລັບການສົ່ງ. ກະລຸນາຕັ້ງຄ່າຫນຶ່ງໃນການຈັດສົ່ງສິນຄ້າ.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,ຂາດແມ່ແບບອີເມວສໍາລັບການສົ່ງ. ກະລຸນາຕັ້ງຄ່າຫນຶ່ງໃນການຈັດສົ່ງສິນຄ້າ.
 DocType: Student Leave Application,Mark as Present,ເຄື່ອງຫມາຍການນໍາສະເຫນີ
 DocType: Supplier Scorecard,Indicator Color,ຕົວຊີ້ວັດສີ
 DocType: Purchase Order,To Receive and Bill,ທີ່ຈະໄດ້ຮັບແລະບັນຊີລາຍການ
@@ -7048,7 +7054,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,ເລືອກ Serial No
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,ການອອກແບບ
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,ຂໍ້ກໍານົດແລະເງື່ອນໄຂ Template
-DocType: Serial No,Delivery Details,ລາຍລະອຽດການຈັດສົ່ງ
+DocType: Delivery Trip,Delivery Details,ລາຍລະອຽດການຈັດສົ່ງ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},ສູນຕົ້ນທຶນທີ່ຕ້ອງການໃນການຕິດຕໍ່ກັນ {0} ໃນພາສີອາກອນຕາຕະລາງສໍາລັບປະເພດ {1}
 DocType: Program,Program Code,ລະຫັດໂຄງການ
 DocType: Terms and Conditions,Terms and Conditions Help,ຂໍ້ກໍານົດແລະເງື່ອນໄຂຊ່ວຍເຫລືອ
@@ -7072,7 +7078,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ນໍາໄປສູ່ການທີ່ໃຊ້ເວລາວັນ
 DocType: Cash Flow Mapping,Is Income Tax Expense,ແມ່ນຄ່າໃຊ້ຈ່າຍພາສີລາຍໄດ້
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,ຄໍາສັ່ງຂອງທ່ານແມ່ນອອກສໍາລັບການຈັດສົ່ງ!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"ຕິດຕໍ່ກັນ, {0}: ປະກາດວັນທີ່ຈະຕ້ອງເຊັ່ນດຽວກັນກັບວັນທີ່ຊື້ {1} ຂອງຊັບສິນ {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"ຕິດຕໍ່ກັນ, {0}: ປະກາດວັນທີ່ຈະຕ້ອງເຊັ່ນດຽວກັນກັບວັນທີ່ຊື້ {1} ຂອງຊັບສິນ {2}"
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,ກວດສອບນີ້ຖ້າຫາກວ່ານັກສຶກສາໄດ້ອາໄສຢູ່ໃນ Hostel ສະຖາບັນຂອງ.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,ກະລຸນາໃສ່ຄໍາສັ່ງຂາຍໃນຕາຕະລາງຂ້າງເທິງ
 ,Stock Summary,Stock Summary
diff --git a/erpnext/translations/lt.csv b/erpnext/translations/lt.csv
index 79dee9d..53132db 100644
--- a/erpnext/translations/lt.csv
+++ b/erpnext/translations/lt.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Periodo pavadinimas
 DocType: Employee,Salary Mode,Pajamos režimas
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Registruotis
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Registruotis
 DocType: Patient,Divorced,išsiskyręs
 DocType: Support Settings,Post Route Key,Paskelbti maršruto raktą
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Leisti punktas turi būti pridėtas kelis kartus iš sandorio
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Naujas kursas
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Valiutų reikia kainoraščio {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bus apskaičiuojama sandorį.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Tiekėjas&gt; Tiekėjo tipas
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Klientų Susisiekite
 DocType: Patient Appointment,Check availability,Patikrinkite užimtumą
@@ -70,7 +69,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Rodyti atvira
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Serija Atnaujinta sėkmingai
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Užsakymas
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} eilutėje {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} eilutėje {1}
 DocType: Asset Finance Book,Depreciation Start Date,Nusidėvėjimo pradžios data
 DocType: Pricing Rule,Apply On,taikyti ant
 DocType: Item Price,Multiple Item prices.,Keli punktas kainos.
@@ -118,7 +117,7 @@
 DocType: Lab Prescription,Lab Prescription,Lab receptas
 ,Delay Days,Vėlavimo dienos
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Paslaugų išlaidų
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijos numeris: {0} jau yra nuorodos į pardavimo sąskaita-faktūra: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijos numeris: {0} jau yra nuorodos į pardavimo sąskaita-faktūra: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,faktūra
 DocType: Purchase Invoice Item,Item Weight Details,Prekės svarumo duomenys
 DocType: Asset Maintenance Log,Periodicity,periodiškumas
@@ -143,6 +142,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,buhalteris
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Pardavimo kainoraštis
 DocType: Patient,Tobacco Current Use,Tabako vartojimas
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Pradžios data ir pabaigos data sutampa su darbo dokumentu <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Pardavimo norma
 DocType: Cost Center,Stock User,akcijų Vartotojas
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -162,7 +162,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Susijęs
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,"Lankomumas data negali būti mažesnė nei darbuotojo, jungiančia datos"
 DocType: Grading Scale,Grading Scale Name,Vertinimo skalė Vardas
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Pridėkite vartotojų prie &quot;Marketplace&quot;
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Pridėkite vartotojų prie &quot;Marketplace&quot;
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Tai šaknys sąskaita ir negali būti redaguojami.
 DocType: Sales Invoice,Company Address,Kompanijos adresas
 DocType: BOM,Operations,operacijos
@@ -320,7 +320,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Qty
 DocType: Production Plan,Material Request Detail,Medžiagos užklausa išsamiai
 DocType: Selling Settings,Default Quotation Validity Days,Numatytų kuponų galiojimo dienos
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Įtraukti mokestį iš eilės {0} prekės norma, mokesčiai eilučių {1}, taip pat turi būti įtraukti"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Įtraukti mokestį iš eilės {0} prekės norma, mokesčiai eilučių {1}, taip pat turi būti įtraukti"
 DocType: SMS Center,SMS Center,SMS centro
 DocType: Payroll Entry,Validate Attendance,Patvirtinti lankomumą
 DocType: Sales Invoice,Change Amount,Pakeisti suma
@@ -439,7 +439,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Tarpai tarp eilučių ir suma žodžiais
 DocType: Vehicle,Additional Details,Papildoma informacija
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Nėra aprašymo suteikta
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Tiekėjas&gt; Tiekėjo grupė
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Užsisakyti įsigyti.
 DocType: POS Closing Voucher Details,Collected Amount,Surinkta suma
 DocType: Lab Test,Submitted Date,Pateiktas data
@@ -484,7 +483,7 @@
 DocType: Student Admission,Student Admission,Studentų Priėmimas
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Prekė {0} atšaukiamas
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Nusidėvėjimo eilutė {0}: nusidėvėjimo pradžios data įrašoma kaip praėjusioji data
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Nusidėvėjimo eilutė {0}: nusidėvėjimo pradžios data įrašoma kaip praėjusioji data
 DocType: Contract Template,Fulfilment Terms and Conditions,Atlikimo sąlygos
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,medžiaga Prašymas
 DocType: Bank Reconciliation,Update Clearance Date,Atnaujinti Sąskaitų data
@@ -541,6 +540,7 @@
 DocType: Accounts Settings,Settings for Accounts,Nustatymai sąskaitų
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Tiekėjas sąskaitoje Nr egzistuoja pirkimo sąskaitoje faktūroje {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Valdyti pardavimo asmuo medį.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Negalima apdoroti maršruto, nes &quot;Google&quot; žemėlapių nustatymai neleidžiami."
 DocType: Job Applicant,Cover Letter,lydraštis
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Neįvykdyti čekiai ir užstatai ir išvalyti
 DocType: Item,Synced With Hub,Sinchronizuojami su Hub
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Nauja turto vert
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Norma, pagal kurią Klientas valiuta konvertuojama į kliento bazine valiuta"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Žinoma planavimas įrankių
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Eilutės # {0}: Pirkimo sąskaita faktūra negali būti pareikštas esamo turto {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Eilutės # {0}: Pirkimo sąskaita faktūra negali būti pareikštas esamo turto {1}
 DocType: Crop Cycle,LInked Analysis,Įtraukta analizė
 DocType: POS Closing Voucher,POS Closing Voucher,POS uždarymo balionas
 DocType: Contract,Lapsed,Netekęs
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} nėra įtraukti į eigą {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Studento vardas:
 DocType: POS Closing Voucher Details,Difference,Skirtumas
+DocType: Delivery Settings,Delay between Delivery Stops,Vėlavimas tarp pristatymo stotelių
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serijos Nr {0} nepriklauso važtaraštyje {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Atrodo, kad yra problema dėl serverio &quot;GoCardless&quot; konfigūracijos. Nesijaudinkite, nesėkmės atveju suma bus grąžinta į jūsų sąskaitą."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext demo
@@ -695,7 +696,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Kiekis ir Balsuok
 DocType: Delivery Note,% Installed,% Įdiegta
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Kabinetai / Laboratorijos tt, kai paskaitos gali būti planuojama."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Abiejų bendrovių bendrovės valiutos turėtų atitikti &quot;Inter&quot; bendrovės sandorius.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Abiejų bendrovių bendrovės valiutos turėtų atitikti &quot;Inter&quot; bendrovės sandorius.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Prašome įvesti įmonės pavadinimą pirmoji
 DocType: Travel Itinerary,Non-Vegetarian,Ne vegetaras
 DocType: Purchase Invoice,Supplier Name,tiekėjas Vardas
@@ -781,7 +782,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Išnuomotas nuo datos
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Pakankamai Dalys sukurti
 DocType: POS Profile User,POS Profile User,POS vartotojo profilis
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Eilutė {0}: būtina nusidėvėjimo pradžios data
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Eilutė {0}: būtina nusidėvėjimo pradžios data
 DocType: Purchase Invoice Item,Service Start Date,Paslaugos pradžios data
 DocType: Subscription Invoice,Subscription Invoice,Prenumeratos sąskaita faktūra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,tiesioginių pajamų
@@ -850,7 +851,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Santrumpą jau naudoja kitai bendrovei
 DocType: Selling Settings,Default Customer Group,Pagal nutylėjimą klientų grupei
 DocType: Employee,IFSC Code,IFSC kodas
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Pradžios data ir pabaigos data sutampa su darbo dokumentu <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",Jei išjungti &quot;suapvalinti sumą&quot; laukas nebus matomas bet koks sandoris
 DocType: BOM,Operating Cost,Operacinė Kaina
 DocType: Crop,Produced Items,Pagaminti daiktai
@@ -902,7 +902,7 @@
 DocType: Supplier,Prevent RFQs,Užkirsti kelią RFQ
 DocType: Hub User,Hub User,&quot;Hub&quot; naudotojas
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Padaryti pardavimo užsakymų
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Atlyginimo užstatas pateiktas laikotarpiui nuo {0} iki {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Atlyginimo užstatas pateiktas laikotarpiui nuo {0} iki {1}
 DocType: Project Task,Project Task,Projektų Užduotis
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Išpirkti taškai
 ,Lead Id,Švinas ID
@@ -1034,7 +1034,7 @@
 DocType: Fee Validity,Max number of visit,Maksimalus apsilankymo skaičius
 ,Hotel Room Occupancy,Viešbučio kambario užimtumas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Lapą sukurta:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Prašome nustatyti numatytąją grynaisiais ar banko sąskaitą mokėjimo būdas {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Prašome nustatyti numatytąją grynaisiais ar banko sąskaitą mokėjimo būdas {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,įrašyti
 DocType: GST Settings,GST Settings,GST Nustatymai
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Valiuta turi būti tokia pati kaip ir kainų sąrašo valiuta: {0}
@@ -1089,7 +1089,7 @@
 DocType: Vehicle Log,Service Details,paslaugų detalės
 DocType: Lab Test Template,Grouped,Grupuojami
 DocType: Selling Settings,Delivery Note Required,Reikalinga Važtaraštis
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Atlyginimo atlyginimų pateikimas ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Atlyginimo atlyginimų pateikimas ...
 DocType: Bank Guarantee,Bank Guarantee Number,Banko garantija Taškų
 DocType: Bank Guarantee,Bank Guarantee Number,Banko garantija Taškų
 DocType: Assessment Criteria,Assessment Criteria,vertinimo kriterijai
@@ -1115,13 +1115,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Mokėjimo įrašas jau yra sukurta
 DocType: Request for Quotation,Get Suppliers,Gaukite tiekėjus
 DocType: Purchase Receipt Item Supplied,Current Stock,Dabartinis sandėlyje
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},"Eilutės # {0}: Turto {1} nėra susijęs su straipsniais, {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},"Eilutės # {0}: Turto {1} nėra susijęs su straipsniais, {2}"
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Peržiūrėti darbo užmokestį
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Sąskaita {0} buvo įrašytas kelis kartus
 DocType: Account,Expenses Included In Valuation,"Sąnaudų, įtrauktų Vertinimo"
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Galite atnaujinti tik jei narystės terminas baigiasi per 30 dienų
 DocType: Shopping Cart Settings,Show Stock Availability,Rodyti sandėlyje
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Nustatykite {0} turto kategorijoje {1} arba įmonės {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Nustatykite {0} turto kategorijoje {1} arba įmonės {2}
 DocType: Location,Longitude,Ilguma
 ,Absent Student Report,Nėra studento ataskaitos
 DocType: Crop,Crop Spacing UOM,Crop Spacing UOM
@@ -1194,7 +1194,7 @@
 DocType: Soil Texture,Sand,Smėlis
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,energija
 DocType: Opportunity,Opportunity From,galimybė Nuo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Eilutė {0}: {1} {2} elementui reikalingi eilės numeriai. Jūs pateikė {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Eilutė {0}: {1} {2} elementui reikalingi eilės numeriai. Jūs pateikė {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Pasirinkite lentelę
 DocType: BOM,Website Specifications,Interneto svetainė duomenys
 DocType: Special Test Items,Particulars,Duomenys
@@ -1286,7 +1286,7 @@
 DocType: Item,Items with higher weightage will be shown higher,"Daiktai, turintys aukštąjį weightage bus rodomas didesnis"
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Lab testus ir gyvybinius požymius
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bankas Susitaikymas detalės
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Eilutės # {0}: Turto {1} turi būti pateiktas
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Eilutės # {0}: Turto {1} turi būti pateiktas
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nėra darbuotojas nerasta
 DocType: Item,If subcontracted to a vendor,Jei subrangos sutartį pardavėjas
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentų grupė jau yra atnaujinama.
@@ -1341,7 +1341,6 @@
 DocType: Loyalty Program Collection,Tier Name,Pakopos pavadinimas
 DocType: HR Settings,Enter retirement age in years,Įveskite pensinį amžių metais
 DocType: Crop,Target Warehouse,Tikslinė sandėlis
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nustatymų seriją galite nustatyti {0} naudodami sąranką&gt; Nustatymai&gt; pavadinimo serija
 DocType: Payroll Employee Detail,Payroll Employee Detail,Išsami darbo užmokesčio darbuotojo informacija
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Prašome pasirinkti sandėlį
 DocType: Cheque Print Template,Starting location from left edge,Nuo vietą iš kairiojo krašto
@@ -1431,7 +1430,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Planas medžiaga mazgams
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Pardavimų Partneriai ir teritorija
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} turi būti aktyvus
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Nepavyko perkelti jokių elementų
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Nepavyko perkelti jokių elementų
 DocType: Employee Boarding Activity,Activity Name,Veiklos pavadinimas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Keisti išleidimo datą
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Galutinio produkto kiekis <b>{0}</b> ir Kiekis <b>{1}</b> negali būti kitoks
@@ -1660,6 +1659,7 @@
 DocType: Project,First Email,Pirmasis el. Paštas
 DocType: Company,Exception Budget Approver Role,Išimtis biudžeto patvirtinimo vaidmuo
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Kai nustatyta, ši sąskaita bus sulaikyta iki nustatytos datos"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserved Sandėlis pardavimų užsakymų / Finished produkcijos sandėlis
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Parduodami suma
 DocType: Repayment Schedule,Interest Amount,palūkanų suma
@@ -1671,7 +1671,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Įrašai
 DocType: Asset,Scrapped,metalo laužą
 DocType: Item,Item Defaults,Numatytasis elementas
-DocType: Purchase Invoice,Returns,grąžinimas
+DocType: Cashier Closing,Returns,grąžinimas
 DocType: Job Card,WIP Warehouse,WIP sandėlis
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serijos Nr {0} yra pagal priežiūros sutartį net iki {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,verbavimas
@@ -1685,7 +1685,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Pervedimo tipas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,pardavimų sąnaudos
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klientas&gt; Klientų grupė&gt; Teritorija
 DocType: Diagnosis,Diagnosis,Diagnozė
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standartinė Ieško
 DocType: Attendance Request,Explanation,Paaiškinimas
@@ -1698,7 +1697,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Įsigijimo pavedimai yra atidėti
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Pašto kodas
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Pardavimų užsakymų {0} yra {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Pasirinkite palūkanų pajamų sąskaitą paskolai {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Pasirinkite palūkanų pajamų sąskaitą paskolai {0}
 DocType: Opportunity,Contact Info,Kontaktinė informacija
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Padaryti atsargų papildymams
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,"Negalima reklamuoti darbuotojo, kurio statusas kairėje"
@@ -1710,7 +1709,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Sąskaitą faktūrą atlikti negalima už nulinę atsiskaitymo valandą
 DocType: Company,Date of Commencement,Pradžios data
 DocType: Sales Person,Select company name first.,Pasirinkite įmonės pavadinimas pirmas.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},El. Laiškas išsiųstas {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},El. Laiškas išsiųstas {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,"Citatos, gautų iš tiekėjų."
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Pakeiskite BOM ir atnaujinkite naujausią kainą visose BOM
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Norėdami {0} | {1} {2}
@@ -1732,7 +1731,7 @@
 DocType: Asset Movement,From Employee,iš darbuotojo
 DocType: Driver,Cellphone Number,Mobiliojo telefono numeris
 DocType: Project,Monitor Progress,Stebėti progresą
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Įspėjimas: sistema netikrins per didelių sąskaitų, nes suma už prekę {0} iš {1} yra lygus nuliui"
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Įspėjimas: sistema netikrins per didelių sąskaitų, nes suma už prekę {0} iš {1} yra lygus nuliui"
 DocType: Journal Entry,Make Difference Entry,Padaryti Skirtumas įrašą
 DocType: Supplier Quotation,Auto Repeat Section,Automatinis kartojimo skyrius
 DocType: Upload Attendance,Attendance From Date,Lankomumas Nuo data
@@ -1836,7 +1835,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Eilutės # {0}: Atmesta Kiekis negali būti įrašytas į pirkimo Grįžti
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Kliento grupės keitimas pasirinktam Klientui yra draudžiamas.
 ,Purchase Order Items To Be Billed,Pirkimui užsakyti klausimai turi būti apmokestinama
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Atnaujintas numatomas atvykimo laikas.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Atnaujintas numatomas atvykimo laikas.
 DocType: Program Enrollment Tool,Enrollment Details,Registracijos duomenys
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Negalima nustatyti kelios įmonės numatytosios pozicijos.
 DocType: Purchase Invoice Item,Net Rate,grynasis Balsuok
@@ -1850,7 +1849,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Palikimo tipas yra teisėtas
 DocType: Support Settings,Close Issue After Days,Uždaryti išdavimas Po dienos
 ,Eway Bill,Eway Billas
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Norint pridėti naudotojų prie &quot;Marketplace&quot;, turite būti &quot;System Manager&quot; ir &quot;Item Manager&quot; funkcijų turintis vartotojas."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Norint pridėti naudotojų prie &quot;Marketplace&quot;, turite būti &quot;System Manager&quot; ir &quot;Item Manager&quot; funkcijų turintis vartotojas."
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Palikite tuščią, jei laikomas visų šakų"
 DocType: Job Opening,Staffing Plan,Personalo planas
 DocType: Bank Guarantee,Validity in Days,Galiojimas dienomis
@@ -1872,7 +1871,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Dubliuoti eilutė {0} su tuo pačiu {1}
 DocType: Marketplace Settings,Disable Marketplace,Išjungti Marketplace
 ,Trial Balance,bandomasis balansas
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Finansiniai metai {0} nerastas
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Finansiniai metai {0} nerastas
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Įsteigti Darbuotojai
 DocType: Hotel Room Reservation,Hotel Reservation User,Viešbučių rezervavimo vartotojas
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Prašome pasirinkti prefiksą pirmas
@@ -1980,7 +1979,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Nepavyko prisijungti
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Turtas {0} sukurtas
 DocType: Special Test Items,Special Test Items,Specialūs testo elementai
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Turite būti su Sistemos valdytoju ir &quot;Item Manager&quot; vartotojais, kad galėtumėte užsiregistruoti &quot;Marketplace&quot;."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Turite būti su Sistemos valdytoju ir &quot;Item Manager&quot; vartotojais, kad galėtumėte užsiregistruoti &quot;Marketplace&quot;."
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,mokėjimo būdas
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Pagal jūsų paskirtą darbo užmokesčio struktūrą negalite kreiptis dėl išmokų
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Interneto svetainė Paveikslėlis turėtų būti valstybės failą ar svetainės URL
@@ -1992,7 +1991,7 @@
 DocType: Warehouse,Warehouse Contact Info,Sandėlių Kontaktinė informacija
 DocType: Payment Entry,Write Off Difference Amount,Nurašyti skirtumo suma
 DocType: Volunteer,Volunteer Name,Savanorio vardas
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Rastos su pasikartojančiomis datomis kitose eilutėse buvo rasta: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Rastos su pasikartojančiomis datomis kitose eilutėse buvo rasta: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: Darbuotojų elektroninis paštas nerastas, todėl elektroninis laiškas neišsiųstas"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Nė viena atlyginimo struktūra darbuotojui {0} nurodytoje datoje {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Pristatymo taisyklė netaikoma šaliai {0}
@@ -2083,6 +2082,7 @@
 DocType: Salary Component,Earning,Pelningiausi
 DocType: Supplier Scorecard,Scoring Criteria,Balų kriterijai
 DocType: Purchase Invoice,Party Account Currency,Šalis paskyra Valiuta
+DocType: Delivery Trip,Total Estimated Distance,Bendras numatomas atstumas
 ,BOM Browser,BOM naršyklė
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Prašome atnaujinti savo statusą šiam renginiui
 DocType: Item Barcode,EAN,EAN
@@ -2121,7 +2121,7 @@
 DocType: Activity Cost,Projects,projektai
 DocType: Payment Request,Transaction Currency,Operacijos valiuta
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Iš {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Kai kurie el. Laiškai yra netinkami
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Kai kurie el. Laiškai yra netinkami
 DocType: Work Order Operation,Operation Description,Veikimo aprašymas
 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.,"Nepavyksta pakeisti finansiniai metai pradžios data ir fiskalinių metų pabaigos, kai finansiniai metai yra išsaugotas."
 DocType: Quotation,Shopping Cart,Prekių krepšelis
@@ -2145,7 +2145,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Grynasis pokytis ilgalaikio turto
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Palikite tuščią, jei laikomas visų pavadinimų"
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Mokesčio tipas &quot;Tikrasis&quot; iš eilės {0} negali būti įtraukti į klausimus lygis
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Mokesčio tipas &quot;Tikrasis&quot; iš eilės {0} negali būti įtraukti į klausimus lygis
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,nuo datetime
 DocType: Shopify Settings,For Company,dėl Company
@@ -2159,7 +2159,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Kuriant tvarkaraštį sukūrėme klaidų
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Pirmasis išlaidų patvirtiniklis sąraše bus nustatytas kaip numatytasis išlaidų patvirtinimas.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,negali būti didesnis nei 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Jums reikia būti kitam vartotojui nei administratorius su Sistemos valdytoju ir &quot;Item Manager&quot; vaidmenimis, kad užsiregistruotumėte &quot;Marketplace&quot;."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Jums reikia būti kitam vartotojui nei administratorius su Sistemos valdytoju ir &quot;Item Manager&quot; vaidmenimis, kad užsiregistruotumėte &quot;Marketplace&quot;."
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Prekė {0} nėra sandėlyje punktas
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Neplanuotai
@@ -2188,7 +2188,7 @@
 DocType: HR Settings,Employee Settings,darbuotojų Nustatymai
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Įkraunama mokėjimo sistema
 ,Batch-Wise Balance History,Serija-Išminčius Balansas istorija
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Eilutė # {0}: negalima nustatyti rodiklio, jei suma yra didesnė už {1}."
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Eilutė # {0}: negalima nustatyti rodiklio, jei suma yra didesnė už {1}."
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Spausdinimo parametrai atnaujinama atitinkamos spausdinimo formatą
 DocType: Package Code,Package Code,Pakuotės kodas
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,mokinys
@@ -2420,7 +2420,7 @@
 DocType: Delivery Trip,Optimize Route,Optimizuoti maršrutą
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Pabandykite planuoja operacijas X dienų iš anksto.
 DocType: HR Settings,Stop Birthday Reminders,Sustabdyti Gimimo diena Priminimai
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Prašome Set Default Darbo užmokesčio MOKĖTINOS Narystė Bendrovėje {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Prašome Set Default Darbo užmokesčio MOKĖTINOS Narystė Bendrovėje {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Gaukite finansinį &quot;Amazon&quot; mokesčių ir mokesčių duomenų sulūžimą
 DocType: SMS Center,Receiver List,imtuvas sąrašas
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Paieška punktas
@@ -2490,7 +2490,7 @@
 DocType: Vital Signs,Constipated,Užkietėjimas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Prieš tiekėjo sąskaitoje {0} data {1}
 DocType: Customer,Default Price List,Numatytasis Kainų sąrašas
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Turto Judėjimo įrašas {0} sukūrė
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Turto Judėjimo įrašas {0} sukūrė
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Nerasta daiktų.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Jūs negalite trinti finansiniai metai {0}. Finansiniai metai {0} yra numatytoji Global Settings
 DocType: Share Transfer,Equity/Liability Account,Nuosavybės / atsakomybės sąskaita
@@ -2630,6 +2630,7 @@
 DocType: Blanket Order,Order Type,pavedimo tipas
 ,Item-wise Sales Register,Prekė išmintingas Pardavimų Registruotis
 DocType: Asset,Gross Purchase Amount,Pilna Pirkimo suma
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Prekės kodas&gt; Prekės grupė&gt; Gamintojas
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Atidarymo likučiai
 DocType: Asset,Depreciation Method,nusidėvėjimo metodas
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ar šis mokestis įtrauktas į bazinę palūkanų normą?
@@ -2711,7 +2712,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,"Veiksmai, jei metinis biudžetas viršytas PO"
 DocType: Student Leave Application,Student Leave Application,Studentų atostogos taikymas
 DocType: Item,Will also apply for variants,Bus taikoma variantų
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Turto negali būti atšauktas, nes jis jau yra {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Turto negali būti atšauktas, nes jis jau yra {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Darbuotojų {0} pusę dienos {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Iš viso darbo valandų turi būti ne didesnis nei maks darbo valandų {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,apie
@@ -2735,6 +2736,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Paimkite duomenis
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Didžiausias leistinas atostogas tipo atostogų {0} yra {1}
 DocType: SMS Center,Create Receiver List,Sukurti imtuvas sąrašas
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Galima naudoti Data turėtų būti po pirkimo datos
 DocType: Vehicle,Wheels,ratai
 DocType: Packing Slip,To Package No.,Paketas Nr
 DocType: Patient Relation,Family,Šeima
@@ -2748,7 +2750,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,"Atsiskaitymo valiuta turi būti lygi arba numatytojo įmonės valiuta, arba šalies sąskaitos valiuta"
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Nurodo, kad paketas yra šio pristatymo (tik projekto) dalis"
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Eilutė {0}: mokėjimo data negali būti prieš paskelbimo datą
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Eilutė {0}: mokėjimo data negali būti prieš paskelbimo datą
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Padaryti Mokėjimo įrašą
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Kiekis už prekę {0} turi būti mažesnis nei {1}
 ,Sales Invoice Trends,Pardavimo sąskaita-faktūra tendencijos
@@ -2820,7 +2822,7 @@
 DocType: Guardian,Guardian Interests,Guardian Pomėgiai
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Atnaujinti paskyros pavadinimą / numerį
 DocType: Naming Series,Current Value,Dabartinė vertė
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Keli fiskalinius metus egzistuoja datos {0}. Prašome nustatyti bendrovės finansiniams metams
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Keli fiskalinius metus egzistuoja datos {0}. Prašome nustatyti bendrovės finansiniams metams
 DocType: Education Settings,Instructor Records to be created by,"Instruktorių įrašai, kuriuos turi sukurti"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} sukūrė
 DocType: GST Account,GST Account,GST sąskaita
@@ -2837,7 +2839,7 @@
 DocType: Sales Person,Name and Employee ID,Vardas ir darbuotojo ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Terminas negali būti prieš paskelbdami data
 DocType: Website Item Group,Website Item Group,Interneto svetainė punktas grupė
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"Nė vienas atlyginimų slipas, kuris buvo pateiktas dėl pirmiau nurodytų kriterijų ar jau pateikto atlyginimo užstato"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"Nė vienas atlyginimų slipas, kuris buvo pateiktas dėl pirmiau nurodytų kriterijų ar jau pateikto atlyginimo užstato"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Muitai ir mokesčiai
 DocType: Projects Settings,Projects Settings,Projektų nustatymai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Prašome įvesti Atskaitos data
@@ -2846,7 +2848,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Tiekiami Kiekis
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Medžiaga Prašymas punktas
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Pirmiausia atšaukite pirkimo kvitą {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Pirmiausia atšaukite pirkimo kvitą {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Medis punktas grupes.
 DocType: Production Plan,Total Produced Qty,Bendras pagamintas kiekis
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Negali remtis eilutės skaičius didesnis nei arba lygus dabartinės eilutės numeris Šio mokesčio tipą
@@ -2956,6 +2958,7 @@
 ,Vehicle Expenses,Transporto išlaidos
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Sukurkite laboratorijos testą (-us) dėl pardavimo sąskaitų pateikimo
 DocType: Serial No,Invoice Details,informacija apie sąskaitą
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,"Įjunkite &quot;Google&quot; žemėlapių nustatymus, kad įvertintumėte ir optimizuotumėte maršrutus"
 DocType: Grant Application,Show on Website,Rodyti svetainėje
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Pradėk nuo
 DocType: Hub Tracked Item,Hub Category,Hub kategorija
@@ -2996,7 +2999,7 @@
 DocType: Inpatient Record,B Positive,B teigiamas
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Maksimali nauda darbuotojui {0} viršija {1} ankstesnės sumos {2} suma
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Eilutės # {0}: Kiekis turi būti 1, kaip elementas yra ilgalaikio turto. Prašome naudoti atskirą eilutę daugkartiniam vnt."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Eilutės # {0}: Kiekis turi būti 1, kaip elementas yra ilgalaikio turto. Prašome naudoti atskirą eilutę daugkartiniam vnt."
 DocType: Leave Block List Allow,Leave Block List Allow,Palikite Blokuoti sąrašas Leisti
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Santrumpos reikšmė negali būti tuščia arba tarpas
 DocType: Patient Medical Record,Patient Medical Record,Paciento medicinos ataskaita
@@ -3031,7 +3034,7 @@
 DocType: Workstation,Wages per hour,Darbo užmokestis per valandą
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Akcijų balansas Serija {0} taps neigiamas {1} už prekę {2} į sandėlį {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Šios medžiagos prašymai buvo iškeltas automatiškai pagal elemento naujo užsakymo lygio
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Sąskaita {0} yra neteisinga. Sąskaitos valiuta turi būti {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Sąskaita {0} yra neteisinga. Sąskaitos valiuta turi būti {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Nuo datos {0} negali būti po darbuotojo atleidimo data {1}
 DocType: Supplier,Is Internal Supplier,Ar yra vidinis tiekėjas
 DocType: Employee,Create User Permission,Sukurti vartotojo leidimą
@@ -3177,7 +3180,7 @@
 DocType: Account,Fixed Asset,Ilgalaikio turto
 DocType: Amazon MWS Settings,After Date,Po datos
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Serijinis Inventorius
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Netinkama {0} sąskaita faktūrai &quot;Inter&quot;.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Netinkama {0} sąskaita faktūrai &quot;Inter&quot;.
 ,Department Analytics,Departamentas &quot;Analytics&quot;
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Numatytojo adreso el. Pašto adresas nerastas
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generuoti paslaptį
@@ -3190,7 +3193,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Mokesčių struktūros ir studentų grupės {0} programos skiriasi.
 DocType: Bank Statement Transaction Entry,Receivable Account,gautinos sąskaitos
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Galioja nuo datos turi būti mažesnis nei galiojanti iki datos.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Eilutės # {0}: Turto {1} jau yra {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Eilutės # {0}: Turto {1} jau yra {2}
 DocType: Quotation Item,Stock Balance,akcijų balansas
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,"Pardavimų užsakymų, kad mokėjimo"
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,Vadovas
@@ -3232,6 +3235,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Debeto reikalingas
 DocType: Clinical Procedure,Inpatient Record,Stacionarus įrašas
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Laiko apskaitos žiniaraščiai padėti sekti laiko, išlaidų ir sąskaitų už veiklose padaryti jūsų komanda"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Tiekėjas&gt; Tiekėjo tipas
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Pirkimo Kainų sąrašas
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Sandorio data
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Tiekimo rezultatų kortelės kintamųjų šablonai.
@@ -3275,7 +3279,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Valiutų Pelnas / nuostolis
 DocType: Opportunity,Lost Reason,Pamiršote Priežastis
 DocType: Amazon MWS Settings,Enable Amazon,Įgalinti &quot;Amazon&quot;
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Eilutė # {0}: sąskaita {1} nepriklauso bendrovei {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Eilutė # {0}: sąskaita {1} nepriklauso bendrovei {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Nepavyko rasti DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Naujas adresas
 DocType: Quality Inspection,Sample Size,imties dydis
@@ -3387,7 +3391,7 @@
 DocType: Water Analysis,Origin,Kilmė
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Šis dokumentas yra virš ribos iki {0} {1} už prekę {4}. Darai dar {3} prieš patį {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Prašome nustatyti pasikartojančių po taupymo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Pasirinkite Keisti suma sąskaita
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Pasirinkite Keisti suma sąskaita
 DocType: Purchase Invoice,Price List Currency,Kainų sąrašas Valiuta
 DocType: Naming Series,User must always select,Vartotojas visada turi pasirinkti
 DocType: Stock Settings,Allow Negative Stock,Leiskite Neigiama Stock
@@ -3429,7 +3433,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Ar tikrai norite atšaukti šį susitikimą?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Viešbučių kainų nustatymo paketas
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,pardavimų vamzdynų
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Prašome nustatyti numatytąją sąskaitą užmokesčių Component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Prašome nustatyti numatytąją sąskaitą užmokesčių Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Reikalinga Apie
 DocType: Rename Tool,File to Rename,Failo pervadinti
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Prašome pasirinkti BOM už prekę eilutėje {0}
@@ -3450,7 +3454,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kaina įsigytų daiktų
 DocType: Employee Separation,Employee Separation Template,Darbuotojų atskyrimo šablonas
 DocType: Selling Settings,Sales Order Required,Pardavimų užsakymų Reikalinga
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Tapk pardavėju
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Tapk pardavėju
 DocType: Purchase Invoice,Credit To,Kreditas
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Aktyvios laidai / Klientai
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,"Palikite tuščią, kad galėtumėte naudoti standartinį pristatymo formos įrašą"
@@ -3492,7 +3496,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Padaryti mokesčių šabloną
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,vartotojas Forumas
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Žaliavos negali būti tuščias.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Eilutė # {0} (mokėjimo lentelė): suma turi būti neigiama
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Eilutė # {0} (mokėjimo lentelė): suma turi būti neigiama
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Nepavyko atnaujinti atsargų, sąskaitos faktūros yra lašas laivybos elementą."
 DocType: Contract,Fulfilment Status,Įvykdymo būsena
 DocType: Lab Test Sample,Lab Test Sample,Laboratorinio bandinio pavyzdys
@@ -3632,7 +3636,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Dokumento data
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Fee Įrašai Sukurta - {0}
 DocType: Asset Category Account,Asset Category Account,Turto Kategorija paskyra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Eilutė # {0} (mokėjimo lentelė): suma turi būti teigiama
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Eilutė # {0} (mokėjimo lentelė): suma turi būti teigiama
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Negali gaminti daugiau Elementą {0} nei pardavimų užsakymų kiekio {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Pasirinkite atributo reikšmes
 DocType: Purchase Invoice,Reason For Issuing document,Paaiškinimas Dokumento išdavimas
@@ -3687,7 +3691,7 @@
 DocType: Purchase Receipt,Time at which materials were received,"Laikas, per kurį buvo gauta medžiagos"
 DocType: Products Settings,Products per Page,Produktai puslapyje
 DocType: Stock Ledger Entry,Outgoing Rate,Siunčiami Balsuok
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,arba
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,arba
 DocType: Sales Order,Billing Status,atsiskaitymo būsena
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Pranešti apie problemą
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Komunalinė sąnaudos
@@ -3715,7 +3719,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Darbuotojų atleidimo nuo mokesčio deklaracija
 DocType: Payment Entry,Cheque/Reference Date,Čekis / Nuoroda data
 DocType: Purchase Invoice,Total Taxes and Charges,Iš viso Mokesčiai ir rinkliavos
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Galima naudoti Data įvedama kaip ankstesnė data
 DocType: Employee,Emergency Contact,Avarinės pagalbos kontaktinė
 DocType: Bank Reconciliation Detail,Payment Entry,Mokėjimo įrašas
 ,sales-browser,pardavimo-naršyklė
@@ -3762,6 +3765,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Ar yra grąža (kredito ataskaita)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Pradėti darbą
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Turto serijos numeris yra privalomas {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nustatymų seriją galite nustatyti {0} naudodami sąranką&gt; Nustatymai&gt; pavadinimo serija
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Neįgaliųjų šablonas turi būti ne numatytasis šablonas
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Eilutėje {0}: įveskite numatytą kiekį
 DocType: Account,Income Account,pajamų sąskaita
@@ -3775,6 +3779,7 @@
 DocType: Loyalty Program,Help Section,Pagalbos skyrius
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Ankstesnis
 DocType: Appraisal Goal,Key Responsibility Area,Pagrindinė atsakomybė Plotas
+DocType: Delivery Trip,Distance UOM,Atstumas UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Studentų Partijos padėti jums sekti lankomumo, vertinimai ir rinkliavos studentams"
 DocType: Payment Entry,Total Allocated Amount,Visos skirtos sumos
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Nustatykite numatytąjį inventoriaus sąskaitos už amžiną inventoriaus
@@ -3816,7 +3821,7 @@
 DocType: Item Supplier,Item Supplier,Prekė Tiekėjas
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Prašome įvesti Prekės kodas gauti partiją nėra
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Prašome pasirinkti vertę už {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Neleidžiama perkelti elementų
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Neleidžiama perkelti elementų
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Visi adresai.
 DocType: Company,Stock Settings,Akcijų Nustatymai
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sujungimas yra galimas tik tada, jei šie savybės yra tos pačios tiek įrašų. Ar grupė, Šaknų tipas, Įmonės"
@@ -4101,7 +4106,7 @@
 DocType: Patient,Personal and Social History,Asmeninė ir socialinė istorija
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Naudotojas {0} sukūrė
 DocType: Fee Schedule,Fee Breakup for each student,Mokesčio perviršis kiekvienam studentui
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Iš viso avansas ({0}) prieš ordino {1} negali būti didesnis nei IŠ VISO ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Iš viso avansas ({0}) prieš ordino {1} negali būti didesnis nei IŠ VISO ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Pasirinkite Mėnesio pasiskirstymas į netolygiai paskirstyti tikslus visoje mėnesius.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Keisti kodą
 DocType: Purchase Invoice Item,Valuation Rate,Vertinimo Balsuok
@@ -4110,7 +4115,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Pasinaudojo ITC Cess
 ,Student Monthly Attendance Sheet,Studentų Mėnesio Lankomumas lapas
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Pristatymo taisyklė taikoma tik Pardavimui
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Nusidėvėjimo eilutė {0}: kita Nusidėvėjimo data negali būti prieš Pirkimo datą
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Nusidėvėjimo eilutė {0}: kita Nusidėvėjimo data negali būti prieš Pirkimo datą
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekto pradžia
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,iki
 DocType: Rename Tool,Rename Log,pervadinti Prisijungti
@@ -4128,12 +4133,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Kaip dažnai reikia atnaujinti projektą ir įmonę remiantis pardavimo sandoriais.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Baigia galioti
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Pridėti Studentai
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Prašome ištrinti Darbuotoją <a href=""#Form/Employee/{0}"">{0}</a> \, kad atšauktumėte šį dokumentą"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Prašome pasirinkti {0}
 DocType: C-Form,C-Form No,C-formos Nėra
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Atstumas
+DocType: Delivery Stop,Distance,Atstumas
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Nurodykite savo produktus ar paslaugas, kurias perkate ar parduodate."
 DocType: Water Analysis,Storage Temperature,Laikymo temperatūra
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4160,7 +4163,7 @@
 DocType: Homepage,Company Description for website homepage,Įmonės aprašymas interneto svetainės pagrindiniame puslapyje
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Dėl klientų patogumui, šie kodai gali būti naudojami spausdinimo formatus, pavyzdžiui, sąskaitose ir važtaraščiuose"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Vardas
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Nepavyko gauti informacijos apie {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Nepavyko gauti informacijos apie {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Atidarymo leidinys
 DocType: Contract,Fulfilment Terms,Įvykdymo sąlygos
 DocType: Sales Invoice,Time Sheet List,Laikas lapas sąrašas
@@ -4343,7 +4346,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Pasirinkite studentai rankiniu veikla grindžiamo grupės
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Pasirinkite studentai rankiniu veikla grindžiamo grupės
 DocType: Journal Entry,User Remark,vartotojas Pastaba
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Maršrutų optimizavimas.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Maršrutų optimizavimas.
 DocType: Travel Itinerary,Non Diary,Ne dienoraštis
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Negalite sukurti išsaugojimo premijos už likusius Darbuotojai
 DocType: Lead,Market Segment,Rinkos segmentas
@@ -4374,7 +4377,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Lojalumo programa
 DocType: Student Guardian,Father,Fėvas
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Palaikymo bilietai
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,"""Atnaujinti sandėlį"" negali būti patikrintas dėl ilgalaikio turto pardavimo."
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,"""Atnaujinti sandėlį"" negali būti patikrintas dėl ilgalaikio turto pardavimo."
 DocType: Bank Reconciliation,Bank Reconciliation,bankas suderinimas
 DocType: Attendance,On Leave,atostogose
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Gaukite atnaujinimus
@@ -4419,7 +4422,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serijos Nr paketais
 DocType: Warranty Claim,From Company,iš Company
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Suma balais vertinimo kriterijai turi būti {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Prašome nustatyti Taškų nuvertinimai Užsakytas
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Prašome nustatyti Taškų nuvertinimai Užsakytas
 DocType: Supplier Scorecard Period,Calculations,Skaičiavimai
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Vertė arba Kiekis
 DocType: Payment Terms Template,Payment Terms,Mokėjimo sąlygos
@@ -4439,7 +4442,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Nuolaida (%) nuo Kainų sąrašas norma atsargos
 DocType: Healthcare Service Unit Type,Rate / UOM,Reitingas / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Visi Sandėliai
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Nebuvo nustatyta {0} &quot;Inter&quot; kompanijos sandoriams.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Nebuvo nustatyta {0} &quot;Inter&quot; kompanijos sandoriams.
 DocType: Travel Itinerary,Rented Car,Išnuomotas automobilis
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Apie jūsų įmonę
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Kreditas sąskaitos turi būti balansas sąskaitos
@@ -4541,6 +4544,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Augalų analizės kriterijai
 DocType: Cheque Print Template,Cheque Height,Komunalinės Ūgis
 DocType: Supplier,Supplier Details,Tiekėjo informacija
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Nustatykite numeriravimo serijas lankytojams per sąranką&gt; numeravimo serija
 DocType: Setup Progress,Setup Progress,&quot;Progress setup&quot;
 DocType: Expense Claim,Approval Status,patvirtinimo būsena
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Nuo vertė turi būti mažesnė nei vertės eilės {0}
@@ -4634,7 +4638,6 @@
 DocType: Travel Request,Fully Sponsored,Visiškai remiama
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Atvirkštinis žurnalo įrašas
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Klientas {0} sukurtas.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prašome nustatyti darbuotojų pavadinimo sistemą žmogiškųjų išteklių&gt; HR nustatymai
 DocType: Stock Settings,Limit Percent,riba procentais
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Šiuo metu nėra nei viename sandėlyje.
 ,Payment Period Based On Invoice Date,Mokėjimo periodas remiantis sąskaitos faktūros išrašymo data
@@ -4693,7 +4696,7 @@
 DocType: BOM Explosion Item,Source Warehouse,šaltinis sandėlis
 DocType: Installation Note,Installation Date,Įrengimas data
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Dalinkis &quot;Ledger&quot;
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Eilutės # {0}: Turto {1} nepriklauso bendrovei {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Eilutės # {0}: Turto {1} nepriklauso bendrovei {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Sukurta pardavimo sąskaitą {0}
 DocType: Employee,Confirmation Date,Patvirtinimas data
 DocType: Inpatient Occupancy,Check Out,Patikrinkite
@@ -4713,6 +4716,7 @@
 DocType: Production Plan,Sales Orders Detail,Pardavimų užsakymų detalės
 DocType: Bin,Requested Quantity,prašomam kiekiui
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Prašome nustatyti &quot;Instruktorių pavadinimo&quot; sistemą &quot;Education&quot;&gt; &quot;Education Settings&quot;
 DocType: Patient,Marital Status,Šeimyninė padėtis
 DocType: Stock Settings,Auto Material Request,Auto Medžiaga Prašymas
 DocType: Woocommerce Settings,API consumer secret,API vartotojo paslaptis
@@ -4765,7 +4769,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Pasirinkite dienas
 DocType: Academic Term,Term Name,terminas Vardas
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Kreditas ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Kurti atlyginimus ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Kurti atlyginimus ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Jūs negalite redaguoti šakninis mazgas.
 DocType: Buying Settings,Purchase Order Required,Pirkimui užsakyti Reikalinga
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Laikmatis
@@ -4803,7 +4807,7 @@
 DocType: Account,Rate at which this tax is applied,"Norma, kuri yra taikoma ši mokesčių"
 DocType: Cash Flow Mapper,Section Name,Skyriaus pavadinimas
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Pertvarkyti Kiekis
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Nusidėvėjimo eilutė {0}: numatoma vertė po naudingo tarnavimo laiko turi būti didesnė arba lygi {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Nusidėvėjimo eilutė {0}: numatoma vertė po naudingo tarnavimo laiko turi būti didesnė arba lygi {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Dabartinis darbas Angos
 DocType: Company,Stock Adjustment Account,Vertybinių popierių reguliavimas paskyra
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Nusirašinėti
@@ -4850,7 +4854,7 @@
 DocType: Program Enrollment,School House,Mokykla Namas
 DocType: Serial No,Out of AMC,Iš AMC
 DocType: Opportunity,Opportunity Amount,Galimybių suma
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Taškų nuvertinimai REZERVUOTA negali būti didesnis nei bendras skaičius nuvertinimai
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Taškų nuvertinimai REZERVUOTA negali būti didesnis nei bendras skaičius nuvertinimai
 DocType: Purchase Order,Order Confirmation Date,Užsakymo patvirtinimo data
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Padaryti Priežiūros vizitas
@@ -4891,7 +4895,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Partija:
 DocType: Volunteer,Afternoon,Popietė
 DocType: Loyalty Program,Loyalty Program Help,Lojalumo programos pagalba
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} &quot;{1}&quot; yra išjungta
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} &quot;{1}&quot; yra išjungta
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nustatyti kaip Open
 DocType: Cheque Print Template,Scanned Cheque,Nuskaityti čekis
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,"Siųsti automatinius laiškus Kontaktai, kaip pateikti sandorių."
@@ -4904,7 +4908,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Punktas ir garantijos informacija
 DocType: Chapter,Chapter Members,Skyrius nariai
 DocType: Sales Team,Contribution (%),Indėlis (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Pastaba: mokėjimo įrašas nebus sukurtos nuo &quot;pinigais arba banko sąskaitos&quot; nebuvo nurodyta
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Pastaba: mokėjimo įrašas nebus sukurtos nuo &quot;pinigais arba banko sąskaitos&quot; nebuvo nurodyta
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Projektas {0} jau egzistuoja
 DocType: Clinical Procedure,Nursing User,Slaugos naudotojas
 DocType: Employee Benefit Application,Payroll Period,Darbo užmokesčio laikotarpis
@@ -4912,6 +4916,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Serijos numeris {0} nepriklauso paketui {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,atsakomybė
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Pasibaigė šios citatos galiojimo laikotarpis.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Prašome ištrinti Darbuotoją <a href=""#Form/Employee/{0}"">{0}</a> \, kad atšauktumėte šį dokumentą"
 DocType: Expense Claim Account,Expense Claim Account,Kompensuojamos Pretenzija paskyra
 DocType: Account,Capital Work in Progress,Sėkmingas kapitalas
 DocType: Accounts Settings,Allow Stale Exchange Rates,Leisti nejudančius valiutų keitimo kursus
@@ -4993,7 +4999,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,klausimas Medžiaga
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Susisiekite Shopify su ERPNext
 DocType: Material Request Item,For Warehouse,Sandėliavimo
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Pristatymo pastabos {0} atnaujintos
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Pristatymo pastabos {0} atnaujintos
 DocType: Employee,Offer Date,Pasiūlymo data
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,citatos
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,"Jūs esate neprisijungę. Jūs negalite įkelti, kol turite tinklą."
@@ -5044,7 +5050,7 @@
 DocType: Shipping Rule,Calculate Based On,Apskaičiuoti remiantis
 DocType: Contract,Unfulfilled,Nepakankamai
 DocType: Delivery Note Item,From Warehouse,iš sandėlio
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Nė vienas iš minėtų kriterijų darbuotojų nėra
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Nė vienas iš minėtų kriterijų darbuotojų nėra
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,"Neturite prekių su Bill iš medžiagų, Gamyba"
 DocType: Shopify Settings,Default Customer,Numatytasis klientas
 DocType: Sales Stage,Stage Name,Sceninis vardas
@@ -5087,7 +5093,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,"Mokesčių suma, nuolaidos suma"
 DocType: Patient,Inpatient Status,Stacionarus būklė
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Dienos darbo santrauka Nustatymai
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Pasirinktame kainoraštyje turėtų būti patikrinti pirkimo ir pardavimo laukai.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Pasirinktame kainoraštyje turėtų būti patikrinti pirkimo ir pardavimo laukai.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Prašome įvesti reqd pagal datą
 DocType: Payment Entry,Internal Transfer,vidaus perkėlimo
 DocType: Asset Maintenance,Maintenance Tasks,Techninės priežiūros užduotys
@@ -5124,7 +5130,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Grupuoti pagal
 DocType: Guardian,Interests,Pomėgiai
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Įjungti / išjungti valiutas.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Nepavyko pateikti kai kurių atlyginimų užmokesčių
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Nepavyko pateikti kai kurių atlyginimų užmokesčių
 DocType: Exchange Rate Revaluation,Get Entries,Gauti užrašus
 DocType: Production Plan,Get Material Request,Gauk Material užklausa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,pašto išlaidas
@@ -5211,7 +5217,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Kompensuojamos sąskaitos yra privalomas už prekę {0}
 DocType: BOM,Website Description,Interneto svetainė Aprašymas
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Grynasis pokytis nuosavo kapitalo
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Prašome anuliuoti sąskaitą-faktūrą {0} pirmas
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Prašome anuliuoti sąskaitą-faktūrą {0} pirmas
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Neleistina. Prašome išjungti paslaugų bloko tipą
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Pašto adresas turi būti unikalus, jau egzistuoja {0}"
 DocType: Serial No,AMC Expiry Date,AMC Galiojimo data
@@ -5251,7 +5257,7 @@
 DocType: Hotel Room,Hotel Room,Viešbučio kambarys
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Sąskaita {0} nėra siejamas su kompanijos {1}
 DocType: Leave Type,Rounding,Apvalinimas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Serijiniai numeriai {0} eilės nesutampa su Važtaraštis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Serijiniai numeriai {0} eilės nesutampa su Važtaraštis
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Išparduota suma (iš anksto įvertinta)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Tada kainos nustatymo taisyklės yra išfiltruojamos pagal kliento, klientų grupės, teritorijos, tiekėjo, tiekėjų grupės, kampanijos, pardavimų partnerio ir tt"
 DocType: Student,Guardian Details,&quot;guardian&quot; informacija
@@ -5306,7 +5312,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Sandėlių reikalingas akcijų punkte {0}
 DocType: Leave Allocation,Unused leaves,nepanaudoti lapai
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Atlikti grąžinimo įmoką
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Visi departamentai
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Visi departamentai
 DocType: Healthcare Service Unit,Vacant,Laisva
 DocType: Patient,Alcohol Past Use,Alkoholio praeities vartojimas
 DocType: Fertilizer Content,Fertilizer Content,Trąšų turinys
@@ -5317,7 +5323,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Darbo užsakymas {0} turi būti atšauktas prieš atšaukiant šį pardavimo užsakymą
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Paduok sprogo BOM (įskaitant mazgus)
 DocType: Authorization Rule,Applicable To (Employee),Taikoma (Darbuotojų)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Terminas yra privalomi
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Terminas yra privalomi
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Taškinis atributas {0} negali būti 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Naudos tipas ir suma
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Rezervuoti kambariai
@@ -5465,7 +5471,7 @@
 DocType: Purchase Invoice Item,Total Weight,Bendras svoris
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Komisija dėl pardavimo
 DocType: Job Offer Term,Value / Description,Vertė / Aprašymas
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Eilutės # {0}: Turto {1} negali būti pateikti, tai jau {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Eilutės # {0}: Turto {1} negali būti pateikti, tai jau {2}"
 DocType: Tax Rule,Billing Country,atsiskaitymo Šalis
 DocType: Purchase Order Item,Expected Delivery Date,Numatomas pristatymo datos
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restorano užsakymo įrašas
@@ -5504,12 +5510,13 @@
 DocType: Maintenance Visit,Breakdown,Palaužti
 DocType: Travel Itinerary,Vegetarian,Vegetaras
 DocType: Patient Encounter,Encounter Date,Susitikimo data
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Sąskaita: {0} su valiutos: {1} negalima pasirinkti
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Sąskaita: {0} su valiutos: {1} negalima pasirinkti
 DocType: Bank Statement Transaction Settings Item,Bank Data,Banko duomenys
 DocType: Purchase Receipt Item,Sample Quantity,Mėginio kiekis
 DocType: Bank Guarantee,Name of Beneficiary,Gavėjo vardas ir pavardė
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Atnaujinti BOM išlaidas automatiškai per planuotoją, remiantis naujausiu žaliavų įvertinimo / kainų sąrašo norma / paskutine pirkimo norma."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Tiekėjas&gt; Tiekėjo grupė
 DocType: Bank Reconciliation Detail,Cheque Date,čekis data
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Sąskaita {0}: Tėvų sąskaitą {1} nepriklauso įmonės: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,"Sėkmingai ištrinta visus sandorius, susijusius su šios bendrovės!"
@@ -5537,7 +5544,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Vaiko mazgai gali būti kuriamos tik pagal &quot;grupė&quot; tipo mazgų
 DocType: Attendance Request,Half Day Date,Pusė dienos data
 DocType: Academic Year,Academic Year Name,Akademiniai metai Vardas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} neleidžiama prekiauti {1}. Prašome pakeisti įmonę.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} neleidžiama prekiauti {1}. Prašome pakeisti įmonę.
 DocType: Sales Partner,Contact Desc,Kontaktinė Aprašymo
 DocType: Email Digest,Send regular summary reports via Email.,Siųsti reguliarius suvestines ataskaitas elektroniniu paštu.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Prašome nustatyti numatytąją sąskaitą išlaidų teiginio tipas {0}
@@ -5570,7 +5577,7 @@
 DocType: Hotel Room,Hotel Manager,Viešbučių vadybininkas
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Nustatyti Mokesčių taisyklė krepšelį
 DocType: Purchase Invoice,Taxes and Charges Added,Mokesčiai ir rinkliavos Pridėta
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Nusidėvėjimo eilutė {0}: tolimesnė nusidėvėjimo data negali būti ankstesnė. Galima naudoti data
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Nusidėvėjimo eilutė {0}: tolimesnė nusidėvėjimo data negali būti ankstesnė. Galima naudoti data
 ,Sales Funnel,pardavimų piltuvas
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Santrumpa yra privaloma
 DocType: Project,Task Progress,užduotis pažanga
@@ -5584,7 +5591,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Visi klientų grupėms
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,sukauptas Mėnesio
 DocType: Attendance Request,On Duty,Vykdantis pareigas
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} yra privalomas. Gal Valiutų įrašas nėra sukurtas {1} ir {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} yra privalomas. Gal Valiutų įrašas nėra sukurtas {1} ir {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Personalo planas {0} jau egzistuoja paskyrimui {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Mokesčių šablonas yra privalomi.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Sąskaita {0}: Tėvų sąskaitą {1} neegzistuoja
@@ -5664,11 +5671,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Atleast vienas sandėlis yra privalomas
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Konfigūruoti elemento laukus, pvz., UOM, elementų grupę, aprašymą ir valandų skaičių."
 DocType: Certification Application,Certification Status,Sertifikavimo būsena
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Marketplace
 DocType: Travel Itinerary,Travel Advance Required,Reikalinga kelionė
 DocType: Subscriber,Subscriber Name,Prenumeratos pavadinimas
 DocType: Serial No,Out of Warranty,Iš Garantija
-DocType: Cashier Closing,Cashier-closing-,Kasos uždarymas-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Įrašytas duomenų tipas
 DocType: BOM Update Tool,Replace,pakeisti
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Nėra prekių nerasta.
@@ -5756,7 +5762,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Sukuriami numatyti mokesčių šablonai pardavimui ir pirkimui.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Vertinimo rezultatų įrašas {0} jau egzistuoja.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Pavyzdys: ABCD. #####. Jei serijos yra nustatytos ir partijos Nr nėra minimi sandoriuose, tada automatinis partijos numeris bus sukurtas pagal šią seriją. Jei visada norite aiškiai paminėti šios prekės partiją, palikite tuščią. Pastaba: šis nustatymas bus pirmenybė prieš vardų serijos prefiksą, esantį atsargų nustatymuose."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Nustatykite numeriravimo serijas lankytojams per sąranką&gt; numeravimo serija
 DocType: BOM,Materials Required (Exploded),"Medžiagų, reikalingų (Išpjovinė)"
 DocType: Contract,Party User,Partijos vartotojas
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Prašome nustatyti Įmonės filtruoti tuščias, jei Grupuoti pagal tai &quot;kompanija&quot;"
@@ -5959,7 +5964,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,opp Grafas
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,"Turi būti nustatyta tiek bandomojo laikotarpio pradžios data, tiek bandomojo laikotarpio pabaigos data"
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Vidutinė norma
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Bendra mokėjimo suma mokėjimo grafike turi būti lygi Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Bendra mokėjimo suma mokėjimo grafike turi būti lygi Grand / Rounded Total
 DocType: Subscription Plan Detail,Plan,Suplanuoti
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Banko pažyma likutis vienam General Ledger
 DocType: Job Applicant,Applicant Name,Vardas pareiškėjas
@@ -6028,7 +6033,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,"Muilas, skalbimo"
 DocType: BOM,Show Items,Rodyti prekių
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Nuo laikas negali būti didesnis nei laiko.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Ar norite pranešti visiems klientams elektroniniu paštu?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Ar norite pranešti visiems klientams elektroniniu paštu?
 DocType: Subscription Plan,Billing Interval,Atsiskaitymo intervalas
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Filmavimo ir vaizdo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Užsakytas
@@ -6037,9 +6042,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Eilutė {0}: {1} turi būti didesnė už 0
 DocType: Assessment Criteria,Assessment Criteria Group,Vertinimo kriterijai grupė
 DocType: Healthcare Settings,Patient Name By,Paciento vardas
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},&quot;Accrual Journal&quot; įrašas už atlyginimus nuo {0} iki {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},&quot;Accrual Journal&quot; įrašas už atlyginimus nuo {0} iki {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Įgalinti atidėtąsias pajamas
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Atidarymo Sukauptas nusidėvėjimas turi būti mažesnis arba lygus {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Atidarymo Sukauptas nusidėvėjimas turi būti mažesnis arba lygus {0}
 DocType: Warehouse,Warehouse Name,Sandėlių Vardas
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Faktinė pradžios data turi būti mažesnė už faktinę pabaigos datą
 DocType: Naming Series,Select Transaction,Pasirinkite Sandorio
@@ -6190,7 +6195,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Rekomenduojama Pertvarkyti lygis
 DocType: Salary Detail,Salary Detail,Pajamos detalės
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Prašome pasirinkti {0} pirmas
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Pridėta {0} naudotojų
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Pridėta {0} naudotojų
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","Kalbant apie daugiapakopę programą, klientai bus automatiškai priskirti atitinkamam lygmeniui, atsižvelgiant į jų išleidimą"
 DocType: Appointment Type,Physician,Gydytojas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Serija {0} punkto {1} yra pasibaigęs.
@@ -6335,7 +6340,7 @@
 DocType: Asset,Custodian,Saugotojas
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Point-of-Sale profilis
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} turėtų būti vertė nuo 0 iki 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Mokėjimas {0} nuo {1} iki {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Mokėjimas {0} nuo {1} iki {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,neužtikrintas paskolas
 DocType: Cost Center,Cost Center Name,Kainuos centras vardas
 DocType: Student,B+,B+
@@ -6367,6 +6372,7 @@
 DocType: Employee,Date of Issue,Išleidimo data
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Kaip už pirkimo parametrus, jei pirkimas Čekio Reikalinga == &quot;Taip&quot;, tada sukurti sąskaitą-faktūrą, vartotojo pirmiausia reikia sukurti pirkimo kvitą už prekę {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Eilutės # {0}: Nustatykite Tiekėjas už prekę {1}
+DocType: Global Defaults,Default Distance Unit,Numatytasis atstumas vienetas
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Eilutės {0}: valandos vertė turi būti didesnė už nulį.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Interneto svetainė Paveikslėlis {0} pridedamas prie punkto {1} negali būti rastas
 DocType: Issue,Content Type,turinio tipas
@@ -6422,7 +6428,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Debeto sąskaitą turi būti balansas sąskaitos
 DocType: Asset,Naming Series,Pavadinimų serija
 DocType: Vital Signs,Coated,Padengtas
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Eilutė {0}: numatoma vertė po naudingo tarnavimo laiko turi būti mažesnė už bendrąją pirkimo sumą
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Eilutė {0}: numatoma vertė po naudingo tarnavimo laiko turi būti mažesnė už bendrąją pirkimo sumą
 DocType: GoCardless Settings,GoCardless Settings,&quot;GoCardless&quot; nustatymai
 DocType: Leave Block List,Leave Block List Name,Palikite blokuojamų sąrašą pavadinimas
 DocType: Certified Consultant,Certification Validity,Sertifikavimo galiojimas
@@ -6491,6 +6497,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Banko antraštė
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Peržiūrėti laboratorijos bandymus
 DocType: Hub Users,Hub Users,&quot;Hub&quot; vartotojai
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klientas&gt; Klientų grupė&gt; Teritorija
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,priežiūra data
 DocType: Purchase Invoice Item,Rejected Serial No,Atmesta Serijos Nr
@@ -6505,7 +6512,7 @@
 DocType: SG Creation Tool Course,Max Strength,Maksimali jėga
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Iš anksto įdiegti
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Kliento pasirinkta pristatymo pastaba ()
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Kliento pasirinkta pristatymo pastaba ()
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Darbuotojas {0} neturi didžiausios naudos sumos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Pasirinkite elementus pagal pristatymo datą
 DocType: Grant Application,Has any past Grant Record,Turi bet kokį ankstesnį &quot;Grant Record&quot;
@@ -6533,7 +6540,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Viešbučių kambario rezervacija
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Klientų aptarnavimas
 DocType: BOM,Thumbnail,Miniatiūra
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Nerasta jokių kontaktų su el. Pašto ID.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Nerasta jokių kontaktų su el. Pašto ID.
 DocType: Item Customer Detail,Item Customer Detail,Prekė Klientų detalės
 DocType: Notification Control,Prompt for Email on Submission of,Klausti Email pateikus
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Maksimalus darbuotojo naudos dydis {0} viršija {1}
@@ -6793,7 +6800,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,"Negalima paslėptas į grupę, nes sąskaitos tipas yra pasirinktas."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} buvo pakeistas. Prašome atnaujinti.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop vartotojus nuo priėmimo prašymų įstoti į šių dienų.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Prekės kodas&gt; Prekės grupė&gt; Gamintojas
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Jei neribotas lojalumo taškų galiojimo laikas, laikymo galiojimo laikas tuščias arba 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Techninės priežiūros komandos nariai
 DocType: Loyalty Point Entry,Purchase Amount,pirkimo suma
@@ -6801,7 +6807,7 @@
 											to fullfill Sales Order {2}","Negalima pateikti serijos Nr {0} elemento {1}, nes jis yra rezervuotas \ užpildyti Pardavimų užsakymą {2}"
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Tiekėjas Citata {0} sukūrė
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Pabaiga metai bus ne anksčiau pradžios metus
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Pabaiga metai bus ne anksčiau pradžios metus
 DocType: Employee Benefit Application,Employee Benefits,Išmokos darbuotojams
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Supakuotas kiekis turi vienodas kiekis už prekę {0} iš eilės {1}
 DocType: Work Order,Manufactured Qty,pagaminta Kiekis
@@ -6817,6 +6823,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Pasirinkite partijų numeriai
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Vekseliai iškelti į klientams.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prašome nustatyti darbuotojų pavadinimo sistemą žmogiškųjų išteklių&gt; HR nustatymai
 DocType: Healthcare Settings,Invoice Appointments Automatically,Sąskaitų paskirties paskyrimai automatiškai
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projektų ID
 DocType: Salary Component,Variable Based On Taxable Salary,Kintamasis pagal apmokestinamąją algą
@@ -6865,7 +6872,7 @@
 DocType: POS Profile,Account for Change Amount,Sąskaita už pokyčio sumą
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Prisijungimas prie &quot;QuickBooks&quot;
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Bendras padidėjimas / nuostolis
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Neteisinga bendrovė &quot;Inter&quot; kompanijos sąskaitai faktūrai.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Neteisinga bendrovė &quot;Inter&quot; kompanijos sąskaitai faktūrai.
 DocType: Purchase Invoice,input service,įvesties paslauga
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Eilutės {0}: Šalis / Sąskaita nesutampa su {1} / {2} į {3} {4}
 DocType: Employee Promotion,Employee Promotion,Darbuotojų skatinimas
@@ -6995,7 +7002,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Gyvenamasis sklypas
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Google Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Krepšelis tuščias
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Prašome nustatyti &quot;Instruktorių pavadinimo&quot; sistemą &quot;Education&quot;&gt; &quot;Education Settings&quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Prekė {0} neturi serijos numerio. Tik serilialized items \ gali turėti pristatymą pagal serijos numerį
 DocType: Vehicle,Model,Modelis
@@ -7025,7 +7031,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Nieko keisti
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Prašome pasirinkti CSV failą
 DocType: Holiday List,Total Holidays,Bendras atostogos
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Trūksta el. Pašto šablono siuntimui. Nustatykite vieną &quot;Delivery Settings&quot;.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Trūksta el. Pašto šablono siuntimui. Nustatykite vieną &quot;Delivery Settings&quot;.
 DocType: Student Leave Application,Mark as Present,Žymėti kaip dabartis
 DocType: Supplier Scorecard,Indicator Color,Rodiklio spalva
 DocType: Purchase Order,To Receive and Bill,Gauti ir Bill
@@ -7034,7 +7040,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Pasirinkite serijos numerį
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,dizaineris
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Terminai ir sąlygos Šablono
-DocType: Serial No,Delivery Details,Pristatymo informacija
+DocType: Delivery Trip,Delivery Details,Pristatymo informacija
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Kaina centras reikalingas eilės {0} mokesčių lentelė tipo {1}
 DocType: Program,Program Code,programos kodas
 DocType: Terms and Conditions,Terms and Conditions Help,Terminai ir sąlygos Pagalba
@@ -7058,7 +7064,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Švinas Laikas dienas
 DocType: Cash Flow Mapping,Is Income Tax Expense,Yra pajamų mokesčio sąnaudos
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Jūsų užsakymas pristatytas!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Eilutės # {0}: Siunčiamos data turi būti tokia pati kaip pirkimo datos {1} Turto {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Eilutės # {0}: Siunčiamos data turi būti tokia pati kaip pirkimo datos {1} Turto {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Pažymėkite, jei tas studentas gyvena institute bendrabutyje."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Prašome įvesti pardavimų užsakymų pirmiau pateiktoje lentelėje
 ,Stock Summary,akcijų santrauka
diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv
index 6c9f152..14ec0db 100644
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Perioda nosaukums
 DocType: Employee,Salary Mode,Alga Mode
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Reģistrēties
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Reģistrēties
 DocType: Patient,Divorced,Šķīries
 DocType: Support Settings,Post Route Key,Pasta maršruta atslēga
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Atļaut punkts jāpievieno vairākas reizes darījumā
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Jauns valūtas kurss
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Valūta ir nepieciešama Cenrāža {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Tiks aprēķināts darījumā.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Piegādātājs&gt; Piegādātāja tips
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Klientu Kontakti
 DocType: Patient Appointment,Check availability,Pārbaudīt pieejamību
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Rādīt open
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Series Atjaunots Veiksmīgi
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,izrakstīšanās
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} rindā {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} rindā {1}
 DocType: Asset Finance Book,Depreciation Start Date,Nolietojuma sākuma datums
 DocType: Pricing Rule,Apply On,Piesakies On
 DocType: Item Price,Multiple Item prices.,Vairāki Izstrādājumu cenas.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Lab prescription
 ,Delay Days,Kavēšanās dienas
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Servisa izdevumu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Sērijas numurs: {0} jau ir atsauce pārdošanas rēķina: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Sērijas numurs: {0} jau ir atsauce pārdošanas rēķina: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Pavadzīme
 DocType: Purchase Invoice Item,Item Weight Details,Vienuma svara dati
 DocType: Asset Maintenance Log,Periodicity,Periodiskums
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Grāmatvedis
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Pārdošanas cenrādis
 DocType: Patient,Tobacco Current Use,Tabakas patēriņš
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Sākuma datums un beigu datums pārklājas ar darba karti <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Pārdošanas likme
 DocType: Cost Center,Stock User,Stock User
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,saistīts
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Apmeklējums datums nevar būt mazāks par darbinieka pievienojas datuma
 DocType: Grading Scale,Grading Scale Name,Šķirošana Scale Name
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Pievienot lietotājus Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Pievienot lietotājus Marketplace
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Tas ir root kontu un to nevar rediģēt.
 DocType: Sales Invoice,Company Address,Uzņēmuma adrese
 DocType: BOM,Operations,Operācijas
@@ -322,7 +322,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Qty
 DocType: Production Plan,Material Request Detail,Materiāla pieprasījums detalizēti
 DocType: Selling Settings,Default Quotation Validity Days,Nokotināšanas cesijas derīguma dienas
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Lai iekļautu nodokli rindā {0} vienības likmes, nodokļi rindās {1} ir jāiekļauj arī"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Lai iekļautu nodokli rindā {0} vienības likmes, nodokļi rindās {1} ir jāiekļauj arī"
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Payroll Entry,Validate Attendance,Apstiprināt apmeklējumu
 DocType: Sales Invoice,Change Amount,Mainīt Summa
@@ -441,7 +441,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Rindstarpas par summu vārdiem
 DocType: Vehicle,Additional Details,papildu Details
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Apraksts nav dota
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Piegādātājs&gt; Piegādātāju grupa
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Pieprasīt iegādei.
 DocType: POS Closing Voucher Details,Collected Amount,Savākto summu
 DocType: Lab Test,Submitted Date,Iesniegtais datums
@@ -486,7 +485,7 @@
 DocType: Student Admission,Student Admission,Studentu uzņemšana
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Postenis {0} ir atcelts
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Nolietojuma rinda {0}: nolietojuma sākuma datums tiek ierakstīts kā pagājis datums
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Nolietojuma rinda {0}: nolietojuma sākuma datums tiek ierakstīts kā pagājis datums
 DocType: Contract Template,Fulfilment Terms and Conditions,Izpildes noteikumi
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Materiāls Pieprasījums
 DocType: Bank Reconciliation,Update Clearance Date,Update Klīrenss Datums
@@ -543,6 +542,7 @@
 DocType: Accounts Settings,Settings for Accounts,Iestatījumi kontu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Piegādātājs Invoice Nr pastāv pirkuma rēķina {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Pārvaldīt pārdošanas persona Tree.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Nevar apstrādāt maršrutu, jo Google Maps iestatījumi ir atspējoti."
 DocType: Job Applicant,Cover Letter,Pavadvēstule
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,"Izcilas Čeki un noguldījumi, lai nodzēstu"
 DocType: Item,Synced With Hub,Sinhronizēts ar Hub
@@ -602,7 +602,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Jauna aktīva vērtība
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Ātrums, kādā Klients Valūtu pārvērsts klienta bāzes valūtā"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Protams plānošanas rīks
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Pirkuma rēķins nevar būt pret esošā aktīva {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Pirkuma rēķins nevar būt pret esošā aktīva {1}
 DocType: Crop Cycle,LInked Analysis,Ievilkta analīze
 DocType: POS Closing Voucher,POS Closing Voucher,POS slēgšanas kvīts
 DocType: Contract,Lapsed,Zaudēja
@@ -637,6 +637,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} nav uzņemts Course {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Studenta vārds:
 DocType: POS Closing Voucher Details,Difference,Atšķirība
+DocType: Delivery Settings,Delay between Delivery Stops,Kavējums starp piegādes apstādinājumiem
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Sērijas Nr {0} nepieder komplektāciju {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Šķiet, ka ir problēma ar servera GoCardless konfigurāciju. Neuztraucieties, ja neizdodas, summa tiks atmaksāta jūsu kontā."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -697,7 +698,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Daudzums un Rate
 DocType: Delivery Note,% Installed,% Uzstādīts
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,Klases / Laboratories etc kur lekcijas var tikt plānots.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Abu uzņēmumu kompāniju valūtām vajadzētu atbilst Inter uzņēmuma darījumiem.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Abu uzņēmumu kompāniju valūtām vajadzētu atbilst Inter uzņēmuma darījumiem.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Ievadiet uzņēmuma nosaukumu pirmais
 DocType: Travel Itinerary,Non-Vegetarian,Ne-veģetārietis
 DocType: Purchase Invoice,Supplier Name,Piegādātājs Name
@@ -783,7 +784,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Izīrēts no datuma
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Pietiekami Parts Build
 DocType: POS Profile User,POS Profile User,POS lietotāja profils
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Rinda {0}: ir jānosaka nolietojuma sākuma datums
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Rinda {0}: ir jānosaka nolietojuma sākuma datums
 DocType: Purchase Invoice Item,Service Start Date,Pakalpojuma sākuma datums
 DocType: Subscription Invoice,Subscription Invoice,Abonēšanas rēķins
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Direct Ienākumi
@@ -852,7 +853,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Abreviatūra jau tiek izmantots citam uzņēmumam
 DocType: Selling Settings,Default Customer Group,Default Klientu Group
 DocType: Employee,IFSC Code,IFSC kods
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Sākuma datums un beigu datums pārklājas ar darba karti <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ja atslēgt ""noapaļots Kopā"" lauks nebūs redzama nevienā darījumā"
 DocType: BOM,Operating Cost,Darbības izmaksas
 DocType: Crop,Produced Items,Ražotie vienumi
@@ -904,7 +904,7 @@
 DocType: Supplier,Prevent RFQs,Novērst RFQ
 DocType: Hub User,Hub User,Hub Lietotājs
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Veikt klientu pasūtījumu
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Algu slīdēšana iesniegta periodam no {0} līdz {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Algu slīdēšana iesniegta periodam no {0} līdz {1}
 DocType: Project Task,Project Task,Projekta uzdevums
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Pērti punkti
 ,Lead Id,Potenciālā klienta ID
@@ -1036,7 +1036,7 @@
 DocType: Fee Validity,Max number of visit,Maksimālais apmeklējuma skaits
 ,Hotel Room Occupancy,Viesnīcas istabu aizņemšana
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Kontrolsaraksts izveidots:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Lūdzu iestatītu standarta kases vai bankas kontu maksājuma veidu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Lūdzu iestatītu standarta kases vai bankas kontu maksājuma veidu {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,uzņemt
 DocType: GST Settings,GST Settings,GST iestatījumi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Valūtam jābūt tādam pašam kā Cenrādī Valūta: {0}
@@ -1090,7 +1090,7 @@
 DocType: Vehicle Log,Service Details,Detalizēta informācija par pakalpojumu
 DocType: Lab Test Template,Grouped,Sagrupēti
 DocType: Selling Settings,Delivery Note Required,Nepieciešamais Piegāde Note
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Iesniedzot algas likmes ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Iesniedzot algas likmes ...
 DocType: Bank Guarantee,Bank Guarantee Number,Bankas garantijas skaits
 DocType: Bank Guarantee,Bank Guarantee Number,Bankas garantijas skaits
 DocType: Assessment Criteria,Assessment Criteria,vērtēšanas kritēriji
@@ -1116,13 +1116,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Maksājums ieraksts ir jau radīta
 DocType: Request for Quotation,Get Suppliers,Iegūt piegādātājus
 DocType: Purchase Receipt Item Supplied,Current Stock,Pašreizējā Stock
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} nav saistīts ar posteni {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} nav saistīts ar posteni {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Preview Alga Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Konts {0} ir ievadīts vairākas reizes
 DocType: Account,Expenses Included In Valuation,Izdevumi iekļauts vērtēšanā
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,"Jūs varat atjaunot tikai tad, ja jūsu dalības termiņš ir 30 dienu laikā"
 DocType: Shopping Cart Settings,Show Stock Availability,Rādīt pieejamību
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Iestatiet {0} īpašuma kategorijā {1} vai uzņēmumā {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Iestatiet {0} īpašuma kategorijā {1} vai uzņēmumā {2}
 DocType: Location,Longitude,Garums
 ,Absent Student Report,Nekonstatē Student pārskats
 DocType: Crop,Crop Spacing UOM,Crop starpība UOM
@@ -1195,7 +1195,7 @@
 DocType: Soil Texture,Sand,Smiltis
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Enerģija
 DocType: Opportunity,Opportunity From,Iespēja no
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rinda {0}: {1} {2} vienumam ir vajadzīgi sērijas numuri. Jūs esat iesniedzis {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rinda {0}: {1} {2} vienumam ir vajadzīgi sērijas numuri. Jūs esat iesniedzis {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,"Lūdzu, atlasiet tabulu"
 DocType: BOM,Website Specifications,Website specifikācijas
 DocType: Special Test Items,Particulars,Daži dati
@@ -1287,7 +1287,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Preces ar augstāku weightage tiks parādīts augstāk
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Lab testu un dzīvības pazīmes
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banku samierināšanās Detail
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} jāiesniedz
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} jāiesniedz
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Darbinieks nav atrasts
 DocType: Item,If subcontracted to a vendor,Ja apakšlīgumu nodot pārdevējs
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentu grupa jau ir atjaunināts.
@@ -1342,7 +1342,6 @@
 DocType: Loyalty Program Collection,Tier Name,Līmeņa nosaukums
 DocType: HR Settings,Enter retirement age in years,Ievadiet pensionēšanās vecumu gados
 DocType: Crop,Target Warehouse,Mērķa Noliktava
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Lūdzu, iestatiet Nosaukumu sēriju {0}, izmantojot iestatījumu&gt; Iestatījumi&gt; Nosaukumu sērija"
 DocType: Payroll Employee Detail,Payroll Employee Detail,Payroll Employee Detail
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,"Lūdzu, izvēlieties noliktavu"
 DocType: Cheque Print Template,Starting location from left edge,Sākot atrašanās vietu no kreisās malas
@@ -1432,7 +1431,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Plāns materiāls mezgliem
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Pārdošanas Partneri un teritorija
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} jābūt aktīvam
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Nav pieejams neviens elements pārsūtīšanai
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Nav pieejams neviens elements pārsūtīšanai
 DocType: Employee Boarding Activity,Activity Name,Aktivitātes nosaukums
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Mainīt izlaiduma datumu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +250,Closing (Opening + Total),Slēgšana (atvēršana + kopā)
@@ -1661,6 +1660,7 @@
 DocType: Project,First Email,Pirmā e-pasta adrese
 DocType: Company,Exception Budget Approver Role,Izņēmums Budžeta apstiprinātāja loma
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date",Pēc iestatīšanas šis rēķins tiks aizturēts līdz noteiktajam datumam
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervēts noliktavām Sales Order / gatavu preču noliktava
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Pārdošanas apjoms
 DocType: Repayment Schedule,Interest Amount,procentu summa
@@ -1672,7 +1672,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Ieraksti
 DocType: Asset,Scrapped,iznīcināts
 DocType: Item,Item Defaults,Vienuma noklusējumi
-DocType: Purchase Invoice,Returns,atgriešana
+DocType: Cashier Closing,Returns,atgriešana
 DocType: Job Card,WIP Warehouse,WIP Noliktava
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Sērijas Nr {0} ir zem uzturēšanas līgumu līdz pat {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,vervēšana
@@ -1686,7 +1686,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Pārsūtīšanas veids
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Pārdošanas izmaksas
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Pasūtītājs&gt; Klientu grupa&gt; Teritorija
 DocType: Diagnosis,Diagnosis,Diagnoze
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standarta iepirkums
 DocType: Attendance Request,Explanation,Paskaidrojums
@@ -1699,7 +1698,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Pirkuma pasūtījumi priekšmetus kavējas
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Pasta indekss
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Pārdošanas pasūtījums {0} ir {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Atlasiet procentu ienākumu kontu aizdevumā {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Atlasiet procentu ienākumu kontu aizdevumā {0}
 DocType: Opportunity,Contact Info,Kontaktinformācija
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Making Krājumu
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Nevar reklamēt Darbinieku ar statusu pa kreisi
@@ -1711,7 +1710,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Rēķinu nevar veikt par nulles norēķinu stundu
 DocType: Company,Date of Commencement,Sākuma datums
 DocType: Sales Person,Select company name first.,Izvēlieties uzņēmuma nosaukums pirmo reizi.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},E-pasts nosūtīts uz {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},E-pasts nosūtīts uz {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,"Citāti, kas saņemti no piegādātājiem."
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Aizstāt BOM un atjaunināt jaunāko cenu visās BOMs
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Uz {0} | {1}{2}
@@ -1733,7 +1732,7 @@
 DocType: Asset Movement,From Employee,No darbinieka
 DocType: Driver,Cellphone Number,Mobilā tālruņa numurs
 DocType: Project,Monitor Progress,Pārraudzīt Progress
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Brīdinājums: Sistēma nepārbaudīs pārāk augstu maksu, jo summu par posteni {0} ir {1} ir nulle"
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Brīdinājums: Sistēma nepārbaudīs pārāk augstu maksu, jo summu par posteni {0} ir {1} ir nulle"
 DocType: Journal Entry,Make Difference Entry,Padarīt atšķirība Entry
 DocType: Supplier Quotation,Auto Repeat Section,Auto atkārtotā sadaļa
 DocType: Upload Attendance,Attendance From Date,Apmeklējumu No Datums
@@ -1836,7 +1835,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Noraidīts Daudz nevar jāieraksta Pirkuma Atgriezties
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Klienta grupas maiņa izvēlētajam klientam nav atļauta.
 ,Purchase Order Items To Be Billed,Pirkuma pasūtījuma posteņi ir Jāmaksā
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Aptuveno ierašanās laiku atjaunināšana.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Aptuveno ierašanās laiku atjaunināšana.
 DocType: Program Enrollment Tool,Enrollment Details,Reģistrēšanās informācija
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Nevar iestatīt vairākus uzņēmuma vienumu noklusējuma iestatījumus.
 DocType: Purchase Invoice Item,Net Rate,Net Rate
@@ -1850,7 +1849,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Atvaļinājuma veids ir disciplinārsods
 DocType: Support Settings,Close Issue After Days,Aizvērt Issue Pēc dienas
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Lai pievienotu Marketplace lietotājiem, jums ir jābūt lietotājam ar sistēmas pārvaldnieka un vienumu pārvaldnieka lomu."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Lai pievienotu Marketplace lietotājiem, jums ir jābūt lietotājam ar sistēmas pārvaldnieka un vienumu pārvaldnieka lomu."
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Atstāt tukšu, ja to uzskata par visām filiālēm"
 DocType: Job Opening,Staffing Plan,Personāla plāns
 DocType: Bank Guarantee,Validity in Days,Derīguma dienās
@@ -1872,7 +1871,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Dublikāts rinda {0} ar pašu {1}
 DocType: Marketplace Settings,Disable Marketplace,Atslēgt tirgu
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Fiskālā gads {0} nav atrasts
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Fiskālā gads {0} nav atrasts
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Iestatīšana Darbinieki
 DocType: Hotel Room Reservation,Hotel Reservation User,Viesnīcu rezervācijas lietotājs
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,"Lūdzu, izvēlieties kodu pirmais"
@@ -1980,7 +1979,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Neizdevās pieslēgties
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Aktīvs {0} izveidots
 DocType: Special Test Items,Special Test Items,Īpašie testa vienumi
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Lai reģistrētos vietnē Marketplace, jums ir jābūt lietotājam ar sistēmas pārvaldnieka un vienumu pārvaldnieka lomu."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Lai reģistrētos vietnē Marketplace, jums ir jābūt lietotājam ar sistēmas pārvaldnieka un vienumu pārvaldnieka lomu."
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Maksājuma veidu
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,"Jūs nevarat pieteikties pabalstu saņemšanai, ņemot vērā jūsu piešķirto algu struktūru"
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Website Image vajadzētu būt publiski failu vai tīmekļa URL
@@ -1992,7 +1991,7 @@
 DocType: Warehouse,Warehouse Contact Info,Noliktava Kontaktinformācija
 DocType: Payment Entry,Write Off Difference Amount,Norakstīt starpības summa
 DocType: Volunteer,Volunteer Name,Brīvprātīgo vārds
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Tika atrastas rindas ar dublējošiem termiņiem citās rindās: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Tika atrastas rindas ar dublējošiem termiņiem citās rindās: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: Darbinieku e-pasts nav atrasts, līdz ar to e-pasts nav nosūtīts"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Darba algas struktūra nav piešķirta darbiniekam {0} noteiktā datumā {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Piegādes noteikumi nav piemērojami valstij {0}
@@ -2083,6 +2082,7 @@
 DocType: Salary Component,Earning,Nopelnot
 DocType: Supplier Scorecard,Scoring Criteria,Vērtēšanas kritēriji
 DocType: Purchase Invoice,Party Account Currency,Party konta valūta
+DocType: Delivery Trip,Total Estimated Distance,Kopējais aprēķinātais attālums
 ,BOM Browser,BOM Browser
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,"Lūdzu, atjauniniet savu statusu šim mācību pasākumam"
 DocType: Item Barcode,EAN,EAN
@@ -2121,7 +2121,7 @@
 DocType: Activity Cost,Projects,Projekti
 DocType: Payment Request,Transaction Currency,darījuma valūta
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},No {0} | {1}{2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Daži e-pasta ziņojumi ir nederīgi
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Daži e-pasta ziņojumi ir nederīgi
 DocType: Work Order Operation,Operation Description,Darbība Apraksts
 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.,"Nevar mainīt fiskālā gada sākuma datumu un fiskālā gada beigu datumu, kad saimnieciskais gads ir saglabāts."
 DocType: Quotation,Shopping Cart,Grozs
@@ -2145,7 +2145,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Neto izmaiņas pamatlīdzekļa
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Atstāt tukšu, ja to uzskata par visiem apzīmējumiem"
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Lādiņš tips ""Faktiskais"" rindā {0} nevar iekļaut postenī Rate"
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Lādiņš tips ""Faktiskais"" rindā {0} nevar iekļaut postenī Rate"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,No DATETIME
 DocType: Shopify Settings,For Company,Par Company
@@ -2159,7 +2159,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,"Izveidojot kursu grafiku, radās kļūdas"
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Pirmais izdevumu apstiprinātājs sarakstā tiks iestatīts kā noklusējuma izdevumu apstiprinātājs.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,nevar būt lielāks par 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Lai reģistrētos vietnē Marketplace, jums ir jābūt lietotājam, kas nav Administrators ar sistēmas pārvaldnieku un vienumu pārvaldnieka lomu."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Lai reģistrētos vietnē Marketplace, jums ir jābūt lietotājam, kas nav Administrators ar sistēmas pārvaldnieku un vienumu pārvaldnieka lomu."
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Postenis {0} nav krājums punkts
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Neplānotā
@@ -2188,7 +2188,7 @@
 DocType: HR Settings,Employee Settings,Darbinieku iestatījumi
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Maksājumu sistēmas ielāde
 ,Batch-Wise Balance History,Partijas-Wise Balance Vēsture
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Row # {0}: nevar iestatīt vērtējumu, ja summa {1} ir lielāka par rēķināto summu."
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Row # {0}: nevar iestatīt vērtējumu, ja summa {1} ir lielāka par rēķināto summu."
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Drukas iestatījumi atjaunināti attiecīgajā drukas formātā
 DocType: Package Code,Package Code,Package Kods
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Māceklis
@@ -2422,7 +2422,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.","{0} vakanču un {1} budžeta {2}, kas jau ir plānots meitasuzņēmumiem {3}. \ Jūs varat plānot tikai līdz {4} vakanci un budžetu {5} atbilstoši personāla plānam {6} mātesuzņēmumam {3}."
 DocType: HR Settings,Stop Birthday Reminders,Stop Birthday atgādinājumi
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Lūdzu noteikt Noklusējuma Algas Kreditoru kontu Uzņēmumu {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Lūdzu noteikt Noklusējuma Algas Kreditoru kontu Uzņēmumu {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Iegūstiet finansiālu sabrukumu par Nodokļiem un nodevām Amazon
 DocType: SMS Center,Receiver List,Uztvērējs Latviešu
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Meklēt punkts
@@ -2492,7 +2492,7 @@
 DocType: Vital Signs,Constipated,Aizcietējums
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Pret Piegādātāju rēķinu {0} datēts {1}
 DocType: Customer,Default Price List,Default Cenrādis
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Asset Kustība ierakstīt {0} izveidots
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Asset Kustība ierakstīt {0} izveidots
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Nav atrasts neviens vienums.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Jūs nevarat izdzēst saimnieciskais gads {0}. Fiskālā gads {0} ir noteikta kā noklusējuma Global iestatījumi
 DocType: Share Transfer,Equity/Liability Account,Pašu kapitāls / Atbildības konts
@@ -2632,6 +2632,7 @@
 DocType: Blanket Order,Order Type,Order Type
 ,Item-wise Sales Register,Postenis gudrs Sales Reģistrēties
 DocType: Asset,Gross Purchase Amount,Gross Pirkuma summa
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Vienības kods&gt; Vienības grupa&gt; Zīmols
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Atvēršanas atlikumi
 DocType: Asset,Depreciation Method,nolietojums metode
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Vai šis nodoklis iekļauts pamatlikmes?
@@ -2715,7 +2716,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,"Darbība, ja gada budžets pārsniegts PO"
 DocType: Student Leave Application,Student Leave Application,Studentu atvaļinājums
 DocType: Item,Will also apply for variants,Attieksies arī uz variantiem
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Asset nevar atcelt, jo tas jau ir {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Asset nevar atcelt, jo tas jau ir {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Darbinieku {0} uz pusi dienas uz {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Kopējais darba laiks nedrīkst būt lielāks par max darba stundas {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Par
@@ -2739,6 +2740,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Ielādēt datus
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Atvaļinājuma maksimālais atvaļinājums veids {0} ir {1}
 DocType: SMS Center,Create Receiver List,Izveidot Uztvērēja sarakstu
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Pieejams lietošanai Datums vajadzētu būt pēc pirkuma datuma
 DocType: Vehicle,Wheels,Riteņi
 DocType: Packing Slip,To Package No.,Iesaiņot No.
 DocType: Patient Relation,Family,Ģimene
@@ -2752,7 +2754,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Norēķinu valūtai jābūt vienādai ar noklusējuma uzņēmuma valūtas vai partijas konta valūtu
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Norāda, ka pakete ir daļa no šīs piegādes (Tikai projekts)"
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Rinda {0}: maksājuma datums nevar būt pirms izlikšanas datuma
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Rinda {0}: maksājuma datums nevar būt pirms izlikšanas datuma
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Izveidot maksājuma Ierakstu
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Daudzums postenī {0} nedrīkst būt mazāks par {1}
 ,Sales Invoice Trends,PPR tendences
@@ -2825,7 +2827,7 @@
 DocType: Guardian,Guardian Interests,Guardian intereses
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Atjauniniet konta nosaukumu / numuru
 DocType: Naming Series,Current Value,Pašreizējā vērtība
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Vairāki fiskālie gadi pastāv dienas {0}. Lūdzu noteikt uzņēmuma finanšu gads
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Vairāki fiskālie gadi pastāv dienas {0}. Lūdzu noteikt uzņēmuma finanšu gads
 DocType: Education Settings,Instructor Records to be created by,"Instruktoru ieraksti, ko izveido"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} izveidots
 DocType: GST Account,GST Account,GST konts
@@ -2842,7 +2844,7 @@
 DocType: Sales Person,Name and Employee ID,Darbinieka Vārds un ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Due Date nevar būt pirms nosūtīšanas datums
 DocType: Website Item Group,Website Item Group,Mājas lapa Prece Group
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"Nav atalgojuma slīdes, kas iesniegts iepriekš norādītajiem kritērijiem VAI jau iesniegtās algu kvītis"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"Nav atalgojuma slīdes, kas iesniegts iepriekš norādītajiem kritērijiem VAI jau iesniegtās algu kvītis"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Nodevas un nodokļi
 DocType: Projects Settings,Projects Settings,Projektu iestatījumi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Ievadiet Atsauces datums
@@ -2851,7 +2853,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Piegādāto Daudz
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Materiāls Pieprasījums postenis
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Vispirms atceļiet pirkuma kvīti {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Vispirms atceļiet pirkuma kvīti {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Koks poz grupu.
 DocType: Production Plan,Total Produced Qty,Kopējā produkta daudzums
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Nevar atsaukties rindu skaits ir lielāks par vai vienāds ar pašreizējo rindu skaitu šim Charge veida
@@ -2962,6 +2964,7 @@
 ,Vehicle Expenses,transportlīdzekļu Izdevumi
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Izveidot lab testu (-s) par pārdošanas rēķinu iesniegšanu
 DocType: Serial No,Invoice Details,Informācija par rēķinu
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,"Lūdzu, iespējojiet Google Maps iestatījumus, lai novērtētu un optimizētu maršrutus"
 DocType: Grant Application,Show on Website,Rādīt vietnē
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Sāciet
 DocType: Hub Tracked Item,Hub Category,Hub kategorijas
@@ -3002,7 +3005,7 @@
 DocType: Inpatient Record,B Positive,B Pozitīvs
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Maksimālais darba ņēmēja pabalsts {0} pārsniedz {1} no summas {2} no iepriekšējās pieprasītās summas
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Daudz jābūt 1, jo prece ir pamatlīdzeklis. Lūdzu, izmantojiet atsevišķu rindu daudzkārtējai qty."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Daudz jābūt 1, jo prece ir pamatlīdzeklis. Lūdzu, izmantojiet atsevišķu rindu daudzkārtējai qty."
 DocType: Leave Block List Allow,Leave Block List Allow,Atstājiet Block Latviešu Atļaut
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr nevar būt tukšs vai telpa
 DocType: Patient Medical Record,Patient Medical Record,Pacienta medicīniskais ieraksts
@@ -3037,7 +3040,7 @@
 DocType: Workstation,Wages per hour,Algas stundā
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Krājumu atlikumu partijā {0} kļūs negatīvs {1} postenī {2} pie Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,"Šāds materiāls Pieprasījumi tika automātiski izvirzīts, balstoties uz posteni atjaunotne pasūtījuma līmenī"
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Konts {0} ir nederīgs. Konta valūta ir {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Konts {0} ir nederīgs. Konta valūta ir {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},No Datuma {0} nevar būt pēc darbinieku atlaišanas Datums {1}
 DocType: Supplier,Is Internal Supplier,Iekšējais piegādātājs
 DocType: Employee,Create User Permission,Izveidot lietotāja atļauju
@@ -3183,7 +3186,7 @@
 DocType: Account,Fixed Asset,Pamatlīdzeklis
 DocType: Amazon MWS Settings,After Date,Pēc datuma
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Serializēja inventarizācija
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Nederīgs {0} Inter uzņēmuma rēķins.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Nederīgs {0} Inter uzņēmuma rēķins.
 ,Department Analytics,Departamenta analīze
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-pasta adrese nav atrasta noklusējuma kontā
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Izveidot slepenu
@@ -3196,7 +3199,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Maksas struktūras un studentu grupas {0} programmas atšķiras.
 DocType: Bank Statement Transaction Entry,Receivable Account,Debitoru konts
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Derīga no datuma ir mazāka nekā derīga līdz datumam.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} jau {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} jau {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Sales Order to Apmaksa
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,CEO
@@ -3238,6 +3241,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Debets ir nepieciešama
 DocType: Clinical Procedure,Inpatient Record,Stacionārais ieraksts
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets palīdz sekot līdzi laika, izmaksu un rēķinu par aktivitātēm, ko veic savu komandu"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Piegādātājs&gt; Piegādātāja tips
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Pirkuma Cenrādis
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Darījuma datums
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Piegādes rezultātu tabulas mainīgie modeļi.
@@ -3281,7 +3285,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Exchange Gain / zaudējumi
 DocType: Opportunity,Lost Reason,Zaudēja Iemesls
 DocType: Amazon MWS Settings,Enable Amazon,Iespējot Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Row # {0}: konts {1} nepieder uzņēmumam {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Row # {0}: konts {1} nepieder uzņēmumam {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Nevar atrast DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Jaunā adrese
 DocType: Quality Inspection,Sample Size,Izlases lielums
@@ -3393,7 +3397,7 @@
 DocType: Water Analysis,Origin,Izcelsme
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Šis dokuments ir pāri robežai ar {0} {1} par posteni {4}. Jūs padarīt vēl {3} pret pats {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Lūdzu noteikt atkārtojas pēc glābšanas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Izvēlieties Mainīt summu konts
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Izvēlieties Mainīt summu konts
 DocType: Purchase Invoice,Price List Currency,Cenrādis Currency
 DocType: Naming Series,User must always select,Lietotājam ir vienmēr izvēlēties
 DocType: Stock Settings,Allow Negative Stock,Atļaut negatīvs Stock
@@ -3435,7 +3439,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Vai tiešām vēlaties atcelt šo tikšanos?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Viesnīcas numuru cenas pakete
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Sales Pipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Lūdzu iestatīt noklusēto kontu Algu komponentes {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Lūdzu iestatīt noklusēto kontu Algu komponentes {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nepieciešamais On
 DocType: Rename Tool,File to Rename,Failu pārdēvēt
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Lūdzu, izvēlieties BOM par posteni rindā {0}"
@@ -3456,7 +3460,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Izmaksas iegādātās preces
 DocType: Employee Separation,Employee Separation Template,Darbinieku nošķiršanas veidne
 DocType: Selling Settings,Sales Order Required,Pasūtījumu Nepieciešamais
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Kļūstiet par Pārdevēju
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Kļūstiet par Pārdevēju
 DocType: Purchase Invoice,Credit To,Kredīts Lai
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Aktīvās pievadi / Klienti
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,"Atstājiet tukšu, lai izmantotu standarta piegādes piezīmes formātu"
@@ -3498,7 +3502,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Veidojiet nodokļu veidlapu
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,lietotāju forums
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Izejvielas nevar būt tukšs.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Rinda # {0} (Maksājumu tabula): summai jābūt negatīvai
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Rinda # {0} (Maksājumu tabula): summai jābūt negatīvai
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Nevarēja atjaunināt sastāvu, rēķins ir piliens kuģniecības objektu."
 DocType: Contract,Fulfilment Status,Izpildes statuss
 DocType: Lab Test Sample,Lab Test Sample,Laba testa paraugs
@@ -3638,7 +3642,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Doc Datums
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Maksa Records Izveidoja - {0}
 DocType: Asset Category Account,Asset Category Account,Asset kategorija konts
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Row # {0} (Maksājumu tabula): summai jābūt pozitīvai
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Row # {0} (Maksājumu tabula): summai jābūt pozitīvai
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Nevar ražot vairāk Vienību {0} nekā Pasūtījumu daudzums {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Atlasiet Atribūtu vērtības
 DocType: Purchase Invoice,Reason For Issuing document,Iemesls dokumentu izsniegšanai
@@ -3693,7 +3697,7 @@
 DocType: Purchase Receipt,Time at which materials were received,"Laiks, kurā materiāli tika saņemti"
 DocType: Products Settings,Products per Page,Produkti uz lapu
 DocType: Stock Ledger Entry,Outgoing Rate,Izejošais Rate
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,vai
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,vai
 DocType: Sales Order,Billing Status,Norēķinu statuss
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Ziņojiet par problēmu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Utility Izdevumi
@@ -3721,7 +3725,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Darbinieku atbrīvojuma no nodokļiem deklarācija
 DocType: Payment Entry,Cheque/Reference Date,Čeks / Reference Date
 DocType: Purchase Invoice,Total Taxes and Charges,Kopā nodokļi un maksājumi
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Pieejamais lietojuma datums tiek ierakstīts kā pagājis datums
 DocType: Employee,Emergency Contact,Avārijas Contact
 DocType: Bank Reconciliation Detail,Payment Entry,maksājumu Entry
 ,sales-browser,pārdošanas pārlūkprogrammu
@@ -3768,6 +3771,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Vai atdeve (kredītrēķins)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Sākt darbu
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Aktīvai ir nepieciešama sērijas Nr. {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Lūdzu, iestatiet Nosaukumu sēriju {0}, izmantojot iestatījumu&gt; Iestatījumi&gt; Nosaukumu sērija"
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Invalīdu veidni nedrīkst noklusējuma veidni
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Rindai {0}: ievadiet plānoto daudzumu
 DocType: Account,Income Account,Ienākumu konta
@@ -3781,6 +3785,7 @@
 DocType: Loyalty Program,Help Section,Palīdzības sadaļa
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Iepriekšējā
 DocType: Appraisal Goal,Key Responsibility Area,Key Atbildība Platība
+DocType: Delivery Trip,Distance UOM,Attālums UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Studentu Partijas palīdzēs jums izsekot apmeklējumu, slēdzienus un maksu studentiem"
 DocType: Payment Entry,Total Allocated Amount,Kopējā piešķirtā summa
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Iestatīt noklusējuma inventāra veido pastāvīgās uzskaites
@@ -3822,7 +3827,7 @@
 DocType: Item Supplier,Item Supplier,Postenis piegādātājs
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,"Ievadiet posteņu kodu, lai iegūtu partiju nē"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},"Lūdzu, izvēlieties vērtību {0} quotation_to {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Pārvietošanai nav atlasīts neviens vienums
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Pārvietošanai nav atlasīts neviens vienums
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Visas adreses.
 DocType: Company,Stock Settings,Akciju iestatījumi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Apvienošana ir iespējama tikai tad, ja šādas īpašības ir vienādas abos ierakstos. Vai Group, Root Type, Uzņēmuma"
@@ -4108,7 +4113,7 @@
 DocType: Patient,Personal and Social History,Personiskā un sociālā vēsture
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Lietotājs {0} izveidots
 DocType: Fee Schedule,Fee Breakup for each student,Maksas sadalījums katram studentam
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Kopā avanss ({0}) pret rīkojuma {1} nevar būt lielāks par kopsummā ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Kopā avanss ({0}) pret rīkojuma {1} nevar būt lielāks par kopsummā ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Izvēlieties Mēneša Distribution nevienmērīgi izplatīt mērķus visā mēnešiem.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Mainīt kodu
 DocType: Purchase Invoice Item,Valuation Rate,Vērtēšanas Rate
@@ -4117,7 +4122,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Izmantojis ITC Sess
 ,Student Monthly Attendance Sheet,Student Mēneša Apmeklējumu lapa
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Piegādes noteikums attiecas tikai uz Pārdošanu
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Nolietojuma rinda {0}: Nākamais nolietojuma datums nevar būt pirms pirkuma datuma
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Nolietojuma rinda {0}: Nākamais nolietojuma datums nevar būt pirms pirkuma datuma
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekta sākuma datums
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Līdz
 DocType: Rename Tool,Rename Log,Pārdēvēt Ieiet
@@ -4135,12 +4140,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,"Cik bieži ir jāuzlabo projekts un uzņēmums, pamatojoties uz pārdošanas darījumiem."
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Beigu termiņš
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Pievienot Students
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Lūdzu, izdzēsiet Darbinieku <a href=""#Form/Employee/{0}"">{0}</a> \, lai atceltu šo dokumentu"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},"Lūdzu, izvēlieties {0}"
 DocType: C-Form,C-Form No,C-Form Nr
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Attālums
+DocType: Delivery Stop,Distance,Attālums
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Ierakstiet savus produktus vai pakalpojumus, kurus jūs pērkat vai pārdodat."
 DocType: Water Analysis,Storage Temperature,Uzglabāšanas temperatūra
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4167,7 +4170,7 @@
 DocType: Homepage,Company Description for website homepage,Uzņēmuma apraksts mājas lapas sākumlapā
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Par ērtības klientiem, šie kodi var izmantot drukas formātos, piemēram, rēķinos un pavadzīmēs"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Name
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Nevarēja izgūt informāciju par {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Nevarēja izgūt informāciju par {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Atklāšanas ierakstu žurnāls
 DocType: Contract,Fulfilment Terms,Izpildes noteikumi
 DocType: Sales Invoice,Time Sheet List,Time Sheet saraksts
@@ -4350,7 +4353,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Izvēlieties studenti manuāli Grupas darbības balstītas
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Izvēlieties studenti manuāli Grupas darbības balstītas
 DocType: Journal Entry,User Remark,Lietotājs Piezīme
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Maršrutu optimizācija.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Maršrutu optimizācija.
 DocType: Travel Itinerary,Non Diary,Ne dienasgrāmata
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Nevar izveidot atlikušo darbinieku saglabāšanas bonusu
 DocType: Lead,Market Segment,Tirgus segmentā
@@ -4381,7 +4384,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Lojalitātes programma
 DocType: Student Guardian,Father,tēvs
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Atbalsta biļetes
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&quot;Update Stock&quot; nevar pārbaudīta pamatlīdzekļu pārdošana
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&quot;Update Stock&quot; nevar pārbaudīta pamatlīdzekļu pārdošana
 DocType: Bank Reconciliation,Bank Reconciliation,Banku samierināšanās
 DocType: Attendance,On Leave,Atvaļinājumā
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Saņemt atjauninājumus
@@ -4426,7 +4429,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Sērijas Nr un partijas
 DocType: Warranty Claim,From Company,No Company
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Summa rādītājus vērtēšanas kritēriju jābūt {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Lūdzu noteikts skaits nolietojuma Rezervēts
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Lūdzu noteikts skaits nolietojuma Rezervēts
 DocType: Supplier Scorecard Period,Calculations,Aprēķini
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Vērtība vai Daudz
 DocType: Payment Terms Template,Payment Terms,Maksājuma nosacījumi
@@ -4446,7 +4449,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Atlaide (%) par Cenrādis likmi ar Margin
 DocType: Healthcare Service Unit Type,Rate / UOM,Rate / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Visas Noliktavas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Netika atrasta neviena {0} starpuzņēmuma Darījumu gadījumā.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Netika atrasta neviena {0} starpuzņēmuma Darījumu gadījumā.
 DocType: Travel Itinerary,Rented Car,Izīrēts auto
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Par jūsu uzņēmumu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Kredīts kontā jābūt bilance konts
@@ -4548,6 +4551,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Augu analīzes kritēriji
 DocType: Cheque Print Template,Cheque Height,Čeku augstums
 DocType: Supplier,Supplier Details,Piegādātājs Details
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Lūdzu, uzstādiet apmeklētāju numerācijas sēriju, izmantojot iestatīšanas&gt; numerācijas sēriju"
 DocType: Setup Progress,Setup Progress,Iestatīšanas progress
 DocType: Expense Claim,Approval Status,Apstiprinājums statuss
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},No vērtība nedrīkst būt mazāka par to vērtību rindā {0}
@@ -4641,7 +4645,6 @@
 DocType: Travel Request,Fully Sponsored,Pilnībā sponsorēts
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Reversās žurnāla ieraksts
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Klients {0} ir izveidots.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Lūdzu, izveidojiet darbinieku nosaukumu sistēmu cilvēkresursu vadībā&gt; Personāla iestatījumi"
 DocType: Stock Settings,Limit Percent,Limit Percent
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Pašlaik nav nevienas noliktavas noliktavā
 ,Payment Period Based On Invoice Date,"Samaksa periodā, pamatojoties uz rēķina datuma"
@@ -4700,7 +4703,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Source Noliktava
 DocType: Installation Note,Installation Date,Uzstādīšana Datums
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Akciju pārvaldnieks
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} nepieder uzņēmumam {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} nepieder uzņēmumam {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Tirdzniecības rēķins {0} izveidots
 DocType: Employee,Confirmation Date,Apstiprinājums Datums
 DocType: Inpatient Occupancy,Check Out,Izbraukšana
@@ -4720,6 +4723,7 @@
 DocType: Production Plan,Sales Orders Detail,Pārdošanas pasūtījumu detalizēts apraksts
 DocType: Bin,Requested Quantity,Pieprasītā daudzums
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Lūdzu, uzstādiet Instruktoru nosaukumu sistēmu izglītībā&gt; Izglītības iestatījumi"
 DocType: Patient,Marital Status,Ģimenes statuss
 DocType: Stock Settings,Auto Material Request,Auto Materiāls Pieprasījums
 DocType: Woocommerce Settings,API consumer secret,API patērētāju noslēpums
@@ -4772,7 +4776,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Izvēlieties dienas
 DocType: Academic Term,Term Name,Termina nosaukums
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Kredīts ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Algu likmju radīšana ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Algu likmju radīšana ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Jūs nevarat rediģēt saknes mezglu.
 DocType: Buying Settings,Purchase Order Required,Pasūtījuma Obligātas
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Taimeris
@@ -4810,7 +4814,7 @@
 DocType: Account,Rate at which this tax is applied,"Ātrums, kādā tiek piemērots šis nodoklis"
 DocType: Cash Flow Mapper,Section Name,Sadaļas nosaukums
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Pārkārtot Daudz
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Nolietojuma rinda {0}: paredzamā vērtība pēc lietderīgās lietošanas laika ir lielāka vai vienāda ar {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Nolietojuma rinda {0}: paredzamā vērtība pēc lietderīgās lietošanas laika ir lielāka vai vienāda ar {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Pašreizējās vakanču
 DocType: Company,Stock Adjustment Account,Stock konta korekcijas
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Uzrakstiet Off
@@ -4857,7 +4861,7 @@
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
 DocType: Opportunity,Opportunity Amount,Iespējas summa
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Skaits nolietojuma kartīti nedrīkst būt lielāks par kopskaita nolietojuma
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Skaits nolietojuma kartīti nedrīkst būt lielāks par kopskaita nolietojuma
 DocType: Purchase Order,Order Confirmation Date,Pasūtījuma apstiprinājuma datums
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Izveidot tehniskās apkopes vizīti
@@ -4898,7 +4902,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Partija:
 DocType: Volunteer,Afternoon,Pēcpusdiena
 DocType: Loyalty Program,Loyalty Program Help,Lojalitātes programmas palīdzība
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' ir neaktīvs
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' ir neaktīvs
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Uzstādīt kā Atvērt
 DocType: Cheque Print Template,Scanned Cheque,Skanētie Čeku
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Nosūtīt automātisko e-pastus kontaktiem Iesniedzot darījumiem.
@@ -4911,7 +4915,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Elements un Garantija Details
 DocType: Chapter,Chapter Members,Nodaļas locekļi
 DocType: Sales Team,Contribution (%),Ieguldījums (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Piezīme: Maksājumu ievades netiks izveidota, jo ""naudas vai bankas konts"" netika norādīta"
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Piezīme: Maksājumu ievades netiks izveidota, jo ""naudas vai bankas konts"" netika norādīta"
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Projekts {0} jau eksistē
 DocType: Clinical Procedure,Nursing User,Aprūpes lietotājs
 DocType: Employee Benefit Application,Payroll Period,Algas periods
@@ -4919,6 +4923,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Sērijas numurs {0} nepieder partijai {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Pienākumi
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Šīs kotācijas derīguma termiņš ir beidzies.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Lūdzu, izdzēsiet Darbinieku <a href=""#Form/Employee/{0}"">{0}</a> \, lai atceltu šo dokumentu"
 DocType: Expense Claim Account,Expense Claim Account,Izdevumu Prasība konts
 DocType: Account,Capital Work in Progress,Kapitālais darbs notiek
 DocType: Accounts Settings,Allow Stale Exchange Rates,Atļaut mainīt valūtas kursus
@@ -5000,7 +5006,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Jautājums Materiāls
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Savienojiet Shopify ar ERPNext
 DocType: Material Request Item,For Warehouse,Noliktavai
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Piegādes piezīmes {0} ir atjauninātas
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Piegādes piezīmes {0} ir atjauninātas
 DocType: Employee,Offer Date,Piedāvājuma Datums
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Citāti
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,"Jūs esat bezsaistes režīmā. Jūs nevarēsiet, lai pārlādētu, kamēr jums ir tīkls."
@@ -5050,7 +5056,7 @@
 DocType: Shipping Rule,Calculate Based On,"Aprēķināt, pamatojoties uz"
 DocType: Contract,Unfulfilled,Nepiepildīts
 DocType: Delivery Note Item,From Warehouse,No Noliktavas
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Nav minētu kritēriju darbinieku
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Nav minētu kritēriju darbinieku
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Nav Preces ar Bill materiālu ražošana
 DocType: Shopify Settings,Default Customer,Noklusējuma klients
 DocType: Sales Stage,Stage Name,Skatuves vārds
@@ -5093,7 +5099,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Nodokļu summa pēc Atlaide Summa
 DocType: Patient,Inpatient Status,Stacionārs statuss
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Ikdienas darba kopsavilkums Settings
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Izvēlētajā cenrāžā jāpārbauda pirkšanas un pārdošanas lauki.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Izvēlētajā cenrāžā jāpārbauda pirkšanas un pārdošanas lauki.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,"Lūdzu, ievadiet Reqd pēc datuma"
 DocType: Payment Entry,Internal Transfer,iekšējā Transfer
 DocType: Asset Maintenance,Maintenance Tasks,Apkopes uzdevumi
@@ -5130,7 +5136,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Group By
 DocType: Guardian,Interests,intereses
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Ieslēgt / izslēgt valūtas.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Nevarēja iesniegt kādu atalgojuma slīdni
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Nevarēja iesniegt kādu atalgojuma slīdni
 DocType: Exchange Rate Revaluation,Get Entries,Iegūt ierakstus
 DocType: Production Plan,Get Material Request,Iegūt Material pieprasījums
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Pasta izdevumi
@@ -5217,7 +5223,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Izdevumu konts ir obligāta posteni {0}
 DocType: BOM,Website Description,Mājas lapa Apraksts
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Neto pašu kapitāla izmaiņas
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Lūdzu atcelt pirkuma rēķina {0} pirmais
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Lūdzu atcelt pirkuma rēķina {0} pirmais
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,"Nav atļauts. Lūdzu, atspējojiet servisa vienības veidu"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-pasta adrese ir unikāls, jau pastāv {0}"
 DocType: Serial No,AMC Expiry Date,AMC Derīguma termiņš
@@ -5257,7 +5263,7 @@
 DocType: Hotel Room,Hotel Room,Viesnicas istaba
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Konts {0} nav pieder uzņēmumam {1}
 DocType: Leave Type,Rounding,Noapaļošana
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Sērijas numurus kārtas {0} nesakrīt ar piegādes piezīme
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Sērijas numurus kārtas {0} nesakrīt ar piegādes piezīme
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Apmaksātā summa (Pro-rated)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Tad cenu noteikumi tiek filtrēti, pamatojoties uz Klientu, Klientu grupu, Teritoriju, Piegādātāju, Piegādātāju grupu, Kampaņu, Pārdošanas partneri utt."
 DocType: Student,Guardian Details,Guardian Details
@@ -5312,7 +5318,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Noliktava nepieciešama krājumu postenī {0}
 DocType: Leave Allocation,Unused leaves,Neizmantotās lapas
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Veikt atmaksu ierakstu
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Visi departamenti
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Visi departamenti
 DocType: Healthcare Service Unit,Vacant,Brīvs
 DocType: Patient,Alcohol Past Use,Alkohola iepriekšējā lietošana
 DocType: Fertilizer Content,Fertilizer Content,Mēslošanas līdzekļa saturs
@@ -5323,7 +5329,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Pirms šī Pārdošanas pasūtījuma anulēšanas ir jāanulē darba kārtība {0}
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Atnest eksplodēja BOM (ieskaitot mezglus)
 DocType: Authorization Rule,Applicable To (Employee),Piemērojamais Lai (Darbinieku)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Due Date ir obligāts
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Due Date ir obligāts
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Pieaugums par atribūtu {0} nevar būt 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Pabalsta veids un summa
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Rezervētas istabas
@@ -5471,7 +5477,7 @@
 DocType: Purchase Invoice Item,Total Weight,Kopējais svars
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Komisijas apjoms
 DocType: Job Offer Term,Value / Description,Vērtība / Apraksts
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} nevar iesniegt, tas jau {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} nevar iesniegt, tas jau {2}"
 DocType: Tax Rule,Billing Country,Norēķinu Country
 DocType: Purchase Order Item,Expected Delivery Date,Gaidīts Piegāde Datums
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restorāna pasūtījuma ieraksts
@@ -5510,12 +5516,13 @@
 DocType: Maintenance Visit,Breakdown,Avārija
 DocType: Travel Itinerary,Vegetarian,Veģetārietis
 DocType: Patient Encounter,Encounter Date,Saskarsmes datums
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Konts: {0} ar valūtu: {1} nevar atlasīt
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Konts: {0} ar valūtu: {1} nevar atlasīt
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bankas dati
 DocType: Purchase Receipt Item,Sample Quantity,Parauga daudzums
 DocType: Bank Guarantee,Name of Beneficiary,Saņēmēja nosaukums
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Automātiski atjaunināt BOM izmaksas, izmantojot plānotāju, pamatojoties uz jaunāko novērtēšanas likmi / cenrāžu likmi / izejvielu pēdējo pirkumu likmi."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Piegādātājs&gt; Piegādātāju grupa
 DocType: Bank Reconciliation Detail,Cheque Date,Čeku Datums
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Konts {0}: Mātes vērā {1} nepieder uzņēmumam: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Veiksmīgi svītrots visas ar šo uzņēmumu darījumus!
@@ -5543,7 +5550,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Bērnu mezgli var izveidot tikai ar &quot;grupa&quot; tipa mezgliem
 DocType: Attendance Request,Half Day Date,Half Day Date
 DocType: Academic Year,Academic Year Name,Akadēmiskais gads Name
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,"{0} nav atļauts veikt darījumus ar {1}. Lūdzu, mainiet uzņēmumu."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,"{0} nav atļauts veikt darījumus ar {1}. Lūdzu, mainiet uzņēmumu."
 DocType: Sales Partner,Contact Desc,Contact Desc
 DocType: Email Digest,Send regular summary reports via Email.,Regulāri jānosūta kopsavilkuma ziņojumu pa e-pastu.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Lūdzu iestatīt noklusēto kontu Izdevumu prasījuma veida {0}
@@ -5576,7 +5583,7 @@
 DocType: Hotel Room,Hotel Manager,Viesnīcas vadītājs
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Uzstādīt Nodokļu noteikums par iepirkumu grozs
 DocType: Purchase Invoice,Taxes and Charges Added,Nodokļi un maksājumi Pievienoja
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Nolietojuma rinda {0}: Nākamais nolietojuma datums nevar būt pirms pieejamā datuma
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Nolietojuma rinda {0}: Nākamais nolietojuma datums nevar būt pirms pieejamā datuma
 ,Sales Funnel,Pārdošanas piltuve
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Saīsinājums ir obligāta
 DocType: Project,Task Progress,uzdevums Progress
@@ -5590,7 +5597,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Visas klientu grupas
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,uzkrātais Mēneša
 DocType: Attendance Request,On Duty,Darbā
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ir obligāta. Varbūt Valūtas ieraksts nav izveidots {1} uz {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ir obligāta. Varbūt Valūtas ieraksts nav izveidots {1} uz {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Personāla plāns {0} jau ir paredzēts apzīmējumam {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Nodokļu veidne ir obligāta.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Konts {0}: Mātes vērā {1} neeksistē
@@ -5670,11 +5677,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Vismaz viena noliktava ir obligāta
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Konfigurēt vienuma laukus, piemēram, UOM, vienumu grupa, apraksts un stundu skaits."
 DocType: Certification Application,Certification Status,Sertifikācijas statuss
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Tirgus laukums
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Tirgus laukums
 DocType: Travel Itinerary,Travel Advance Required,Nepieciešama iepriekšēja ceļošana
 DocType: Subscriber,Subscriber Name,Abonenta nosaukums
 DocType: Serial No,Out of Warranty,No Garantijas
-DocType: Cashier Closing,Cashier-closing-,Kasešu slēgšana-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Mape datu tips
 DocType: BOM Update Tool,Replace,Aizstāt
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Nav produktu atrasts.
@@ -5762,7 +5768,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Tiek veidoti noklusējuma nodokļu veidnes pārdošanai un pirkšanai.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Novērtējuma rezultātu reģistrs {0} jau eksistē.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Piemērs: ABCD. #####. Ja sērija ir iestatīta un Partijas Nr nav minēts darījumos, automātiskais partijas numurs tiks izveidots, pamatojoties uz šo sēriju. Ja jūs vienmēr vēlaties skaidri norādīt šī vienuma partijas Nr, atstājiet šo tukšu. Piezīme. Šis iestatījums būs prioritāte salīdzinājumā ar nosaukumu sērijas prefiksu krājumu iestatījumos."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Lūdzu, uzstādiet apmeklētāju numerācijas sēriju, izmantojot iestatīšanas&gt; numerācijas sēriju"
 DocType: BOM,Materials Required (Exploded),Nepieciešamie materiāli (eksplodēja)
 DocType: Contract,Party User,Partijas lietotājs
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Lūdzu noteikt Company filtrēt tukšu, ja Group By ir &quot;Uzņēmuma&quot;"
@@ -5965,7 +5970,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp skaits
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,"Ir jānosaka gan izmēģinājuma perioda sākuma datums, gan izmēģinājuma perioda beigu datums"
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Vidējā likme
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Maksājuma grafikam kopējam maksājuma summai jābūt vienādai ar Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Maksājuma grafikam kopējam maksājuma summai jābūt vienādai ar Grand / Rounded Total
 DocType: Subscription Plan Detail,Plan,Plānu
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bankas paziņojums bilance kā vienu virsgrāmatas
 DocType: Job Applicant,Applicant Name,Pieteikuma iesniedzēja nosaukums
@@ -6034,7 +6039,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Ziepes un mazgāšanas
 DocType: BOM,Show Items,Rādīt preces
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,No laiks nedrīkst būt lielāks par uz laiku.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Vai vēlaties paziņot visiem klientiem pa e-pastu?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Vai vēlaties paziņot visiem klientiem pa e-pastu?
 DocType: Subscription Plan,Billing Interval,Norēķinu intervāls
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Pasūtīts
@@ -6043,9 +6048,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Rindai {0}: {1} jābūt lielākam par 0
 DocType: Assessment Criteria,Assessment Criteria Group,Vērtēšanas kritēriji Group
 DocType: Healthcare Settings,Patient Name By,Pacienta nosaukums līdz
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Uzkrāšanas žurnāls Ieraksts algas no {0} līdz {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Uzkrāšanas žurnāls Ieraksts algas no {0} līdz {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Iespējot atliktos ieņēmumus
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Atklāšanas Uzkrātais nolietojums jābūt mazākam nekā vienādam ar {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Atklāšanas Uzkrātais nolietojums jābūt mazākam nekā vienādam ar {0}
 DocType: Warehouse,Warehouse Name,Noliktavas nosaukums
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Faktiskajam sākuma datumam jābūt mazākam par faktisko beigu datumu
 DocType: Naming Series,Select Transaction,Izvēlieties Transaction
@@ -6197,7 +6202,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Darbiniekam {0} pakāpē {1} nav paredzētas atvaļinājuma politikas
 DocType: Salary Detail,Salary Detail,alga Detail
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,"Lūdzu, izvēlieties {0} pirmais"
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Pievienoti {0} lietotāji
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Pievienoti {0} lietotāji
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","Daudzpakāpju programmas gadījumā Klienti tiks automātiski piešķirti attiecīgajam līmenim, salīdzinot ar viņu iztērēto"
 DocType: Appointment Type,Physician,Ārsts
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Sērija {0} no posteņa {1} ir beidzies.
@@ -6342,7 +6347,7 @@
 DocType: Asset,Custodian,Turētājbanka
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Point-of-Sale Profils
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} jābūt vērtībai no 0 līdz 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},{0} maksājums no {1} līdz {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},{0} maksājums no {1} līdz {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Nenodrošināti aizdevumi
 DocType: Cost Center,Cost Center Name,Cost Center Name
 DocType: Student,B+,B +
@@ -6374,6 +6379,7 @@
 DocType: Employee,Date of Issue,Izdošanas datums
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Kā vienu Pirkšana iestatījumu, ja pirkuma čeka Nepieciešams == &quot;JĀ&quot;, tad, lai izveidotu pirkuma rēķinu, lietotājam ir nepieciešams, lai izveidotu pirkuma kvīts vispirms posteni {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Row # {0}: Set Piegādātājs posteni {1}
+DocType: Global Defaults,Default Distance Unit,Noklusējuma attāluma vienība
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Rinda {0}: Stundas vērtībai ir jābūt lielākai par nulli.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Website Image {0} pievienots posteni {1} nevar atrast
 DocType: Issue,Content Type,Content Type
@@ -6429,7 +6435,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Debets kontā jābūt bilance konts
 DocType: Asset,Naming Series,Nosaucot Series
 DocType: Vital Signs,Coated,Pārklāts
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Rinda {0}: paredzamā vērtība pēc derīguma termiņa beigām ir mazāka nekā bruto pirkuma summa
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Rinda {0}: paredzamā vērtība pēc derīguma termiņa beigām ir mazāka nekā bruto pirkuma summa
 DocType: GoCardless Settings,GoCardless Settings,GoCardless iestatījumi
 DocType: Leave Block List,Leave Block List Name,Atstājiet Block Saraksta nosaukums
 DocType: Certified Consultant,Certification Validity,Sertifikācijas derīgums
@@ -6498,6 +6504,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Bankas virsraksts
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Skatīt laboratorijas testus
 DocType: Hub Users,Hub Users,Centrmezglu lietotāji
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Pasūtītājs&gt; Klientu grupa&gt; Teritorija
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Uzturēšana Datums
 DocType: Purchase Invoice Item,Rejected Serial No,Noraidīts Sērijas Nr
@@ -6512,7 +6519,7 @@
 DocType: SG Creation Tool Course,Max Strength,Max Stiprums
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Iepriekš iestatīto instalēšana
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Klientam nav izvēlēta piegādes piezīme {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Klientam nav izvēlēta piegādes piezīme {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Darbiniekam {0} nav maksimālās labuma summas
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,"Atlasiet vienumus, pamatojoties uz piegādes datumu"
 DocType: Grant Application,Has any past Grant Record,Vai ir kāds pagātnes Granta ieraksts
@@ -6540,7 +6547,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Viesnīcas numuru rezervēšana
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Klientu apkalpošana
 DocType: BOM,Thumbnail,Thumbnail
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Netika atrasts neviens kontakts ar e-pasta ID.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Netika atrasts neviens kontakts ar e-pasta ID.
 DocType: Item Customer Detail,Item Customer Detail,Postenis Klientu Detail
 DocType: Notification Control,Prompt for Email on Submission of,Jautāt e-pastu uz iesniegšanai
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Darbinieka maksimālais pabalsta apmērs {0} pārsniedz {1}
@@ -6801,7 +6808,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,"Nevar slēptu to grupai, jo ir izvēlēta Account Type."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0}{1} ir mainīta. Lūdzu atsvaidzināt.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Pietura lietotājiem veikt Leave Pieteikumi uz nākamajās dienās.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Vienības kods&gt; Vienības grupa&gt; Zīmols
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Ja neierobežots derīguma termiņš ir Lojalitātes punktiem, derīguma termiņš ir tukšs vai 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Tehniskās apkopes komandas biedri
 DocType: Loyalty Point Entry,Purchase Amount,pirkuma summa
@@ -6809,7 +6815,7 @@
 											to fullfill Sales Order {2}","Nevar piegādāt sērijas Nr {0} vienumu {1}, jo tas ir rezervēts, lai pilnībā aizpildītu pārdošanas pasūtījumu {2}"
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Piegādātājs Piedāvājums {0} izveidots
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Beigu gads nevar būt pirms Start gads
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Beigu gads nevar būt pirms Start gads
 DocType: Employee Benefit Application,Employee Benefits,Darbinieku pabalsti
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Pildīta daudzums ir jābūt vienādai daudzums postenim {0} rindā {1}
 DocType: Work Order,Manufactured Qty,Ražoti Daudz
@@ -6825,6 +6831,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Izvēlieties Partijas Numbers
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Uz GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Rēķinus izvirzīti klientiem.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Lūdzu, izveidojiet darbinieku nosaukumu sistēmu cilvēkresursu vadībā&gt; Personāla iestatījumi"
 DocType: Healthcare Settings,Invoice Appointments Automatically,Rēķina iecelšana automātiski
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekts Id
 DocType: Salary Component,Variable Based On Taxable Salary,"Mainīgs, pamatojoties uz aplikšanu ar nodokli"
@@ -6873,7 +6880,7 @@
 DocType: POS Profile,Account for Change Amount,Konts Mainīt summa
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Savienošana ar QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Kopējā peļņa / zaudējumi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Nederīgs uzņēmums Inter uzņēmuma rēķinam.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Nederīgs uzņēmums Inter uzņēmuma rēķinam.
 DocType: Purchase Invoice,input service,ievades pakalpojums
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Account nesakrīt ar {1} / {2} jo {3} {4}
 DocType: Employee Promotion,Employee Promotion,Darbinieku veicināšana
@@ -7004,7 +7011,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Ierašanās priekšrocība
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Grozs ir tukšs
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Lūdzu, uzstādiet Instruktoru nosaukumu sistēmu izglītībā&gt; Izglītības iestatījumi"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No","Vienumam {0} nav sērijas numura. Tikai serilialized preces \ var būt piegāde, pamatojoties uz sērijas Nr"
 DocType: Vehicle,Model,modelis
@@ -7034,7 +7040,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Nekas mainīt
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,"Lūdzu, izvēlieties csv failu"
 DocType: Holiday List,Total Holidays,Kopējās svētku dienas
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,"Trūkst e-pasta veidnes nosūtīšanai. Lūdzu, iestatiet to piegādes iestatījumos."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,"Trūkst e-pasta veidnes nosūtīšanai. Lūdzu, iestatiet to piegādes iestatījumos."
 DocType: Student Leave Application,Mark as Present,Atzīmēt kā Present
 DocType: Supplier Scorecard,Indicator Color,Indikatora krāsa
 DocType: Purchase Order,To Receive and Bill,Lai saņemtu un Bill
@@ -7043,7 +7049,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Izvēlieties kārtas numuru
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Dizainers
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Noteikumi un nosacījumi Template
-DocType: Serial No,Delivery Details,Piegādes detaļas
+DocType: Delivery Trip,Delivery Details,Piegādes detaļas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Izmaksas Center ir nepieciešama rindā {0} nodokļos tabula veidam {1}
 DocType: Program,Program Code,programmas kods
 DocType: Terms and Conditions,Terms and Conditions Help,Noteikumi Palīdzība
@@ -7067,7 +7073,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Izpildes laiks dienas
 DocType: Cash Flow Mapping,Is Income Tax Expense,Ir ienākumu nodokļa izdevumi
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Jūsu pasūtījums ir paredzēts piegādei!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: norīkošana datums jābūt tāds pats kā iegādes datums {1} no aktīva {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: norīkošana datums jābūt tāds pats kā iegādes datums {1} no aktīva {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Atzīmējiet šo, ja students dzīvo pie institūta Hostel."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Ievadiet klientu pasūtījumu tabulā iepriekš
 ,Stock Summary,Stock kopsavilkums
diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv
index a8078af..4eed464 100644
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Име на периодот
 DocType: Employee,Salary Mode,Режим на плата
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Регистрирај се
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Регистрирај се
 DocType: Patient,Divorced,Разведен
 DocType: Support Settings,Post Route Key,Пост-клуч за пат
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Овозможува ставките да се додадат повеќе пати во една трансакција
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Нов девизен курс
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Е потребно валута за Ценовник {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Ќе се пресметува во трансакцијата.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Добавувачот&gt; Тип на добавувач
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Контакт со клиентите
 DocType: Patient Appointment,Check availability,Проверете достапност
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Show open
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Серија успешно ажурирани
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Плаќање
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} во ред {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} во ред {1}
 DocType: Asset Finance Book,Depreciation Start Date,Датум на почеток на амортизацијата
 DocType: Pricing Rule,Apply On,Apply On
 DocType: Item Price,Multiple Item prices.,Повеќекратни цени точка.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Рецепт за лабораторија
 ,Delay Days,Денови на одложување
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Расходи на услуги
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Сериски број: {0} веќе е наведено во Продај фактура: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Сериски број: {0} веќе е наведено во Продај фактура: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Фактура
 DocType: Purchase Invoice Item,Item Weight Details,Детали за телесната тежина
 DocType: Asset Maintenance Log,Periodicity,Поените
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Сметководител
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Продажба на ценовник
 DocType: Patient,Tobacco Current Use,Тековна употреба на тутун
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Датумот и датумот на почеток се преклопуваат со работната картичка <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Продажба стапка
 DocType: Cost Center,Stock User,Акциите пристап
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,поврзани
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,датум присуство не може да биде помала од датум приклучи вработениот
 DocType: Grading Scale,Grading Scale Name,Скала за оценување Име
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Додај корисници на пазар
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Додај корисници на пазар
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Ова е root сметката и не може да се уредува.
 DocType: Sales Invoice,Company Address,адреса на компанијата
 DocType: BOM,Operations,Операции
@@ -322,7 +322,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Qty
 DocType: Production Plan,Material Request Detail,Материјал Барам детали
 DocType: Selling Settings,Default Quotation Validity Days,Стандардни дена за валидност на понудата
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да го вклучите данок во ред {0} на стапката точка, даноци во редови {1} исто така, мора да бидат вклучени"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да го вклучите данок во ред {0} на стапката точка, даноци во редови {1} исто така, мора да бидат вклучени"
 DocType: SMS Center,SMS Center,SMS центарот
 DocType: Payroll Entry,Validate Attendance,Потврди присуство
 DocType: Sales Invoice,Change Amount,промени Износ
@@ -441,7 +441,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Проред за износот напишан со зборови
 DocType: Vehicle,Additional Details,дополнителни детали
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Нема опис даден
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Добавувачот&gt; Група на снабдувачи
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Барање за купување.
 DocType: POS Closing Voucher Details,Collected Amount,Собран износ
 DocType: Lab Test,Submitted Date,Датум на поднесување
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,Поставки за сметки
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Добавувачот фактура не постои во Набавка фактура {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Управување со продажбата на лице дрвото.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Не може да се обработи маршрутата, бидејќи Поставките на Google Maps е оневозможено."
 DocType: Job Applicant,Cover Letter,мотивационо писмо
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Најдобро Чекови и депозити да се расчисти
 DocType: Item,Synced With Hub,Синхронизираат со Hub
@@ -601,7 +601,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Нова вредност на средствата
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Стапка по која клиентите Валута се претвора во основната валута купувачи
 DocType: Course Scheduling Tool,Course Scheduling Tool,Курс Планирање алатката
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ред # {0}: Набавка фактура не може да се направи против постоечко средство {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ред # {0}: Набавка фактура не може да се направи против постоечко средство {1}
 DocType: Crop Cycle,LInked Analysis,LInked Analysis
 DocType: POS Closing Voucher,POS Closing Voucher,POS затворање ваучер
 DocType: Contract,Lapsed,Бегство
@@ -636,6 +636,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} не е запишано во текот {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Име на ученикот:
 DocType: POS Closing Voucher Details,Difference,Разликата
+DocType: Delivery Settings,Delay between Delivery Stops,Одлагање помеѓу прекин на испорака
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Сериски № {0} не му припаѓа на испорака Забелешка {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Се чини дека постои проблем со конфигурацијата на GoCardless на серверот. Не грижете се, во случај на неуспех, износот ќе ви биде вратен на вашата сметка."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Демо
@@ -696,7 +697,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Количина и брзина
 DocType: Delivery Note,% Installed,% Инсталирана
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Училници / лаборатории итн, каде што можат да бидат закажани предавања."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Валутите на компанијата и на двете компании треба да се совпаѓаат за трансакциите на Интер.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Валутите на компанијата и на двете компании треба да се совпаѓаат за трансакциите на Интер.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Ве молиме внесете го името на компанијата прв
 DocType: Travel Itinerary,Non-Vegetarian,Не-вегетаријанска
 DocType: Purchase Invoice,Supplier Name,Добавувачот Име
@@ -783,7 +784,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Изнајмено од датум
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Доволно делови да се изгради
 DocType: POS Profile User,POS Profile User,POS профил корисник
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Ред {0}: Датумот на амортизација е потребен
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Ред {0}: Датумот на амортизација е потребен
 DocType: Purchase Invoice Item,Service Start Date,Датум на почеток на услугата
 DocType: Subscription Invoice,Subscription Invoice,Фактура за претплата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Директните приходи
@@ -852,7 +853,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Кратенка веќе се користи за друга компанија
 DocType: Selling Settings,Default Customer Group,Стандардната група на потрошувачи
 DocType: Employee,IFSC Code,IFSC код
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Датумот и датумот на почеток се преклопуваат со работната картичка <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ако е оневозможено, полето 'Вкупно заокружено' нема да биде видливо во сите трансакции"
 DocType: BOM,Operating Cost,Оперативните трошоци
 DocType: Crop,Produced Items,Произведени предмети
@@ -904,7 +904,7 @@
 DocType: Supplier,Prevent RFQs,Спречете RFQs
 DocType: Hub User,Hub User,Корисник на Hub
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Направи Продај Побарувања
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Плата за лична достава за период од {0} до {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Плата за лична достава за период од {0} до {1}
 DocType: Project Task,Project Task,Проектна задача
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Искористени поени
 ,Lead Id,Потенцијален клиент Id
@@ -1036,7 +1036,7 @@
 DocType: Fee Validity,Max number of visit,Макс број на посети
 ,Hotel Room Occupancy,Хотелско сместување
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet е основан:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Ве молиме да поставите основен готовина или Банкарска сметка во начинот на плаќање {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Ве молиме да поставите основен готовина или Банкарска сметка во начинот на плаќање {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,запишат
 DocType: GST Settings,GST Settings,GST Settings
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Валутата треба да биде иста со ценовникот Валута: {0}
@@ -1091,7 +1091,7 @@
 DocType: Vehicle Log,Service Details,Детали услуга
 DocType: Lab Test Template,Grouped,Групирани
 DocType: Selling Settings,Delivery Note Required,Испратница Задолжителни
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Доставување на ливчиња ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Доставување на ливчиња ...
 DocType: Bank Guarantee,Bank Guarantee Number,Број на банкарска гаранција
 DocType: Bank Guarantee,Bank Guarantee Number,Број на банкарска гаранција
 DocType: Assessment Criteria,Assessment Criteria,Критериуми за оценување
@@ -1117,13 +1117,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Плаќање Влегување веќе е создадена
 DocType: Request for Quotation,Get Suppliers,Добивај добавувачи
 DocType: Purchase Receipt Item Supplied,Current Stock,Тековни берза
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Ред # {0}: {1} средства не се поврзани со Точка {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Ред # {0}: {1} средства не се поврзани со Точка {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Преглед Плата фиш
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Сметка {0} е внесен повеќе пати
 DocType: Account,Expenses Included In Valuation,Трошоци Вклучени Во Вреднување
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Вие може да продолжите само ако вашето членство истекува во рок од 30 дена
 DocType: Shopping Cart Settings,Show Stock Availability,Прикажи ја достапноста на акциите
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Поставете {0} во категорија на средства {1} или компанија {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Поставете {0} во категорија на средства {1} или компанија {2}
 DocType: Location,Longitude,Должина
 ,Absent Student Report,Отсутни Студентски извештај
 DocType: Crop,Crop Spacing UOM,Распределба на култури UOM
@@ -1196,7 +1196,7 @@
 DocType: Soil Texture,Sand,Песок
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Енергија
 DocType: Opportunity,Opportunity From,Можност од
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ред {0}: {1} Сериски броеви потребни за точка {2}. Вие сте доставиле {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ред {0}: {1} Сериски броеви потребни за точка {2}. Вие сте доставиле {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Изберете табела
 DocType: BOM,Website Specifications,Веб-страница Спецификации
 DocType: Special Test Items,Particulars,Спецификации
@@ -1288,7 +1288,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Предмети со поголема weightage ќе бидат прикажани повисоки
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Лабораториски тестови и витални знаци
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банка помирување Детална
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,{0} ред #: средства мора да бидат поднесени {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,{0} ред #: средства мора да бидат поднесени {1}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Не се пронајдени вработен
 DocType: Item,If subcontracted to a vendor,Ако иницираат да продавач
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Група на студенти веќе се ажурираат.
@@ -1343,7 +1343,6 @@
 DocType: Loyalty Program Collection,Tier Name,Име на ниво
 DocType: HR Settings,Enter retirement age in years,Внесете пензионирање возраст во години
 DocType: Crop,Target Warehouse,Целна Магацински
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ве молиме наместете го Селектирањето за {0} преку Setup&gt; Settings&gt; Series за именување
 DocType: Payroll Employee Detail,Payroll Employee Detail,Детали за вработените во платниот список
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Ве молам изберете еден магацин
 DocType: Cheque Print Template,Starting location from left edge,Почетна локација од левиот раб
@@ -1433,7 +1432,7 @@
 DocType: Work Order,Plan material for sub-assemblies,План материјал за потсклопови
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Продај Партнери и територија
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} мора да биде активен
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Нема достапни ставки за пренос
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Нема достапни ставки за пренос
 DocType: Employee Boarding Activity,Activity Name,Име на активност
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Промени го датумот на издавање
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Готовината количина на производот <b>{0}</b> и For Quantity <b>{1} не</b> можат да бидат различни
@@ -1663,6 +1662,7 @@
 DocType: Project,First Email,Прва е-пошта
 DocType: Company,Exception Budget Approver Role,Улога на одобрување на буџет за исклучок
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Откако ќе се постави, оваа фактура ќе се одржи до одредениот датум"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Задржани Магацински во Продај Побарувања / готови производи Магацински
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Продажба Износ
 DocType: Repayment Schedule,Interest Amount,Износот на каматата
@@ -1674,7 +1674,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Рекорди
 DocType: Asset,Scrapped,укинат
 DocType: Item,Item Defaults,Стандардни точки
-DocType: Purchase Invoice,Returns,Се враќа
+DocType: Cashier Closing,Returns,Се враќа
 DocType: Job Card,WIP Warehouse,WIP Магацински
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Сериски № {0} е под договор за одржување до {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,вработување
@@ -1688,7 +1688,6 @@
 DocType: Student,A-,А-
 DocType: Share Transfer,Transfer Type,Вид на трансфер
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Трошоци за продажба
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група на клиенти&gt; Територија
 DocType: Diagnosis,Diagnosis,Дијагноза
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Стандардна Купување
 DocType: Attendance Request,Explanation,Објаснување
@@ -1701,7 +1700,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Нарачка за нарачки за нарачка
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Поштенски
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Продај Побарувања {0} е {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Изберете сметка за приход од камата во заем {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Изберете сметка за приход од камата во заем {0}
 DocType: Opportunity,Contact Info,Контакт инфо
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Акции правење записи
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Не може да се промовира вработениот со статус Лево
@@ -1713,7 +1712,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Фактурата не може да се направи за час на фактурирање
 DocType: Company,Date of Commencement,Датум на започнување
 DocType: Sales Person,Select company name first.,Изберете името на компанијата во прв план.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},Е-мејл испратен до {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},Е-мејл испратен до {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Понуди добиени од Добавувачи.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Заменете Бум и ажурирајте ја најновата цена во сите спецификации
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},{0} | {1} {2}
@@ -1735,7 +1734,7 @@
 DocType: Asset Movement,From Employee,Од Вработен
 DocType: Driver,Cellphone Number,Број на мобилен телефон
 DocType: Project,Monitor Progress,Следи напредок
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Предупредување: Систем не ќе ги провери overbilling од износот за ставката {0} од {1} е нула
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Предупредување: Систем не ќе ги провери overbilling од износот за ставката {0} од {1} е нула
 DocType: Journal Entry,Make Difference Entry,Направи разликата Влегување
 DocType: Supplier Quotation,Auto Repeat Section,Автоматско повторување
 DocType: Upload Attendance,Attendance From Date,Публика од денот
@@ -1838,7 +1837,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Отфрлени Количина не може да се влезе во Набавка Враќање
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Промена на група клиенти за избраниот клиент не е дозволено.
 ,Purchase Order Items To Be Billed,"Нарачката елементи, за да бидат фактурирани"
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Ажурирање на времето за пристигнување.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Ажурирање на времето за пристигнување.
 DocType: Program Enrollment Tool,Enrollment Details,Детали за запишување
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Не може да се постават повеќекратни преференции на ставка за компанијата.
 DocType: Purchase Invoice Item,Net Rate,Нето стапката
@@ -1852,7 +1851,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Оставете Тип е латерален
 DocType: Support Settings,Close Issue After Days,Затвори прашање по денови
 ,Eway Bill,Ева Бил
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Треба да бидете корисник со улоги на System Manager и Item Manager за да додадете корисници на Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Треба да бидете корисник со улоги на System Manager и Item Manager за да додадете корисници на Marketplace.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Оставете го празно ако се земе предвид за сите гранки
 DocType: Job Opening,Staffing Plan,Кадровски план
 DocType: Bank Guarantee,Validity in Days,Важност во денови
@@ -1874,7 +1873,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Дупликат ред {0} со истиот {1}
 DocType: Marketplace Settings,Disable Marketplace,Оневозможи пазар
 ,Trial Balance,Судскиот биланс
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Фискалната година {0} не е пронајден
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Фискалната година {0} не е пронајден
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Поставување на вработените
 DocType: Hotel Room Reservation,Hotel Reservation User,Корисник за резервација на хотел
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Ве молиме изберете префикс прв
@@ -1982,7 +1981,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Не успеав да се најавам
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Средство {0} создадено
 DocType: Special Test Items,Special Test Items,Специјални тестови
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Треба да бидете корисник со улогите на System Manager и менаџерот на елемент за да се регистрирате на Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Треба да бидете корисник со улогите на System Manager и менаџерот на елемент за да се регистрирате на Marketplace.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Начин на плаќање
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Според вашата распределена платежна структура не можете да аплицирате за бенефиции
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Веб-страница на слика треба да биде јавен датотеката или URL на веб страната
@@ -1994,7 +1993,7 @@
 DocType: Warehouse,Warehouse Contact Info,Магацински Контакт Инфо
 DocType: Payment Entry,Write Off Difference Amount,Отпише разликата Износ
 DocType: Volunteer,Volunteer Name,Име на волонтерот
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Редови со дупликат датуми на достасаност во други редови беа пронајдени: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Редови со дупликат датуми на достасаност во други редови беа пронајдени: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: е-маил на вработените не се најде, па затоа не е-мејл испратен"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Структура за плата доделена за вработените {0} на даден датум {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Правилото за пренесување не важи за земја {0}
@@ -2085,6 +2084,7 @@
 DocType: Salary Component,Earning,Заработуваат
 DocType: Supplier Scorecard,Scoring Criteria,Критериуми за бодување
 DocType: Purchase Invoice,Party Account Currency,Партија Валута профил
+DocType: Delivery Trip,Total Estimated Distance,Вкупно проценето растојание
 ,BOM Browser,BOM пребарувач
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Ве молиме да го ажурирате вашиот статус за овој тренинг настан
 DocType: Item Barcode,EAN,EAN
@@ -2123,7 +2123,7 @@
 DocType: Activity Cost,Projects,Проекти
 DocType: Payment Request,Transaction Currency,Валута
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Од {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Некои пораки се неважечки
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Некои пораки се неважечки
 DocType: Work Order Operation,Operation Description,Операција Опис
 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.,Не може да се промени фискалната година Почеток Датум и фискалната година Крај Датум еднаш на фискалната година е спасен.
 DocType: Quotation,Shopping Cart,Кошничка
@@ -2147,7 +2147,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Нето промени во основни средства
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,Оставете го празно ако се земе предвид за сите ознаки
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Полнење од типот &quot;Крај&quot; во ред {0} не може да бидат вклучени во точка Оцени
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Полнење од типот &quot;Крај&quot; во ред {0} не може да бидат вклучени во точка Оцени
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Макс: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Од DateTime
 DocType: Shopify Settings,For Company,За компанијата
@@ -2161,7 +2161,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Имаше грешки во креирањето на наставниот план
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Првиот одобрение за трошоци во листата ќе биде поставен како стандарден Expens Approver.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,не може да биде поголема од 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Треба да бидете корисник, освен Администратор, со Управување со System Manager и Управувачот со ставка за да се регистрирате на Marketplace."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Треба да бидете корисник, освен Администратор, со Управување со System Manager и Управувачот со ставка за да се регистрирате на Marketplace."
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Ставка {0} не е складишна ставка
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Непланирана
@@ -2190,7 +2190,7 @@
 DocType: HR Settings,Employee Settings,Подесувања на вработените
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Вчитување на платниот систем
 ,Batch-Wise Balance History,Според групата биланс Историја
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Ред # {0}: Не може да се постави Стапка ако износот е поголем од фактурираниот износ за Точка {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Ред # {0}: Не може да се постави Стапка ако износот е поголем од фактурираниот износ за Точка {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Поставки за печатење ажурирани во соодветните формат за печатење
 DocType: Package Code,Package Code,пакет законик
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Чирак
@@ -2424,7 +2424,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} слободни работни места и {1} буџет за {2} веќе планиран за подружници од {3}. \ Можете да планирате само до {4} слободни места и буџет {5} според планот за екипирање {6} за матичната компанија {3}.
 DocType: HR Settings,Stop Birthday Reminders,Стоп роденден потсетници
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Поставете Стандардна Даноци се плаќаат сметка во Друштвото {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Поставете Стандардна Даноци се плаќаат сметка во Друштвото {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Добијте финансиски распадот на Даноците и давачките на податоците од Амазон
 DocType: SMS Center,Receiver List,Листа на примачот
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Барај точка
@@ -2494,7 +2494,7 @@
 DocType: Vital Signs,Constipated,Запечатен
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Против Добавувачот Фактура {0} датум {1}
 DocType: Customer,Default Price List,Стандардно Ценовник
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,рекорд движење средства {0} создадена
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,рекорд движење средства {0} создадена
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Нема пронајдени предмети.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Не може да избришете фискалната {0}. Фискалната година {0} е поставена како стандардна во глобалните поставувања
 DocType: Share Transfer,Equity/Liability Account,Сметка за акционерски капитал / одговорност
@@ -2634,6 +2634,7 @@
 DocType: Blanket Order,Order Type,Цел Тип
 ,Item-wise Sales Register,Точка-мудар Продажбата Регистрирај се
 DocType: Asset,Gross Purchase Amount,Бруто купување износ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код на ставка&gt; Група на производи&gt; Бренд
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Отворање на салда
 DocType: Asset,Depreciation Method,амортизација Метод
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Е овој данок се вклучени во основната стапка?
@@ -2717,7 +2718,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Акција доколку Годишниот буџет е надминат на PO
 DocType: Student Leave Application,Student Leave Application,Студентски оставите апликацијата
 DocType: Item,Will also apply for variants,Ќе се применуваат и за варијанти
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Средства не може да се откаже, како што е веќе {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Средства не може да се откаже, како што е веќе {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Вработен {0} на половина ден на {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Вкупно работно време не смее да биде поголема од работното време max {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,На
@@ -2741,6 +2742,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Донеси податоци
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Максимално дозволено отсуство во типот на одмор {0} е {1}
 DocType: SMS Center,Create Receiver List,Креирај Листа ресивер
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Датумот достапен за користење Датум треба да биде по датумот на купување
 DocType: Vehicle,Wheels,тркала
 DocType: Packing Slip,To Package No.,Пакет бр
 DocType: Patient Relation,Family,Семејство
@@ -2754,7 +2756,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Монетарната валута мора да биде еднаква на валутата на валутата на девизната или партиската сметка на друштвото
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Покажува дека пакетот е дел од оваа испорака (Само Предлог)
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Ред {0}: Датумот на достасаност не може да биде пред датумот на објавување
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Ред {0}: Датумот на достасаност не може да биде пред датумот на објавување
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Направете плаќање Влегување
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Кол за ставката {0} мора да биде помала од {1}
 ,Sales Invoice Trends,Продажбата Трендови Фактура
@@ -2827,7 +2829,7 @@
 DocType: Guardian,Guardian Interests,Гардијан Интереси
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Ажурирај име на профил / број
 DocType: Naming Series,Current Value,Сегашна вредност
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,постојат повеќе фискални години за датумот {0}. Поставете компанијата во фискалната
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,постојат повеќе фискални години за датумот {0}. Поставете компанијата во фискалната
 DocType: Education Settings,Instructor Records to be created by,Записи за инструктори кои треба да се креираат од
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} создаден
 DocType: GST Account,GST Account,GST сметка
@@ -2844,7 +2846,7 @@
 DocType: Sales Person,Name and Employee ID,Име и вработените проект
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Поради Датум не може да биде пред Праќање пораки во Датум
 DocType: Website Item Group,Website Item Group,Веб-страница Точка група
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Не е утврдена плата за плати за гореспоменатите критериуми ИЛИ платен лист веќе е поднесен
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Не е утврдена плата за плати за гореспоменатите критериуми ИЛИ платен лист веќе е поднесен
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Давачки и даноци
 DocType: Projects Settings,Projects Settings,Подесувања на проектите
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Ве молиме внесете референтен датум
@@ -2853,7 +2855,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Опрема што се испорачува Количина
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Материјал Барање Точка
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Ве молиме откажете ја купопродажната цена {0} прво
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Ве молиме откажете ја купопродажната цена {0} прво
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Дрвото на точка групи.
 DocType: Production Plan,Total Produced Qty,Вкупно произведена количина
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Не може да се однесува ред број е поголема или еднаква на тековниот број на ред за овој тип на полнење
@@ -2964,6 +2966,7 @@
 ,Vehicle Expenses,Трошоци возило
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Креирајте лабораториски тестови за продажната фактура
 DocType: Serial No,Invoice Details,Детали за фактура
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Те молам вклучи ги поставките на Google Maps за да ги процени и оптимизира маршрутите
 DocType: Grant Application,Show on Website,Покажи на веб-страница
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Почнете
 DocType: Hub Tracked Item,Hub Category,Категорија на категории
@@ -3004,7 +3007,7 @@
 DocType: Inpatient Record,B Positive,Б Позитивен
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Максималната корист на вработениот {0} ја надминува {1} за сумата {2} од претходно тврдената \ износ
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ред # {0}: Количина мора да биде 1, како точка е на основните средства. Ве молиме користете посебен ред за повеќе количество."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ред # {0}: Количина мора да биде 1, како точка е на основните средства. Ве молиме користете посебен ред за повеќе количество."
 DocType: Leave Block List Allow,Leave Block List Allow,Остави Забрани Листа Дозволете
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr не може да биде празно или простор
 DocType: Patient Medical Record,Patient Medical Record,Медицински рекорд на пациенти
@@ -3039,7 +3042,7 @@
 DocType: Workstation,Wages per hour,Плати по час
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Акции рамнотежа во Серија {0} ќе стане негативна {1} за Точка {2} На Магацински {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Следните Материјал Барања биле воспитани автоматски врз основа на нивото повторно цел елемент
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Сметка {0} не е валиден. Валута сметка мора да биде {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Сметка {0} не е валиден. Валута сметка мора да биде {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Од датумот {0} не може да биде по ослободување на вработениот Датум {1}
 DocType: Supplier,Is Internal Supplier,Е внатрешен снабдувач
 DocType: Employee,Create User Permission,Креирај дозвола за корисници
@@ -3185,7 +3188,7 @@
 DocType: Account,Fixed Asset,Основни средства
 DocType: Amazon MWS Settings,After Date,По Датум
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Серијали Инвентар
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Невалиден {0} за Inter Company фактура.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Невалиден {0} за Inter Company фактура.
 ,Department Analytics,Одделот за анализи
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Е-пошта не е пронајдена во стандардниот контакт
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Генерирање на тајната
@@ -3198,7 +3201,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Програмата во структурата на надоместоците и студентската група {0} се различни.
 DocType: Bank Statement Transaction Entry,Receivable Account,Побарувања профил
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Датум на важност од датумот мора да биде помал од Датум на валиден Upto.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Ред # {0}: Асет {1} е веќе {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Ред # {0}: Асет {1} е веќе {2}
 DocType: Quotation Item,Stock Balance,Биланс на акции
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Продај Побарувања на плаќање
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,извршен директор
@@ -3240,6 +3243,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Дебитна Да се бара
 DocType: Clinical Procedure,Inpatient Record,Зборот за бебиња
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets помогне да ги пратите на време, трошоци и платежна за активности направено од страна на вашиот тим"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Добавувачот&gt; Тип на добавувач
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Откупната цена Листа
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Датум на трансакција
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Шаблони на променливите на резултатите од добавувачот.
@@ -3283,7 +3287,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Размена добивка / загуба
 DocType: Opportunity,Lost Reason,Си ја заборавивте Причина
 DocType: Amazon MWS Settings,Enable Amazon,Овозможи Амазон
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Ред # {0}: Сметка {1} не припаѓа на компанија {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Ред # {0}: Сметка {1} не припаѓа на компанија {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Не може да се пронајде DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Нова адреса
 DocType: Quality Inspection,Sample Size,Големина на примерокот
@@ -3395,7 +3399,7 @@
 DocType: Water Analysis,Origin,Потекло
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Овој документ е над границата од {0} {1} за ставката {4}. Ви се прави уште една {3} против истиот {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Поставете се повторуваат по спасување
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,износот сметка Одберете промени
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,износот сметка Одберете промени
 DocType: Purchase Invoice,Price List Currency,Ценовник Валута
 DocType: Naming Series,User must always select,Корисникот мора секогаш изберете
 DocType: Stock Settings,Allow Negative Stock,Дозволете негативна состојба
@@ -3437,7 +3441,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Дали сте сигурни дека сакате да го откажете овој состанок?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Пакет за цени за хотелска соба
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,гасоводот продажба
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Поставете стандардна сметка во Плата Компонента {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Поставете стандардна сметка во Плата Компонента {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Потребни на
 DocType: Rename Tool,File to Rename,Датотека за да ја преименувате
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Ве молам изберете Бум објект во ред {0}
@@ -3458,7 +3462,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Цената на купените предмети
 DocType: Employee Separation,Employee Separation Template,Шаблон за одделување на вработените
 DocType: Selling Settings,Sales Order Required,Продај Побарувања задолжителни
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Станете продавач
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Станете продавач
 DocType: Purchase Invoice,Credit To,Кредитите за
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Активни Потенцијални клиенти / Клиенти
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Оставете празно за да го користите стандардниот формат Забелешка за испорака
@@ -3500,7 +3504,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Направете даночен образец
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,корисникот форум
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,"Суровини, не може да биде празна."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Ред # {0} (Платежна табела): Износот мора да биде негативен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Ред # {0} (Платежна табела): Износот мора да биде негативен
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Не може да го ажурира трговија, фактура содржи капка превозот ставка."
 DocType: Contract,Fulfilment Status,Статус на исполнување
 DocType: Lab Test Sample,Lab Test Sample,Примерок за лабораториски испитувања
@@ -3640,7 +3644,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Док Датум
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Надомест записи создадени - {0}
 DocType: Asset Category Account,Asset Category Account,Средства Категорија сметка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Ред # {0} (Платежна табела): Износот мора да биде позитивен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Ред # {0} (Платежна табела): Износот мора да биде позитивен
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Не може да произведе повеќе од ставка {0} од количина {1} во Продажна нарачка
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Изберете вредности за атрибути
 DocType: Purchase Invoice,Reason For Issuing document,Причина за издавање на документ
@@ -3695,7 +3699,7 @@
 DocType: Purchase Receipt,Time at which materials were received,На кој беа примени материјали време
 DocType: Products Settings,Products per Page,Производи по страница
 DocType: Stock Ledger Entry,Outgoing Rate,Тековна стапка
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,или
 DocType: Sales Order,Billing Status,Платежна Статус
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Изнеле
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Комунални трошоци
@@ -3723,7 +3727,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Декларација за даночно ослободување од вработените
 DocType: Payment Entry,Cheque/Reference Date,Чек / референтен датум
 DocType: Purchase Invoice,Total Taxes and Charges,Вкупно Даноци и Такси
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Датумот достапен за користење Датум се внесува како минато
 DocType: Employee,Emergency Contact,Итни Контакт
 DocType: Bank Reconciliation Detail,Payment Entry,плаќање за влез
 ,sales-browser,продажба пребарувач
@@ -3770,6 +3773,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Е враќање (кредитната белешка)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Започнете со работа
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Серискиот број не е потребен за средството {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ве молиме наместете го Селектирањето за {0} преку Setup&gt; Settings&gt; Series за именување
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Лицата со посебни потреби образецот не мора да биде стандардна дефиниција
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,За ред {0}: Внесете го планираното количество
 DocType: Account,Income Account,Сметка приходи
@@ -3783,6 +3787,7 @@
 DocType: Loyalty Program,Help Section,Помош Секција
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Пред
 DocType: Appraisal Goal,Key Responsibility Area,Клучна одговорност Површина
+DocType: Delivery Trip,Distance UOM,Растојание UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Студентски Пакетите да ви помогне да ги пратите на посетеност, проценки и такси за студентите"
 DocType: Payment Entry,Total Allocated Amount,"Вкупно лимит,"
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Поставете инвентар стандардна сметка за постојана инвентар
@@ -3824,7 +3829,7 @@
 DocType: Item Supplier,Item Supplier,Точка Добавувачот
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Ве молиме внесете Точка законик за да се добие серија не
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Ве молиме изберете вредност за {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Нема селектирани ставки за пренос
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Нема селектирани ставки за пренос
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Сите адреси.
 DocType: Company,Stock Settings,Акции Settings
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Спојувањето е можно само ако следниве својства се исти во двата записи. Е група, корен Тип компанијата"
@@ -4110,7 +4115,7 @@
 DocType: Patient,Personal and Social History,Лична и социјална историја
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Создаден корисник {0}
 DocType: Fee Schedule,Fee Breakup for each student,Провизија на отплата за секој ученик
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Вкупно Аванс ({0}) во однос на Нарачка {1} не може да биде поголемо од Сѐ Вкупно ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Вкупно Аванс ({0}) во однос на Нарачка {1} не може да биде поголемо од Сѐ Вкупно ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Изберете Месечен Дистрибуција на нерамномерно дистрибуира цели низ месеци.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Промени го кодот
 DocType: Purchase Invoice Item,Valuation Rate,Вреднување стапка
@@ -4136,12 +4141,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Колку често треба да се ажурираат проектите и компанијата врз основа на продажните трансакции.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,истекува на
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Додај Студентите
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Избришете го вработениот <a href=""#Form/Employee/{0}"">{0}</a> \ за да го откажете овој документ"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Ве молиме изберете {0}
 DocType: C-Form,C-Form No,C-Образец бр
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Растојание
+DocType: Delivery Stop,Distance,Растојание
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Наведете ги вашите производи или услуги што ги купувате или продавате.
 DocType: Water Analysis,Storage Temperature,Температура на складирање
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4168,7 +4171,7 @@
 DocType: Homepage,Company Description for website homepage,Опис на компанијата за веб-сајт почетната страница од пребарувачот
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","За погодност на клиентите, овие кодови може да се користи во печатените формати како Фактури и испорака белешки"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Име suplier
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Не може да се добијат информации за {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Не може да се добијат информации за {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Отворање Влезен весник
 DocType: Contract,Fulfilment Terms,Условите за исполнување
 DocType: Sales Invoice,Time Sheet List,Време Листа на состојба
@@ -4351,7 +4354,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Изберете рачно студентите за активност врз група
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Изберете рачно студентите за активност врз група
 DocType: Journal Entry,User Remark,Корисникот Напомена
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Оптимизирање на правци.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Оптимизирање на правци.
 DocType: Travel Itinerary,Non Diary,Не дневник
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Не може да се создаде бонус за задржување за лево вработените
 DocType: Lead,Market Segment,Сегмент од пазарот
@@ -4382,7 +4385,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Програма за лојалност
 DocType: Student Guardian,Father,татко
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Поддршка на билети
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&quot;Ажурирање Акции&quot; не може да се провери за фиксни продажба на средства
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&quot;Ажурирање Акции&quot; не може да се провери за фиксни продажба на средства
 DocType: Bank Reconciliation,Bank Reconciliation,Банка помирување
 DocType: Attendance,On Leave,на одмор
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Добијат ажурирања
@@ -4427,7 +4430,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Сериски Не и серија
 DocType: Warranty Claim,From Company,Од компанијата
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Збирот на резултатите на критериумите за оценување треба да биде {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Поставете Број на амортизациони Резервирано
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Поставете Број на амортизациони Резервирано
 DocType: Supplier Scorecard Period,Calculations,Пресметки
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Вредност или Количина
 DocType: Payment Terms Template,Payment Terms,Услови на плаќање
@@ -4447,7 +4450,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Попуст (%) на цени за курс со Разлика
 DocType: Healthcare Service Unit Type,Rate / UOM,Оцени / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,сите Магацини
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Не {0} пронајдени за интер-трансакции на компанијата.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Не {0} пронајдени за интер-трансакции на компанијата.
 DocType: Travel Itinerary,Rented Car,Изнајмен автомобил
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,За вашата компанија
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Кредит на сметка мора да биде на сметка Биланс на состојба
@@ -4549,6 +4552,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Критериуми за анализа на растенијата
 DocType: Cheque Print Template,Cheque Height,чек Висина
 DocType: Supplier,Supplier Details,Добавувачот Детали за
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ве молиме наместете серија за нумерација за Присуство преку Поставување&gt; Нумерирање
 DocType: Setup Progress,Setup Progress,Прогрес за поставување
 DocType: Expense Claim,Approval Status,Статус на Одобри
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Од вредност мора да биде помал од вредност во ред {0}
@@ -4642,7 +4646,6 @@
 DocType: Travel Request,Fully Sponsored,Целосно спонзорирана
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Внесување обратен весник
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Клиентот {0} е создаден.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ве молиме подесете Систем за имиџ на вработените во човечки ресурси&gt; Поставувања за човечки ресурси
 DocType: Stock Settings,Limit Percent,Процент граница
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Немам моментални ставки на пазарот
 ,Payment Period Based On Invoice Date,Плаќање период врз основа на датум на фактурата
@@ -4701,7 +4704,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Извор Магацински
 DocType: Installation Note,Installation Date,Инсталација Датум
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Сподели книга
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Ред # {0}: {1} средства не му припаѓа на компанијата {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Ред # {0}: {1} средства не му припаѓа на компанијата {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Создадена фактура {0}
 DocType: Employee,Confirmation Date,Потврда Датум
 DocType: Inpatient Occupancy,Check Out,Проверете
@@ -4721,6 +4724,7 @@
 DocType: Production Plan,Sales Orders Detail,Детали за нарачки за продажба
 DocType: Bin,Requested Quantity,бараната количина
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Ве молиме поставете Систем за именување на инструктори во образованието&gt; Образование
 DocType: Patient,Marital Status,Брачен статус
 DocType: Stock Settings,Auto Material Request,Авто материјал Барање
 DocType: Woocommerce Settings,API consumer secret,АПИ потрошувачка тајна
@@ -4773,7 +4777,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Изберете дена
 DocType: Academic Term,Term Name,терминот Име
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Кредит ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Креирање на лизгалки ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Креирање на лизгалки ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Не можете да уредувате корен јазол.
 DocType: Buying Settings,Purchase Order Required,Нарачка задолжителни
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Тајмер
@@ -4856,7 +4860,7 @@
 DocType: Program Enrollment,School House,школа куќа
 DocType: Serial No,Out of AMC,Од АМЦ
 DocType: Opportunity,Opportunity Amount,Износ на можност
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Број на амортизациони резервација не може да биде поголем од вкупниот број на амортизација
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Број на амортизациони резервација не може да биде поголем од вкупниот број на амортизација
 DocType: Purchase Order,Order Confirmation Date,Датум за потврда на нарачката
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Направете Одржување Посета
@@ -4897,7 +4901,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Batch:
 DocType: Volunteer,Afternoon,Попладне
 DocType: Loyalty Program,Loyalty Program Help,Помош за Програмата за лојалност
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} {1} &quot;е оневозможено
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} {1} &quot;е оневозможено
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Постави како отворено
 DocType: Cheque Print Template,Scanned Cheque,скенирани чекови
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Испрати автоматски пораки до контакти за доставување на трансакции.
@@ -4910,7 +4914,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Точка и гаранција Детали за
 DocType: Chapter,Chapter Members,Членови на глава
 DocType: Sales Team,Contribution (%),Придонес (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Забелешка: Плаќањето за влез нема да бидат направивме од &quot;Пари или банкарска сметка &#39;не е одредено,"
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Забелешка: Плаќањето за влез нема да бидат направивме од &quot;Пари или банкарска сметка &#39;не е одредено,"
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Проектот {0} веќе постои
 DocType: Clinical Procedure,Nursing User,Корисник за нега
 DocType: Employee Benefit Application,Payroll Period,Период на платен список
@@ -4918,6 +4922,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Сериската број {0} не припаѓа на групата {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Одговорности
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Периодот на валидност на овој цитат заврши.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Избришете го вработениот <a href=""#Form/Employee/{0}"">{0}</a> \ за да го откажете овој документ"
 DocType: Expense Claim Account,Expense Claim Account,Тврдат сметка сметка
 DocType: Account,Capital Work in Progress,Капиталната работа е напредок
 DocType: Accounts Settings,Allow Stale Exchange Rates,Дозволи замени стапки на размена
@@ -4999,7 +5005,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Материјал прашање
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Поврзете го Shopify со ERPNext
 DocType: Material Request Item,For Warehouse,За Магацински
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Белешки за испорака {0} ажурирани
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Белешки за испорака {0} ажурирани
 DocType: Employee,Offer Date,Датум на понуда
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Понуди
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Вие сте моментално во режим без мрежа. Вие нема да бидете во можност да ја превчитате додека имате мрежа.
@@ -5050,7 +5056,7 @@
 DocType: Shipping Rule,Calculate Based On,Се пресмета врз основа на
 DocType: Contract,Unfulfilled,Неуспешен
 DocType: Delivery Note Item,From Warehouse,Од Магацин
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Нема вработени за наведените критериуми
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Нема вработени за наведените критериуми
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Нема предмети со Бил на материјали за производство на
 DocType: Shopify Settings,Default Customer,Стандарден клиент
 DocType: Sales Stage,Stage Name,Сценско име
@@ -5093,7 +5099,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Износот на данокот По Износ попуст
 DocType: Patient,Inpatient Status,Статус на стационар
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Дневен работа поставувања Резиме
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Избраните ценовници треба да имаат проверени купување и продавање на полиња.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Избраните ценовници треба да имаат проверени купување и продавање на полиња.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Ве молиме внесете Reqd по датум
 DocType: Payment Entry,Internal Transfer,внатрешен трансфер
 DocType: Asset Maintenance,Maintenance Tasks,Задачи за одржување
@@ -5130,7 +5136,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Со група
 DocType: Guardian,Interests,Интереси
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Овозможи / оневозможи валути.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Не може да се достават некои износи за заработувачка
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Не може да се достават некои износи за заработувачка
 DocType: Exchange Rate Revaluation,Get Entries,Земи записи
 DocType: Production Plan,Get Material Request,Земете материјал Барање
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Поштенски трошоци
@@ -5217,7 +5223,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Сметка сметка е задолжително за ставката {0}
 DocType: BOM,Website Description,Веб-сајт Опис
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Нето промени во капиталот
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Ве молиме откажете купувањето фактура {0} првиот
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Ве молиме откажете купувањето фактура {0} првиот
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Не е дозволено. Ве молиме оневозможете го типот на услугата
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail адреса мора да биде уникатен, веќе постои за {0}"
 DocType: Serial No,AMC Expiry Date,АМЦ датумот на истекување
@@ -5257,7 +5263,7 @@
 DocType: Hotel Room,Hotel Room,Хотелска соба
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},На сметка {0} не припаѓа на компанијата {1}
 DocType: Leave Type,Rounding,Заокружување
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Сериски броеви во ред {0} не се поклопува со Потврда за испорака
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Сериски броеви во ред {0} не се поклопува со Потврда за испорака
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Дистрибуиран износ (проценети)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Потоа ценовните правила се филтрираат врз основа на клиент, група клиенти, територија, снабдувач, група за набавувачи, кампања, партнер за продажба итн."
 DocType: Student,Guardian Details,Гардијан Детали
@@ -5312,7 +5318,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Магацински потребни за акции Точка {0}
 DocType: Leave Allocation,Unused leaves,Неискористени листови
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Внесете го отплатата
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Сите одделенија
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Сите одделенија
 DocType: Healthcare Service Unit,Vacant,Празен
 DocType: Patient,Alcohol Past Use,Користење на алкохол за минатото
 DocType: Fertilizer Content,Fertilizer Content,Содржина на ѓубрива
@@ -5323,7 +5329,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Работната нарачка {0} мора да биде откажана пред да ја откажете оваа Продажна нарачка
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Земи експлодира Бум (вклучувајќи ги и потсклопови)
 DocType: Authorization Rule,Applicable To (Employee),Применливи To (вработените)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Поради Датум е задолжително
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Поради Датум е задолжително
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Интервалот за Атрибут {0} не може да биде 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Тип на бенефиција и износ
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Соби резервирани
@@ -5472,7 +5478,7 @@
 DocType: Purchase Invoice Item,Total Weight,Вкупна тежина
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Комисијата за Продажба
 DocType: Job Offer Term,Value / Description,Вредност / Опис
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ред # {0}: {1} средства не може да се поднесе, тоа е веќе {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ред # {0}: {1} средства не може да се поднесе, тоа е веќе {2}"
 DocType: Tax Rule,Billing Country,Платежна Земја
 DocType: Purchase Order Item,Expected Delivery Date,Се очекува испорака датум
 DocType: Restaurant Order Entry,Restaurant Order Entry,Влез во рецепција за ресторани
@@ -5511,12 +5517,13 @@
 DocType: Maintenance Visit,Breakdown,Дефект
 DocType: Travel Itinerary,Vegetarian,Вегетаријанец
 DocType: Patient Encounter,Encounter Date,Датум на средба
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Сметка: {0} со валутна: не може да се одбрани {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Сметка: {0} со валутна: не може да се одбрани {1}
 DocType: Bank Statement Transaction Settings Item,Bank Data,Податоци за банка
 DocType: Purchase Receipt Item,Sample Quantity,Количина на примероци
 DocType: Bank Guarantee,Name of Beneficiary,Име на корисникот
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Ажурирајте го БОМ трошокот автоматски преку Распоредувачот, врз основа на најновата проценка за стапката / ценовниот лист / последната стапка на набавка на суровини."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Добавувачот&gt; Група на снабдувачи
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Датум
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},На сметка {0}: Родител на сметка {1} не припаѓа на компанијата: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Успешно избришани сите трансакции поврзани со оваа компанија!
@@ -5544,7 +5551,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,јазли дете може да се создаде само под јазли типот &quot;група&quot;
 DocType: Attendance Request,Half Day Date,Половина ден Датум
 DocType: Academic Year,Academic Year Name,Академска година име
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} не е дозволено да се справи со {1}. Ве молиме да ја смените компанијата.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} не е дозволено да се справи со {1}. Ве молиме да ја смените компанијата.
 DocType: Sales Partner,Contact Desc,Контакт Desc
 DocType: Email Digest,Send regular summary reports via Email.,Испрати редовни збирни извештаи преку E-mail.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Поставете стандардна сметка во трошок Тип на приговор {0}
@@ -5590,7 +5597,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Сите групи потрошувачи
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,Акумулирана Месечни
 DocType: Attendance Request,On Duty,На должност
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задолжително. Можеби рекорд размена на валута не е создадена за {1} до {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задолжително. Можеби рекорд размена на валута не е создадена за {1} до {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Планот за вработување {0} веќе постои за означување {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Данок Шаблон е задолжително.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,На сметка {0}: Родител на сметка {1} не постои
@@ -5670,11 +5677,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Барем еден магацин е задолжително
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Конфигурирај ги Полето на предметот како UOM, група на предмети, Опис и број на часови."
 DocType: Certification Application,Certification Status,Статус на сертификација
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Пазар
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Пазар
 DocType: Travel Itinerary,Travel Advance Required,Потребно е патување
 DocType: Subscriber,Subscriber Name,Претплатник Име
 DocType: Serial No,Out of Warranty,Надвор од гаранција
-DocType: Cashier Closing,Cashier-closing-,Касиери-затворање-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Тип на мапиран податок
 DocType: BOM Update Tool,Replace,Заменете
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Не се пронајдени производи.
@@ -5762,7 +5768,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Основни даночни обрасци за продажба и купување се создаваат.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Оценка Резултатот од резултатот {0} веќе постои.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Пример: ABCD. #####. Ако серијата е поставена и Batch No не е споменат во трансакциите, тогаш автоматски сериски број ќе биде креиран врз основа на оваа серија. Ако секогаш сакате експлицитно да го споменате Batch No за оваа ставка, оставете го ова празно. Забелешка: оваа поставка ќе има приоритет над Префиксот за назив на сериите во поставките на акции."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ве молиме наместете серија за нумерација за Присуство преку Поставување&gt; Нумерирање
 DocType: BOM,Materials Required (Exploded),Потребни материјали (експлодира)
 DocType: Contract,Party User,Партија корисник
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Поставете компанијата филтер празно ако група од страна е &quot;Друштвото&quot;
@@ -5965,7 +5970,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Грофот
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Мора да се постави датумот на завршување на датумот на судењето и датумот на завршување на судечкиот период
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Просечна стапка
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Вкупниот износ на исплата во распоредот за плаќање мора да биде еднаков на Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Вкупниот износ на исплата во распоредот за плаќање мора да биде еднаков на Grand / Rounded Total
 DocType: Subscription Plan Detail,Plan,План
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,"Извод од банка биланс, како на генералниот Леџер"
 DocType: Job Applicant,Applicant Name,Подносител на барањето Име
@@ -6034,7 +6039,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Сапун и детергент
 DocType: BOM,Show Items,Прикажи Теми
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Од време не може да биде поголема отколку на време.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Дали сакате да ги известите сите клиенти преку е-пошта?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Дали сакате да ги известите сите клиенти преку е-пошта?
 DocType: Subscription Plan,Billing Interval,Интервал на фактурирање
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Филмски и видео
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Нареди
@@ -6043,9 +6048,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Редот {0}: {1} мора да биде поголем од 0
 DocType: Assessment Criteria,Assessment Criteria Group,Критериуми за оценување група
 DocType: Healthcare Settings,Patient Name By,Име на пациентот од
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Вчитај дневник Внес за плати од {0} до {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Вчитај дневник Внес за плати од {0} до {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Овозможи одложен приход
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Отворање Акумулирана амортизација треба да биде помалку од еднаква на {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Отворање Акумулирана амортизација треба да биде помалку од еднаква на {0}
 DocType: Warehouse,Warehouse Name,Магацински Име
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Крајниот датум на почеток мора да биде помал од вистинскиот краен датум
 DocType: Naming Series,Select Transaction,Изберете Трансакција
@@ -6197,7 +6202,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Вработениот {0} од одделение {1} нема политика за напуштање на стандард
 DocType: Salary Detail,Salary Detail,плата детали
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Ве молиме изберете {0} Првиот
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Додадено е {0} корисници
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Додадено е {0} корисници
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","Во случај на повеќеслојна програма, корисниците ќе бидат автоматски доделени на засегнатите нивоа, како на нивните потрошени"
 DocType: Appointment Type,Physician,Лекар
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Серија {0} од ставка {1} е истечен.
@@ -6342,7 +6347,7 @@
 DocType: Asset,Custodian,Чувар
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Point-of-Продажба Профил
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} треба да биде вредност помеѓу 0 и 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Плаќање на {0} од {1} до {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Плаќање на {0} од {1} до {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Необезбедени кредити
 DocType: Cost Center,Cost Center Name,Чини Име центар
 DocType: Student,B+,B +
@@ -6374,6 +6379,7 @@
 DocType: Employee,Date of Issue,Датум на издавање
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Како на Settings Купување ако Набавка Reciept задолжителни == &quot;ДА&quot;, тогаш за создавање Набавка фактура, корисникот треба да се создаде Набавка Потврда за прв елемент {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Ред # {0}: Постави Добавувачот за ставката {1}
+DocType: Global Defaults,Default Distance Unit,Стандардна единица за оддалеченост
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Ред {0}: часови вредност мора да биде поголема од нула.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Веб-страница на слика {0} прилог Точка {1} Не може да се најде
 DocType: Issue,Content Type,Типот на содржина
@@ -6429,7 +6435,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Должење на сметка мора да биде на сметка Биланс на состојба
 DocType: Asset,Naming Series,Именување Серија
 DocType: Vital Signs,Coated,Обложени
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Ред {0}: Очекувана вредност по корисен животен век мора да биде помала од износот на бруто-откуп
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Ред {0}: Очекувана вредност по корисен животен век мора да биде помала од износот на бруто-откуп
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Settings
 DocType: Leave Block List,Leave Block List Name,Остави Забрани Листа на Име
 DocType: Certified Consultant,Certification Validity,Валидност на сертификацијата
@@ -6498,6 +6504,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Банкарски наслов
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Погледнете ги лабораторните тестови
 DocType: Hub Users,Hub Users,Users Hub
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група на клиенти&gt; Територија
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Датум на одржување
 DocType: Purchase Invoice Item,Rejected Serial No,Одбиени Сериски Не
@@ -6512,7 +6519,7 @@
 DocType: SG Creation Tool Course,Max Strength,Макс Сила
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Инсталирање на меморија
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Нема избрана белешка за избор за клиент {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Нема избрана белешка за избор за клиент {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Вработениот {0} нема максимален износ на корист
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Изберете предмети врз основа на датумот на испорака
 DocType: Grant Application,Has any past Grant Record,Има некое минато грант рекорд
@@ -6540,7 +6547,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Резервација на хотелот
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Услуги за Потрошувачи
 DocType: BOM,Thumbnail,Thumbnail
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Не се пронајдени контакти со идентификација на е-пошта.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Не се пронајдени контакти со идентификација на е-пошта.
 DocType: Item Customer Detail,Item Customer Detail,Точка Детали за корисници
 DocType: Notification Control,Prompt for Email on Submission of,Прашај за е-мејл за доставување на
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Максималниот износ на корист на вработениот {0} надминува {1}
@@ -6801,7 +6808,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,"Не може да се тајните на група, бидејќи е избран тип на сметка."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} е изменета. Ве молиме да се одмориме.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Стоп за корисниците од правење Остави апликации на наредните денови.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код Код&gt; Точка група&gt; Бренд
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Ако неограничен рок на употреба за Поени за Доверба, оставете траење на траење празно или 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Членови за одржување на тимот
 DocType: Loyalty Point Entry,Purchase Amount,купување износ
@@ -6809,7 +6815,7 @@
 											to fullfill Sales Order {2}",Не може да се испорача Сериски број {0} на ставката {1} како што е резервирано \ за да се исполни нарачката за продажба {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Добавувачот Цитати {0} создадена
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Крајот на годината не може да биде пред почетокот на годината
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Крајот на годината не може да биде пред почетокот на годината
 DocType: Employee Benefit Application,Employee Benefits,Користи за вработените
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Спакувани количество мора да биде еднаков количина за ставката {0} во ред {1}
 DocType: Work Order,Manufactured Qty,Произведени Количина
@@ -6825,6 +6831,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Изберете Серија броеви
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,За GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Сметки се зголеми на клиенти.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ве молиме подесете Систем за имиџ на вработените во човечки ресурси&gt; Поставувања за човечки ресурси
 DocType: Healthcare Settings,Invoice Appointments Automatically,Автоматско назначување на фактурата
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,На проект
 DocType: Salary Component,Variable Based On Taxable Salary,Променлива врз основа на оданочлива плата
@@ -6873,7 +6880,7 @@
 DocType: POS Profile,Account for Change Amount,Сметка за промени Износ
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Поврзување со QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Вкупно добивка / загуба
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Невалидна фирма за фактура на Интер Компани.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Невалидна фирма за фактура на Интер Компани.
 DocType: Purchase Invoice,input service,услуга за внесување
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ред {0}: Забава / профилот не се поклопува со {1} / {2} со {3} {4}
 DocType: Employee Promotion,Employee Promotion,Промоција на вработените
@@ -7004,7 +7011,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Преферираната површина за сместување
 apps/erpnext/erpnext/config/selling.py +184,Analytics,анализатор
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Кошничка е празна
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Ве молиме поставете Систем за именување на инструктори во образованието&gt; Образование
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Точката {0} нема сериски број. Само сериализирани ставки \ можат да имаат испорака врз основа на сериски број
 DocType: Vehicle,Model,модел
@@ -7034,7 +7040,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Нема ништо да се промени
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Ве молиме изберете CSV датотека
 DocType: Holiday List,Total Holidays,Вкупно празници
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Недостасува е-пошта за испраќање. Поставете го едно во поставките за испорака.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Недостасува е-пошта за испраќање. Поставете го едно во поставките за испорака.
 DocType: Student Leave Application,Mark as Present,Означи како Тековен
 DocType: Supplier Scorecard,Indicator Color,Боја на индикаторот
 DocType: Purchase Order,To Receive and Bill,За да примите и Бил
@@ -7043,7 +7049,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Изберете сериски број
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Дизајнер
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Услови и правила Шаблон
-DocType: Serial No,Delivery Details,Детали за испорака
+DocType: Delivery Trip,Delivery Details,Детали за испорака
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Цена центар е потребно во ред {0} даноци во табелата за видот {1}
 DocType: Program,Program Code,Code програмата
 DocType: Terms and Conditions,Terms and Conditions Help,Услови и правила Помош
@@ -7067,7 +7073,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Потенцијален клиент Време Денови
 DocType: Cash Flow Mapping,Is Income Tax Expense,Дали трошоците за данок на доход
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Вашата нарачка е надвор за испорака!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ред # {0}: Праќање пораки во Датум мора да биде иста како датум на купување {1} на средства {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ред # {0}: Праќање пораки во Датум мора да биде иста како датум на купување {1} на средства {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Изберете го ова ако ученикот е престојуваат во Хостел на Институтот.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Ве молиме внесете Продај Нарачка во горната табела
 ,Stock Summary,акции Резиме
diff --git a/erpnext/translations/ml.csv b/erpnext/translations/ml.csv
index cb3b476..8af430e 100644
--- a/erpnext/translations/ml.csv
+++ b/erpnext/translations/ml.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,കാലാവധി നാമം
 DocType: Employee,Salary Mode,ശമ്പളം മോഡ്
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,രജിസ്റ്റർ ചെയ്യുക
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,രജിസ്റ്റർ ചെയ്യുക
 DocType: Patient,Divorced,ആരുമില്ലെന്ന
 DocType: Support Settings,Post Route Key,പോസ്റ്റ് റൂട്ട് കീ
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,ഇനം ഒരു ഇടപാട് ഒന്നിലധികം തവണ ചേർക്കാൻ അനുവദിക്കുക
@@ -35,7 +35,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,പുതിയ എക്സ്ചേഞ്ച് നിരക്ക്
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},കറൻസി വില പട്ടിക {0} ആവശ്യമാണ്
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ഇടപാടിലും കണക്കു കൂട്ടുക.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണക്കാരൻ തരം
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,കസ്റ്റമർ കോൺടാക്റ്റ്
 DocType: Patient Appointment,Check availability,ലഭ്യത ഉറപ്പു വരുത്തുക
@@ -71,7 +70,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,തുറക്കുക കാണിക്കുക
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,സീരീസ് വിജയകരമായി അപ്ഡേറ്റ്
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,ചെക്ക് ഔട്ട്
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} വരിയിൽ {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} വരിയിൽ {0}
 DocType: Asset Finance Book,Depreciation Start Date,ഡിസ്രിരിസേഷൻ ആരംഭ തീയതി
 DocType: Pricing Rule,Apply On,പുരട്ടുക
 DocType: Item Price,Multiple Item prices.,മൾട്ടിപ്പിൾ ഇനം വില.
@@ -117,7 +116,7 @@
 DocType: Lab Prescription,Lab Prescription,പ്രിസ്ക്രിപ്ഷൻ ലാബ്
 ,Delay Days,കാലതാമസം ഒഴിവാക്കുക
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,സേവന ചിലവേറിയ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},സീരിയൽ നമ്പർ: {0} ഇതിനകം സെയിൽസ് ഇൻവോയ്സ് പരാമർശിച്ചിരിക്കുന്ന ആണ്: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},സീരിയൽ നമ്പർ: {0} ഇതിനകം സെയിൽസ് ഇൻവോയ്സ് പരാമർശിച്ചിരിക്കുന്ന ആണ്: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,വികയപതം
 DocType: Purchase Invoice Item,Item Weight Details,ഇനം ഭാരം വിശദാംശങ്ങൾ
 DocType: Asset Maintenance Log,Periodicity,ഇതേ
@@ -142,6 +141,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,കണക്കെഴുത്തുകാരന്
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,വില ലിസ്റ്റ് വിൽക്കുന്നു
 DocType: Patient,Tobacco Current Use,പുകയില നിലവിലുളള ഉപയോഗം
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","ആരംഭ തീയതിയും അവസാന തീയതിയും തൊഴിൽ കാർഡ് ഉപയോഗിച്ച് ഓവർലാപ്പുചെയ്യുന്നു <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,വിൽക്കുന്ന നിരക്ക്
 DocType: Cost Center,Stock User,സ്റ്റോക്ക് ഉപയോക്താവ്
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -161,7 +161,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,ബന്ധപ്പെട്ട
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,ഹാജർ തീയതി ജീവനക്കാരന്റെ ചേരുന്ന തീയതി കുറവ് പാടില്ല
 DocType: Grading Scale,Grading Scale Name,ഗ്രേഡിംഗ് സ്കെയിൽ പേര്
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Marketplace- ലേക്ക് ഉപയോക്താക്കളെ ചേർക്കുക
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Marketplace- ലേക്ക് ഉപയോക്താക്കളെ ചേർക്കുക
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,ഇത് ഒരു റൂട്ട് അക്കൌണ്ട് ആണ് എഡിറ്റ് ചെയ്യാൻ കഴിയില്ല.
 DocType: Sales Invoice,Company Address,കമ്പനി വിലാസം
 DocType: BOM,Operations,പ്രവര്ത്തനങ്ങള്
@@ -316,7 +316,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,വ്യത്യാസം
 DocType: Production Plan,Material Request Detail,മെറ്റീരിയൽ അഭ്യർത്ഥന വിശദാംശം
 DocType: Selling Settings,Default Quotation Validity Days,സ്ഥിരസ്ഥിതി ഉദ്ധരണിക്കൽ സാധുത ദിവസങ്ങൾ
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","നികുതി ഉൾപ്പെടുത്തുന്നതിനായി നിരയിൽ {0} ഇനം നിരക്ക്, വരികൾ {1} ലെ നികുതികൾ കൂടി ഉൾപ്പെടുത്തും വേണം"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","നികുതി ഉൾപ്പെടുത്തുന്നതിനായി നിരയിൽ {0} ഇനം നിരക്ക്, വരികൾ {1} ലെ നികുതികൾ കൂടി ഉൾപ്പെടുത്തും വേണം"
 DocType: SMS Center,SMS Center,എസ്എംഎസ് കേന്ദ്രം
 DocType: Payroll Entry,Validate Attendance,അറ്റൻഡൻസ് പരിശോധിക്കുക
 DocType: Sales Invoice,Change Amount,തുക മാറ്റുക
@@ -434,7 +434,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,വാക്കുകളിൽ തുക വരി വിടവ്
 DocType: Vehicle,Additional Details,കൂടുതൽ വിവരങ്ങൾ
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,വിവരണം നൽകിയിട്ടില്ല
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,വിതരണക്കാരൻ&gt; വിതരണക്കാരൻ ഗ്രൂപ്പ്
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,വാങ്ങിയതിന് അഭ്യർത്ഥന.
 DocType: POS Closing Voucher Details,Collected Amount,ശേഖരിച്ച തുക
 DocType: Lab Test,Submitted Date,സമർപ്പിച്ച തീയതി
@@ -479,7 +478,7 @@
 DocType: Student Admission,Student Admission,വിദ്യാർത്ഥിയുടെ അഡ്മിഷൻ
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,ഇനം {0} റദ്ദാക്കി
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,മൂല്യശോഷണ വരി {0}: കഴിഞ്ഞദിവസം പോലെ മൂല്യത്തകർച്ച ആരംഭ തീയതി നൽകി
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,മൂല്യശോഷണ വരി {0}: കഴിഞ്ഞദിവസം പോലെ മൂല്യത്തകർച്ച ആരംഭ തീയതി നൽകി
 DocType: Contract Template,Fulfilment Terms and Conditions,നിർവ്വഹണ നിബന്ധനകളും വ്യവസ്ഥകളും
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന
 DocType: Bank Reconciliation,Update Clearance Date,അപ്ഡേറ്റ് ക്ലിയറൻസ് തീയതി
@@ -536,6 +535,7 @@
 DocType: Accounts Settings,Settings for Accounts,അക്കൗണ്ടുകൾക്കുമുള്ള ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},വിതരണക്കാരൻ ഇൻവോയ്സ് വാങ്ങൽ ഇൻവോയ്സ് {0} നിലവിലുണ്ട്
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,സെയിൽസ് പേഴ്സൺ ട്രീ നിയന്ത്രിക്കുക.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Google മാപ്സ് ക്രമീകരണങ്ങൾ അപ്രാപ്തമാക്കിയതിനാൽ, റൂട്ട് പ്രോസസ്സ് ചെയ്യാൻ കഴിയില്ല."
 DocType: Job Applicant,Cover Letter,കവർ ലെറ്റർ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ക്ലിയർ നിലവിലുള്ള ചെക്കുകൾ ആൻഡ് നിക്ഷേപങ്ങൾ
 DocType: Item,Synced With Hub,ഹബ് കൂടി സമന്വയിപ്പിച്ചു
@@ -594,7 +594,7 @@
 DocType: Asset Value Adjustment,New Asset Value,പുതിയ അസറ്റ് മൂല്യം
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,കസ്റ്റമർ നാണയ ഉപഭോക്താവിന്റെ അടിസ്ഥാന കറൻസി മാറ്റുമ്പോൾ തോത്
 DocType: Course Scheduling Tool,Course Scheduling Tool,കോഴ്സ് സമയംസജ്ജീകരിയ്ക്കുന്നു ടൂൾ
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},വരി # {0}: വാങ്ങൽ ഇൻവോയ്സ് നിലവിലുള്ള അസറ്റ് {1} നേരെ ഉണ്ടാക്കി കഴിയില്ല
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},വരി # {0}: വാങ്ങൽ ഇൻവോയ്സ് നിലവിലുള്ള അസറ്റ് {1} നേരെ ഉണ്ടാക്കി കഴിയില്ല
 DocType: Crop Cycle,LInked Analysis,LInked വിശകലനം
 DocType: POS Closing Voucher,POS Closing Voucher,പിഒസ് ക്ലോസിംഗ് വൗച്ചർ
 DocType: Contract,Lapsed,ലാപ്സ് ചെയ്തു
@@ -628,6 +628,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} കോഴ്സ് {2} എൻറോൾ ചെയ്തിട്ടില്ല
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,വിദ്യാർഥിയുടെ പേര്:
 DocType: POS Closing Voucher Details,Difference,വ്യത്യാസം
+DocType: Delivery Settings,Delay between Delivery Stops,ഡെലിവറി സ്റ്റോപ്പുകൾക്കിടയിൽ കാലതാമസം
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},സീരിയൽ ഇല്ല {0} ഡെലിവറി നോട്ട് {1} സ്വന്തമല്ല
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","സെർവറിന്റെ GoCardless കോൺഫിഗറേഷനിൽ ഒരു പ്രശ്നമുണ്ടെന്ന് തോന്നുന്നു. വിഷമിക്കേണ്ട, പരാജയപ്പെട്ടാൽ നിങ്ങളുടെ അക്കൗണ്ടിലേക്ക് തുക തിരികെ നൽകും."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext ഡെമോ
@@ -688,7 +689,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,"ക്വാണ്ടിറ്റി, റേറ്റ്"
 DocType: Delivery Note,% Installed,% ഇൻസ്റ്റാളുചെയ്തു
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,ക്ലാസ്മുറിയുടെ / ലബോറട്ടറീസ് തുടങ്ങിയവ പ്രഭാഷണങ്ങളും ഷെഡ്യൂൾ കഴിയും.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,രണ്ട് കമ്പനികളുടെയും കമ്പനിയുടെ കറൻസിയും ഇന്റർ കമ്പനിയുടെ ഇടപാടുകൾക്ക് യോജിച്ചതായിരിക്കണം.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,രണ്ട് കമ്പനികളുടെയും കമ്പനിയുടെ കറൻസിയും ഇന്റർ കമ്പനിയുടെ ഇടപാടുകൾക്ക് യോജിച്ചതായിരിക്കണം.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,കമ്പനിയുടെ പേര് ആദ്യം നൽകുക
 DocType: Travel Itinerary,Non-Vegetarian,നോൺ-വെജിറ്റേറിയൻ
 DocType: Purchase Invoice,Supplier Name,വിതരണക്കാരൻ പേര്
@@ -774,7 +775,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,തീയതി മുതൽ വാടകയ്ക്കെടുത്തു
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,ബിൽഡ് മതിയായ ഭാഗങ്ങൾ
 DocType: POS Profile User,POS Profile User,POS പ്രൊഫൈൽ ഉപയോക്താവ്
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,വരി {0}: അഴിമതി ആരംഭ തീയതി ആവശ്യമാണ്
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,വരി {0}: അഴിമതി ആരംഭ തീയതി ആവശ്യമാണ്
 DocType: Purchase Invoice Item,Service Start Date,സേവനം ആരംഭിക്കുന്ന തീയതി
 DocType: Subscription Invoice,Subscription Invoice,സബ്സ്ക്രിപ്ഷൻ ഇൻവോയ്സ്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,നേരിട്ടുള്ള ആദായ
@@ -843,7 +844,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,ഇതിനകം മറ്റൊരു കമ്പനി ഉപയോഗിക്കുന്ന ചുരുക്കെഴുത്ത്
 DocType: Selling Settings,Default Customer Group,സ്ഥിരസ്ഥിതി ഉപഭോക്തൃ ഗ്രൂപ്പ്
 DocType: Employee,IFSC Code,IFSC കോഡ്
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","ആരംഭ തീയതിയും അവസാന തീയതിയും തൊഴിൽ കാർഡ് ഉപയോഗിച്ച് ഓവർലാപ്പുചെയ്യുന്നു <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","അപ്രാപ്തമാക്കുകയാണെങ്കിൽ, &#39;വൃത്തത്തിലുള്ള ആകെ&#39; ഫീൽഡ് ഒരു ഇടപാടിലും ദൃശ്യമാകില്ല"
 DocType: BOM,Operating Cost,ഓപ്പറേറ്റിംഗ് ചെലവ്
 DocType: Crop,Produced Items,ഉല്പന്ന വസ്തുക്കൾ
@@ -895,7 +895,7 @@
 DocType: Supplier,Prevent RFQs,RFQ കൾ തടയുക
 DocType: Hub User,Hub User,ഹബ് യൂസർ
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,സെയിൽസ് ഓർഡർ നിർമ്മിക്കുക
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},{0} മുതൽ {1} വരെയുള്ള കാലയളവിനുള്ള ശമ്പള സ്ലിപ്പ് സമർപ്പിച്ചു
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},{0} മുതൽ {1} വരെയുള്ള കാലയളവിനുള്ള ശമ്പള സ്ലിപ്പ് സമർപ്പിച്ചു
 DocType: Project Task,Project Task,പ്രോജക്ട് ടാസ്ക്
 DocType: Loyalty Point Entry Redemption,Redeemed Points,റിഡീം ചെയ്ത പോയിന്റുകൾ
 ,Lead Id,ലീഡ് ഐഡി
@@ -1024,7 +1024,7 @@
 DocType: Fee Validity,Max number of visit,സന്ദർശിക്കുന്ന പരമാവധി എണ്ണം
 ,Hotel Room Occupancy,ഹോട്ടൽ മുറികൾ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet സൃഷ്ടിച്ചത്:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},അടക്കേണ്ട രീതി {0} ൽ സ്ഥിരസ്ഥിതി ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട് സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},അടക്കേണ്ട രീതി {0} ൽ സ്ഥിരസ്ഥിതി ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട് സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,പേരെഴുതുക
 DocType: GST Settings,GST Settings,ചരക്കുസേവന ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},കറൻസി പ്രൈസ് ലിസ്റ്റ് പോലെ ആയിരിക്കണം: {0}
@@ -1079,7 +1079,7 @@
 DocType: Vehicle Log,Service Details,സേവന വിശദാംശങ്ങൾ
 DocType: Lab Test Template,Grouped,ഗ്രൂപ്പുചെയ്തു
 DocType: Selling Settings,Delivery Note Required,ഡെലിവറി നോട്ട് ആവശ്യമാണ്
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,ശമ്പള സ്ലിപ്പുകൾ സമർപ്പിക്കുന്നു ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,ശമ്പള സ്ലിപ്പുകൾ സമർപ്പിക്കുന്നു ...
 DocType: Bank Guarantee,Bank Guarantee Number,ബാങ്ക് ഗ്യാരണ്ടി നമ്പർ
 DocType: Bank Guarantee,Bank Guarantee Number,ബാങ്ക് ഗ്യാരണ്ടി നമ്പർ
 DocType: Assessment Criteria,Assessment Criteria,അസസ്മെന്റ് മാനദണ്ഡം
@@ -1105,7 +1105,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,പേയ്മെന്റ് എൻട്രി സൃഷ്ടിക്കപ്പെടാത്ത
 DocType: Request for Quotation,Get Suppliers,വിതരണക്കാരെ നേടുക
 DocType: Purchase Receipt Item Supplied,Current Stock,ഇപ്പോഴത്തെ സ്റ്റോക്ക്
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},വരി # {0}: അസറ്റ് {1} ഇനം {2} ലിങ്കുചെയ്തിട്ടില്ല ഇല്ല
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},വരി # {0}: അസറ്റ് {1} ഇനം {2} ലിങ്കുചെയ്തിട്ടില്ല ഇല്ല
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,പ്രിവ്യൂ ശമ്പളം ജി
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,അക്കൗണ്ട് {0} ഒന്നിലധികം തവണ നൽകിയിട്ടുണ്ടെന്നും
 DocType: Account,Expenses Included In Valuation,മൂലധനം ഉൾപ്പെടുത്തിയിട്ടുണ്ട് ചിലവുകൾ
@@ -1182,7 +1182,7 @@
 DocType: Soil Texture,Sand,മണല്
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,എനർജി
 DocType: Opportunity,Opportunity From,നിന്ന് ഓപ്പർച്യൂനിറ്റി
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,വരി {0}: {1} ഇനം {2} എന്നതിന് സീരിയൽ നമ്പറുകൾ ആവശ്യമാണ്. നിങ്ങൾ {3} നൽകി.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,വരി {0}: {1} ഇനം {2} എന്നതിന് സീരിയൽ നമ്പറുകൾ ആവശ്യമാണ്. നിങ്ങൾ {3} നൽകി.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,ദയവായി ഒരു പട്ടിക തിരഞ്ഞെടുക്കുക
 DocType: BOM,Website Specifications,വെബ്സൈറ്റ് വ്യതിയാനങ്ങൾ
 DocType: Special Test Items,Particulars,വിശദാംശങ്ങൾ
@@ -1272,7 +1272,7 @@
 DocType: Item,Items with higher weightage will be shown higher,ചിത്രം വെയ്റ്റേജ് ഇനങ്ങൾ ചിത്രം കാണിക്കും
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,ലാബ് ടെസ്റ്റുകളും സുപ്രധാന സൂചനകളും
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ബാങ്ക് അനുരഞ്ജനം വിശദാംശം
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,വരി # {0}: അസറ്റ് {1} സമർപ്പിക്കേണ്ടതാണ്
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,വരി # {0}: അസറ്റ് {1} സമർപ്പിക്കേണ്ടതാണ്
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ജീവനക്കാരൻ കണ്ടെത്തിയില്ല
 DocType: Item,If subcontracted to a vendor,ഒരു വെണ്ടർ വരെ subcontracted എങ്കിൽ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് ഇതിനകം അപ്ഡേറ്റ് ചെയ്യുന്നത്.
@@ -1327,7 +1327,6 @@
 DocType: Loyalty Program Collection,Tier Name,ടയർ പേര്
 DocType: HR Settings,Enter retirement age in years,വർഷങ്ങളിൽ വിരമിക്കൽ പ്രായം നൽകുക
 DocType: Crop,Target Warehouse,ടാർജറ്റ് വെയർഹൗസ്
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup&gt; Settings&gt; Naming Series വഴി {0} നാമത്തിനായുള്ള പരമ്പര സജ്ജീകരിക്കുക
 DocType: Payroll Employee Detail,Payroll Employee Detail,പേയ്റോൾ തൊഴിലുടമ വിശദാംശം
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,വെയർഹൗസ് തിരഞ്ഞെടുക്കുക
 DocType: Cheque Print Template,Starting location from left edge,ഇടത് അറ്റം നിന്ന് ലൊക്കേഷൻ ആരംഭിക്കുന്നു
@@ -1417,7 +1416,7 @@
 DocType: Work Order,Plan material for sub-assemblies,സബ് സമ്മേളനങ്ങൾ പദ്ധതി മെറ്റീരിയൽ
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,സെയിൽസ് പങ്കാളികളും ടെറിട്ടറി
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM ലേക്ക് {0} സജീവ ആയിരിക്കണം
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,ട്രാൻസ്ഫർ ചെയ്യാനായി ഇനങ്ങളൊന്നും ലഭ്യമല്ല
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,ട്രാൻസ്ഫർ ചെയ്യാനായി ഇനങ്ങളൊന്നും ലഭ്യമല്ല
 DocType: Employee Boarding Activity,Activity Name,പ്രവർത്തന നാമം
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,റിലീസ് തിയതി മാറ്റുക
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,"പൂർത്തിയായ ഉല്പന്ന അളവ് <b>{0}</b> , കൂടാതെ <b>{1}</b> എന്നത് വ്യത്യസ്തമായിരിക്കില്ല"
@@ -1641,6 +1640,7 @@
 DocType: Project,First Email,ആദ്യ ഇമെയിൽ
 DocType: Company,Exception Budget Approver Role,ഒഴിവാക്കൽ ബജറ്റ് അംഗീകൃത റോൾ
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","സെറ്റ് ചെയ്തുകഴിഞ്ഞാൽ, സെറ്റ് തിയതി വരെ ഈ ഇൻവോയ്സ് ഹോൾഡ് ആയിരിക്കും"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,സെയിൽസ് ഓർഡർ / പൂർത്തിയായ ഗുഡ്സ് സംഭരണശാല കരുതിവച്ചിരിക്കുന്ന വെയർഹൗസ്
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,തുക വിൽക്കുന്ന
 DocType: Repayment Schedule,Interest Amount,പലിശ തുക
@@ -1652,7 +1652,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,രേഖകള്
 DocType: Asset,Scrapped,തയ്യാർ
 DocType: Item,Item Defaults,ഇനം സ്ഥിരസ്ഥിതികൾ
-DocType: Purchase Invoice,Returns,റിട്ടേൺസ്
+DocType: Cashier Closing,Returns,റിട്ടേൺസ്
 DocType: Job Card,WIP Warehouse,WIP വെയർഹൗസ്
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},സീരിയൽ ഇല്ല {0} {1} വരെ അറ്റകുറ്റപ്പണി കരാർ പ്രകാരം ആണ്
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,റിക്രൂട്ട്മെന്റ്
@@ -1666,7 +1666,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,ട്രാൻസ്ഫർ തരം
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,സെയിൽസ് ചെലവുകൾ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ഉപഭോക്താവ്&gt; കസ്റ്റമർ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
 DocType: Diagnosis,Diagnosis,രോഗനിർണ്ണയം
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,സ്റ്റാൻഡേർഡ് വാങ്ങൽ
 DocType: Attendance Request,Explanation,വിശദീകരണം
@@ -1679,7 +1678,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,ഓർഡറിന്റെ ഇനങ്ങൾ വാങ്ങുക
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,സിപ്പ് കോഡ്
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},സെയിൽസ് ഓർഡർ {0} {1} ആണ്
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},വായ്പയിൽ പലിശ വരുമാനം അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},വായ്പയിൽ പലിശ വരുമാനം അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക {0}
 DocType: Opportunity,Contact Info,ബന്ധപ്പെടുന്നതിനുള്ള വിവരം
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,സ്റ്റോക്ക് എൻട്രികളിൽ ഉണ്ടാക്കുന്നു
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,നില ഇടത്തോടുകൂടിയ ജീവനക്കാരനെ പ്രോത്സാഹിപ്പിക്കാനാവില്ല
@@ -1691,7 +1690,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,പൂജ്യം ബില്ലിങ് മണിക്കൂറിന് ഇൻവോയ്സ് ഉണ്ടാക്കാനാകില്ല
 DocType: Company,Date of Commencement,ആരംഭിക്കുന്ന ദിവസം
 DocType: Sales Person,Select company name first.,ആദ്യം കമ്പനിയുടെ പേര് തിരഞ്ഞെടുക്കുക.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},{0} ലേക്ക് അയച്ച ഇമെയിൽ
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},{0} ലേക്ക് അയച്ച ഇമെയിൽ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ഉദ്ധരണികളും വിതരണക്കാരിൽനിന്നുമാണ് ലഭിച്ചു.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOM മാറ്റി പകരം എല്ലാ BOM- കളിൽ ഏറ്റവും പുതിയ വിലയും പുതുക്കുക
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},{0} ചെയ്യുക | {1} {2}
@@ -1712,7 +1711,7 @@
 DocType: Asset Movement,From Employee,ജീവനക്കാരുടെ നിന്നും
 DocType: Driver,Cellphone Number,സെൽഫോൺ നമ്പർ
 DocType: Project,Monitor Progress,മോണിറ്റർ പുരോഗതി
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,മുന്നറിയിപ്പ്: സിസ്റ്റം ഇനം {0} തുക നു ശേഷം overbilling പരിശോധിക്കില്ല {1} പൂജ്യമാണ് ലെ
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,മുന്നറിയിപ്പ്: സിസ്റ്റം ഇനം {0} തുക നു ശേഷം overbilling പരിശോധിക്കില്ല {1} പൂജ്യമാണ് ലെ
 DocType: Journal Entry,Make Difference Entry,വ്യത്യാസം എൻട്രി നിർമ്മിക്കുക
 DocType: Supplier Quotation,Auto Repeat Section,സ്വയം ആവർത്തിക്കുക വിഭാഗം
 DocType: Upload Attendance,Attendance From Date,ഈ തീയതി മുതൽ ഹാജർ
@@ -1813,7 +1812,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,വരി # {0}: നിരസിച്ചു Qty വാങ്ങൽ പകരമായി പ്രവേശിക്കുവാൻ പാടില്ല
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,തിരഞ്ഞെടുത്ത കസ്റ്റമർക്കായി ഉപഭോക്തൃ ഗ്രൂപ്പ് മാറ്റുന്നത് അനുവദനീയമല്ല.
 ,Purchase Order Items To Be Billed,ബില്ല് ക്രമത്തിൽ ഇനങ്ങൾ വാങ്ങുക
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,കണക്കാക്കിയ സമയം അപ്ഡേറ്റ് ചെയ്യുന്നു.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,കണക്കാക്കിയ സമയം അപ്ഡേറ്റ് ചെയ്യുന്നു.
 DocType: Program Enrollment Tool,Enrollment Details,എൻറോൾമെൻറ് വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,ഒരു കമ്പനിക്കായി ഒന്നിലധികം ഇനം സ്ഥിരസ്ഥിതികൾ സജ്ജമാക്കാൻ കഴിയില്ല.
 DocType: Purchase Invoice Item,Net Rate,നെറ്റ് റേറ്റ്
@@ -1827,7 +1826,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,വിടവാങ്ങൽ വിസ്മയമാണ്
 DocType: Support Settings,Close Issue After Days,ദിവസം കഴിഞ്ഞശേഷം അടയ്ക്കുക പ്രശ്നം
 ,Eway Bill,ഈവേ ബിൽ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Marketplace- ലേക്ക് ഉപയോക്താക്കളെ ചേർക്കാൻ നിങ്ങൾ സിസ്റ്റം മാനേജറും ഉപയോക്തൃ മാനേജർ റോളുകളും ഉള്ള ഒരു ഉപയോക്താവായിരിക്കണം.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Marketplace- ലേക്ക് ഉപയോക്താക്കളെ ചേർക്കാൻ നിങ്ങൾ സിസ്റ്റം മാനേജറും ഉപയോക്തൃ മാനേജർ റോളുകളും ഉള്ള ഒരു ഉപയോക്താവായിരിക്കണം.
 DocType: Leave Control Panel,Leave blank if considered for all branches,എല്ലാ ശാഖകളും വേണ്ടി പരിഗണിക്കും എങ്കിൽ ശൂന്യമായിടൂ
 DocType: Job Opening,Staffing Plan,സ്റ്റാഫ് പ്ലാൻ
 DocType: Bank Guarantee,Validity in Days,ങ്ങളിലായി സാധുത
@@ -1849,7 +1848,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},{1} അതേ കൂടെ വരി {0} തനിപ്പകർപ്പെടുക്കുക
 DocType: Marketplace Settings,Disable Marketplace,Marketplace അപ്രാപ്തമാക്കുക
 ,Trial Balance,ട്രയൽ ബാലൻസ്
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,സാമ്പത്തിക വർഷത്തെ {0} കണ്ടെത്തിയില്ല
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,സാമ്പത്തിക വർഷത്തെ {0} കണ്ടെത്തിയില്ല
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,എംപ്ലോയീസ് സജ്ജമാക്കുന്നു
 DocType: Hotel Room Reservation,Hotel Reservation User,ഹോട്ടൽ റിസർവേഷൻ ഉപയോക്താവ്
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,ആദ്യം പ്രിഫിക്സ് തിരഞ്ഞെടുക്കുക
@@ -1954,7 +1953,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,പ്രവേശിക്കുന്നത് പരാജയപ്പെട്ടു
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,അസറ്റ് {0} സൃഷ്ടിച്ചു
 DocType: Special Test Items,Special Test Items,പ്രത്യേക ടെസ്റ്റ് ഇനങ്ങൾ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Marketplace- ൽ രജിസ്റ്റർ ചെയ്യുന്നതിന് സിസ്റ്റം മാനേജറും ഒരു ഇനം മാനേജുമെന്റ് റോളുകളും ഉള്ള ഒരു ഉപയോക്താവായിരിക്കണം നിങ്ങൾ.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Marketplace- ൽ രജിസ്റ്റർ ചെയ്യുന്നതിന് സിസ്റ്റം മാനേജറും ഒരു ഇനം മാനേജുമെന്റ് റോളുകളും ഉള്ള ഒരു ഉപയോക്താവായിരിക്കണം നിങ്ങൾ.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,അടക്കേണ്ട മോഡ്
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,നിങ്ങളുടെ ശമ്പള ശമ്പളം അനുസരിച്ച് ആനുകൂല്യങ്ങൾക്ക് അപേക്ഷിക്കാൻ കഴിയില്ല
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,വെബ്സൈറ്റ് ചിത്രം ഒരു പൊതു ഫയൽ അല്ലെങ്കിൽ വെബ്സൈറ്റ് URL ആയിരിക്കണം
@@ -1966,7 +1965,7 @@
 DocType: Warehouse,Warehouse Contact Info,വെയർഹൗസ് ബന്ധപ്പെടാനുള്ള വിവരങ്ങളും
 DocType: Payment Entry,Write Off Difference Amount,വ്യത്യാസം തുക എഴുതുക
 DocType: Volunteer,Volunteer Name,വോളന്റിയുടെ പേര്
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},മറ്റ് വരികളിലെ ഡ്യൂപ്ലിക്കേറ്റ് തീയതികൾ ഉള്ള വരികൾ കണ്ടെത്തി: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},മറ്റ് വരികളിലെ ഡ്യൂപ്ലിക്കേറ്റ് തീയതികൾ ഉള്ള വരികൾ കണ്ടെത്തി: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: ജീവനക്കാരുടെ ഇമെയിൽ കണ്ടെത്തിയില്ല, ഇവിടെനിന്നു മെയിൽ അയച്ചിട്ടില്ല"
 DocType: Item,Foreign Trade Details,വിദേശ വ്യാപാര വിവരങ്ങൾ
 ,Assessment Plan Status,അസസ്സ്മെന്റ് പ്ലാൻ സ്റ്റാറ്റസ്
@@ -2055,6 +2054,7 @@
 DocType: Salary Component,Earning,സമ്പാദിക്കാനുള്ള
 DocType: Supplier Scorecard,Scoring Criteria,സ്കോറിംഗ് മാനദണ്ഡം
 DocType: Purchase Invoice,Party Account Currency,പാർട്ടി അക്കൗണ്ട് കറൻസി
+DocType: Delivery Trip,Total Estimated Distance,ആകെ കണക്കാക്കപ്പെട്ട ദൂരം
 ,BOM Browser,BOM ബ്രൌസർ
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,ഈ പരിശീലന ഇവന്റിനായി നിങ്ങളുടെ സ്റ്റാറ്റസ് അപ്ഡേറ്റുചെയ്യുക
 DocType: Item Barcode,EAN,EAN
@@ -2093,7 +2093,7 @@
 DocType: Activity Cost,Projects,പ്രോജക്റ്റുകൾ
 DocType: Payment Request,Transaction Currency,ഇടപാട് കറൻസി
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},{0} നിന്ന് | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,ചില ഇമെയിലുകൾ അസാധുവാണ്
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,ചില ഇമെയിലുകൾ അസാധുവാണ്
 DocType: Work Order Operation,Operation Description,ഓപ്പറേഷൻ വിവരണം
 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.,സാമ്പത്തിക വർഷത്തെ സംരക്ഷിച്ചു ഒരിക്കൽ സാമ്പത്തിക വർഷത്തെ ആരംഭ തീയതി സാമ്പത്തിക വർഷം അവസാനിക്കുന്ന തീയതി മാറ്റാൻ കഴിയില്ല.
 DocType: Quotation,Shopping Cart,ഷോപ്പിംഗ് കാർട്ട്
@@ -2117,7 +2117,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,സ്ഥിര അസറ്റ് ലെ നെറ്റ് മാറ്റുക
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,റിയഡ് കാട്ടി
 DocType: Leave Control Panel,Leave blank if considered for all designations,എല്ലാ തരത്തിലുള്ള വേണ്ടി പരിഗണിക്കും എങ്കിൽ ശൂന്യമായിടൂ
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,&#39;യഥാർത്ഥ&#39; തരം ചുമതലയുള്ള വരിയിലെ {0} ഇനം റേറ്റ് ഉൾപ്പെടുത്തിയിട്ടുണ്ട് ചെയ്യാൻ കഴിയില്ല
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,&#39;യഥാർത്ഥ&#39; തരം ചുമതലയുള്ള വരിയിലെ {0} ഇനം റേറ്റ് ഉൾപ്പെടുത്തിയിട്ടുണ്ട് ചെയ്യാൻ കഴിയില്ല
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},പരമാവധി: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,തീയതി-ൽ
 DocType: Shopify Settings,For Company,കമ്പനിക്ക് വേണ്ടി
@@ -2131,7 +2131,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,കോഴ്സ് ഷെഡ്യൂൾ സൃഷ്ടിക്കുന്നതിൽ പിശകുകൾ ഉണ്ടായിരുന്നു
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,"ലിസ്റ്റിലെ ആദ്യ ചെലവ് അംഗീകൃതമായത്, സാധാരണ ചിലവ് അപ്പാരവർ ആയി സജ്ജമാക്കിയിരിക്കും."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,100 വലുതായിരിക്കും കഴിയില്ല
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Marketplace- ൽ രജിസ്റ്റർ ചെയ്യുന്നതിന് സിസ്റ്റം മാനേജറും ഉപയോക്തൃ മാനേജർ റോളുകളും ഉള്ള അഡ്മിനിസ്ട്രേറ്റർ അല്ലാത്ത ഒരു ഉപയോക്താവായിരിക്കണം നിങ്ങൾ.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Marketplace- ൽ രജിസ്റ്റർ ചെയ്യുന്നതിന് സിസ്റ്റം മാനേജറും ഉപയോക്തൃ മാനേജർ റോളുകളും ഉള്ള അഡ്മിനിസ്ട്രേറ്റർ അല്ലാത്ത ഒരു ഉപയോക്താവായിരിക്കണം നിങ്ങൾ.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC- .YYYY.-
 DocType: Maintenance Visit,Unscheduled,വരണേ
@@ -2160,7 +2160,7 @@
 DocType: HR Settings,Employee Settings,ജീവനക്കാരുടെ ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,പേയ്മെന്റ് സിസ്റ്റം ലോഡുചെയ്യുന്നു
 ,Batch-Wise Balance History,ബാച്ച് യുക്തിമാനും ബാലൻസ് ചരിത്രം
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,വരി # {0}: ഇനം {1} എന്നതിന്റെ ബില്ല്യൺ തുകയേക്കാൾ കൂടുതലാണെങ്കിൽ നിരക്ക് ക്രമീകരിക്കാൻ കഴിയില്ല.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,വരി # {0}: ഇനം {1} എന്നതിന്റെ ബില്ല്യൺ തുകയേക്കാൾ കൂടുതലാണെങ്കിൽ നിരക്ക് ക്രമീകരിക്കാൻ കഴിയില്ല.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,അച്ചടി ക്രമീകരണങ്ങൾ അതാത് പ്രിന്റ് ഫോർമാറ്റിൽ അപ്ഡേറ്റ്
 DocType: Package Code,Package Code,പാക്കേജ് കോഡ്
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,വിദേശികൾക്ക്
@@ -2390,7 +2390,7 @@
 DocType: Delivery Trip,Optimize Route,റൂട്ട് ഒപ്റ്റിമൈസുചെയ്യുക
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,മുൻകൂട്ടി എക്സ് ദിവസം വേണ്ടി ഓപ്പറേഷൻസ് ആസൂത്രണം ശ്രമിക്കുക.
 DocType: HR Settings,Stop Birthday Reminders,ജന്മദിന ഓർമ്മക്കുറിപ്പുകൾ നിർത്തുക
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},കമ്പനി {0} ൽ സ്ഥിര ശമ്പളപ്പട്ടിക പേയബിൾ അക്കൗണ്ട് സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},കമ്പനി {0} ൽ സ്ഥിര ശമ്പളപ്പട്ടിക പേയബിൾ അക്കൗണ്ട് സജ്ജീകരിക്കുക
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,ആമസോണിന്റെ നികുതികളും ചാർജുകളും ഡാറ്റയുടെ സാമ്പത്തിക വിഭജനം നേടുക
 DocType: SMS Center,Receiver List,റിസീവർ പട്ടിക
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,തിരയൽ ഇനം
@@ -2458,7 +2458,7 @@
 DocType: Vital Signs,Constipated,മലബന്ധം
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},വിതരണക്കാരൻ ഇൻവോയിസ് {0} എഗെൻസ്റ്റ് {1} dated
 DocType: Customer,Default Price List,സ്ഥിരസ്ഥിതി വില പട്ടിക
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,അസറ്റ് മൂവ്മെന്റ് റെക്കോർഡ് {0} സൃഷ്ടിച്ചു
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,അസറ്റ് മൂവ്മെന്റ് റെക്കോർഡ് {0} സൃഷ്ടിച്ചു
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,ഇനങ്ങളൊന്നും കണ്ടെത്തിയില്ല.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,നിങ്ങൾ സാമ്പത്തിക വർഷത്തെ {0} ഇല്ലാതാക്കാൻ കഴിയില്ല. സാമ്പത്തിക വർഷത്തെ {0} ആഗോള ക്രമീകരണങ്ങൾ സ്വതവേ സജ്ജീകരിച്ച
 DocType: Share Transfer,Equity/Liability Account,ഇക്വിറ്റി / ബാധ്യതാ അക്കൗണ്ട്
@@ -2593,6 +2593,7 @@
 DocType: Blanket Order,Order Type,ഓർഡർ തരം
 ,Item-wise Sales Register,ഇനം തിരിച്ചുള്ള സെയിൽസ് രജിസ്റ്റർ
 DocType: Asset,Gross Purchase Amount,മൊത്തം വാങ്ങൽ തുക
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,ഇനം കോഡ്&gt; ഇനം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,ബാലൻസ് തുറക്കുന്നു
 DocType: Asset,Depreciation Method,മൂല്യത്തകർച്ച രീതി
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,ബേസിക് റേറ്റ് ഉൾപ്പെടുത്തിയിട്ടുണ്ട് ഈ നികുതി ആണോ?
@@ -2674,7 +2675,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,വാർഷിക ബജറ്റ് പി.ഒ.
 DocType: Student Leave Application,Student Leave Application,വിദ്യാർത്ഥി അനുവാദ അപ്ലിക്കേഷൻ
 DocType: Item,Will also apply for variants,കൂടാതെ മോഡലുകൾക്കാണ് ബാധകമാകും
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","അത് ഇതിനകം {0} പോലെ, അസറ്റ് റദ്ദാക്കാൻ സാധിക്കില്ല"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","അത് ഇതിനകം {0} പോലെ, അസറ്റ് റദ്ദാക്കാൻ സാധിക്കില്ല"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},ന് {1} ജീവനക്കാർ {0} ഹാഫ് ദിവസം
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},ആകെ തൊഴിൽ സമയം ജോലി സമയം {0} MAX ശ്രേഷ്ഠ പാടില്ല
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ഓൺ
@@ -2698,6 +2699,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,ഡാറ്റ ലഭ്യമാക്കുക
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},ലീവ് തരം അനുവദനീയമായ പരമാവധി അവധി {0} ആണ് {1}
 DocType: SMS Center,Create Receiver List,റിസീവർ ലിസ്റ്റ് സൃഷ്ടിക്കുക
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,"ലഭ്യമായ ഉപയോഗത്തിനായുള്ള തീയതി, വാങ്ങൽ തീയതിക്ക് ശേഷം ആയിരിക്കണം"
 DocType: Vehicle,Wheels,ചക്രങ്ങളും
 DocType: Packing Slip,To Package No.,നമ്പർ പാക്കേജ്
 DocType: Patient Relation,Family,കുടുംബം
@@ -2711,7 +2713,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,ബില്ലിംഗ് കറൻസി സ്ഥിര കമ്പനിയുടെ കറൻസി അല്ലെങ്കിൽ കക്ഷി അക്കൗണ്ട് കറൻസിക്ക് തുല്യമാണ്
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),(മാത്രം ഡ്രാഫ്റ്റ്) പാക്കേജ് ഈ ഡെലിവറി ഒരു ഭാഗമാണ് സൂചിപ്പിക്കുന്നു
 DocType: Soil Texture,Loam,ഹരം
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,വരി {0}: തീയതി തീയതി പോസ്റ്റുചെയ്യുന്നതിനു മുമ്പുള്ള തീയതി അല്ല
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,വരി {0}: തീയതി തീയതി പോസ്റ്റുചെയ്യുന്നതിനു മുമ്പുള്ള തീയതി അല്ല
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,പേയ്മെന്റ് എൻട്രി നിർമ്മിക്കുക
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},ഇനം {0} വേണ്ടി ക്വാണ്ടിറ്റി {1} താഴെ ആയിരിക്കണം
 ,Sales Invoice Trends,സെയിൽസ് ഇൻവോയിസ് ട്രെൻഡുകൾ
@@ -2783,7 +2785,7 @@
 DocType: Guardian,Guardian Interests,ഗാർഡിയൻ താൽപ്പര്യങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,അക്കൗണ്ട് പേര് / നമ്പർ അപ്ഡേറ്റുചെയ്യുക
 DocType: Naming Series,Current Value,ഇപ്പോഴത്തെ മൂല്യം
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ഒന്നിലധികം വർഷത്തേക്ക് തീയതി {0} കണക്കേ. സാമ്പത്തിക വർഷം കമ്പനി സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ഒന്നിലധികം വർഷത്തേക്ക് തീയതി {0} കണക്കേ. സാമ്പത്തിക വർഷം കമ്പനി സജ്ജീകരിക്കുക
 DocType: Education Settings,Instructor Records to be created by,അധ്യാപക റെക്കോർഡുകൾ സൃഷ്ടിക്കേണ്ടതുണ്ട്
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} സൃഷ്ടിച്ചു
 DocType: GST Account,GST Account,GST അക്കൗണ്ട്
@@ -2800,7 +2802,7 @@
 DocType: Sales Person,Name and Employee ID,പേര് തൊഴിൽ ഐഡി
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,നിശ്ചിത തീയതി തീയതി പതിച്ച മുമ്പ് ആകാൻ പാടില്ല
 DocType: Website Item Group,Website Item Group,വെബ്സൈറ്റ് ഇനം ഗ്രൂപ്പ്
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ശമ്പള സ്ലിപ്പിൽ മുകളിൽ തിരഞ്ഞെടുത്ത മാനദണ്ഡം സമർപ്പിക്കുന്നതിന് അല്ലെങ്കിൽ ശമ്പള സ്ലിപ്പ് സമർപ്പിച്ചു
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ശമ്പള സ്ലിപ്പിൽ മുകളിൽ തിരഞ്ഞെടുത്ത മാനദണ്ഡം സമർപ്പിക്കുന്നതിന് അല്ലെങ്കിൽ ശമ്പള സ്ലിപ്പ് സമർപ്പിച്ചു
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,"കടമകൾ, നികുതി"
 DocType: Projects Settings,Projects Settings,പ്രോജക്ട് ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,റഫറൻസ് തീയതി നൽകുക
@@ -2809,7 +2811,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,വിതരണം Qty
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR- .YYYY.-
 DocType: Purchase Order Item,Material Request Item,മെറ്റീരിയൽ അഭ്യർത്ഥന ഇനം
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,ആദ്യം വാങ്ങൽ വാങ്ങൽ റദ്ദാക്കുക {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,ആദ്യം വാങ്ങൽ വാങ്ങൽ റദ്ദാക്കുക {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,ഇനം ഗ്രൂപ്പ് ട്രീ.
 DocType: Production Plan,Total Produced Qty,ആകെ ഉല്പാദിപ്പിച്ച ക്വറി
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,ഈ ചാർജ് തരം വേണ്ടി ശ്രേഷ്ഠ അഥവാ നിലവിലെ വരി നമ്പറിലേക്ക് തുല്യ വരി എണ്ണം റെഫർ ചെയ്യാൻ കഴിയില്ല
@@ -2919,6 +2921,7 @@
 ,Vehicle Expenses,വാഹന ചെലവുകൾ
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,സെയിൽ ഇൻവോയ്സ് സമർപ്പിക്കുക എന്നതിലെ ലാബ് ടെസ്റ്റ് (കൾ) സൃഷ്ടിക്കുക
 DocType: Serial No,Invoice Details,ഇൻവോയ്സ് വിശദാംശങ്ങൾ
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,വഴികൾ കണക്കാക്കാനും ഒപ്റ്റിമൈസുചെയ്യാനും ദയവായി Google മാപ്സ് ക്രമീകരണങ്ങൾ പ്രാപ്തമാക്കുക
 DocType: Grant Application,Show on Website,വെബ്സൈറ്റിൽ കാണിക്കുക
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,ആരംഭിക്കുക
 DocType: Hub Tracked Item,Hub Category,ഹബ് വിഭാഗം
@@ -2957,7 +2960,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1797,Get Items from Prescriptions,കുറിപ്പുകളിൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
 DocType: Patient,Patient Details,രോഗിയുടെ വിശദാംശങ്ങൾ
 DocType: Inpatient Record,B Positive,ബി പോസിറ്റീവ്
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","വരി # {0}: അളവ് 1, ഇനം ഒരു നിശ്ചിത അസറ്റ് പോലെ ആയിരിക്കണം. ഒന്നിലധികം അളവ് പ്രത്യേകം വരി ഉപയോഗിക്കുക."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","വരി # {0}: അളവ് 1, ഇനം ഒരു നിശ്ചിത അസറ്റ് പോലെ ആയിരിക്കണം. ഒന്നിലധികം അളവ് പ്രത്യേകം വരി ഉപയോഗിക്കുക."
 DocType: Leave Block List Allow,Leave Block List Allow,അനുവദിക്കുക ബ്ലോക്ക് ലിസ്റ്റ് വിടുക
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr ബ്ലാങ്ക് ബഹിരാകാശ ആകാൻ പാടില്ല
 DocType: Patient Medical Record,Patient Medical Record,രോഗിയുടെ മെഡിക്കൽ റെക്കോർഡ്
@@ -2992,7 +2995,7 @@
 DocType: Workstation,Wages per hour,മണിക്കൂറിൽ വേതനം
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},ബാച്ച് ലെ സ്റ്റോക്ക് ബാലൻസ് {0} സംഭരണശാല {3} ചെയ്തത് ഇനം {2} വേണ്ടി {1} നെഗറ്റീവ് ആയിത്തീരും
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,തുടർന്ന് മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ ഇനത്തിന്റെ റീ-ഓർഡർ തലത്തിൽ അടിസ്ഥാനമാക്കി സ്വയം ഉൾപ്പെടും
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},അക്കൗണ്ട് {0} അസാധുവാണ്. അക്കൗണ്ട് കറന്സി {1} ആയിരിക്കണം
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},അക്കൗണ്ട് {0} അസാധുവാണ്. അക്കൗണ്ട് കറന്സി {1} ആയിരിക്കണം
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},തീയതി മുതൽ {0} ജീവനക്കാരന്റെ ഒഴിവാക്കൽ തീയതിക്ക് ശേഷം ആയിരിക്കരുത് {1}
 DocType: Supplier,Is Internal Supplier,ആന്തരിക വിതരണക്കാരൻ
 DocType: Employee,Create User Permission,ഉപയോക്തൃ അനുമതി സൃഷ്ടിക്കുക
@@ -3137,7 +3140,7 @@
 DocType: Account,Fixed Asset,സ്ഥിര അസറ്റ്
 DocType: Amazon MWS Settings,After Date,തീയതിക്ക് ശേഷം
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,സീരിയൽ ഇൻവെന്ററി
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,ഇന്റർ കമ്പനി ഇൻവോയ്സിനായി {0} അസാധുവാണ്.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,ഇന്റർ കമ്പനി ഇൻവോയ്സിനായി {0} അസാധുവാണ്.
 ,Department Analytics,ഡിപ്പാർട്ട്മെൻറ് അനലിറ്റിക്സ്
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,സ്ഥിരസ്ഥിതി സമ്പർക്കത്തിൽ ഇമെയിൽ കണ്ടെത്തിയില്ല
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,രഹസ്യം സൃഷ്ടിക്കുക
@@ -3149,7 +3152,7 @@
 DocType: Sales Invoice,Total Billing Amount,ആകെ ബില്ലിംഗ് തുക
 DocType: Bank Statement Transaction Entry,Receivable Account,സ്വീകാ അക്കൗണ്ട്
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,തീയതി മുതൽ സാധുതയുള്ള തീയതി വരെ സാധുത കുറവായിരിക്കണം.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},വരി # {0}: അസറ്റ് {1} {2} ഇതിനകം
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},വരി # {0}: അസറ്റ് {1} {2} ഇതിനകം
 DocType: Quotation Item,Stock Balance,ഓഹരി ബാലൻസ്
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,പെയ്മെന്റ് വിൽപ്പന ഓർഡർ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,സിഇഒ
@@ -3190,6 +3193,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,ഡെബിറ്റ് ആവശ്യമാണ്
 DocType: Clinical Procedure,Inpatient Record,ഇൻപെഷ്യൻറ് റിക്കോർഡ്
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","തിമെശെഎത്സ് സമയം, നിങ്ങളുടെ ടീം നടക്കുന്ന പ്രവർത്തനങ്ങൾ ചിലവു ബില്ലിംഗ് ട്രാക്ക് സൂക്ഷിക്കാൻ സഹായിക്കുന്നു"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണക്കാരൻ തരം
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,വാങ്ങൽ വില പട്ടിക
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,ഇടപാട് തീയതി
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,വിതരണക്കാരന്റെ സ്കോർബോർഡ് വേരിയബിളുകൾ.
@@ -3341,7 +3345,7 @@
 DocType: Water Analysis,Origin,ഉത്ഭവം
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ഈ പ്രമാണം ഇനം {4} വേണ്ടി {0} {1} വഴി പരിധിക്കു. നിങ്ങൾ നിർമ്മിക്കുന്നത് ഒരേ {2} നേരെ മറ്റൊരു {3}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,സംരക്ഷിക്കുന്നതിൽ ശേഷം ആവർത്തിക്കുന്ന സജ്ജമാക്കുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,മാറ്റം തുക അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,മാറ്റം തുക അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
 DocType: Purchase Invoice,Price List Currency,വില പട്ടിക കറന്സി
 DocType: Naming Series,User must always select,ഉപയോക്താവ് എപ്പോഴും തിരഞ്ഞെടുക്കണം
 DocType: Stock Settings,Allow Negative Stock,നെഗറ്റീവ് സ്റ്റോക്ക് അനുവദിക്കുക
@@ -3383,7 +3387,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,ഈ അപ്പോയിന്റ്മെന്റ് റദ്ദാക്കണമെന്ന് നിങ്ങൾക്ക് തീർച്ചയാണോ?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Hotel Room Pricing Package ൻറെ ഹോട്ടൽ നിരക്കുകൾ പുതുക്കുന്നതിനായി തീയതികൾ എൻറർ ചെയ്യുക
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,സെയിൽസ് പൈപ്പ്ലൈൻ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},ശമ്പള ഘടക {0} ൽ സ്ഥിര അക്കൗണ്ട് സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},ശമ്പള ഘടക {0} ൽ സ്ഥിര അക്കൗണ്ട് സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ആവശ്യമാണ്
 DocType: Rename Tool,File to Rename,പേരു്മാറ്റുക ഫയൽ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},ദയവായി വരി {0} ൽ ഇനം വേണ്ടി BOM ൽ തിരഞ്ഞെടുക്കുക
@@ -3404,7 +3408,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,വാങ്ങിയ ഇനങ്ങൾ ചെലവ്
 DocType: Employee Separation,Employee Separation Template,തൊഴിലുടമ വേർപിരിയുന്ന ടെംപ്ലേറ്റ്
 DocType: Selling Settings,Sales Order Required,സെയിൽസ് ഓർഡർ ആവശ്യമുണ്ട്
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,ഒരു വിൽപ്പനക്കാരനാവുക
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,ഒരു വിൽപ്പനക്കാരനാവുക
 DocType: Purchase Invoice,Credit To,ക്രെഡിറ്റ് ചെയ്യുക
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,സജീവ നയിക്കുന്നു / കസ്റ്റമറുകൾക്ക്
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,സ്റ്റാൻഡേർഡ് ഡെലിവറി നോട്ട് ഫോർമാറ്റ് ഉപയോഗിക്കാൻ ശൂന്യമായി വിടുക
@@ -3446,7 +3450,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,ടാക്സ് ടെംപ്ലേറ്റ് ഉണ്ടാക്കുക
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ഉപയോക്തൃ ഫോറം
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,അസംസ്കൃത വസ്തുക്കൾ ശൂന്യമായിരിക്കാൻ കഴിയില്ല.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,വരി # {0} (പേയ്മെന്റ് ടേബിൾ): തുക നെഗറ്റീവ് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,വരി # {0} (പേയ്മെന്റ് ടേബിൾ): തുക നെഗറ്റീവ് ആയിരിക്കണം
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","ഇൻവോയ്സ് ഡ്രോപ്പ് ഷിപ്പിംഗ് ഇനം ഉൾപ്പെടുന്നു, സ്റ്റോക്ക് അപ്ഡേറ്റുചെയ്യാനായില്ല."
 DocType: Contract,Fulfilment Status,പൂരിപ്പിക്കൽ നില
 DocType: Lab Test Sample,Lab Test Sample,ലാബ് ടെസ്റ്റ് സാമ്പിൾ
@@ -3586,7 +3590,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,പ്രമാണ തീയതി
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},സൃഷ്ടിച്ചു ഫീസ് റെക്കോർഡ്സ് - {0}
 DocType: Asset Category Account,Asset Category Account,അസറ്റ് വർഗ്ഗം അക്കൗണ്ട്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,വരി # {0} (പേയ്മെന്റ് ടേബിൾ): തുക പോസിറ്റീവ് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,വരി # {0} (പേയ്മെന്റ് ടേബിൾ): തുക പോസിറ്റീവ് ആയിരിക്കണം
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},സെയിൽസ് ഓർഡർ അളവ് {1} അധികം ഇനം {0} ഉത്പാദിപ്പിക്കാനുള്ള കഴിയുന്നില്ലേ
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,ആട്രിബ്യൂട്ട് മൂല്യങ്ങൾ തിരഞ്ഞെടുക്കുക
 DocType: Purchase Invoice,Reason For Issuing document,രേഖ രേഖപ്പെടുത്തുന്നതിനുള്ള കാരണം
@@ -3640,7 +3644,7 @@
 DocType: Purchase Receipt,Time at which materials were received,വസ്തുക്കൾ ലഭിച്ച ഏത് സമയം
 DocType: Products Settings,Products per Page,ഓരോ പേജിലും ഉൽപ്പന്നങ്ങൾ
 DocType: Stock Ledger Entry,Outgoing Rate,ഔട്ട്ഗോയിംഗ് റേറ്റ്
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,അഥവാ
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,അഥവാ
 DocType: Sales Order,Billing Status,ബില്ലിംഗ് അവസ്ഥ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ഒരു പ്രശ്നം റിപ്പോർട്ടുചെയ്യുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,യൂട്ടിലിറ്റി ചെലവുകൾ
@@ -3667,7 +3671,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,എംപ്ലോയീസ് ടാക്സ് എക്സംപ്ഷൻ ഡിക്ലറേഷൻ
 DocType: Payment Entry,Cheque/Reference Date,ചെക്ക് / റഫറൻസ് തീയതി
 DocType: Purchase Invoice,Total Taxes and Charges,ആകെ നികുതി ചാർജുകളും
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,കഴിഞ്ഞ തീയതി എന്ന നിലയിൽ ലഭ്യമായ ഉപയോഗത്തിനായുള്ള തീയതി നൽകി
 DocType: Employee,Emergency Contact,അത്യാവശ്യ സമീപനം
 DocType: Bank Reconciliation Detail,Payment Entry,പേയ്മെന്റ് എൻട്രി
 ,sales-browser,വിൽപ്പന-ബ്രൗസർ
@@ -3713,6 +3716,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Depreciation Amount during the period,കാലയളവിൽ മൂല്യത്തകർച്ച തുക
 DocType: Sales Invoice,Is Return (Credit Note),മടങ്ങാണ് (ക്രെഡിറ്റ് നോട്ട്)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,ജോലി ആരംഭിക്കുക
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup&gt; Settings&gt; Naming Series വഴി {0} നാമത്തിനായുള്ള പരമ്പര സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,അപ്രാപ്തമാക്കി ടെംപ്ലേറ്റ് സ്ഥിരസ്ഥിതി ടെംപ്ലേറ്റ് പാടില്ല
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,വരിയ്ക്കായി {0}: ആസൂത്രിത അളവുകൾ നൽകുക
 DocType: Account,Income Account,ആദായ അക്കൗണ്ട്
@@ -3726,6 +3730,7 @@
 DocType: Loyalty Program,Help Section,സഹായ വിഭാഗം
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,മുമ്പത്തെ
 DocType: Appraisal Goal,Key Responsibility Area,കീ ഉത്തരവാദിത്വം ഏരിയ
+DocType: Delivery Trip,Distance UOM,ദൂരം UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",സ്റ്റുഡന്റ് ബാച്ചുകൾ നിങ്ങൾ വിദ്യാർത്ഥികൾക്ക് ഹാജർ അസെസ്മെന്റുകൾ ഫീസും കണ്ടെത്താൻ സഹായിക്കുന്ന
 DocType: Payment Entry,Total Allocated Amount,ആകെ തുക
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,ശാശ്വതമായ സാധനങ്ങളും സ്ഥിരസ്ഥിതി സാധനങ്ങളും അക്കൗണ്ട് സജ്ജമാക്കുക
@@ -3764,7 +3769,7 @@
 DocType: Item Supplier,Item Supplier,ഇനം വിതരണക്കാരൻ
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,യാതൊരു ബാച്ച് ലഭിക്കാൻ ഇനം കോഡ് നൽകുക
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},{1} quotation_to {0} ഒരു മൂല്യം തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,കൈമാറാൻ ഇനങ്ങൾ ഒന്നും തിരഞ്ഞെടുത്തിട്ടില്ല
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,കൈമാറാൻ ഇനങ്ങൾ ഒന്നും തിരഞ്ഞെടുത്തിട്ടില്ല
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,എല്ലാ വിലാസങ്ങൾ.
 DocType: Company,Stock Settings,സ്റ്റോക്ക് ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","താഴെ പ്രോപ്പർട്ടികൾ ഇരു രേഖകളിൽ ഒരേ തന്നെയുള്ള സംയോജിപ്പിച്ചുകൊണ്ട് മാത്രമേ സാധിക്കുകയുള്ളൂ. ഗ്രൂപ്പ്, റൂട്ട് ടൈപ്പ്, കമ്പനിയാണ്"
@@ -4050,7 +4055,7 @@
 DocType: Patient,Personal and Social History,വ്യക്തിപരവും സാമൂഹ്യവുമായ ചരിത്രം
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,ഉപയോക്താവ് {0} സൃഷ്ടിച്ചു
 DocType: Fee Schedule,Fee Breakup for each student,ഓരോ വിദ്യാർത്ഥിക്കും ഫീസ് ഒടിക്കാൻ
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),മുൻകൂർ ({0}) ഉത്തരവിനെതിരെ {1} ({2}) ഗ്രാൻഡ് ആകെ ശ്രേഷ്ഠ പാടില്ല
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),മുൻകൂർ ({0}) ഉത്തരവിനെതിരെ {1} ({2}) ഗ്രാൻഡ് ആകെ ശ്രേഷ്ഠ പാടില്ല
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,സമമായി മാസം ഉടനീളമുള്ള ലക്ഷ്യങ്ങളിലൊന്നാണ് വിതരണം ചെയ്യാൻ പ്രതിമാസ വിതരണം തിരഞ്ഞെടുക്കുക.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,കോഡ് മാറ്റുക
 DocType: Purchase Invoice Item,Valuation Rate,മൂലധനം റേറ്റ്
@@ -4059,7 +4064,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,ഐടിസി സെസ്സ് ഉപയോഗിച്ചു
 ,Student Monthly Attendance Sheet,വിദ്യാർത്ഥി പ്രതിമാസ ഹാജർ ഷീറ്റ്
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,വിൽപ്പനയ്ക്കായി മാത്രം ഷിപ്പിംഗ് നിയമം ബാധകമാക്കുന്നു
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,മൂല്യശുദ്ധിവരുത്തൽ നിര {0}: വാങ്ങൽ തീയതിക്കു മുമ്പുള്ള അടുത്ത ഡിപ്രീസിയേഷൻ തീയതി ഉണ്ടായിരിക്കരുത്
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,മൂല്യശുദ്ധിവരുത്തൽ നിര {0}: വാങ്ങൽ തീയതിക്കു മുമ്പുള്ള അടുത്ത ഡിപ്രീസിയേഷൻ തീയതി ഉണ്ടായിരിക്കരുത്
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,പ്രോജക്ട് ആരംഭ തീയതി
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,എഴു
 DocType: Rename Tool,Rename Log,രേഖ
@@ -4077,12 +4082,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,"സെയിൽ ട്രാൻസാക്ഷന്റെ അടിസ്ഥാനത്തിൽ പ്രൊജക്റ്റ്, കമ്പനി എത്രമാത്രം അപ്ഡേറ്റുചെയ്യണം."
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ഓൺ കാലഹരണപ്പെടുന്നു
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,വിദ്യാർത്ഥികൾ ചേർക്കുക
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","ഈ പ്രമാണം റദ്ദാക്കാൻ ജീവനക്കാരനെ <a href=""#Form/Employee/{0}"">{0}</a> \ remove"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},{0} തിരഞ്ഞെടുക്കുക
 DocType: C-Form,C-Form No,സി-ഫോം ഇല്ല
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,ദൂരം
+DocType: Delivery Stop,Distance,ദൂരം
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,നിങ്ങൾ വാങ്ങുന്നതോ വിൽക്കുന്നതോ ആയ ഉൽപ്പന്നങ്ങളോ സേവനങ്ങളോ ലിസ്റ്റ് ചെയ്യുക.
 DocType: Water Analysis,Storage Temperature,സംഭരണ താപനില
 DocType: Sales Order,SAL-ORD-.YYYY.-,സാൽ- ORD- .YYYY.-
@@ -4109,7 +4112,7 @@
 DocType: Homepage,Company Description for website homepage,വെബ്സൈറ്റ് ഹോംപേജിൽ കമ്പനിയുടെ വിവരണം
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ഉപഭോക്താക്കൾക്ക് സൗകര്യത്തിനായി, ഈ കോഡുകൾ ഇൻവോയ്സുകളും ഡെലിവറി കുറിപ്പുകൾ പോലെ പ്രിന്റ് രൂപങ്ങളിലും ഉപയോഗിക്കാൻ കഴിയും"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier പേര്
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,{0} എന്നതിനായുള്ള വിവരം വീണ്ടെടുക്കാൻ കഴിഞ്ഞില്ല.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,{0} എന്നതിനായുള്ള വിവരം വീണ്ടെടുക്കാൻ കഴിഞ്ഞില്ല.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,എൻട്രി ജേർണൽ തുറക്കുന്നു
 DocType: Contract,Fulfilment Terms,നിർവ്വഹണ നിബന്ധനകൾ
 DocType: Sales Invoice,Time Sheet List,സമയം ഷീറ്റ് പട്ടിക
@@ -4290,7 +4293,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,പ്രവർത്തനം അടിസ്ഥാനമാക്കി ഗ്രൂപ്പ് മാനുവലായി വിദ്യാർത്ഥികളെ തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,പ്രവർത്തനം അടിസ്ഥാനമാക്കി ഗ്രൂപ്പ് മാനുവലായി വിദ്യാർത്ഥികളെ തിരഞ്ഞെടുക്കുക
 DocType: Journal Entry,User Remark,ഉപയോക്താവിന്റെ അഭിപ്രായപ്പെടുക
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,വഴികൾ ഒപ്റ്റിമൈസ് ചെയ്യുന്നു.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,വഴികൾ ഒപ്റ്റിമൈസ് ചെയ്യുന്നു.
 DocType: Travel Itinerary,Non Diary,നോൺ ഡയറി
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,ഇടത് ജീവനക്കാർക്കായി നിലനിർത്തൽ ബോണസ് സൃഷ്ടിക്കാൻ കഴിയില്ല
 DocType: Lead,Market Segment,മാർക്കറ്റ് സെഗ്മെന്റ്
@@ -4321,7 +4324,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,ലോയൽറ്റി പ്രോഗ്രാം
 DocType: Student Guardian,Father,പിതാവ്
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,പിന്തുണ ടിക്കറ്റ്
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;അപ്ഡേറ്റ് ഓഹരി&#39; നിർണയത്തിനുള്ള അസറ്റ് വില്പനയ്ക്ക് പരിശോധിക്കാൻ കഴിയുന്നില്ല
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;അപ്ഡേറ്റ് ഓഹരി&#39; നിർണയത്തിനുള്ള അസറ്റ് വില്പനയ്ക്ക് പരിശോധിക്കാൻ കഴിയുന്നില്ല
 DocType: Bank Reconciliation,Bank Reconciliation,ബാങ്ക് അനുരഞ്ജനം
 DocType: Attendance,On Leave,അവധിയിലാണ്
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,അപ്ഡേറ്റുകൾ നേടുക
@@ -4364,7 +4367,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,സീരിയൽ ഇല്ല ആൻഡ് ബാച്ച്
 DocType: Warranty Claim,From Company,കമ്പനി നിന്നും
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,വിലയിരുത്തിയശേഷം മാനദണ്ഡം സ്കോററായ സം {0} വേണം.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,ബുക്കുചെയ്തു Depreciations എണ്ണം ക്രമീകരിക്കുക ദയവായി
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,ബുക്കുചെയ്തു Depreciations എണ്ണം ക്രമീകരിക്കുക ദയവായി
 DocType: Supplier Scorecard Period,Calculations,കണക്കുകൂട്ടലുകൾ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,മൂല്യം അഥവാ Qty
 DocType: Payment Terms Template,Payment Terms,പേയ്മെന്റ് നിബന്ധനകൾ
@@ -4384,7 +4387,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,വില പട്ടിക നിരക്ക് ഡിസ്കൗണ്ട് (%) മാർജിൻ കൊണ്ട്
 DocType: Healthcare Service Unit Type,Rate / UOM,റേറ്റുചെയ്യുക / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,എല്ലാ അബദ്ധങ്ങളും
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,ഇൻറർ കമ്പനി ഇടപാടുകൾക്ക് {0} കണ്ടെത്തിയില്ല.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,ഇൻറർ കമ്പനി ഇടപാടുകൾക്ക് {0} കണ്ടെത്തിയില്ല.
 DocType: Travel Itinerary,Rented Car,വാടകയ്ക്കെടുത്ത കാർ
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,നിങ്ങളുടെ കമ്പനിയെക്കുറിച്ച്
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ക്രെഡിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
@@ -4486,6 +4489,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,പ്ലാന്റ് അനാലിസിസ് മാനദണ്ഡം
 DocType: Cheque Print Template,Cheque Height,ചെക്ക് ഉയരം
 DocType: Supplier,Supplier Details,വിതരണക്കാരൻ വിശദാംശങ്ങൾ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,സെറ്റപ്പ്&gt; നമ്പറിംഗ് സീരീസുകൾ വഴി ഹാജരാക്കാനായി സെറ്റപ്പ് നമ്പറുകൾ ക്രമീകരിക്കുക
 DocType: Setup Progress,Setup Progress,സെറ്റപ്പ് പുരോഗതി
 DocType: Expense Claim,Approval Status,അംഗീകാരം അവസ്ഥ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},മൂല്യം നിന്ന് വരി {0} മൂല്യം വരെ താഴെ ആയിരിക്കണം
@@ -4578,7 +4582,6 @@
 DocType: Travel Request,Fully Sponsored,പൂർണ്ണമായി സ്പോൺസർ ചെയ്തത്
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,ജേണൽ എൻട്രി റിവേഴ്സ് ചെയ്യുക
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ഉപഭോക്താവ് {0} സൃഷ്ടിച്ചു.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,മാനവ വിഭവശേഷി&gt; എച്ച്ആർ സജ്ജീകരണങ്ങളിൽ ദയവായി എംപ്ലോയീ നെയിമിങ് സിസ്റ്റം സെറ്റപ്പ് ചെയ്യുക
 DocType: Stock Settings,Limit Percent,ശതമാനം പരിമിതപ്പെടുത്തുക
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,ഏതൊരു വെയർഹൌസിലും നിലവിൽ സ്റ്റോക്കില്ല
 ,Payment Period Based On Invoice Date,ഇൻവോയിസ് തീയതി അടിസ്ഥാനമാക്കി പേയ്മെന്റ് പിരീഡ്
@@ -4637,7 +4640,7 @@
 DocType: BOM Explosion Item,Source Warehouse,ഉറവിട വെയർഹൗസ്
 DocType: Installation Note,Installation Date,ഇന്സ്റ്റലേഷന് തീയതി
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,ലഡ്ജർ പങ്കിടുക
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},വരി # {0}: അസറ്റ് {1} കമ്പനി ഭാഗമല്ല {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},വരി # {0}: അസറ്റ് {1} കമ്പനി ഭാഗമല്ല {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,വിൽപ്പന ഇൻവോയ്സ് {0} സൃഷ്ടിച്ചു
 DocType: Employee,Confirmation Date,സ്ഥിരീകരണം തീയതി
 DocType: Inpatient Occupancy,Check Out,ചെക്ക് ഔട്ട്
@@ -4657,6 +4660,7 @@
 DocType: Production Plan,Sales Orders Detail,സെയിൽസ് ഓർഡറുകൾ വിശദാംശം
 DocType: Bin,Requested Quantity,അഭ്യർത്ഥിച്ചു ക്വാണ്ടിറ്റി
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,ദയവായി വിദ്യാഭ്യാസം&gt; വിദ്യാഭ്യാസ സജ്ജീകരണങ്ങളിൽ സജ്ജീകരണ അധ്യാപിക നാമനിർദേശം ചെയ്യുന്ന സംവിധാനം
 DocType: Patient,Marital Status,വൈവാഹിക നില
 DocType: Stock Settings,Auto Material Request,ഓട്ടോ മെറ്റീരിയൽ അഭ്യർത്ഥന
 DocType: Woocommerce Settings,API consumer secret,API ഉപഭോക്തൃ രഹസ്യം
@@ -4707,7 +4711,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,ദിവസങ്ങൾ തിരഞ്ഞെടുക്കുക
 DocType: Academic Term,Term Name,ടേം പേര്
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),ക്രെഡിറ്റ് ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,ശമ്പള സ്ലിപ്പുകള് സൃഷ്ടിക്കുന്നു ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,ശമ്പള സ്ലിപ്പുകള് സൃഷ്ടിക്കുന്നു ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,നിങ്ങൾക്ക് റൂട്ട് നോഡ് എഡിറ്റുചെയ്യാൻ കഴിയില്ല.
 DocType: Buying Settings,Purchase Order Required,ഓർഡർ ആവശ്യമുണ്ട് വാങ്ങുക
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,ടൈമർ
@@ -4745,7 +4749,7 @@
 DocType: Account,Rate at which this tax is applied,ഈ നികുതി പ്രയോഗിക്കുന്നു തോത്
 DocType: Cash Flow Mapper,Section Name,വിഭാഗത്തിന്റെ പേര്
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,പുനഃക്രമീകരിക്കുക Qty
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},മൂല്യശേഖരം നിര {0}: ഉപയോഗപ്രദമായ ജീവിതത്തിന് ശേഷം പ്രതീക്ഷിച്ച മൂല്യം {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},മൂല്യശേഖരം നിര {0}: ഉപയോഗപ്രദമായ ജീവിതത്തിന് ശേഷം പ്രതീക്ഷിച്ച മൂല്യം {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,നിലവിൽ ജോലികൾ
 DocType: Company,Stock Adjustment Account,സ്റ്റോക്ക് ക്രമീകരണ അക്കൗണ്ട്
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,എഴുതുക
@@ -4791,7 +4795,7 @@
 DocType: Program Enrollment,School House,സ്കൂൾ ഹൗസ്
 DocType: Serial No,Out of AMC,എഎംസി പുറത്താണ്
 DocType: Opportunity,Opportunity Amount,അവസര തുക
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ബുക്കുചെയ്തു Depreciations എണ്ണം Depreciations മൊത്തം എണ്ണം വലുതായിരിക്കും കഴിയില്ല
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ബുക്കുചെയ്തു Depreciations എണ്ണം Depreciations മൊത്തം എണ്ണം വലുതായിരിക്കും കഴിയില്ല
 DocType: Purchase Order,Order Confirmation Date,ഓർഡർ സ്ഥിരീകരണ തീയതി
 DocType: Driver,HR-DRI-.YYYY.-,എച്ച്ആർ-ഡിആർഐ .YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,മെയിൻറനൻസ് സന്ദർശനം നിർമ്മിക്കുക
@@ -4832,7 +4836,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,ബാച്ച്:
 DocType: Volunteer,Afternoon,ഉച്ചകഴിഞ്ഞ്
 DocType: Loyalty Program,Loyalty Program Help,ലോയൽറ്റി പ്രോഗ്രാം സഹായം
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} &#39;{1}&#39; അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} &#39;{1}&#39; അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ഓപ്പൺ സജ്ജമാക്കുക
 DocType: Cheque Print Template,Scanned Cheque,സ്കാൻ ചെയ്ത ചെക്ക്
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,സമർപ്പിക്കുന്നു ഇടപാടുകൾ ബന്ധങ്ങൾ ഓട്ടോമാറ്റിക് ഇമെയിലുകൾ അയയ്ക്കുക.
@@ -4845,7 +4849,7 @@
 DocType: Warranty Claim,Item and Warranty Details,ഇനം വാറണ്ടിയുടെയും വിശദാംശങ്ങൾ
 DocType: Chapter,Chapter Members,ചാപ്റ്റർ അംഗങ്ങൾ
 DocType: Sales Team,Contribution (%),കോൺട്രിബ്യൂഷൻ (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,കുറിപ്പ്: &#39;ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട്&#39; വ്യക്തമാക്കിയില്ല മുതലുള്ള പേയ്മെന്റ് എൻട്രി സൃഷ്ടിച്ച ചെയ്യില്ല
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,കുറിപ്പ്: &#39;ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട്&#39; വ്യക്തമാക്കിയില്ല മുതലുള്ള പേയ്മെന്റ് എൻട്രി സൃഷ്ടിച്ച ചെയ്യില്ല
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,പ്രോജക്റ്റ് {0} ഇതിനകം നിലവിലുണ്ട്
 DocType: Clinical Procedure,Nursing User,നഴ്സിംഗ് ഉപയോക്താവ്
 DocType: Employee Benefit Application,Payroll Period,പേളിന്റെ കാലാവധി
@@ -4853,6 +4857,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},സീരിയൽ {0} ബാച്ച് {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,ഉത്തരവാദിത്വങ്ങൾ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,ഈ ഉദ്ധരണിയുടെ സാധുതാ കാലാവധി കഴിഞ്ഞു.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","ഈ പ്രമാണം റദ്ദാക്കാൻ ജീവനക്കാരനെ <a href=""#Form/Employee/{0}"">{0}</a> \ remove"
 DocType: Expense Claim Account,Expense Claim Account,ചിലവേറിയ ക്ലെയിം അക്കൗണ്ട്
 DocType: Account,Capital Work in Progress,കാപ്പിറ്റൽ വർക്സ് പുരോഗതിയിലാണ്
 DocType: Accounts Settings,Allow Stale Exchange Rates,സ്റ്റേലെറ്റ് എക്സ്ചേഞ്ച് നിരക്കുകൾ അനുവദിക്കുക
@@ -4934,7 +4940,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,പ്രശ്നം മെറ്റീരിയൽ
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,ERPNext ഉപയോഗിച്ച് Shopify കണക്റ്റുചെയ്യുക
 DocType: Material Request Item,For Warehouse,വെയർഹൗസ് വേണ്ടി
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,ഡെലിവറി കുറിപ്പുകൾ {0} അപ്ഡേറ്റുചെയ്തു
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,ഡെലിവറി കുറിപ്പുകൾ {0} അപ്ഡേറ്റുചെയ്തു
 DocType: Employee,Offer Date,ആഫര് തീയതി
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,ഉദ്ധരണികളും
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,നിങ്ങൾ ഓഫ്ലൈൻ മോഡിലാണ്. നിങ്ങൾ നെറ്റ്വർക്ക് ഞങ്ങൾക്കുണ്ട് വരെ ലോഡുചെയ്യണോ കഴിയില്ല.
@@ -4985,7 +4991,7 @@
 DocType: Shipping Rule,Calculate Based On,അടിസ്ഥാനത്തിൽ ഓൺ കണക്കുകൂട്ടുക
 DocType: Contract,Unfulfilled,പൂർത്തിയാകാത്ത
 DocType: Delivery Note Item,From Warehouse,വെയർഹൗസിൽ നിന്ന്
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,പരാമർശിക്കപ്പെട്ട മാനദണ്ഡത്തിനായി ജീവനക്കാർ ഇല്ല
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,പരാമർശിക്കപ്പെട്ട മാനദണ്ഡത്തിനായി ജീവനക്കാർ ഇല്ല
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,നിർമ്മിക്കാനുള്ള വസ്തുക്കളുടെ ബിൽ കൂടിയ ഇനങ്ങൾ ഇല്ല
 DocType: Shopify Settings,Default Customer,സ്ഥിരസ്ഥിതി ഉപഭോക്താവ്
 DocType: Sales Stage,Stage Name,സ്റ്റേജ് പേര്
@@ -5028,7 +5034,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ഡിസ്കൗണ്ട് തുക ശേഷം നികുതിയും
 DocType: Patient,Inpatient Status,ഇൻപേഷ്യൻറ് സ്റ്റാറ്റസ്
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,നിത്യജീവിതത്തിലെ ഔദ്യോഗിക ചുരുക്കം ക്രമീകരണങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,തിരഞ്ഞെടുക്കപ്പെട്ട വില ലിസ്റ്റ് പരിശോധിച്ച ഫീൽഡുകൾ വാങ്ങലും വിൽക്കുന്നതും ആയിരിക്കണം.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,തിരഞ്ഞെടുക്കപ്പെട്ട വില ലിസ്റ്റ് പരിശോധിച്ച ഫീൽഡുകൾ വാങ്ങലും വിൽക്കുന്നതും ആയിരിക്കണം.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,ദയവായി തീയതി അനുസരിച്ച് Reqd നൽകുക
 DocType: Payment Entry,Internal Transfer,ആന്തരിക ട്രാൻസ്ഫർ
 DocType: Asset Maintenance,Maintenance Tasks,മെയിൻറനൻസ് ടാസ്കുകൾ
@@ -5065,7 +5071,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,ഗ്രൂപ്പ്
 DocType: Guardian,Interests,താൽപ്പര്യങ്ങൾ
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,പ്രാപ്തമാക്കുക / കറൻസിയുടെ അപ്രാപ്തമാക്കാൻ.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,ചില ശമ്പള സ്ലിപ്പുകൾ സമർപ്പിക്കാൻ കഴിഞ്ഞില്ല
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,ചില ശമ്പള സ്ലിപ്പുകൾ സമർപ്പിക്കാൻ കഴിഞ്ഞില്ല
 DocType: Exchange Rate Revaluation,Get Entries,എൻട്രികൾ സ്വീകരിക്കുക
 DocType: Production Plan,Get Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന നേടുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,തപാൽ ചെലവുകൾ
@@ -5150,7 +5156,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},ചിലവേറിയ ഇനത്തിന്റെ {0} നിര്ബന്ധമാണ്
 DocType: BOM,Website Description,വെബ്സൈറ്റ് വിവരണം
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,ഇക്വിറ്റി ലെ മൊത്തം മാറ്റം
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,വാങ്ങൽ ഇൻവോയ്സ് {0} ആദ്യം റദ്ദാക്കുകയോ ചെയ്യുക
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,വാങ്ങൽ ഇൻവോയ്സ് {0} ആദ്യം റദ്ദാക്കുകയോ ചെയ്യുക
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,അനുവദനീയമല്ല. ദയവായി സേവന യൂണിറ്റ് തരം അപ്രാപ്തമാക്കുക
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ഇമെയിൽ വിലാസം അതുല്യമായ ആയിരിക്കണം, ഇതിനകം {0} നിലവിലുണ്ട്"
 DocType: Serial No,AMC Expiry Date,എഎംസി കാലഹരണ തീയതി
@@ -5190,7 +5196,7 @@
 DocType: Hotel Room,Hotel Room,ഹോട്ടൽ റൂം
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},അക്കൗണ്ട് {0} കമ്പനി {1} വകയാണ് ഇല്ല
 DocType: Leave Type,Rounding,വൃത്താകം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,തുടർച്ചയായ സീരിയൽ നമ്പറുകൾ {0} ഡെലിവറി നോട്ട് ഉപയോഗിച്ച് പൊരുത്തപ്പെടുന്നില്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,തുടർച്ചയായ സീരിയൽ നമ്പറുകൾ {0} ഡെലിവറി നോട്ട് ഉപയോഗിച്ച് പൊരുത്തപ്പെടുന്നില്ല
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),ഡിസ്പെന്ഡ് തുക (പ്രോ-റേറ്റുചെയ്തത്)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","പിന്നെ കസ്റ്റമർ, കസ്റ്റമർ ഗ്രൂപ്പ്, ടെറിട്ടറി, വിതരണക്കാരൻ, വിതരണക്കാരൻ ഗ്രൂപ്പ്, കാമ്പെയ്ൻ, സെയിൽസ് പാർട്ട്നർ എന്നിവ അടിസ്ഥാനമാക്കിയുള്ള വിലനിർണ്ണയ വ്യവസ്ഥകൾ ഫിൽട്ടർ ചെയ്യപ്പെടുന്നു."
 DocType: Student,Guardian Details,ഗാർഡിയൻ വിവരങ്ങൾ
@@ -5245,7 +5251,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},ഓഹരി ഇനം {0} ആവശ്യമുള്ളതിൽ വെയർഹൗസ്
 DocType: Leave Allocation,Unused leaves,ഉപയോഗിക്കപ്പെടാത്ത ഇല
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,തിരിച്ചടയ്ക്കാനുള്ള എൻട്രി ചെയ്യുക
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,എല്ലാ വകുപ്പുകളും
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,എല്ലാ വകുപ്പുകളും
 DocType: Healthcare Service Unit,Vacant,ഒഴിവുള്ള
 DocType: Patient,Alcohol Past Use,മദ്യപിക്കുന്ന ഭൂതകാല ഉപയോഗം
 DocType: Fertilizer Content,Fertilizer Content,വളപ്രയോഗം ഉള്ളടക്കം
@@ -5256,7 +5262,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,ഈ സെയിൽസ് ഓർഡർ റദ്ദാക്കുന്നതിന് മുമ്പ് വർക്ക് ഓർഡർ {0} റദ്ദാക്കണം
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),(സബ്-സമ്മേളനങ്ങൾ ഉൾപ്പെടെ) പൊട്ടിത്തെറിക്കുന്ന BOM ലഭ്യമാക്കുക
 DocType: Authorization Rule,Applicable To (Employee),(ജീവനക്കാർ) ബാധകമായ
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,അവസാന തീയതി നിർബന്ധമാണ്
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,അവസാന തീയതി നിർബന്ധമാണ്
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,ഗുണ {0} 0 ആകാൻ പാടില്ല വേണ്ടി വർദ്ധന
 DocType: Employee Benefit Claim,Benefit Type and Amount,"ബെനിഫിറ്റ് തരം, തുക"
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,ബുക്കുചെയ്ത മുറികൾ
@@ -5400,7 +5406,7 @@
 DocType: Purchase Invoice Item,Total Weight,ആകെ ഭാരം
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,വിൽപ്പന കമ്മീഷൻ
 DocType: Job Offer Term,Value / Description,മൂല്യം / വിവരണം
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","വരി # {0}: അസറ്റ് {1} സമർപ്പിക്കാൻ കഴിയില്ല, അത് ഇതിനകം {2} ആണ്"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","വരി # {0}: അസറ്റ് {1} സമർപ്പിക്കാൻ കഴിയില്ല, അത് ഇതിനകം {2} ആണ്"
 DocType: Tax Rule,Billing Country,ബില്ലിംഗ് രാജ്യം
 DocType: Purchase Order Item,Expected Delivery Date,പ്രതീക്ഷിച്ച ഡെലിവറി തീയതി
 DocType: Restaurant Order Entry,Restaurant Order Entry,റെസ്റ്റോറന്റ് ഓർഡർ എൻട്രി
@@ -5439,12 +5445,13 @@
 DocType: Maintenance Visit,Breakdown,പ്രവർത്തന രഹിതം
 DocType: Travel Itinerary,Vegetarian,വെജിറ്റേറിയൻ
 DocType: Patient Encounter,Encounter Date,എൻകണറ്റ് തീയതി
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,അക്കൗണ്ട്: {0} കറൻസി കൂടെ: {1} തിരഞ്ഞെടുത്ത ചെയ്യാൻ കഴിയില്ല
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,അക്കൗണ്ട്: {0} കറൻസി കൂടെ: {1} തിരഞ്ഞെടുത്ത ചെയ്യാൻ കഴിയില്ല
 DocType: Bank Statement Transaction Settings Item,Bank Data,ബാങ്ക് ഡാറ്റ
 DocType: Purchase Receipt Item,Sample Quantity,സാമ്പിൾ അളവ്
 DocType: Bank Guarantee,Name of Beneficiary,ഗുണഭോക്താവിന്റെ പേര്
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",ഏറ്റവും പുതിയ മൂല്യനിർണ്ണയ നിരക്ക് / വിലനിർണയ നിരക്ക് / അസംസ്കൃത വസ്തുക്കളുടെ അവസാന വാങ്ങൽ നിരക്ക് എന്നിവ അടിസ്ഥാനമാക്കി ഷെഡ്യൂളർ വഴി BOM നിരക്ക് അപ്ഡേറ്റ് ചെയ്യുക.
 DocType: Supplier,SUP-.YYYY.-,SUP- .YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,വിതരണക്കാരൻ&gt; വിതരണക്കാരൻ ഗ്രൂപ്പ്
 DocType: Bank Reconciliation Detail,Cheque Date,ചെക്ക് തീയതി
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},അക്കൗണ്ട് {0}: പാരന്റ് അക്കൌണ്ട് {1} കമ്പനി ഭാഗമല്ല: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,വിജയകരമായി ഈ കമ്പനിയുമായി ബന്ധപ്പെട്ട എല്ലാ ഇടപാടുകൾ ഇല്ലാതാക്കി!
@@ -5472,7 +5479,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,ശിശു നോഡുകൾ മാത്രം &#39;ഗ്രൂപ്പ്&#39; തരം നോഡുകൾ കീഴിൽ സൃഷ്ടിക്കാൻ കഴിയും
 DocType: Attendance Request,Half Day Date,അര ദിവസം തീയതി
 DocType: Academic Year,Academic Year Name,അക്കാദമിക് വർഷം പേര്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} ഉപയോഗിച്ച് കൈമാറാൻ {0} അനുവാദമില്ല. കമ്പനി മാറ്റൂ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} ഉപയോഗിച്ച് കൈമാറാൻ {0} അനുവാദമില്ല. കമ്പനി മാറ്റൂ.
 DocType: Sales Partner,Contact Desc,കോൺടാക്റ്റ് DESC
 DocType: Email Digest,Send regular summary reports via Email.,ഇമെയിൽ വഴി പതിവ് സംഗ്രഹം റിപ്പോർട്ടുകൾ അയയ്ക്കുക.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},ചിലവേറിയ ക്ലെയിം തരം {0} ൽ സ്ഥിര അക്കൗണ്ട് സജ്ജീകരിക്കുക
@@ -5505,7 +5512,7 @@
 DocType: Hotel Room,Hotel Manager,ഹോട്ടൽ മാനേജർ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,ഷോപ്പിംഗ് കാർട്ട് നികുതി റൂൾ സജ്ജീകരിക്കുക
 DocType: Purchase Invoice,Taxes and Charges Added,നികുതി ചാർജുകളും ചേർത്തു
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,മൂല്യശുദ്ധീകരണ വരി {0}: ലഭ്യമായ മൂല്യവിനിമയ തീയതിയ്ക്ക് തൊട്ടടുത്തുള്ള വില വ്യത്യാസം തീയതി ഉണ്ടായിരിക്കരുത്
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,മൂല്യശുദ്ധീകരണ വരി {0}: ലഭ്യമായ മൂല്യവിനിമയ തീയതിയ്ക്ക് തൊട്ടടുത്തുള്ള വില വ്യത്യാസം തീയതി ഉണ്ടായിരിക്കരുത്
 ,Sales Funnel,സെയിൽസ് നാലുവിക്കറ്റ്
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,ചുരുക്കെഴുത്ത് നിർബന്ധമാണ്
 DocType: Project,Task Progress,ടാസ്ക് പുരോഗതി
@@ -5519,7 +5526,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,എല്ലാ ഉപഭോക്തൃ ഗ്രൂപ്പുകൾ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,പ്രതിമാസം കുമിഞ്ഞു
 DocType: Attendance Request,On Duty,ഡ്യൂട്ടിയിൽ
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} നിർബന്ധമാണ്. ഒരുപക്ഷേ കറൻസി എക്സ്ചേഞ്ച് റെക്കോർഡ് {1} {2} വേണ്ടി സൃഷ്ടിക്കപ്പെട്ടിട്ടില്ല.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} നിർബന്ധമാണ്. ഒരുപക്ഷേ കറൻസി എക്സ്ചേഞ്ച് റെക്കോർഡ് {1} {2} വേണ്ടി സൃഷ്ടിക്കപ്പെട്ടിട്ടില്ല.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,നികുതി ഫലകം നിർബന്ധമാണ്.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,അക്കൗണ്ട് {0}: പാരന്റ് അക്കൌണ്ട് {1} നിലവിലില്ല
 DocType: POS Closing Voucher,Period Start Date,ആരംഭ തീയതി കാലാവധി
@@ -5598,11 +5605,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,കുറഞ്ഞത് ഒരു പണ്ടകശാല നിർബന്ധമാണ്
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","UOM, ഇനം ഗ്രൂപ്പ്, വിവരണം കൂടാതെ മണിക്കൂർ എന്നിവ പോലെ ഐറ്റം ഫീൽഡുകൾ കോൺഫിഗർ ചെയ്യുക."
 DocType: Certification Application,Certification Status,സർട്ടിഫിക്കേഷൻ സ്റ്റാറ്റസ്
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Marketplace
 DocType: Travel Itinerary,Travel Advance Required,യാത്ര അഡ്വാൻസ് ആവശ്യമാണ്
 DocType: Subscriber,Subscriber Name,സബ്സ്ക്രൈബർ നാമം
 DocType: Serial No,Out of Warranty,വാറന്റി പുറത്താണ്
-DocType: Cashier Closing,Cashier-closing-,കാലിയർ ക്ലോസിങ്ങ്-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,മാപ്പുചെയ്ത ഡാറ്റ തരം
 DocType: BOM Update Tool,Replace,മാറ്റിസ്ഥാപിക്കുക
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,ഉൽപ്പന്നങ്ങളൊന്നും കണ്ടെത്തിയില്ല.
@@ -5690,7 +5696,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,വിൽപ്പനയ്ക്കായി വാങ്ങുന്നതിനും വാങ്ങുന്നതിനുമുള്ള സ്ഥിര ടാക്സ് ടെംപ്ലേറ്റുകൾ സൃഷ്ടിക്കുന്നു.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,മൂല്യനിർണ്ണയ ഫല റിക്കോഡ് {0} ഇതിനകം നിലവിലുണ്ട്.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","ഉദാഹരണം: ABCD. #####. സീരീസ് സജ്ജമാക്കിയാൽ, ബാച്ച് നോയിംഗ് ഇടപാടുകളിൽ പരാമർശിച്ചിട്ടില്ലെങ്കിൽ, ഈ ശ്രേണിയെ അടിസ്ഥാനമാക്കി യാന്ത്രിക ബാച്ച് നമ്പർ സൃഷ്ടിക്കും. ഈ ഇനത്തിനായി ബാച്ച് നമ്പറെ നിങ്ങൾ എപ്പോഴും സ്പഷ്ടമായി സൂചിപ്പിക്കണമെങ്കിൽ, ഇത് ശൂന്യമാക്കിയിടുക. കുറിപ്പ്: സ്റ്റോക്കിംഗ് ക്രമീകരണങ്ങളിൽ നാമമുള്ള സീരീസ് പ്രിഫിക്സിൽ ഈ ക്രമീകരണം മുൻഗണന നൽകും."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,സെറ്റപ്പ്&gt; നമ്പറിംഗ് സീരീസുകൾ വഴി ഹാജരാക്കാനായി സെറ്റപ്പ് നമ്പറുകൾ ക്രമീകരിക്കുക
 DocType: BOM,Materials Required (Exploded),ആവശ്യമായ മെറ്റീരിയൽസ് (പൊട്ടിത്തെറിക്കുന്ന)
 DocType: Contract,Party User,പാർട്ടി ഉപയോക്താവ്
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',ശൂന്യമായ ഫിൽട്ടർ ഗ്രൂപ്പ് &#39;കമ്പനി&#39; എങ്കിൽ കമ്പനി സജ്ജമാക്കുക
@@ -5893,7 +5898,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,സ്ഥലം പരിശോധന എണ്ണം
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,ട്രയൽ കാലയളവ് ആരംഭിക്കുക തീയതിയും ട്രയൽ കാലയളവും അവസാന തീയതി സജ്ജമാക്കണം
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,ശരാശരി നിരക്ക്
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,മൊത്തം പേയ്മെന്റ് തുക പേയ്മെന്റ് ഷെഡ്യൂൾ ഗ്രാൻഡ് / വൃത്തത്തിലുള്ള മൊത്തമായി തുല്യമായിരിക്കണം
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,മൊത്തം പേയ്മെന്റ് തുക പേയ്മെന്റ് ഷെഡ്യൂൾ ഗ്രാൻഡ് / വൃത്തത്തിലുള്ള മൊത്തമായി തുല്യമായിരിക്കണം
 DocType: Subscription Plan Detail,Plan,പദ്ധതി
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,ജനറൽ ലെഡ്ജർ പ്രകാരം ബാങ്ക് സ്റ്റേറ്റ്മെന്റ് ബാലൻസ്
 DocType: Job Applicant,Applicant Name,അപേക്ഷകന് പേര്
@@ -5962,7 +5967,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,സോപ്പ് &amp; മാലിനനിര്മാര്ജനി
 DocType: BOM,Show Items,ഇനങ്ങൾ കാണിക്കുക
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,കാലാകാലങ്ങളിൽ ശ്രേഷ്ഠ പാടില്ല.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,ഇമെയിൽ വഴി എല്ലാ ഉപഭോക്താക്കളെയും നിങ്ങൾക്ക് അറിയിക്കാൻ താൽപ്പര്യമുണ്ടോ?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,ഇമെയിൽ വഴി എല്ലാ ഉപഭോക്താക്കളെയും നിങ്ങൾക്ക് അറിയിക്കാൻ താൽപ്പര്യമുണ്ടോ?
 DocType: Subscription Plan,Billing Interval,ബില്ലിംഗ് ഇടവേള
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,മോഷൻ പിക്ചർ &amp; വീഡിയോ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ഉത്തരവിട്ടു
@@ -5971,9 +5976,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,വരി {0}: {1} 0-ത്തേക്കാൾ വലുതായിരിക്കണം
 DocType: Assessment Criteria,Assessment Criteria Group,അസസ്മെന്റ് മാനദണ്ഡം ഗ്രൂപ്പ്
 DocType: Healthcare Settings,Patient Name By,വഴി രോഗിയുടെ പേര്
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},{0} മുതൽ {1} വരെയുള്ള ശമ്പളത്തിനായി കൃത്യമായ ജേണൽ എൻട്രി
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},{0} മുതൽ {1} വരെയുള്ള ശമ്പളത്തിനായി കൃത്യമായ ജേണൽ എൻട്രി
 DocType: Sales Invoice Item,Enable Deferred Revenue,വ്യതിരിക്ത വരുമാനം പ്രവർത്തനക്ഷമമാക്കുക
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},സൂക്ഷിക്കുന്നത് മൂല്യത്തകർച്ച തുറക്കുന്നു {0} തുല്യമോ കുറവായിരിക്കണം
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},സൂക്ഷിക്കുന്നത് മൂല്യത്തകർച്ച തുറക്കുന്നു {0} തുല്യമോ കുറവായിരിക്കണം
 DocType: Warehouse,Warehouse Name,വെയർഹൗസ് പേര്
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,യഥാർത്ഥ ആരംഭ തീയതി യഥാർത്ഥ തീയതിയേക്കാൾ കുറവായിരിക്കണം
 DocType: Naming Series,Select Transaction,ഇടപാട് തിരഞ്ഞെടുക്കുക
@@ -6123,7 +6128,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise പുനഃക്രമീകരിക്കുക ലെവൽ ശുപാർശിത
 DocType: Salary Detail,Salary Detail,ശമ്പള വിശദാംശം
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,ആദ്യം {0} തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,{0} ഉപയോക്താക്കൾ ചേർത്തു
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,{0} ഉപയോക്താക്കൾ ചേർത്തു
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","മൾട്ടി-ടയർ പരിപാടിയുടെ കാര്യത്തിൽ, കസ്റ്റമർമാർ ചെലവഴിച്ച തുക പ്രകാരം ബന്ധപ്പെട്ട ടീമിൽ ഓട്ടോ നിർണ്ണയിക്കും"
 DocType: Appointment Type,Physician,വൈദ്യൻ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,ബാച്ച് {0} ഇനത്തിന്റെ {1} കാലഹരണപ്പെട്ടു.
@@ -6298,6 +6303,7 @@
 DocType: Employee,Date of Issue,പുറപ്പെടുവിച്ച തീയതി
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","വാങ്ങൽ തല്ലാൻ ആവശ്യമുണ്ട് == &#39;അതെ&#39;, പിന്നീട് വാങ്ങൽ ഇൻവോയ്സ് സൃഷ്ടിക്കാൻ, ഉപയോക്തൃ ഇനം {0} ആദ്യം വാങ്ങൽ രസീത് സൃഷ്ടിക്കാൻ ആവശ്യമെങ്കിൽ വാങ്ങൽ ക്രമീകരണങ്ങൾ പ്രകാരം"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},വരി # {0}: ഇനത്തിന്റെ വേണ്ടി സജ്ജമാക്കുക വിതരണക്കാരൻ {1}
+DocType: Global Defaults,Default Distance Unit,സ്വപ്രേരിത ദൂരം യൂണിറ്റ്
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,വരി {0}: മണിക്കൂറുകൾ മൂല്യം പൂജ്യത്തേക്കാൾ വലുതായിരിക്കണം.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,വെബ്സൈറ്റ് ചിത്രം {0} ഇനം ഘടിപ്പിച്ചിരിക്കുന്ന {1} കണ്ടെത്താൻ കഴിയുന്നില്ല
 DocType: Issue,Content Type,ഉള്ളടക്ക തരം
@@ -6353,7 +6359,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
 DocType: Asset,Naming Series,സീരീസ് നാമകരണം
 DocType: Vital Signs,Coated,പൂമുഖം
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,വരി {0}: ഉപയോഗപ്രദമായ ലൈഫ് ശേഷം പ്രതീക്ഷിച്ച മൂല്യം മൊത്തം വാങ്ങൽ തുകയേക്കാൾ കുറവായിരിക്കണം
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,വരി {0}: ഉപയോഗപ്രദമായ ലൈഫ് ശേഷം പ്രതീക്ഷിച്ച മൂല്യം മൊത്തം വാങ്ങൽ തുകയേക്കാൾ കുറവായിരിക്കണം
 DocType: GoCardless Settings,GoCardless Settings,GoCardless ക്രമീകരണങ്ങൾ
 DocType: Leave Block List,Leave Block List Name,ബ്ലോക്ക് പട്ടിക പേര് വിടുക
 DocType: Certified Consultant,Certification Validity,സർട്ടിഫിക്കേഷൻ സാധുത
@@ -6422,6 +6428,7 @@
 DocType: Bank Statement Settings Item,Bank Header,ബാങ്ക് ശീർഷകം
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,ലാബ് ടെസ്റ്റുകൾ കാണുക
 DocType: Hub Users,Hub Users,ഹബ് യൂസർ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ഉപഭോക്താവ്&gt; കസ്റ്റമർ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
 DocType: Purchase Invoice,Y,വൈ
 DocType: Maintenance Visit,Maintenance Date,മെയിൻറനൻസ് തീയതി
 DocType: Purchase Invoice Item,Rejected Serial No,നിരസിച്ചു സീരിയൽ പോസ്റ്റ്
@@ -6435,7 +6442,7 @@
 DocType: SG Creation Tool Course,Max Strength,മാക്സ് ദൃഢത
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,പ്രീസെറ്റുകൾ ഇൻസ്റ്റാൾ ചെയ്യുന്നു
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},ഉപഭോക്താവിന് {@} ഡെലിവറി നോട്ട് തിരഞ്ഞെടുത്തിട്ടില്ല
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},ഉപഭോക്താവിന് {@} ഡെലിവറി നോട്ട് തിരഞ്ഞെടുത്തിട്ടില്ല
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,ജീവനക്കാരൻ {0} ന് പരമാവധി ആനുകൂല്യ തുക ഇല്ല
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,ഡെലിവറി തീയതി അടിസ്ഥാനമാക്കിയുള്ള ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
 DocType: Grant Application,Has any past Grant Record,ഏതെങ്കിലും മുൻകാല ഗ്രാന്റാഡ് റെക്കോർഡ് ഉണ്ട്
@@ -6463,7 +6470,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,ഹോട്ടൽ മുറികൾ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,കസ്റ്റമർ സർവീസ്
 DocType: BOM,Thumbnail,ലഘുചിത്രം
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,ഇമെയിൽ ഐഡികളുമായി ബന്ധങ്ങളൊന്നും കണ്ടെത്തിയില്ല.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,ഇമെയിൽ ഐഡികളുമായി ബന്ധങ്ങളൊന്നും കണ്ടെത്തിയില്ല.
 DocType: Item Customer Detail,Item Customer Detail,ഇനം ഉപഭോക്തൃ വിശദാംശം
 DocType: Notification Control,Prompt for Email on Submission of,സമർപ്പിക്കുന്നതിന് ന് ഇമെയിൽ പ്രേരിപ്പിക്കരുത്
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +102,Total allocated leaves are more than days in the period,ആകെ അലോക്കേറ്റഡ് ഇല കാലയളവിൽ ദിവസം അധികം ആകുന്നു
@@ -6723,7 +6730,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,അക്കൗണ്ട് തരം തിരഞ്ഞെടുത്തുവെന്ന് കാരണം ഗ്രൂപ്പിലേക്ക് മറവിൽ ചെയ്യാൻ കഴിയില്ല.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} പരിഷ്ക്കരിച്ചു. പുതുക്കുക.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,താഴെ ദിവസങ്ങളിൽ അവധി അപേക്ഷിക്കുന്നതിനുള്ള നിന്നും ഉപയോക്താക്കളെ നിർത്തുക.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,ഇനം കോഡ്&gt; ഇനം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","ലോയൽറ്റി പോയിന്റുകൾക്കുള്ള പരിധിയില്ലാത്ത കാലാവധി, കാലഹരണപ്പെടൽ കാലാവധി കാലിയാക്കുക അല്ലെങ്കിൽ 0 ആയി നിലനിർത്തുക."
 DocType: Asset Maintenance Team,Maintenance Team Members,മെയിൻറനൻസ് ടീം അംഗങ്ങൾ
 DocType: Loyalty Point Entry,Purchase Amount,വാങ്ങൽ തുക
@@ -6731,7 +6737,7 @@
 											to fullfill Sales Order {2}","സീരിയൽ നമ്പർ {0} സംസ്ക്കരിച്ചതിനാൽ {1} ഡെലിവർ ചെയ്യാൻ കഴിയില്ല, പൂർണ്ണമായി സെയിൽസ് ഓർഡർ {2}"
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN -YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,വിതരണക്കാരൻ ക്വട്ടേഷൻ {0} സൃഷ്ടിച്ചു
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,അവസാനിക്കുന്ന വർഷം ആരംഭിക്കുന്ന വർഷം മുമ്പ് ആകാൻ പാടില്ല
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,അവസാനിക്കുന്ന വർഷം ആരംഭിക്കുന്ന വർഷം മുമ്പ് ആകാൻ പാടില്ല
 DocType: Employee Benefit Application,Employee Benefits,ജീവനക്കാരുടെ ആനുകൂല്യങ്ങൾ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},ചിലരാകട്ടെ അളവ് വരി {1} ൽ ഇനം {0} വേണ്ടി അളവ് ഒക്കുന്നില്ല വേണം
 DocType: Work Order,Manufactured Qty,മാന്യുഫാക്ച്ചേർഡ് Qty
@@ -6747,6 +6753,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,ബാച്ച് നമ്പറുകൾ തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,GSTIN ലേക്ക്
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ഉപഭോക്താക്കൾക്ക് ഉയർത്തുകയും ബില്ലുകള്.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,മാനവ വിഭവശേഷി&gt; എച്ച്ആർ സജ്ജീകരണങ്ങളിൽ ദയവായി എംപ്ലോയീ നെയിമിങ് സിസ്റ്റം സെറ്റപ്പ് ചെയ്യുക
 DocType: Healthcare Settings,Invoice Appointments Automatically,ഇൻവോയ്സ് അപ്പോയിൻമെന്റുകൾ സ്വപ്രേരിതമായി
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,പ്രോജക്ട് ഐഡി
 DocType: Salary Component,Variable Based On Taxable Salary,നികുതി അടക്കുന്ന ശമ്പളത്തെ അടിസ്ഥാനമാക്കിയുള്ള വേരിയബിൾ
@@ -6795,7 +6802,7 @@
 DocType: POS Profile,Account for Change Amount,തുക മാറ്റത്തിനായി അക്കൗണ്ട്
 DocType: QuickBooks Migrator,Connecting to QuickBooks,QuickBooks- ലേക്ക് കണക്റ്റുചെയ്യുന്നു
 DocType: Exchange Rate Revaluation,Total Gain/Loss,മൊത്തം നഷ്ടം / നഷ്ടം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,ഇൻറർ കമ്പനി ഇൻവോയ്സിന്റെ അസാധുവായ കമ്പനി.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,ഇൻറർ കമ്പനി ഇൻവോയ്സിന്റെ അസാധുവായ കമ്പനി.
 DocType: Purchase Invoice,input service,ഇൻപുട്ട് സേവനം
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},വരി {0}: പാർട്ടി / അക്കൗണ്ട് {3} {4} ൽ {1} / {2} കൂടെ പൊരുത്തപ്പെടുന്നില്ല
 DocType: Employee Promotion,Employee Promotion,തൊഴിലുടമ പ്രമോഷൻ
@@ -6925,7 +6932,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,ലോഡ്ജിംഗിനായുള്ള അനുയോജ്യമായ വിസ്തീർണ്ണം
 apps/erpnext/erpnext/config/selling.py +184,Analytics,അനലിറ്റിക്സ്
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,കാർട്ട് ശൂന്യമാണ്
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,ദയവായി വിദ്യാഭ്യാസം&gt; വിദ്യാഭ്യാസ സജ്ജീകരണങ്ങളിൽ സജ്ജീകരണ അധ്യാപിക നാമനിർദേശം ചെയ്യുന്ന സംവിധാനം
 DocType: Vehicle,Model,മാതൃക
 DocType: Work Order,Actual Operating Cost,യഥാർത്ഥ ഓപ്പറേറ്റിംഗ് ചെലവ്
 DocType: Payment Entry,Cheque/Reference No,ചെക്ക് / പരാമർശം ഇല്ല
@@ -6953,7 +6959,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,മാറ്റാൻ ഒന്നുമില്ല
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,ഒരു CSV ഫയൽ തിരഞ്ഞെടുക്കുക
 DocType: Holiday List,Total Holidays,ആകെ അവധിദിനങ്ങൾ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,ഡിസ്ചേസിനായി ഇമെയിൽ ടെംപ്ലേറ്റുകൾ കാണുന്നില്ല. ഡെലിവറി ക്രമീകരണങ്ങളിൽ ഒന്ന് സജ്ജീകരിക്കുക.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,ഡിസ്ചേസിനായി ഇമെയിൽ ടെംപ്ലേറ്റുകൾ കാണുന്നില്ല. ഡെലിവറി ക്രമീകരണങ്ങളിൽ ഒന്ന് സജ്ജീകരിക്കുക.
 DocType: Student Leave Application,Mark as Present,അവതരിപ്പിക്കുക അടയാളപ്പെടുത്തുക
 DocType: Supplier Scorecard,Indicator Color,സൂചക നിറം
 DocType: Purchase Order,To Receive and Bill,സ്വീകരിക്കുക ബിൽ ചെയ്യുക
@@ -6962,7 +6968,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,സീരിയൽ നം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,ഡിസൈനർ
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,നിബന്ധനകളും വ്യവസ്ഥകളും ഫലകം
-DocType: Serial No,Delivery Details,ഡെലിവറി വിശദാംശങ്ങൾ
+DocType: Delivery Trip,Delivery Details,ഡെലിവറി വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},കോസ്റ്റ് കേന്ദ്രം തരം {1} വേണ്ടി നികുതി പട്ടികയിലെ വരി {0} ആവശ്യമാണ്
 DocType: Program,Program Code,പ്രോഗ്രാം കോഡ്
 DocType: Terms and Conditions,Terms and Conditions Help,ഉപാധികളും നിബന്ധനകളും സഹായം
@@ -6985,7 +6991,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ലീഡ് സമയം ദിനങ്ങൾ
 DocType: Cash Flow Mapping,Is Income Tax Expense,ആദായ നികുതി ചെലവ്
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,നിങ്ങളുടെ ഓർഡർ ഡെലിവറിക്ക് പുറത്താണ്!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},വരി # {0}: {1} പോസ്റ്റുചെയ്ത തീയതി വാങ്ങൽ തീയതി തുല്യമായിരിക്കണം ആസ്തിയുടെ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},വരി # {0}: {1} പോസ്റ്റുചെയ്ത തീയതി വാങ്ങൽ തീയതി തുല്യമായിരിക്കണം ആസ്തിയുടെ {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,വിദ്യാർത്ഥി ഇൻസ്റ്റിറ്റ്യൂട്ട് ഹോസ്റ്റൽ വസിക്കുന്നു എങ്കിൽ ഈ പരിശോധിക്കുക.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,മുകളിലുള്ള പട്ടികയിൽ സെയിൽസ് ഓർഡറുകൾ നൽകുക
 ,Stock Summary,ഓഹരി ചുരുക്കം
diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv
index 867d55a..4c99089 100644
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,कालावधी नाव
 DocType: Employee,Salary Mode,पगार मोड
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,नोंदणी करा
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,नोंदणी करा
 DocType: Patient,Divorced,घटस्फोट
 DocType: Support Settings,Post Route Key,पोस्ट मार्ग की
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,आयटम व्यवहार अनेक वेळा जोडले जाण्यास अनुमती द्या
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,नवीन विनिमय दर
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},चलन दर सूची आवश्यक आहे {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* व्यवहारामधे  हिशोब केला जाईल.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,ग्राहक संपर्क
 DocType: Patient Appointment,Check availability,उपलब्धता तपासा
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,खुल्या दर्शवा
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,मालिका यशस्वीपणे अद्यतनित
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,चेकआऊट
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{1} सत्रात {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{1} सत्रात {0}
 DocType: Asset Finance Book,Depreciation Start Date,घसारा प्रारंभ तारीख
 DocType: Pricing Rule,Apply On,रोजी लागू करा
 DocType: Item Price,Multiple Item prices.,एकाधिक आयटम भाव.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,लॅब प्रिस्क्रिप्शन
 ,Delay Days,विलंब दिवस
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,सेवा खर्च
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},अनुक्रमांक: {0} आधीच विक्री चलन संदर्भ आहे: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},अनुक्रमांक: {0} आधीच विक्री चलन संदर्भ आहे: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,चलन
 DocType: Purchase Invoice Item,Item Weight Details,आयटम वजन तपशील
 DocType: Asset Maintenance Log,Periodicity,ठराविक मुदतीने पुन: पुन्हा उगवणे
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,लेखापाल
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,किंमत सूची विक्री
 DocType: Patient,Tobacco Current Use,तंबाखू वर्तमान वापर
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","जॉब कार्डसह प्रारंभ तारीख आणि समाप्ती तारीख आच्छादित आहे <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,विक्री दर
 DocType: Cost Center,Stock User,शेअर सदस्य
 DocType: Soil Analysis,(Ca+Mg)/K,(सीए + एमजी) / के
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,संबंधित
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,उपस्थिती तारीख कर्मचारी सामील तारीख पेक्षा कमी असू शकत नाही
 DocType: Grading Scale,Grading Scale Name,प्रतवारी स्केल नाव
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,मार्केटप्लेसमध्ये वापरकर्ते जोडा
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,मार्केटप्लेसमध्ये वापरकर्ते जोडा
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,हे  रूट खाते आहे आणि संपादित केला जाऊ शकत नाही.
 DocType: Sales Invoice,Company Address,कंपनीचा पत्ता
 DocType: BOM,Operations,ऑपरेशन्स
@@ -323,7 +323,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,डिफ अंदाजे
 DocType: Production Plan,Material Request Detail,साहित्य विनंती तपशील
 DocType: Selling Settings,Default Quotation Validity Days,डीफॉल्ट कोटेशन वैधता दिवस
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","आयटम दर सलग {0} मधे कर समाविष्ट करण्यासाठी, पंक्ती मध्ये कर {1} समाविष्ट करणे आवश्यक आहे"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","आयटम दर सलग {0} मधे कर समाविष्ट करण्यासाठी, पंक्ती मध्ये कर {1} समाविष्ट करणे आवश्यक आहे"
 DocType: SMS Center,SMS Center,एसएमएस केंद्र
 DocType: Payroll Entry,Validate Attendance,उपस्थिततेचे प्रमाणिकरण करा
 DocType: Sales Invoice,Change Amount,रक्कम बदल
@@ -442,7 +442,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,शब्दात रक्कम ओळींतील अंतर
 DocType: Vehicle,Additional Details,अतिरिक्त तपशील
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,वर्णन दिलेले नाही
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,पुरवठादार&gt; पुरवठादार गट
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,खरेदीसाठी विनंती.
 DocType: POS Closing Voucher Details,Collected Amount,एकत्रित रक्कम
 DocType: Lab Test,Submitted Date,सबमिट केलेली तारीख
@@ -487,7 +486,7 @@
 DocType: Student Admission,Student Admission,विद्यार्थी प्रवेश
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,{0} आयटम रद्द
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,घसारा रो {0}: घसारा प्रारंभ तारीख मागील तारखेला दिली आहे
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,घसारा रो {0}: घसारा प्रारंभ तारीख मागील तारखेला दिली आहे
 DocType: Contract Template,Fulfilment Terms and Conditions,Fulfillment नियम आणि अटी
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,साहित्य विनंती
 DocType: Bank Reconciliation,Update Clearance Date,अद्यतन लाभ तारीख
@@ -544,6 +543,7 @@
 DocType: Accounts Settings,Settings for Accounts,खाती सेटिंग्ज
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},पुरवठादार चलन कोणतेही चलन खरेदी अस्तित्वात {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,विक्री व्यक्ती वृक्ष व्यवस्थापित करा.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.",Google नकाशे सेटिंग्ज अक्षम केल्यामुळे मार्ग प्रक्रिया करू शकत नाही.
 DocType: Job Applicant,Cover Letter,कव्हर पत्र
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,थकबाकी चेक आणि स्पष्ट ठेवी
 DocType: Item,Synced With Hub,हबला  समक्रमित
@@ -603,7 +603,7 @@
 DocType: Asset Value Adjustment,New Asset Value,नवीन मालमत्ता मूल्य
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,ग्राहक चलन ग्राहक बेस चलन रूपांतरित दर
 DocType: Course Scheduling Tool,Course Scheduling Tool,अर्थात अनुसूचित साधन
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},सलग # {0}: चलन खरेदी विद्यमान मालमत्तेचे विरुद्ध केली जाऊ शकत नाही {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},सलग # {0}: चलन खरेदी विद्यमान मालमत्तेचे विरुद्ध केली जाऊ शकत नाही {1}
 DocType: Crop Cycle,LInked Analysis,LInked विश्लेषण
 DocType: POS Closing Voucher,POS Closing Voucher,पीओएस बंद व्हाउचर
 DocType: Contract,Lapsed,रद्द झाला
@@ -638,6 +638,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} कोर्स नोंदणी केलेली नाही आहे {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,विद्यार्थी नाव:
 DocType: POS Closing Voucher Details,Difference,फरक
+DocType: Delivery Settings,Delay between Delivery Stops,वितरण स्टॉप दरम्यान विलंब
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},सिरियल क्रमांक {0} वितरण टीप {1} शी  संबंधित नाही
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","सर्व्हरच्या GoCardless कॉन्फिगरेशनसह समस्या असल्यासारखे दिसत आहे. काळजी करू नका, अयशस्वी झाल्यास, आपल्या खात्यात रक्कम परत मिळविली जाईल."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext डेमो
@@ -698,7 +699,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,प्रमाण आणि दर
 DocType: Delivery Note,% Installed,% स्थापित
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,वर्ग / प्रयोगशाळा इत्यादी व्याख्याने होणार जाऊ शकतात.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,दोन्ही कंपन्यांची कंपनीची चलने इंटर कंपनी व्यवहारांसाठी जुळतात.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,दोन्ही कंपन्यांची कंपनीची चलने इंटर कंपनी व्यवहारांसाठी जुळतात.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,पहिल्या कंपनीचे नाव प्रविष्ट करा
 DocType: Travel Itinerary,Non-Vegetarian,नॉन-शाकाहारी
 DocType: Purchase Invoice,Supplier Name,पुरवठादार नाव
@@ -785,7 +786,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,तारखेपासून तारखेस
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,बिल्ड पुरेसे भाग
 DocType: POS Profile User,POS Profile User,पीओएस प्रोफाइल वापरकर्ता
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,पंक्ती {0}: घसारा प्रारंभ तारीख आवश्यक आहे
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,पंक्ती {0}: घसारा प्रारंभ तारीख आवश्यक आहे
 DocType: Purchase Invoice Item,Service Start Date,सेवा प्रारंभ तारीख
 DocType: Subscription Invoice,Subscription Invoice,सदस्यता बीजक
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,थेट उत्पन्न
@@ -854,7 +855,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,संक्षेप कंपनीसाठी आधीच वापरला
 DocType: Selling Settings,Default Customer Group,मुलभूत ग्राहक गट
 DocType: Employee,IFSC Code,आयएफएससी कोड
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","जॉब कार्डसह प्रारंभ तारीख आणि समाप्ती तारीख आच्छादित आहे <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","अक्षम केल्यास, &#39;गोळाबेरीज एकूण&#39; क्षेत्रात काही व्यवहार दृश्यमान होणार नाही"
 DocType: BOM,Operating Cost,ऑपरेटिंग खर्च
 DocType: Crop,Produced Items,उत्पादित वस्तू
@@ -906,7 +906,7 @@
 DocType: Supplier,Prevent RFQs,आरएफक्यू थोपवणे
 DocType: Hub User,Hub User,हब वापरकर्ता
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,विक्री ऑर्डर करा
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},{0} ते {1} कालावधीसाठी वेतन जमा
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},{0} ते {1} कालावधीसाठी वेतन जमा
 DocType: Project Task,Project Task,प्रकल्प कार्य
 DocType: Loyalty Point Entry Redemption,Redeemed Points,पूर्तता केलेले बिंदू
 ,Lead Id,लीड आयडी
@@ -1038,7 +1038,7 @@
 DocType: Fee Validity,Max number of visit,भेटीची कमाल संख्या
 ,Hotel Room Occupancy,हॉटेल रूम रहिवासी
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet तयार:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},मोड ऑफ पेमेंट्स मध्ये डीफॉल्ट रोख किंवा बँक खाते सेट करा {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},मोड ऑफ पेमेंट्स मध्ये डीफॉल्ट रोख किंवा बँक खाते सेट करा {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,नाव नोंदणी करा
 DocType: GST Settings,GST Settings,&#39;जीएसटी&#39; सेटिंग्ज
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},चलन किंमत सूची मुद्रा सारखीच असली पाहिजे: {0}
@@ -1093,7 +1093,7 @@
 DocType: Vehicle Log,Service Details,सेवा तपशील
 DocType: Lab Test Template,Grouped,गटबद्ध
 DocType: Selling Settings,Delivery Note Required,डिलिव्हरी टीप आवश्यक
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,वेतन स्लिप सबमिट करत आहे ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,वेतन स्लिप सबमिट करत आहे ...
 DocType: Bank Guarantee,Bank Guarantee Number,बँक गॅरंटी क्रमांक
 DocType: Bank Guarantee,Bank Guarantee Number,बँक गॅरंटी क्रमांक
 DocType: Assessment Criteria,Assessment Criteria,मूल्यांकन निकष
@@ -1119,13 +1119,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,भरणा प्रवेश आधीच तयार आहे
 DocType: Request for Quotation,Get Suppliers,पुरवठादार मिळवा
 DocType: Purchase Receipt Item Supplied,Current Stock,वर्तमान शेअर
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},सलग # {0}: {1} मालमत्ता आयटम लिंक नाही {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},सलग # {0}: {1} मालमत्ता आयटम लिंक नाही {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,पूर्वावलोकन पगाराच्या स्लिप्स
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,खाते {0} अनेक वेळा प्रविष्ट केले गेले आहे
 DocType: Account,Expenses Included In Valuation,खर्च मूल्यांकन मध्ये समाविष्ट
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,आपली सदस्यता 30 दिवसांच्या आत कालबाह्य झाल्यास आपण केवळ नूतनीकरण करू शकता
 DocType: Shopping Cart Settings,Show Stock Availability,शेअर उपलब्धता दर्शवा
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},{0} मालमत्ता श्रेणी {1} किंवा कंपनी {2} मध्ये सेट करा
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},{0} मालमत्ता श्रेणी {1} किंवा कंपनी {2} मध्ये सेट करा
 DocType: Location,Longitude,रेखांश
 ,Absent Student Report,अनुपस्थित विद्यार्थी अहवाल
 DocType: Crop,Crop Spacing UOM,पीक अंतर UOM
@@ -1198,7 +1198,7 @@
 DocType: Soil Texture,Sand,वाळू
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,ऊर्जा
 DocType: Opportunity,Opportunity From,पासून संधी
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{0} पंक्ती: {1} आयटम {2} साठी आवश्यक क्रम संख्या. आपण {3} प्रदान केले आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{0} पंक्ती: {1} आयटम {2} साठी आवश्यक क्रम संख्या. आपण {3} प्रदान केले आहे
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,कृपया एक सारणी निवडा
 DocType: BOM,Website Specifications,वेबसाइट वैशिष्ट्य
 DocType: Special Test Items,Particulars,तपशील
@@ -1290,7 +1290,7 @@
 DocType: Item,Items with higher weightage will be shown higher,उच्च महत्त्व असलेला आयटम उच्च दर्शविले जाईल
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,प्रयोगशाळा चाचण्या आणि महत्वपूर्ण चिन्हे
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,बँक मेळ तपशील
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,सलग # {0}: मालमत्ता {1} सादर करणे आवश्यक आहे
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,सलग # {0}: मालमत्ता {1} सादर करणे आवश्यक आहे
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,कर्मचारी आढळले  नाहीत
 DocType: Item,If subcontracted to a vendor,विक्रेता करण्यासाठी subcontracted असेल  तर
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,विद्यार्थी गट आधीपासूनच सुधारित केले आहे.
@@ -1345,7 +1345,6 @@
 DocType: Loyalty Program Collection,Tier Name,टायर नाव
 DocType: HR Settings,Enter retirement age in years,वर्षांत निवृत्तीचे वय प्रविष्ट करा
 DocType: Crop,Target Warehouse,लक्ष्य कोठार
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,कृपया सेट अप&gt; सेटिंग्ज&gt; नामांकन मालिकाद्वारे {0} साठी नामांकन शृंखला सेट करा
 DocType: Payroll Employee Detail,Payroll Employee Detail,वेतनपट कर्मचारी तपशील
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,कृपया एक कोठार निवडा
 DocType: Cheque Print Template,Starting location from left edge,बाकी धार पासून स्थान सुरू करत आहे
@@ -1435,7 +1434,7 @@
 DocType: Work Order,Plan material for sub-assemblies,उप-विधानसभा योजना साहित्य
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,विक्री भागीदार आणि प्रदेश
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} सक्रिय असणे आवश्यक आहे
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,स्थानांतरणासाठी कोणतेही आयटम उपलब्ध नाहीत
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,स्थानांतरणासाठी कोणतेही आयटम उपलब्ध नाहीत
 DocType: Employee Boarding Activity,Activity Name,गतिविधीचे नाव
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,प्रकाशन तारीख बदला
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,तयार उत्पाद प्रमाण <b>{0}</b> आणि प्रमाण <b>{1}</b> वेगळी असू शकत नाही
@@ -1665,6 +1664,7 @@
 DocType: Project,First Email,प्रथम ईमेल
 DocType: Company,Exception Budget Approver Role,अपवाद बजेट आधिकारी भूमिका
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","एकदा सेट केल्यानंतर, ही चलन सेट तारखेपर्यंत असेल"
+DocType: Cashier Closing,POS-CLO-,पीओएस-सीएलओ-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,विक्री ऑर्डर / तयार वस्तू भांडार मध्ये राखीव कोठार
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,विक्री रक्कम
 DocType: Repayment Schedule,Interest Amount,व्याज रक्कम
@@ -1676,7 +1676,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,रेकॉर्ड
 DocType: Asset,Scrapped,रद्द
 DocType: Item,Item Defaults,आयटम डीफॉल्ट
-DocType: Purchase Invoice,Returns,परतावा
+DocType: Cashier Closing,Returns,परतावा
 DocType: Job Card,WIP Warehouse,WIP कोठार
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},सिरियल क्रमांक  {0} हा  {1} पर्यंत देखभाल करार अंतर्गत आहे
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,भरती
@@ -1690,7 +1690,6 @@
 DocType: Student,A-,अ-
 DocType: Share Transfer,Transfer Type,हस्तांतरण प्रकार
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,विक्री खर्च
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; प्रदेश
 DocType: Diagnosis,Diagnosis,निदान
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,मानक खरेदी
 DocType: Attendance Request,Explanation,स्पष्टीकरण
@@ -1703,7 +1702,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,खरेदी ऑर्डर आयटम अतिदेय
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,पिनकोड
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},विक्री ऑर्डर {0} हे  {1}आहे
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},कर्जाचा व्याज उत्पन्न खाते निवडा {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},कर्जाचा व्याज उत्पन्न खाते निवडा {0}
 DocType: Opportunity,Contact Info,संपर्क माहिती
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,शेअर नोंदी करून देणे
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,दर्जा असलेल्या डावीकडून कर्मचार्याला प्रोत्साहन देऊ शकत नाही
@@ -1715,7 +1714,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,चलन शून्य बिलिंग तासांसाठी केले जाऊ शकत नाही
 DocType: Company,Date of Commencement,प्रारंभाची तारीख
 DocType: Sales Person,Select company name first.,प्रथम  कंपनीचे नाव निवडा
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},ईमेल पाठविले {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},ईमेल पाठविले {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,अवतरणे पुरवठादारांकडून   प्राप्त झाली.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOM बदला आणि सर्व BOMs मध्ये नवीनतम किंमत अद्यतनित करा
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},करण्यासाठी {0} | {1} {2}
@@ -1737,7 +1736,7 @@
 DocType: Asset Movement,From Employee,कर्मचारी पासून
 DocType: Driver,Cellphone Number,भ्रमणध्वनी क्रमांक
 DocType: Project,Monitor Progress,मॉनिटर प्रगती
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,चेतावनी: प्रणाली आयटम रक्कम पासून overbilling तपासा नाही {0} मधील {1} शून्य आहे
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,चेतावनी: प्रणाली आयटम रक्कम पासून overbilling तपासा नाही {0} मधील {1} शून्य आहे
 DocType: Journal Entry,Make Difference Entry,फरक प्रवेश करा
 DocType: Supplier Quotation,Auto Repeat Section,ऑटो पुनरावृत्ती विभाग
 DocType: Upload Attendance,Attendance From Date,तारीख पासून उपस्थिती
@@ -1840,7 +1839,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,रो # {0}: नाकारलेली Qty खरेदी परत मधे  प्रविष्ट करणे शक्य नाही
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,निवडलेल्या ग्राहकांसाठी कस्टमर ग्रुप बदलण्याची परवानगी नाही.
 ,Purchase Order Items To Be Billed,पर्चेस आयटम बिल करायचे
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,अंदाजे आगमन वेळ अद्यतनित करणे
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,अंदाजे आगमन वेळ अद्यतनित करणे
 DocType: Program Enrollment Tool,Enrollment Details,नावनोंदणी तपशील
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,कंपनीसाठी एकाधिक आयटम डीफॉल्ट सेट करू शकत नाही.
 DocType: Purchase Invoice Item,Net Rate,नेट दर
@@ -1854,7 +1853,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,सोडा प्रकार हा मुकाबला आहे
 DocType: Support Settings,Close Issue After Days,अंक दिवसांनी बंद करा
 ,Eway Bill,ईवे बिल
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,मार्केटप्लेस मध्ये वापरकर्ते जोडण्यासाठी आपण सिस्टम व्यवस्थापक आणि आयटॅमर व्यवस्थापक भूमिका असलेली एक वापरकर्ता असणे आवश्यक आहे.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,मार्केटप्लेस मध्ये वापरकर्ते जोडण्यासाठी आपण सिस्टम व्यवस्थापक आणि आयटॅमर व्यवस्थापक भूमिका असलेली एक वापरकर्ता असणे आवश्यक आहे.
 DocType: Leave Control Panel,Leave blank if considered for all branches,सर्व शाखांमध्ये विचारल्यास रिक्त सोडा
 DocType: Job Opening,Staffing Plan,कर्मचारी योजना
 DocType: Bank Guarantee,Validity in Days,दिवस मध्ये वैधता
@@ -1876,7 +1875,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},डुप्लिकेट सलग {0} त्याच {1} सह
 DocType: Marketplace Settings,Disable Marketplace,मार्केटप्लेस अक्षम करा
 ,Trial Balance,चाचणी शिल्लक
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,आर्थिक वर्ष {0} आढळले नाही
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,आर्थिक वर्ष {0} आढळले नाही
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,कर्मचारी सेट अप
 DocType: Hotel Room Reservation,Hotel Reservation User,हॉटेल आरक्षण वापरकर्ता
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,कृपया पहले उपसर्ग निवडा
@@ -1984,7 +1983,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,लॉगइन करण्यात अयशस्वी
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,मालमत्ता {0} तयार केली
 DocType: Special Test Items,Special Test Items,स्पेशल टेस्ट आयटम्स
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,मार्केटप्लेसवर नोंदणी करण्यासाठी आपण सिस्टम मॅनेजर आणि आयटम व्यवस्थापक भूमिकेसह एक वापरकर्ता असणे आवश्यक आहे.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,मार्केटप्लेसवर नोंदणी करण्यासाठी आपण सिस्टम मॅनेजर आणि आयटम व्यवस्थापक भूमिकेसह एक वापरकर्ता असणे आवश्यक आहे.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,मोड ऑफ पेमेंट्स
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,आपल्या नियुक्त सॅलरी संरचना नुसार आपण लाभांसाठी अर्ज करू शकत नाही
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,वेबसाइट प्रतिमा सार्वजनिक फाइल किंवा वेबसाइट URL असावी
@@ -1996,7 +1995,7 @@
 DocType: Warehouse,Warehouse Contact Info,वखार संपर्क माहिती
 DocType: Payment Entry,Write Off Difference Amount,फरक रक्कम बंद लिहा
 DocType: Volunteer,Volunteer Name,स्वयंसेवक नाव
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},इतर पंक्तीमध्ये डुप्लिकेट देय तारखांसह पंक्ती आढळल्या: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},इतर पंक्तीमध्ये डुप्लिकेट देय तारखांसह पंक्ती आढळल्या: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: कर्मचारी ईमेल आढळले नाही, म्हणून पाठविले नाही ई-मेल"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},दिलेल्या तारखेला कर्मचारी {0} साठी नियुक्त केलेले कोणतेही वेतन रचना नाही {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},देशांकरिता शिपिंग नियम लागू नाही {0}
@@ -2087,6 +2086,7 @@
 DocType: Salary Component,Earning,कमाई
 DocType: Supplier Scorecard,Scoring Criteria,स्कोअरिंग निकष
 DocType: Purchase Invoice,Party Account Currency,पार्टी खाते चलन
+DocType: Delivery Trip,Total Estimated Distance,एकूण अंदाजे अंतर
 ,BOM Browser,BOM ब्राउझर
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,कृपया या प्रशिक्षण कार्यक्रमासाठी आपली स्थिती अद्यतनित करा
 DocType: Item Barcode,EAN,EAN
@@ -2125,7 +2125,7 @@
 DocType: Activity Cost,Projects,प्रकल्प
 DocType: Payment Request,Transaction Currency,व्यवहार चलन
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},पासून {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,काही ईमेल अवैध आहेत
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,काही ईमेल अवैध आहेत
 DocType: Work Order Operation,Operation Description,ऑपरेशन वर्णन
 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.,आर्थिक वर्ष जतन केले आहे एकदा आर्थिक वर्ष प्रारंभ तारीख आणि आर्थिक वर्ष अंतिम तारीख बदलू शकत नाही.
 DocType: Quotation,Shopping Cart,हे खरेदी सूचीत टाका
@@ -2149,7 +2149,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,मुदत मालमत्ता निव्वळ बदला
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,रेखडि मात्रा
 DocType: Leave Control Panel,Leave blank if considered for all designations,सर्व पदांसाठी  विचारल्यास रिक्त सोडा
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार 'वास्तविक ' सलग शुल्क {0} आयटम रेट मधे  समाविष्ट केले जाऊ शकत नाही
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार 'वास्तविक ' सलग शुल्क {0} आयटम रेट मधे  समाविष्ट केले जाऊ शकत नाही
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},कमाल: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,DATETIME पासून
 DocType: Shopify Settings,For Company,कंपनी साठी
@@ -2163,7 +2163,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,कोर्स वेळापत्रक तयार करण्यात त्रुटी होत्या
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,यादीतील पहिल्या खर्चाच्या अंदाजानुसार डिफॉल्ट एक्स्पेन्स अॅपरॉव्हर म्हणून सेट केले जाईल.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,पेक्षा जास्त 100 असू शकत नाही
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,आपण मार्केटप्लेसवर नोंदणी करण्यासाठी सिस्टम मॅनेजर आणि आयटम व्यवस्थापक भूमिकांबरोबर प्रशासक यांच्या व्यतिरिक्त एक वापरकर्ता असणे आवश्यक आहे.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,आपण मार्केटप्लेसवर नोंदणी करण्यासाठी सिस्टम मॅनेजर आणि आयटम व्यवस्थापक भूमिकांबरोबर प्रशासक यांच्या व्यतिरिक्त एक वापरकर्ता असणे आवश्यक आहे.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
 DocType: Packing Slip,MAT-PAC-.YYYY.-,मॅट- पीएसी- .YYY.-
 DocType: Maintenance Visit,Unscheduled,Unscheduled
@@ -2192,7 +2192,7 @@
 DocType: HR Settings,Employee Settings,कर्मचारी सेटिंग्ज
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,देयक भरणा पद्धत
 ,Batch-Wise Balance History,बॅच -वार शिल्लक इतिहास
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,पंक्ती # {0}: आयटम {1} साठी बिलामधून रक्कम मोठी असल्यास दर सेट करू शकत नाही.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,पंक्ती # {0}: आयटम {1} साठी बिलामधून रक्कम मोठी असल्यास दर सेट करू शकत नाही.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,मुद्रण सेटिंग्ज संबंधित प्रिंट स्वरूपात अद्ययावत
 DocType: Package Code,Package Code,पॅकेज कोड
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,शिकाऊ उमेदवार
@@ -2426,7 +2426,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{2} आधीच {3} च्या सहाय्यक कंपन्यांसाठी नियोजित {1} अंदाजपत्रक आणि {2} बजेट. \ मूल पॅरेंट कंपनी {3} साठी स्टाफिंग प्लॅन {6} नुसार आपण फक्त {4} नोकर्या आणि बजेट {5} साठी योजना आखू शकता.
 DocType: HR Settings,Stop Birthday Reminders,थांबवा वाढदिवस स्मरणपत्रे
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},कंपनी मध्ये डीफॉल्ट वेतनपट देय खाते सेट करा {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},कंपनी मध्ये डीफॉल्ट वेतनपट देय खाते सेट करा {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,अमेझॉन द्वारे कराचे आर्थिक भंग आणि शुल्क मिळवा
 DocType: SMS Center,Receiver List,स्वीकारण्याची  यादी
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,आयटम शोध
@@ -2496,7 +2496,7 @@
 DocType: Vital Signs,Constipated,कत्तल
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},पुरवठादार विरुद्ध चलन {0} दिनांक {1}
 DocType: Customer,Default Price List,मुलभूत दर सूची
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,मालमत्ता चळवळ रेकॉर्ड {0} तयार
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,मालमत्ता चळवळ रेकॉर्ड {0} तयार
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,कोणतेही आयटम आढळले नाहीत.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,आपण हटवू शकत नाही आर्थिक वर्ष {0}. आर्थिक वर्ष {0} वैश्विक सेटिंग्ज मध्ये डीफॉल्ट म्हणून सेट केले आहे
 DocType: Share Transfer,Equity/Liability Account,इक्विटी / दायित्व खाते
@@ -2636,6 +2636,7 @@
 DocType: Blanket Order,Order Type,ऑर्डर प्रकार
 ,Item-wise Sales Register,आयटमनूसार विक्री नोंदणी
 DocType: Asset,Gross Purchase Amount,एकूण खरेदी रक्कम
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,उघडणे बाकी
 DocType: Asset,Depreciation Method,घसारा पद्धत
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,हा कर बेसिक रेट मध्ये समाविष्ट केला आहे का ?
@@ -2717,7 +2718,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,वार्षिक अंदाजपत्रक PO वर ओलांडल्यास कारवाई
 DocType: Student Leave Application,Student Leave Application,विद्यार्थी रजेचा अर्ज
 DocType: Item,Will also apply for variants,तसेच रूपे लागू राहील
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","मालमत्ता तो आधीपासूनच आहे म्हणून, रद्द करता येणार नाही {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","मालमत्ता तो आधीपासूनच आहे म्हणून, रद्द करता येणार नाही {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},वर अर्धा दिवशी कर्मचारी {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},एकूण कामाचे तास कमाल कामाचे तास पेक्षा जास्त असू नये {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,रोजी
@@ -2741,6 +2742,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,डेटा मिळवा
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},सुट्टीच्या प्रकार {0} मध्ये अनुमत कमाल सुट {1} आहे
 DocType: SMS Center,Create Receiver List,स्वीकारणारा यादी तयार करा
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,वापरण्यासाठी उपलब्ध तारीख खरेदीच्या तारखेनंतर असावी
 DocType: Vehicle,Wheels,रणधुमाळी
 DocType: Packing Slip,To Package No.,क्रमांक पॅकेज करण्यासाठी
 DocType: Patient Relation,Family,कुटुंब
@@ -2754,7 +2756,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,बिलिंग चलन एकतर डीफॉल्ट कंपनीच्या चलन किंवा पक्ष खाते चलनाच्या बरोबरीने असणे आवश्यक आहे
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),पॅकेज वितरण (फक्त मसुदा) एक भाग आहे असे दर्शवले
 DocType: Soil Texture,Loam,लोम
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,पंक्ती {0}: तारखेच्या तारखेची तारीख पोस्ट करण्यापूर्वी असू शकत नाही
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,पंक्ती {0}: तारखेच्या तारखेची तारीख पोस्ट करण्यापूर्वी असू शकत नाही
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,भरणा प्रवेश करा
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},आयटम  {0} साठी  प्रमाण  {1} पेक्षा कमी असणे आवश्यक आहे
 ,Sales Invoice Trends,विक्री चलन ट्रेन्ड
@@ -2827,7 +2829,7 @@
 DocType: Guardian,Guardian Interests,पालक छंद
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,खाते नाव / क्रमांक अद्ययावत करा
 DocType: Naming Series,Current Value,वर्तमान मूल्य
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,अनेक आर्थिक वर्षांमध्ये तारीख {0} अस्तित्वात. आर्थिक वर्ष कंपनी सेट करा
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,अनेक आर्थिक वर्षांमध्ये तारीख {0} अस्तित्वात. आर्थिक वर्ष कंपनी सेट करा
 DocType: Education Settings,Instructor Records to be created by,द्वारे तयार करण्यासाठी शिक्षक रेकॉर्ड
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} तयार
 DocType: GST Account,GST Account,जीएसटी खाते
@@ -2844,7 +2846,7 @@
 DocType: Sales Person,Name and Employee ID,नाव आणि कर्मचारी आयडी
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,देय तारीख  पोस्ट करण्यापूर्वीची  तारीख असू शकत नाही
 DocType: Website Item Group,Website Item Group,वेबसाइट आयटम गट
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,वरील निवडक मापदंड किंवा वेतन स्लिप आधीपासूनच सादर केल्याबद्दल कोणतीही पगारपत्रक सापडली नाही
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,वरील निवडक मापदंड किंवा वेतन स्लिप आधीपासूनच सादर केल्याबद्दल कोणतीही पगारपत्रक सापडली नाही
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,कर आणि कर्तव्ये
 DocType: Projects Settings,Projects Settings,प्रकल्प सेटिंग्ज
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,संदर्भ तारीख प्रविष्ट करा
@@ -2853,7 +2855,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,पुरवठा Qty
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,एचएलसी-सीपीआर-.YYY.-
 DocType: Purchase Order Item,Material Request Item,साहित्य विनंती आयटम
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,कृपया पावती खरेदी {0} रद्द करा
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,कृपया पावती खरेदी {0} रद्द करा
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,आयटम गटांचा  वृक्ष.
 DocType: Production Plan,Total Produced Qty,एकूण उत्पादित प्रमाण
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,या शुल्क प्रकार चालू पंक्ती संख्या पेक्षा मोठे किंवा समान पंक्ती संख्या refer करू शकत नाही
@@ -2964,6 +2966,7 @@
 ,Vehicle Expenses,वाहन खर्च
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,विक्री चलन वर लॅब प्रयोग (टे) तयार करा सबमिट करा
 DocType: Serial No,Invoice Details,चलन तपशील
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,मार्गांचे अंदाज लावण्यासाठी आणि ऑप्टिमाइझ करण्यासाठी कृपया Google नकाशे सेटिंग्ज सक्षम करा
 DocType: Grant Application,Show on Website,वेबसाइटवर दर्शवा
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,सुरु करा
 DocType: Hub Tracked Item,Hub Category,हब श्रेणी
@@ -3004,7 +3007,7 @@
 DocType: Inpatient Record,B Positive,ब सकारात्मक
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",कर्मचारी {0} चे अधिकतम लाभ {1} पूर्वी हक्क सांगितलेल्या संख्येच्या बेरजे {2} ने जास्त आहे
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","सलग # {0}: प्रमाण 1, आयटम निश्चित मालमत्ता आहे असणे आवश्यक आहे. कृपया एकाधिक प्रमाण स्वतंत्र सलग वापरा."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","सलग # {0}: प्रमाण 1, आयटम निश्चित मालमत्ता आहे असणे आवश्यक आहे. कृपया एकाधिक प्रमाण स्वतंत्र सलग वापरा."
 DocType: Leave Block List Allow,Leave Block List Allow,रजा ब्लॉक यादी परवानगी द्या
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr रिक्त किंवा जागा असू शकत नाही
 DocType: Patient Medical Record,Patient Medical Record,पेशंट मेडिकल रेकॉर्ड
@@ -3039,7 +3042,7 @@
 DocType: Workstation,Wages per hour,ताशी वेतन
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},बॅच {0} मधील शेअर शिल्लक  नकारात्मक होईल{1}  आयटम {2} साठी वखार  {3} येथे
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,साहित्य विनंत्या खालील आयटम च्या पुन्हा ऑर्डर स्तरावर आधारित आपोआप उठविला गेला आहे
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},खाते {0} अवैध आहे. खाते चलन {1} असणे आवश्यक आहे
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},खाते {0} अवैध आहे. खाते चलन {1} असणे आवश्यक आहे
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},{0} तारखेपासून कर्मचार्याच्या मुक्त करण्याच्या तारखेनंतर असू शकत नाही {1}
 DocType: Supplier,Is Internal Supplier,अंतर्गत पुरवठादार आहे
 DocType: Employee,Create User Permission,वापरकर्ता परवानगी तयार करा
@@ -3185,7 +3188,7 @@
 DocType: Account,Fixed Asset,निश्चित मालमत्ता
 DocType: Amazon MWS Settings,After Date,तारीख नंतर
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,सिरीयलाइज यादी
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,इंटर कंपनी इंवॉइससाठी अवैध {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,इंटर कंपनी इंवॉइससाठी अवैध {0}
 ,Department Analytics,विभाग Analytics
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,ईमेल डीफॉल्ट संपर्कात सापडला नाही
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,गुप्त व्युत्पन्न करा
@@ -3198,7 +3201,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,फी संरचना आणि विद्यार्थी गट {0} मधील कार्यक्रम भिन्न आहेत.
 DocType: Bank Statement Transaction Entry,Receivable Account,प्राप्त खाते
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,वैध तारखेनुसार तारीख पर्यंत वैध असणे आवश्यक आहे.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},सलग # {0}: मालमत्ता {1} आधीच आहे {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},सलग # {0}: मालमत्ता {1} आधीच आहे {2}
 DocType: Quotation Item,Stock Balance,शेअर शिल्लक
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,भरणा करण्यासाठी विक्री आदेश
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,मुख्य कार्यकारी अधिकारी
@@ -3240,6 +3243,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,डेबिट करणे आवश्यक आहे
 DocType: Clinical Procedure,Inpatient Record,इन पेशंट रेकॉर्ड
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets आपला संघ केले activites साठी वेळ, खर्च आणि बिलिंग ट्रॅक ठेवण्यात मदत"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,खरेदी दर सूची
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,व्यवहारांची तारीख
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,सप्लायर स्कोअरकार्ड व्हेरिएबल्सचे टेम्पलेट
@@ -3283,7 +3287,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,विनिमय लाभ / कमी होणे
 DocType: Opportunity,Lost Reason,कारण गमावले
 DocType: Amazon MWS Settings,Enable Amazon,ऍमेझॉन सक्षम करा
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},पंक्ती # {0}: खाते {1} कंपनीशी संबंधित नाही {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},पंक्ती # {0}: खाते {1} कंपनीशी संबंधित नाही {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},डॉकटाइप {0} शोधण्यात अक्षम
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,नवीन पत्ता
 DocType: Quality Inspection,Sample Size,नमुना आकार
@@ -3395,7 +3399,7 @@
 DocType: Water Analysis,Origin,मूळ
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,हा दस्तऐवज करून मर्यादेपेक्षा अधिक {0} {1} आयटम {4}. आपण करत आहेत दुसर्या {3} त्याच विरुद्ध {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,जतन केल्यानंतर आवर्ती सेट करा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,बदल निवडा रक्कम खाते
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,बदल निवडा रक्कम खाते
 DocType: Purchase Invoice,Price List Currency,किंमत सूची चलन
 DocType: Naming Series,User must always select,सदस्य नेहमी निवडणे आवश्यक आहे
 DocType: Stock Settings,Allow Negative Stock,नकारात्मक शेअर परवानगी द्या
@@ -3437,7 +3441,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,आपली खात्री आहे की आपण ही नियोजित भेट रद्द करू इच्छिता?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,हॉटेल रूम प्राइसिंग पॅकेज
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,विक्री पाईपलाईन
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},पगार घटक मुलभूत खाते सेट करा {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},पगार घटक मुलभूत खाते सेट करा {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,रोजी आवश्यक
 DocType: Rename Tool,File to Rename,फाइल पुनर्नामित करा
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},कृपया सलग {0} मधे  आयटम साठी BOM निवडा
@@ -3458,7 +3462,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,खरेदी आयटम खर्च
 DocType: Employee Separation,Employee Separation Template,कर्मचारी विभक्त टेम्पलेट
 DocType: Selling Settings,Sales Order Required,विक्री ऑर्डर आवश्यक
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,एक विक्रेता व्हा
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,एक विक्रेता व्हा
 DocType: Purchase Invoice,Credit To,श्रेय
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,सक्रिय निष्पन्न / ग्राहक
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,मानक वितरण नोट स्वरूप वापरण्यासाठी रिक्त सोडा
@@ -3500,7 +3504,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,कर टेम्पलेट करा
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,वापरकर्ता मंच
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,कच्चा माल रिक्त असू शकत नाही.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,पंक्ती # {0} (पेमेंट टेबल): रक्कम नकारात्मक असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,पंक्ती # {0} (पेमेंट टेबल): रक्कम नकारात्मक असणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","शेअर अद्यतनित करू शकत नाही, चलन ड्रॉप शिपिंग आयटम समाविष्टीत आहे."
 DocType: Contract,Fulfilment Status,पूर्तता स्थिती
 DocType: Lab Test Sample,Lab Test Sample,लॅब चाचणी नमुना
@@ -3640,7 +3644,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,दस्तऐवज तारीख
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},फी रेकॉर्ड तयार - {0}
 DocType: Asset Category Account,Asset Category Account,मालमत्ता वर्ग खाते
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,पंक्ती # {0} (पेमेंट टेबल): रक्कम सकारात्मक असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,पंक्ती # {0} (पेमेंट टेबल): रक्कम सकारात्मक असणे आवश्यक आहे
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},विक्री ऑर्डर पेक्षा {1} प्रमाणात जास्त {0} item उत्पादन करू शकत नाही
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,विशेषता मूल्ये निवडा
 DocType: Purchase Invoice,Reason For Issuing document,दस्तऐवज जारी करण्याचे कारण
@@ -3695,7 +3699,7 @@
 DocType: Purchase Receipt,Time at which materials were received,"साहित्य प्राप्त झाले, ती  वेळ"
 DocType: Products Settings,Products per Page,प्रत्येक पृष्ठावरील उत्पादने
 DocType: Stock Ledger Entry,Outgoing Rate,जाणारे दर
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,किंवा
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,किंवा
 DocType: Sales Order,Billing Status,बिलिंग स्थिती
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,समस्या नोंदवणे
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,उपयुक्तता खर्च
@@ -3723,7 +3727,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,कर्मचारी कर सवलत घोषणापत्र
 DocType: Payment Entry,Cheque/Reference Date,धनादेश / संदर्भ तारीख
 DocType: Purchase Invoice,Total Taxes and Charges,एकूण कर आणि शुल्क
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,उपलब्ध-वापरासाठी तारीख मागील तारखेप्रमाणे प्रविष्ट केली आहे
 DocType: Employee,Emergency Contact,तात्काळ संपर्क
 DocType: Bank Reconciliation Detail,Payment Entry,भरणा प्रवेश
 ,sales-browser,विक्री ब्राउझर
@@ -3770,6 +3773,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),परत आहे (क्रेडिट नोट)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,नोकरी प्रारंभ
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},{0} मालमत्तेसाठी अनुक्रमांक आवश्यक नाही
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,कृपया सेट अप&gt; सेटिंग्ज&gt; नामांकन मालिकाद्वारे {0} साठी नामांकन शृंखला सेट करा
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,अक्षम साचा डीफॉल्ट टेम्पलेट असणे आवश्यक नाही
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,{0} पंक्तीसाठी: नियोजित प्रमाण प्रविष्ट करा
 DocType: Account,Income Account,उत्पन्न खाते
@@ -3783,6 +3787,7 @@
 DocType: Loyalty Program,Help Section,मदत विभाग
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,मागील
 DocType: Appraisal Goal,Key Responsibility Area,की जबाबदारी क्षेत्र
+DocType: Delivery Trip,Distance UOM,अंतर UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","विद्यार्थी बॅचेस आपण उपस्थिती, विद्यार्थ्यांना आकलन आणि शुल्क ठेवण्यात मदत"
 DocType: Payment Entry,Total Allocated Amount,एकूण रक्कम
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,शाश्वत यादी मुलभूत यादी खाते सेट
@@ -3824,7 +3829,7 @@
 DocType: Item Supplier,Item Supplier,आयटम पुरवठादार
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,बॅच नाही मिळविण्यासाठी आयटम कोड प्रविष्ट करा
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},कृपया {0} साठी एक मूल्य निवडा quotation_to  {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,स्थानांतरणासाठी कोणतेही आयटम निवडले नाहीत
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,स्थानांतरणासाठी कोणतेही आयटम निवडले नाहीत
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,सर्व पत्ते.
 DocType: Company,Stock Settings,शेअर सेटिंग्ज
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","खालील गुणधर्म दोन्ही रेकॉर्ड मधे  समान आहेत तर, विलीन फक्त शक्य आहे. गट आहे, रूट प्रकार, कंपनी"
@@ -4110,7 +4115,7 @@
 DocType: Patient,Personal and Social History,वैयक्तिक आणि सामाजिक इतिहास
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,वापरकर्ता {0} तयार केले
 DocType: Fee Schedule,Fee Breakup for each student,प्रत्येक विद्यार्थ्यासाठी फी ब्रेकअप
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),एकूण आगाऊ ({0}) आदेश विरुद्ध {1} एकूण ({2}) पेक्षा जास्त असू शकत नाही
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),एकूण आगाऊ ({0}) आदेश विरुद्ध {1} एकूण ({2}) पेक्षा जास्त असू शकत नाही
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,असाधारण महिने ओलांडून लक्ष्य वाटप मासिक वितरण निवडा.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,कोड बदला
 DocType: Purchase Invoice Item,Valuation Rate,मूल्यांकन दर
@@ -4119,7 +4124,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,लाभलेल्या आयटीसी उपकर
 ,Student Monthly Attendance Sheet,विद्यार्थी मासिक उपस्थिती पत्रक
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,शिपिंग नियम फक्त विक्रीसाठी लागू आहे
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,घसारा रो {0}: पुढील घसारा तारीख खरेदी तारखेपूर्वी असू शकत नाही
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,घसारा रो {0}: पुढील घसारा तारीख खरेदी तारखेपूर्वी असू शकत नाही
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,प्रकल्प सुरू तारीख
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,पर्यंत
 DocType: Rename Tool,Rename Log,लॉग पुनर्नामित करा
@@ -4137,12 +4142,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,विक्रय व्यवहाराच्या आधारावर किती वेळा प्रकल्प आणि कंपनी अद्यतनित करावी
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,रोजी कालबाह्य
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,विद्यार्थी जोडा
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","कृपया हा कागदजत्र रद्द करण्यासाठी कर्मचारी <a href=""#Form/Employee/{0}"">{0}</a> \ हटवा"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},कृपया  {0} निवडा
 DocType: C-Form,C-Form No,सी-फॉर्म नाही
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,अंतर
+DocType: Delivery Stop,Distance,अंतर
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,आपण खरेदी किंवा विक्री केलेल्या वस्तू किंवा सेवांची सूची करा.
 DocType: Water Analysis,Storage Temperature,साठवण तापमान
 DocType: Sales Order,SAL-ORD-.YYYY.-,एसएएल- ORD- .YYY.-
@@ -4169,7 +4172,7 @@
 DocType: Homepage,Company Description for website homepage,वेबसाइट मुख्यपृष्ठावर कंपनी वर्णन
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ग्राहकांच्या सोयीसाठी, हे कोड पावत्या आणि वितरण टिपा सारख्या प्रिंट स्वरूपात वापरले जाऊ शकते"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier नाव
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,{0} साठी माहिती पुनर्प्राप्त करू शकले नाही.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,{0} साठी माहिती पुनर्प्राप्त करू शकले नाही.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,उघडत प्रवेश जर्नल
 DocType: Contract,Fulfilment Terms,पूर्तता अटी
 DocType: Sales Invoice,Time Sheet List,वेळ पत्रक यादी
@@ -4352,7 +4355,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,क्रियाकलाप आधारित गट विद्यार्थ्यांना निवडा स्वतः
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,क्रियाकलाप आधारित गट विद्यार्थ्यांना निवडा स्वतः
 DocType: Journal Entry,User Remark,सदस्य शेरा
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,मार्ग अनुकूलित करणे
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,मार्ग अनुकूलित करणे
 DocType: Travel Itinerary,Non Diary,नॉन डायरी
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,डाव्या कर्मचार्यांसाठी धारणा बोनस तयार करू शकत नाही
 DocType: Lead,Market Segment,बाजार विभाग
@@ -4383,7 +4386,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,निष्ठा कार्यक्रम
 DocType: Student Guardian,Father,वडील
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,समर्थन तिकिटे
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;अद्यतन शेअर&#39; निश्चित मालमत्ता विक्री साठी तपासणे शक्य नाही
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;अद्यतन शेअर&#39; निश्चित मालमत्ता विक्री साठी तपासणे शक्य नाही
 DocType: Bank Reconciliation,Bank Reconciliation,बँक मेळ
 DocType: Attendance,On Leave,रजेवर
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,अद्यतने मिळवा
@@ -4428,7 +4431,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,सिरियल क्रमांक आणि बॅच
 DocType: Warranty Claim,From Company,कंपनी पासून
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,मूल्यांकन निकष स्कोअर बेरीज {0} असणे आवश्यक आहे.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Depreciations संख्या बुक सेट करा
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Depreciations संख्या बुक सेट करा
 DocType: Supplier Scorecard Period,Calculations,गणना
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,मूल्य किंवा Qty
 DocType: Payment Terms Template,Payment Terms,देयक अटी
@@ -4448,7 +4451,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,सवलत (%) वर फरकाने दर सूची दर
 DocType: Healthcare Service Unit Type,Rate / UOM,दर / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,सर्व गोदामांची
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,आंतर कंपनी व्यवहारांसाठी कोणतेही {0} आढळले नाही.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,आंतर कंपनी व्यवहारांसाठी कोणतेही {0} आढळले नाही.
 DocType: Travel Itinerary,Rented Car,भाड्याने कार
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,आपल्या कंपनी बद्दल
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,क्रेडिट खाते ताळेबंद खाते असणे आवश्यक आहे
@@ -4550,6 +4553,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,वनस्पती विश्लेषण मानदंड
 DocType: Cheque Print Template,Cheque Height,धनादेश उंची
 DocType: Supplier,Supplier Details,पुरवठादार तपशील
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; क्रमांकन मालिकाद्वारे उपस्थित राहण्यासाठी नंबरिंग शृंखला सेट करा
 DocType: Setup Progress,Setup Progress,सेटअप प्रगती
 DocType: Expense Claim,Approval Status,मंजूरीची स्थिती
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},सलग {0} मधे  मूल्य पासून मूल्य पर्यंत कमी असणे आवश्यक आहे
@@ -4643,7 +4647,6 @@
 DocType: Travel Request,Fully Sponsored,पूर्णतः प्रायोजित
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,रिव्हर्स जर्नल एंट्री
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ग्राहक {0} तयार आहे.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन&gt; एचआर सेटिंग्जमध्ये कर्मचारी नामांकन प्रणाली सेट करा
 DocType: Stock Settings,Limit Percent,मर्यादा टक्के
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,सध्या कोणत्याही कोठारमध्ये कोणतीही स्टॉक उपलब्ध नाही
 ,Payment Period Based On Invoice Date,चलन तारखेला आधारित भरणा कालावधी
@@ -4702,7 +4705,7 @@
 DocType: BOM Explosion Item,Source Warehouse,स्त्रोत कोठार
 DocType: Installation Note,Installation Date,प्रतिष्ठापन तारीख
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,लेजर सामायिक करा
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},सलग # {0}: मालमत्ता {1} कंपनी संबंधित नाही {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},सलग # {0}: मालमत्ता {1} कंपनी संबंधित नाही {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,विक्री चालान {0} तयार केले
 DocType: Employee,Confirmation Date,पुष्टीकरण तारीख
 DocType: Inpatient Occupancy,Check Out,चेक आउट
@@ -4722,6 +4725,7 @@
 DocType: Production Plan,Sales Orders Detail,विक्री ऑर्डर तपशील
 DocType: Bin,Requested Quantity,विनंती प्रमाण
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE -YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,कृपया शिक्षण&gt; शिक्षण सेटिंग्जमध्ये शिक्षक नामांकन प्रणाली सेट करा
 DocType: Patient,Marital Status,विवाहित
 DocType: Stock Settings,Auto Material Request,ऑटो साहित्य विनंती
 DocType: Woocommerce Settings,API consumer secret,API ग्राहक गोपनीय
@@ -4774,7 +4778,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,दिवस निवडा
 DocType: Academic Term,Term Name,मुदत नाव
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),क्रेडिट ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,वेतन स्लिप तयार करणे ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,वेतन स्लिप तयार करणे ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,आपण मूळ नोड संपादित करू शकत नाही.
 DocType: Buying Settings,Purchase Order Required,ऑर्डर आवश्यक खरेदी
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,टायमर
@@ -4812,7 +4816,7 @@
 DocType: Account,Rate at which this tax is applied,कर लागू आहे जेथे  हा  दर
 DocType: Cash Flow Mapper,Section Name,विभाग नाव
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Qty पुनर्क्रमित करा
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},घसारा रो {0}: अपेक्षित मूल्य उपयोगी जीवन नंतर {1} पेक्षा मोठे किंवा त्यासमान असणे आवश्यक आहे
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},घसारा रो {0}: अपेक्षित मूल्य उपयोगी जीवन नंतर {1} पेक्षा मोठे किंवा त्यासमान असणे आवश्यक आहे
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,वर्तमान नोकरी संबंधी
 DocType: Company,Stock Adjustment Account,शेअर समायोजन खाते
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,बंद लिहा
@@ -4859,7 +4863,7 @@
 DocType: Program Enrollment,School House,शाळा हाऊस
 DocType: Serial No,Out of AMC,एएमसी पैकी
 DocType: Opportunity,Opportunity Amount,संधीची रक्कम
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,पूर्वनियोजित Depreciations संख्या Depreciations एकूण संख्या पेक्षा जास्त असू शकत नाही
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,पूर्वनियोजित Depreciations संख्या Depreciations एकूण संख्या पेक्षा जास्त असू शकत नाही
 DocType: Purchase Order,Order Confirmation Date,मागणी पुष्टी तारीख
 DocType: Driver,HR-DRI-.YYYY.-,एचआर-डीआरआय-वाई वाई वाई वाई.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,देखभाल भेट करा
@@ -4900,7 +4904,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,बॅच:
 DocType: Volunteer,Afternoon,दुपारी
 DocType: Loyalty Program,Loyalty Program Help,निष्ठा कार्यक्रम मदत
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} &#39;{1}&#39; अक्षम आहे
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} &#39;{1}&#39; अक्षम आहे
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,उघडा म्हणून सेट करा
 DocType: Cheque Print Template,Scanned Cheque,स्कॅन धनादेश
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,व्यवहार सादर केल्यावर   संपर्कांना  स्वयंचलित ईमेल पाठवा.
@@ -4913,7 +4917,7 @@
 DocType: Warranty Claim,Item and Warranty Details,आयटम आणि हमी तपशील
 DocType: Chapter,Chapter Members,अध्याय सदस्य
 DocType: Sales Team,Contribution (%),योगदान (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,टीप: भरणा प्रवेश पासून तयार केले जाणार नाहीत &#39;रोख किंवा बँक खाते&#39; निर्दिष्ट नाही
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,टीप: भरणा प्रवेश पासून तयार केले जाणार नाहीत &#39;रोख किंवा बँक खाते&#39; निर्दिष्ट नाही
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,{0} प्रकल्प आधीच अस्तित्वात आहे
 DocType: Clinical Procedure,Nursing User,नर्सिंग उपयोगकर्ता
 DocType: Employee Benefit Application,Payroll Period,वेतनपट कालावधी
@@ -4921,6 +4925,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},सिरिअल नाही {0} बॅचचे सदस्य नसतात {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,जबाबदारी
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,या कोटेशनची वैधता संपली आहे.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","कृपया हा कागदजत्र रद्द करण्यासाठी कर्मचारी <a href=""#Form/Employee/{0}"">{0}</a> \ हटवा"
 DocType: Expense Claim Account,Expense Claim Account,खर्च दावा खाते
 DocType: Account,Capital Work in Progress,प्रगतीपथावरील कॅपिटल वर्क
 DocType: Accounts Settings,Allow Stale Exchange Rates,लावलेल्या विनिमय दरांना परवानगी द्या
@@ -5002,7 +5008,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,समस्या साहित्य
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,ERPNext सह Shopify कनेक्ट करा
 DocType: Material Request Item,For Warehouse,वखार साठी
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,डिलिवरी नोट्स {0} अद्यतनित
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,डिलिवरी नोट्स {0} अद्यतनित
 DocType: Employee,Offer Date,ऑफर तारीख
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,बोली
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,आपण ऑफलाइन मोड मध्ये आहोत. आपण नेटवर्क पर्यंत रीलोड सक्षम होणार नाही.
@@ -5052,7 +5058,7 @@
 DocType: Shipping Rule,Calculate Based On,आधारित असणे
 DocType: Contract,Unfulfilled,पूर्ण झालेले नाही
 DocType: Delivery Note Item,From Warehouse,वखार पासून
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,नमूद केलेल्या निकषांसाठी कोणतेही कर्मचारी नाहीत
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,नमूद केलेल्या निकषांसाठी कोणतेही कर्मचारी नाहीत
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,कारखानदार सामग्रीचा बिल नाही आयटम
 DocType: Shopify Settings,Default Customer,डीफॉल्ट ग्राहक
 DocType: Sales Stage,Stage Name,स्टेज नाव
@@ -5095,7 +5101,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,सवलत रक्कम नंतर कर रक्कम
 DocType: Patient,Inpatient Status,Inpatient स्थिती
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,दररोज काम सारांश सेटिंग्ज
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,निवडलेल्या मूल्य सूचीची तपासणी केलेले फील्ड खरेदी आणि विक्री करणे आवश्यक आहे.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,निवडलेल्या मूल्य सूचीची तपासणी केलेले फील्ड खरेदी आणि विक्री करणे आवश्यक आहे.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,कृपया दिनांकानुसार Reqd प्रविष्ट करा
 DocType: Payment Entry,Internal Transfer,अंतर्गत ट्रान्सफर
 DocType: Asset Maintenance,Maintenance Tasks,देखभाल कार्ये
@@ -5132,7 +5138,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,गट
 DocType: Guardian,Interests,छंद
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,चलने अक्षम  /सक्षम करा.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,काही वेतन स्लिप्स सबमिट करणे शक्य झाले नाही
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,काही वेतन स्लिप्स सबमिट करणे शक्य झाले नाही
 DocType: Exchange Rate Revaluation,Get Entries,नोंदी मिळवा
 DocType: Production Plan,Get Material Request,साहित्य विनंती मिळवा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,पोस्टल खर्च
@@ -5219,7 +5225,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},खर्च खाते आयटम  {0} साठी अनिवार्य आहे
 DocType: BOM,Website Description,वेबसाइट वर्णन
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,इक्विटी निव्वळ बदला
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,चलन खरेदी {0} रद्द करा पहिला
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,चलन खरेदी {0} रद्द करा पहिला
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,परवानगी नाही. कृपया सेवा युनिट प्रकार अक्षम करा
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ई-मेल पत्ता, अद्वितीय असणे आवश्यक आहे आधीच अस्तित्वात आहे {0}"
 DocType: Serial No,AMC Expiry Date,एएमसी कालावधी समाप्ती तारीख
@@ -5259,7 +5265,7 @@
 DocType: Hotel Room,Hotel Room,हॉटेल रूम
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},खाते {0} ला  कंपनी {1} मालकीचे नाही
 DocType: Leave Type,Rounding,राउंडिंग
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,{0} सलग मालिका संख्या डिलिव्हरी टीप जुळत नाही
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,{0} सलग मालिका संख्या डिलिव्हरी टीप जुळत नाही
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),मंजूर रक्कम (प्रो रेटेड)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","मग ग्राहक, ग्राहक गट, प्रदेश, पुरवठादार, पुरवठादार गट, मोहीम, विक्री भागीदार इत्यादी वर आधारित मूल्यनिर्धारण नियमांचे मोजमाप केले जाते."
 DocType: Student,Guardian Details,पालक तपशील
@@ -5314,7 +5320,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},स्टॉक आयटम  {0} साठी आवश्यक कोठार
 DocType: Leave Allocation,Unused leaves,न वापरलेल्या  रजा
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,परतफेड प्रवेश करा
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,सर्व विभाग
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,सर्व विभाग
 DocType: Healthcare Service Unit,Vacant,रिक्त करा
 DocType: Patient,Alcohol Past Use,मद्याचा शेवटचा वापर
 DocType: Fertilizer Content,Fertilizer Content,खते सामग्री
@@ -5325,7 +5331,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,विक्री आदेश {0} रद्द करण्यापूर्वी तो रद्द करणे आवश्यक आहे
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),(उप-मंडळ्यांना समावेश) स्फोट झाला BOM प्राप्त
 DocType: Authorization Rule,Applicable To (Employee),लागू करण्यासाठी (कर्मचारी)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,देय तारीख अनिवार्य आहे
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,देय तारीख अनिवार्य आहे
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,विशेषता साठी बढती {0} 0 असू शकत नाही
 DocType: Employee Benefit Claim,Benefit Type and Amount,लाभ प्रकार आणि रक्कम
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,बुक केलेले खोल्या
@@ -5474,7 +5480,7 @@
 DocType: Purchase Invoice Item,Total Weight,एकूण वजन
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,विक्री आयोगाने
 DocType: Job Offer Term,Value / Description,मूल्य / वर्णन
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","सलग # {0}: मालमत्ता {1} सादर केला जाऊ शकत नाही, तो आधीपासूनच आहे {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","सलग # {0}: मालमत्ता {1} सादर केला जाऊ शकत नाही, तो आधीपासूनच आहे {2}"
 DocType: Tax Rule,Billing Country,बिलिंग देश
 DocType: Purchase Order Item,Expected Delivery Date,अपेक्षित वितरण तारीख
 DocType: Restaurant Order Entry,Restaurant Order Entry,रेस्टॉरंट ऑर्डर प्रविष्टी
@@ -5513,12 +5519,13 @@
 DocType: Maintenance Visit,Breakdown,यंत्रातील बिघाड
 DocType: Travel Itinerary,Vegetarian,शाकाहारी
 DocType: Patient Encounter,Encounter Date,तारखांची तारीख
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,खाते: {0} चलन: {1} बरोबर  निवडले जाऊ शकत नाही
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,खाते: {0} चलन: {1} बरोबर  निवडले जाऊ शकत नाही
 DocType: Bank Statement Transaction Settings Item,Bank Data,बँक डेटा
 DocType: Purchase Receipt Item,Sample Quantity,नमुना प्रमाण
 DocType: Bank Guarantee,Name of Beneficiary,लाभार्थीचे नाव
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","नवीनतम मूल्यांकन दर / किंमत सूची दर / कच्चा माल शेवटच्या खरेदी दर यावर आधारित, शेड्युलरद्वारे स्वयंचलितपणे BOM दर अद्यतनित करा."
 DocType: Supplier,SUP-.YYYY.-,एसयूपी- YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,पुरवठादार&gt; पुरवठादार गट
 DocType: Bank Reconciliation Detail,Cheque Date,धनादेश तारीख
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},खाते {0}: पालक खाते {1} कंपनी {2} ला संबंधित नाही:
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,यशस्वीरित्या या  कंपनी संबंधित सर्व व्यवहार हटवला!
@@ -5546,7 +5553,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,बाल नोडस् फक्त &#39;ग्रुप&#39; प्रकार नोडस् अंतर्गत तयार केले जाऊ शकते
 DocType: Attendance Request,Half Day Date,अर्धा दिवस तारीख
 DocType: Academic Year,Academic Year Name,शैक्षणिक वर्ष नाव
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} हे {1} सह व्यवहार करण्यास अनुमत नाही कृपया कंपनी बदला.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} हे {1} सह व्यवहार करण्यास अनुमत नाही कृपया कंपनी बदला.
 DocType: Sales Partner,Contact Desc,संपर्क desc
 DocType: Email Digest,Send regular summary reports via Email.,ईमेल द्वारे नियमित सारांश अहवाल पाठवा.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},खर्च हक्क प्रकार मध्ये डीफॉल्ट खाते सेट करा {0}
@@ -5579,7 +5586,7 @@
 DocType: Hotel Room,Hotel Manager,हॉटेल व्यवस्थापक
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,हे खरेदी सूचीत टाका  कर नियम सेट करा .
 DocType: Purchase Invoice,Taxes and Charges Added,कर आणि शुल्क जोडले
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,घसारा रो {0}: पुढील अवमूल्यन तारीख उपलब्ध-वापरण्याच्या तारखेपूर्वी असू शकत नाही
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,घसारा रो {0}: पुढील अवमूल्यन तारीख उपलब्ध-वापरण्याच्या तारखेपूर्वी असू शकत नाही
 ,Sales Funnel,विक्री धुराचा
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,संक्षेप करणे आवश्यक आहे
 DocType: Project,Task Progress,कार्य प्रगती
@@ -5593,7 +5600,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,सर्व ग्राहक गट
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,जमा मासिक
 DocType: Attendance Request,On Duty,कर्तव्य
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} आवश्यक आहे. कदाचित चलन विनिमय रेकॉर्ड {1} {2} करण्यासाठी तयार केले नाही.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} आवश्यक आहे. कदाचित चलन विनिमय रेकॉर्ड {1} {2} करण्यासाठी तयार केले नाही.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,कर साचा बंधनकारक आहे.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,खाते {0}: पालक खाते {1} अस्तित्वात नाही
 DocType: POS Closing Voucher,Period Start Date,कालावधी प्रारंभ तारीख
@@ -5672,11 +5679,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,किमान एक कोठार अनिवार्य आहे
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","यूओएम, आयटम्स समूह, वर्णन आणि तासांची संख्या यांसारखी आयटम फील्ड कॉन्फिगर करा."
 DocType: Certification Application,Certification Status,प्रमाणन स्थिती
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,मार्केटप्लेस
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,मार्केटप्लेस
 DocType: Travel Itinerary,Travel Advance Required,प्रवास अग्रिम आवश्यक
 DocType: Subscriber,Subscriber Name,सदस्यांचे नाव
 DocType: Serial No,Out of Warranty,हमी पैकी
-DocType: Cashier Closing,Cashier-closing-,रोखपाल-बंद-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,मॅप केलेला डेटा प्रकार
 DocType: BOM Update Tool,Replace,बदला
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,कोणतीही उत्पादने आढळले.
@@ -5764,7 +5770,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,विक्री आणि खरेदीसाठी डिफॉल्ट कर टेम्पलेट तयार केले जातात.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,मूल्यांकन परिणाम रेकॉर्ड {0} आधीपासूनच अस्तित्वात आहे.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","उदाहरण: एबीसीडी. ##### जर मालिका सेट केली असेल आणि व्यवहारांमध्ये बॅच नंबरचा उल्लेख केला नसेल तर या मालिकेनुसार स्वयंचलित बॅच नंबर तयार केला जाईल. आपण नेहमी या आयटमसाठी बॅच नंबरचा स्पष्टपणे उल्लेख करू इच्छित असल्यास, हे रिक्त सोडा. टीप: हे सेटिंग शेअर सेटिंग्जमधील नामांकन सिरीज उपसर्गापेक्षा प्राथमिकता घेईल."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; क्रमांकन मालिकाद्वारे उपस्थित राहण्यासाठी नंबरिंग शृंखला सेट करा
 DocType: BOM,Materials Required (Exploded),साहित्य आवश्यक(स्फोट झालेले )
 DocType: Contract,Party User,पार्टी यूजर
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',गट करून &#39;कंपनी&#39; आहे तर कंपनी रिक्त फिल्टर सेट करा
@@ -5967,7 +5972,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,डॉ संख्या
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,दोन्ही चाचणी कालावधी प्रारंभ तारीख आणि चाचणी कालावधी समाप्ती तारीख सेट करणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,सरासरी दर
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,पेमेंट शेड्यूल मध्ये एकूण देयक रकमेच्या रुंदीच्या एकूण / उरलेली रक्कम
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,पेमेंट शेड्यूल मध्ये एकूण देयक रकमेच्या रुंदीच्या एकूण / उरलेली रक्कम
 DocType: Subscription Plan Detail,Plan,योजना
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,सामान्य लेजर नुसार बँक स्टेटमेंट शिल्लक
 DocType: Job Applicant,Applicant Name,अर्जदाराचे नाव
@@ -6036,7 +6041,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,साबण आणि कपडे
 DocType: BOM,Show Items,आयटम दर्शवा
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,पासून वेळ पेक्षा जास्त असू शकत नाही.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,आपण सर्व ग्राहकांना ईमेलद्वारे सूचित करू इच्छिता?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,आपण सर्व ग्राहकांना ईमेलद्वारे सूचित करू इच्छिता?
 DocType: Subscription Plan,Billing Interval,बिलिंग मध्यांतर
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,मोशन पिक्चर आणि व्हिडिओ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,आदेश दिले
@@ -6045,9 +6050,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,पंक्ती {0}: {1} 0 पेक्षा जास्त असली पाहिजे
 DocType: Assessment Criteria,Assessment Criteria Group,मूल्यांकन निकष गट
 DocType: Healthcare Settings,Patient Name By,रुग्णांच्या नावाने
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},{0} ते {1} पर्यंतच्या पगाराच्या तारखेसाठी उपार्जित जर्नल प्रवेश
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},{0} ते {1} पर्यंतच्या पगाराच्या तारखेसाठी उपार्जित जर्नल प्रवेश
 DocType: Sales Invoice Item,Enable Deferred Revenue,डिफरड रेव्हेन्यू सक्षम करा
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},जमा घसारा उघडत समान पेक्षा कमी असणे आवश्यक {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},जमा घसारा उघडत समान पेक्षा कमी असणे आवश्यक {0}
 DocType: Warehouse,Warehouse Name,वखार नाव
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,वास्तविक प्रारंभ तारीख प्रत्यक्ष अंतिम तारखेपेक्षा कमी असणे आवश्यक आहे
 DocType: Naming Series,Select Transaction,निवडक व्यवहार
@@ -6199,7 +6204,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,ग्रेड {1} चे कर्मचारी {0} कडे कोणतीही डीफॉल्ट सुट्टी धोरण नाही
 DocType: Salary Detail,Salary Detail,पगार तपशील
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,कृपया प्रथम {0} निवडा
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,{0} वापरकर्ते जोडले
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,{0} वापरकर्ते जोडले
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",बहु-स्तरीय कार्यक्रमाच्या बाबतीत ग्राहक त्यांच्या खर्चानुसार संबंधित टायरला स्वयंचलितरित्या नियुक्त केले जातील
 DocType: Appointment Type,Physician,फिजिशियन
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,आयटम बॅच {0} {1} कालबाह्य झाले आहे.
@@ -6344,7 +6349,7 @@
 DocType: Asset,Custodian,कस्टोडियन
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,पॉइंट-ऑफ-सेल  प्रोफाइल
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} 0 आणि 100 च्या दरम्यानचे मूल्य असावे
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},{1} ते {2} पर्यंत {0} चे देयक
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},{1} ते {2} पर्यंत {0} चे देयक
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,बिनव्याजी कर्ज
 DocType: Cost Center,Cost Center Name,खर्च केंद्र नाव
 DocType: Student,B+,B +
@@ -6376,6 +6381,7 @@
 DocType: Employee,Date of Issue,समस्येच्या तारीख
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","प्रति खरेदी सेटिंग्ज Reciept खरेदी आवश्यक == &#39;होय&#39;, नंतर चलन खरेदी तयार करण्यासाठी, वापरकर्ता आयटम प्रथम खरेदी पावती तयार करण्याची आवश्यकता असल्यास {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},रो # {0}: पुरवठादार {1} साठी  आयटम सेट करा
+DocType: Global Defaults,Default Distance Unit,डीफॉल्ट अंतर युनिट
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,सलग {0}: तास मूल्य शून्य पेक्षा जास्त असणे आवश्यक आहे.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,आयटम {1} ला संलग्न वेबसाइट प्रतिमा {0} सापडू शकत नाही
 DocType: Issue,Content Type,सामग्री प्रकार
@@ -6431,7 +6437,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,खाते करण्यासाठी डेबिट एक ताळेबंद खाते असणे आवश्यक आहे
 DocType: Asset,Naming Series,नामांकन मालिका
 DocType: Vital Signs,Coated,कोटेड
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,पंक्ती {0}: अपेक्षित मूल्य नंतर उपयुक्त जीवन एकूण खरेदीपेक्षा कमी असणे आवश्यक आहे
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,पंक्ती {0}: अपेक्षित मूल्य नंतर उपयुक्त जीवन एकूण खरेदीपेक्षा कमी असणे आवश्यक आहे
 DocType: GoCardless Settings,GoCardless Settings,GoCardless सेटिंग्ज
 DocType: Leave Block List,Leave Block List Name,रजा ब्लॉक यादी नाव
 DocType: Certified Consultant,Certification Validity,प्रमाणन वैधता
@@ -6500,6 +6506,7 @@
 DocType: Bank Statement Settings Item,Bank Header,बँक शीर्षलेख
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,लॅब टेस्ट पहा
 DocType: Hub Users,Hub Users,हब वापरकर्ते
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; प्रदेश
 DocType: Purchase Invoice,Y,वाय
 DocType: Maintenance Visit,Maintenance Date,देखभाल तारीख
 DocType: Purchase Invoice Item,Rejected Serial No,नाकारल्याचे सिरियल क्रमांक
@@ -6514,7 +6521,7 @@
 DocType: SG Creation Tool Course,Max Strength,कमाल शक्ती
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,प्रिसेट्स स्थापित करीत आहे
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH- .YYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},ग्राहकांसाठी डिलिव्हरी नोट नाही.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},ग्राहकांसाठी डिलिव्हरी नोट नाही.
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,कर्मचारी {0} कडे कमाल लाभ रक्कम नाही
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,वितरण तारीख वर आधारित आयटम निवडा
 DocType: Grant Application,Has any past Grant Record,कोणतीही मागील ग्रांट रेकॉर्ड आहे
@@ -6542,7 +6549,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,हॉटेल रूम आरक्षण
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,ग्राहक सेवा
 DocType: BOM,Thumbnail,लघुप्रतिमा
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,ईमेल आयडीसह कोणतेही संपर्क सापडले नाहीत.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,ईमेल आयडीसह कोणतेही संपर्क सापडले नाहीत.
 DocType: Item Customer Detail,Item Customer Detail,आयटम ग्राहक तपशील
 DocType: Notification Control,Prompt for Email on Submission of,सादरीकरणासाठी   ईमेल विनंती
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},कर्मचारी {0} पेक्षा जास्तीत जास्त लाभ रक्कम {1}
@@ -6803,7 +6810,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,खाते प्रकार निवडले आहे कारण खाते प्रकार निवडले आहे.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} सुधारणा करण्यात आली आहे. रिफ्रेश करा.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,खालील दिवस रजा अनुप्रयोग बनवण्यासाठी वापरकर्त्यांना थांबवा.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","लॉयल्टी पॉइंट्ससाठी अमर्यादित कालबाह्य असल्यास, कालावधी समाप्ती कालावधी रिक्त किंवा 0 ठेवा."
 DocType: Asset Maintenance Team,Maintenance Team Members,देखरेख कार्यसंघ सदस्य
 DocType: Loyalty Point Entry,Purchase Amount,खरेदी रक्कम
@@ -6811,7 +6817,7 @@
 											to fullfill Sales Order {2}",आयटम {1} ची {0} सीरियल नंबर वितरीत करू शकत नाही कारण {2} पूर्ण मागणी पूर्ण करण्यासाठी आरक्षित आहे
 DocType: Quotation,SAL-QTN-.YYYY.-,एसएएल- QTN- .YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,पुरवठादार अवतरण {0} तयार
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,समाप्त वर्ष प्रारंभ वर्ष असू शकत नाही
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,समाप्त वर्ष प्रारंभ वर्ष असू शकत नाही
 DocType: Employee Benefit Application,Employee Benefits,कर्मचारी फायदे
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},पॅक प्रमाणात सलग आयटम {0} ची  संख्या समान असणे आवश्यक आहे {1}
 DocType: Work Order,Manufactured Qty,उत्पादित Qty
@@ -6827,6 +6833,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,बॅच क्रमांक निवडा
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,GSTIN ला
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ग्राहक असण्याचा बिले.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन&gt; एचआर सेटिंग्जमध्ये कर्मचारी नामांकन प्रणाली सेट करा
 DocType: Healthcare Settings,Invoice Appointments Automatically,स्वयंचलितपणे चलन भेटी
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,प्रकल्प आयडी
 DocType: Salary Component,Variable Based On Taxable Salary,करपात्र वेतन आधारित बदल
@@ -6875,7 +6882,7 @@
 DocType: POS Profile,Account for Change Amount,खाते रक्कम बदल
 DocType: QuickBooks Migrator,Connecting to QuickBooks,QuickBooks शी कनेक्ट करीत आहे
 DocType: Exchange Rate Revaluation,Total Gain/Loss,एकूण मिळकत / नुकसान
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,इंटर कंपनी इंवॉइससाठी अवैध कंपनी.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,इंटर कंपनी इंवॉइससाठी अवैध कंपनी.
 DocType: Purchase Invoice,input service,इनपुट सेवा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},रो {0}: {3} {4} मधील  {1} / {2} पक्ष / खात्याशी जुळत नाही
 DocType: Employee Promotion,Employee Promotion,कर्मचारी प्रोत्साहन
@@ -7006,7 +7013,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,लॉजिंगसाठी प्राधान्यीकृत क्षेत्र
 apps/erpnext/erpnext/config/selling.py +184,Analytics,विश्लेषण
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,कार्ट रिक्त आहे
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,कृपया शिक्षण&gt; शिक्षण सेटिंग्जमध्ये शिक्षक नामांकन प्रणाली सेट करा
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",{0} आयटमला सीरियल नंबर नाही. फक्त क्रमवारीतील आयटम \ सीरियल नंबरवर आधारित वितरण असू शकतो
 DocType: Vehicle,Model,मॉडेल
@@ -7036,7 +7042,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,बदलण्यासाठी काहीही नाही
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,कृपया एक सी फाइल निवडा
 DocType: Holiday List,Total Holidays,एकूण सुट्ट्या
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,प्रेषण साठी गहाळ ईमेल टेम्पलेट. कृपया वितरण सेटिंग्जमध्ये एक सेट करा.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,प्रेषण साठी गहाळ ईमेल टेम्पलेट. कृपया वितरण सेटिंग्जमध्ये एक सेट करा.
 DocType: Student Leave Application,Mark as Present,सध्याची म्हणून चिन्हांकित करा
 DocType: Supplier Scorecard,Indicator Color,सूचक रंग
 DocType: Purchase Order,To Receive and Bill,प्राप्त आणि बिल
@@ -7045,7 +7051,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,अनुक्रमांक निवडा
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,डिझायनर
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,अटी आणि शर्ती साचा
-DocType: Serial No,Delivery Details,वितरण तपशील
+DocType: Delivery Trip,Delivery Details,वितरण तपशील
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},खर्च केंद्र सलग {0} त  कर टेबल मधे प्रकार  {1}  आवश्यक आहे
 DocType: Program,Program Code,कार्यक्रम कोड
 DocType: Terms and Conditions,Terms and Conditions Help,अटी आणि नियम मदत
@@ -7069,7 +7075,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,आघाडी  वेळ दिवस
 DocType: Cash Flow Mapping,Is Income Tax Expense,आयकर खर्च आहे
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,आपले ऑर्डर वितरणासाठी संपले आहे!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},सलग # {0}: पोस्ट दिनांक खरेदी तारीख एकच असणे आवश्यक आहे {1} मालमत्ता {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},सलग # {0}: पोस्ट दिनांक खरेदी तारीख एकच असणे आवश्यक आहे {1} मालमत्ता {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,विद्यार्थी संस्थेचे वसतिगृह येथे राहत आहे तर हे तपासा.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,वरील टेबलमधे  विक्री आदेश प्रविष्ट करा
 ,Stock Summary,शेअर सारांश
diff --git a/erpnext/translations/ms.csv b/erpnext/translations/ms.csv
index 7938341..4e52674 100644
--- a/erpnext/translations/ms.csv
+++ b/erpnext/translations/ms.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Nama Tempoh
 DocType: Employee,Salary Mode,Mod Gaji
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Daftar
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Daftar
 DocType: Patient,Divorced,Bercerai
 DocType: Support Settings,Post Route Key,Kunci Laluan Pos
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Benarkan Perkara yang akan ditambah beberapa kali dalam urus niaga
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Kadar Pertukaran Baru
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Mata wang diperlukan untuk Senarai Harga {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Akan dikira dalam urus niaga.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Pembekal&gt; Jenis Pembekal
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Pelanggan Hubungi
 DocType: Patient Appointment,Check availability,Semak ketersediaan
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Tunjukkan terbuka
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Siri Dikemaskini Berjaya
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Checkout
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} dalam baris {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} dalam baris {1}
 DocType: Asset Finance Book,Depreciation Start Date,Tarikh Permulaan Susutnilai
 DocType: Pricing Rule,Apply On,Memohon Pada
 DocType: Item Price,Multiple Item prices.,Harga Item berbilang.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Preskripsi Lab
 ,Delay Days,Hari Kelewatan
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Perbelanjaan perkhidmatan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Nombor siri: {0} sudah dirujuk dalam Sales Invoice: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Nombor siri: {0} sudah dirujuk dalam Sales Invoice: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Invois
 DocType: Purchase Invoice Item,Item Weight Details,Butiran Butiran Butiran
 DocType: Asset Maintenance Log,Periodicity,Jangka masa
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Akauntan
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Senarai Harga Jualan
 DocType: Patient,Tobacco Current Use,Penggunaan Semasa Tembakau
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Tarikh tarikh dan tarikh akhir bertindih dengan kad kerja <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Kadar Jualan
 DocType: Cost Center,Stock User,Saham pengguna
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Berkaitan
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Tarikh kehadirannya tidak boleh kurang daripada tarikh pendaftaran pekerja
 DocType: Grading Scale,Grading Scale Name,Grading Nama Skala
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Tambah Pengguna ke Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Tambah Pengguna ke Marketplace
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Ini adalah akaun akar dan tidak boleh diedit.
 DocType: Sales Invoice,Company Address,Alamat syarikat
 DocType: BOM,Operations,Operasi
@@ -322,7 +322,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Qty
 DocType: Production Plan,Material Request Detail,Detail Permintaan Bahan
 DocType: Selling Settings,Default Quotation Validity Days,Hari Kesahan Sebutharga Lalai
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Untuk memasukkan cukai berturut-turut {0} dalam kadar Perkara, cukai dalam baris {1} hendaklah juga disediakan"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Untuk memasukkan cukai berturut-turut {0} dalam kadar Perkara, cukai dalam baris {1} hendaklah juga disediakan"
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Payroll Entry,Validate Attendance,Mengesahkan Kehadiran
 DocType: Sales Invoice,Change Amount,Tukar Jumlah
@@ -441,7 +441,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,jarak baris untuk jumlah dalam perkataan
 DocType: Vehicle,Additional Details,maklumat tambahan
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Keterangan tidak diberikan
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Pembekal&gt; Kumpulan Pembekal
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Meminta untuk pembelian.
 DocType: POS Closing Voucher Details,Collected Amount,Jumlah Dikumpul
 DocType: Lab Test,Submitted Date,Tarikh Dihantar
@@ -486,7 +485,7 @@
 DocType: Student Admission,Student Admission,Kemasukan pelajar
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Perkara {0} dibatalkan
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Susut Susut {0}: Tarikh Mula Susut Susut dimasukkan sebagai tarikh terakhir
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Susut Susut {0}: Tarikh Mula Susut Susut dimasukkan sebagai tarikh terakhir
 DocType: Contract Template,Fulfilment Terms and Conditions,Terma dan Syarat Pemenuhan
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Permintaan bahan
 DocType: Bank Reconciliation,Update Clearance Date,Update Clearance Tarikh
@@ -543,6 +542,7 @@
 DocType: Accounts Settings,Settings for Accounts,Tetapan untuk Akaun
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Pembekal Invois No wujud dalam Invois Belian {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Menguruskan Orang Jualan Tree.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Tidak dapat memproses laluan, kerana Tetapan Peta Google dinyahdayakan."
 DocType: Job Applicant,Cover Letter,Cover Letter
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cek cemerlang dan Deposit untuk membersihkan
 DocType: Item,Synced With Hub,Segerakkan Dengan Hub
@@ -602,7 +602,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Nilai Aset Baru
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Kadar di mana mata wang Pelanggan ditukar kepada mata wang asas pelanggan
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kursus Alat Penjadualan
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Invois Belian tidak boleh dibuat terhadap aset yang sedia ada {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Invois Belian tidak boleh dibuat terhadap aset yang sedia ada {1}
 DocType: Crop Cycle,LInked Analysis,Analisis Berfikir
 DocType: POS Closing Voucher,POS Closing Voucher,Baucar Penutupan POS
 DocType: Contract,Lapsed,Lapsed
@@ -637,6 +637,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} tidak mendaftar di Kursus {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Nama pelajar:
 DocType: POS Closing Voucher Details,Difference,Beza
+DocType: Delivery Settings,Delay between Delivery Stops,Kelewatan antara Penghantaran Penghantaran
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},No siri {0} bukan milik Penghantaran Nota {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Nampaknya ada masalah dengan konfigurasi GoCardless pelayan. Jangan bimbang, dalam kes kegagalan, amaun akan dikembalikan ke akaun anda."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -697,7 +698,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Kuantiti dan Kadar
 DocType: Delivery Note,% Installed,% Dipasang
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,Bilik darjah / Laboratories dan lain-lain di mana kuliah boleh dijadualkan.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Mata wang syarikat kedua-dua syarikat perlu sepadan dengan Transaksi Syarikat Antara.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Mata wang syarikat kedua-dua syarikat perlu sepadan dengan Transaksi Syarikat Antara.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Sila masukkan nama syarikat pertama
 DocType: Travel Itinerary,Non-Vegetarian,Bukan vegetarian
 DocType: Purchase Invoice,Supplier Name,Nama Pembekal
@@ -784,7 +785,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Disewa dari tarikh
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Bahagian Cukup untuk Membina
 DocType: POS Profile User,POS Profile User,POS Profil Pengguna
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Baris {0}: Tarikh Permulaan Susutnilai diperlukan
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Baris {0}: Tarikh Permulaan Susutnilai diperlukan
 DocType: Purchase Invoice Item,Service Start Date,Tarikh Mula Perkhidmatan
 DocType: Subscription Invoice,Subscription Invoice,Invois Langganan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Pendapatan Langsung
@@ -853,7 +854,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Singkatan sudah digunakan untuk syarikat lain
 DocType: Selling Settings,Default Customer Group,Default Pelanggan Kumpulan
 DocType: Employee,IFSC Code,Kod IFSC
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Tarikh tarikh dan tarikh akhir bertindih dengan kad kerja <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Jika kurang upaya, bidang &#39;Bulat Jumlah&#39; tidak akan dapat dilihat dalam mana-mana transaksi"
 DocType: BOM,Operating Cost,Kos operasi
 DocType: Crop,Produced Items,Item yang dihasilkan
@@ -905,7 +905,7 @@
 DocType: Supplier,Prevent RFQs,Cegah RFQs
 DocType: Hub User,Hub User,Pengguna Hub
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Buat Jualan Pesanan
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Slip gaji dihantar untuk tempoh dari {0} hingga {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Slip gaji dihantar untuk tempoh dari {0} hingga {1}
 DocType: Project Task,Project Task,Projek Petugas
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Mata yang ditebus
 ,Lead Id,Lead Id
@@ -1037,7 +1037,7 @@
 DocType: Fee Validity,Max number of visit,Bilangan lawatan maksimum
 ,Hotel Room Occupancy,Penghunian Bilik Hotel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet dicipta:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Sila tetapkan lalai Tunai atau akaun Bank dalam Mod Bayaran {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Sila tetapkan lalai Tunai atau akaun Bank dalam Mod Bayaran {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,mendaftar
 DocType: GST Settings,GST Settings,Tetapan GST
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Mata wang sepatutnya sama dengan Senarai Harga Mata Wang: {0}
@@ -1092,7 +1092,7 @@
 DocType: Vehicle Log,Service Details,Maklumat perkhidmatan
 DocType: Lab Test Template,Grouped,Dikelompokkan
 DocType: Selling Settings,Delivery Note Required,Penghantaran Nota Diperlukan
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Mengirim Slip Gaji ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Mengirim Slip Gaji ...
 DocType: Bank Guarantee,Bank Guarantee Number,Bank Nombor Jaminan
 DocType: Bank Guarantee,Bank Guarantee Number,Bank Nombor Jaminan
 DocType: Assessment Criteria,Assessment Criteria,Kriteria penilaian
@@ -1118,13 +1118,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Kemasukan bayaran telah membuat
 DocType: Request for Quotation,Get Suppliers,Dapatkan Pembekal
 DocType: Purchase Receipt Item Supplied,Current Stock,Saham Semasa
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} tidak dikaitkan dengan Perkara {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} tidak dikaitkan dengan Perkara {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Preview Slip Gaji
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Akaun {0} telah dibuat beberapa kali
 DocType: Account,Expenses Included In Valuation,Perbelanjaan Termasuk Dalam Penilaian
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Anda hanya boleh memperbaharui sekiranya keahlian anda tamat tempoh dalam masa 30 hari
 DocType: Shopping Cart Settings,Show Stock Availability,Tunjukkan Ketersediaan Saham
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Tetapkan {0} dalam kategori aset {1} atau syarikat {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Tetapkan {0} dalam kategori aset {1} atau syarikat {2}
 DocType: Location,Longitude,Longitud
 ,Absent Student Report,Tidak hadir Laporan Pelajar
 DocType: Crop,Crop Spacing UOM,Spek Tanaman UOM
@@ -1197,7 +1197,7 @@
 DocType: Soil Texture,Sand,Pasir
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Tenaga
 DocType: Opportunity,Opportunity From,Peluang Daripada
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Baris {0}: {1} Nombor Siri diperlukan untuk Item {2}. Anda telah menyediakan {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Baris {0}: {1} Nombor Siri diperlukan untuk Item {2}. Anda telah menyediakan {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Sila pilih jadual
 DocType: BOM,Website Specifications,Laman Web Spesifikasi
 DocType: Special Test Items,Particulars,Butiran
@@ -1289,7 +1289,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Item dengan wajaran yang lebih tinggi akan ditunjukkan tinggi
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Ujian Makmal dan Tanda Penting
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detail Penyesuaian Bank
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} hendaklah dikemukakan
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} hendaklah dikemukakan
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Tiada pekerja didapati
 DocType: Item,If subcontracted to a vendor,Jika subkontrak kepada vendor
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Kumpulan pelajar sudah dikemaskini.
@@ -1344,7 +1344,6 @@
 DocType: Loyalty Program Collection,Tier Name,Nama Tier
 DocType: HR Settings,Enter retirement age in years,Masukkan umur persaraan pada tahun-tahun
 DocType: Crop,Target Warehouse,Sasaran Gudang
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Sila tetapkan Siri Penamaan untuk {0} melalui Persediaan&gt; Tetapan&gt; Penamaan Siri
 DocType: Payroll Employee Detail,Payroll Employee Detail,Butiran Pekerja Penggajian
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Sila pilih gudang
 DocType: Cheque Print Template,Starting location from left edge,Bermula lokasi dari tepi kiri
@@ -1434,7 +1433,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Bahan rancangan untuk sub-pemasangan
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Jualan rakan-rakan dan Wilayah
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} mesti aktif
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Tiada Item yang tersedia untuk dipindahkan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Tiada Item yang tersedia untuk dipindahkan
 DocType: Employee Boarding Activity,Activity Name,Nama Aktiviti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Tukar Tarikh Siaran
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Kuantiti produk siap <b>{0}</b> dan Kuantiti <b>{1}</b> tidak boleh berbeza
@@ -1664,6 +1663,7 @@
 DocType: Project,First Email,E-mel Pertama
 DocType: Company,Exception Budget Approver Role,Peranan Pendekatan Anggaran Pengecualian
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Setelah ditetapkan, invois ini akan ditangguhkan sehingga tarikh ditetapkan"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Gudang Terpelihara dalam Sales Order / Selesai Barang Gudang
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Jumlah Jualan
 DocType: Repayment Schedule,Interest Amount,Amaun Faedah
@@ -1675,7 +1675,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Rekod
 DocType: Asset,Scrapped,dibatalkan
 DocType: Item,Item Defaults,Default Item
-DocType: Purchase Invoice,Returns,pulangan
+DocType: Cashier Closing,Returns,pulangan
 DocType: Job Card,WIP Warehouse,WIP Gudang
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},No siri {0} adalah di bawah kontrak penyelenggaraan hamper {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,Recruitment
@@ -1689,7 +1689,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Jenis Pemindahan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Perbelanjaan jualan
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
 DocType: Diagnosis,Diagnosis,Diagnosis
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Membeli Standard
 DocType: Attendance Request,Explanation,Penjelasan
@@ -1702,7 +1701,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Item pesanan pembelian tertunggak
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Poskod
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Pesanan Jualan {0} ialah {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Pilih akaun pendapatan faedah dalam pinjaman {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Pilih akaun pendapatan faedah dalam pinjaman {0}
 DocType: Opportunity,Contact Info,Maklumat perhubungan
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Membuat Kemasukan Stok
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Tidak boleh mempromosikan Pekerja dengan status Kiri
@@ -1714,7 +1713,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Invois tidak boleh dibuat untuk jam bil sifar
 DocType: Company,Date of Commencement,Tarikh permulaan
 DocType: Sales Person,Select company name first.,Pilih nama syarikat pertama.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},E-mel yang dihantar kepada {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},E-mel yang dihantar kepada {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Sebut Harga yang diterima daripada Pembekal.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Gantikan BOM dan kemaskini harga terbaru dalam semua BOM
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Untuk {0} | {1} {2}
@@ -1736,7 +1735,7 @@
 DocType: Asset Movement,From Employee,Dari Pekerja
 DocType: Driver,Cellphone Number,Nombor telefon bimbit
 DocType: Project,Monitor Progress,Memantau Kemajuan
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Amaran: Sistem tidak akan semak overbilling sejak jumlah untuk Perkara {0} dalam {1} adalah sifar
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Amaran: Sistem tidak akan semak overbilling sejak jumlah untuk Perkara {0} dalam {1} adalah sifar
 DocType: Journal Entry,Make Difference Entry,Membawa Perubahan Entry
 DocType: Supplier Quotation,Auto Repeat Section,Seksyen Ulang Auto
 DocType: Upload Attendance,Attendance From Date,Kehadiran Dari Tarikh
@@ -1839,7 +1838,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Ditolak Qty tidak boleh dimasukkan dalam Pembelian Pulangan
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Mengubah Kumpulan Pelanggan untuk Pelanggan yang dipilih tidak dibenarkan.
 ,Purchase Order Items To Be Billed,Item Pesanan Belian dikenakan caj
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Mengemas kini anggaran masa ketibaan.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Mengemas kini anggaran masa ketibaan.
 DocType: Program Enrollment Tool,Enrollment Details,Butiran Pendaftaran
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Tidak dapat menetapkan Berbilang Butiran Item untuk syarikat.
 DocType: Purchase Invoice Item,Net Rate,Kadar bersih
@@ -1853,7 +1852,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Tinggalkan Jenis adalah madatory
 DocType: Support Settings,Close Issue After Days,Tutup Isu Selepas Hari
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Anda perlu menjadi pengguna dengan Pengurus Sistem dan peranan Pengurus Item untuk menambah pengguna ke Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Anda perlu menjadi pengguna dengan Pengurus Sistem dan peranan Pengurus Item untuk menambah pengguna ke Marketplace.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Tinggalkan kosong jika dipertimbangkan untuk semua cawangan
 DocType: Job Opening,Staffing Plan,Pelan Kakitangan
 DocType: Bank Guarantee,Validity in Days,Kesahan di Days
@@ -1875,7 +1874,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Salinan barisan {0} dengan sama {1}
 DocType: Marketplace Settings,Disable Marketplace,Lumpuhkan Pasaran
 ,Trial Balance,Imbangan Duga
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Tahun Anggaran {0} tidak dijumpai
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Tahun Anggaran {0} tidak dijumpai
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Menubuhkan Pekerja
 DocType: Hotel Room Reservation,Hotel Reservation User,Pengguna Tempahan Hotel
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Sila pilih awalan pertama
@@ -1983,7 +1982,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Gagal masuk
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Aset {0} dibuat
 DocType: Special Test Items,Special Test Items,Item Ujian Khas
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Anda perlu menjadi pengguna dengan Pengurus Sistem dan peranan Pengurus Item untuk mendaftar di Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Anda perlu menjadi pengguna dengan Pengurus Sistem dan peranan Pengurus Item untuk mendaftar di Marketplace.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Cara Pembayaran
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,"Sebagaimana Struktur Gaji yang anda berikan, anda tidak boleh memohon manfaat"
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Laman web Image perlu fail awam atau URL laman web
@@ -1995,7 +1994,7 @@
 DocType: Warehouse,Warehouse Contact Info,Gudang info
 DocType: Payment Entry,Write Off Difference Amount,Tulis Off Jumlah Perbezaan
 DocType: Volunteer,Volunteer Name,Nama Sukarelawan
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Baris dengan pendua tarikh akhir pada baris lain dijumpai: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Baris dengan pendua tarikh akhir pada baris lain dijumpai: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: e-mel pekerja tidak dijumpai, maka e-mel tidak dihantar"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Tiada Struktur Gaji yang diberikan kepada Pekerja {0} pada tarikh yang diberikan {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Peraturan penghantaran tidak boleh digunakan untuk negara {0}
@@ -2086,6 +2085,7 @@
 DocType: Salary Component,Earning,Pendapatan
 DocType: Supplier Scorecard,Scoring Criteria,Kriteria Pemarkahan
 DocType: Purchase Invoice,Party Account Currency,Akaun Pihak Mata Wang
+DocType: Delivery Trip,Total Estimated Distance,Jumlah Anggaran
 ,BOM Browser,BOM Pelayar
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Sila kemas kini status anda untuk acara latihan ini
 DocType: Item Barcode,EAN,EAN
@@ -2124,7 +2124,7 @@
 DocType: Activity Cost,Projects,Projek
 DocType: Payment Request,Transaction Currency,transaksi mata Wang
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Dari {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Sesetengah e-mel adalah tidak sah
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Sesetengah e-mel adalah tidak sah
 DocType: Work Order Operation,Operation Description,Operasi Penerangan
 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.,Tidak dapat ubah Tahun Fiskal Mula Tarikh dan Tahun Anggaran Tarikh akhir sekali Tahun Fiskal disimpan.
 DocType: Quotation,Shopping Cart,Troli Membeli-belah
@@ -2148,7 +2148,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Perubahan Bersih dalam Aset Tetap
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,Tinggalkan kosong jika dipertimbangkan untuk semua jawatan
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Penjaga jenis &#39;sebenar&#39; di baris {0} tidak boleh dimasukkan dalam Kadar Perkara
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Penjaga jenis &#39;sebenar&#39; di baris {0} tidak boleh dimasukkan dalam Kadar Perkara
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Dari datetime
 DocType: Shopify Settings,For Company,Bagi Syarikat
@@ -2162,7 +2162,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Terdapat kesilapan mencipta Jadual Kursus
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Pengendali Perbelanjaan pertama dalam senarai akan ditetapkan sebagai Pengecualian Perbelanjaan lalai.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,tidak boleh lebih besar daripada 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Anda perlu menjadi pengguna selain Pentadbir dengan Pengurus Sistem dan peranan Pengurus Item untuk mendaftar di Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Anda perlu menjadi pengguna selain Pentadbir dengan Pengurus Sistem dan peranan Pengurus Item untuk mendaftar di Marketplace.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Perkara {0} bukan Item saham
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Tidak Berjadual
@@ -2191,7 +2191,7 @@
 DocType: HR Settings,Employee Settings,Tetapan pekerja
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Memuatkan Sistem Pembayaran
 ,Batch-Wise Balance History,Batch Bijaksana Baki Sejarah
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Baris # {0}: Tidak boleh menetapkan Kadar jika amaun lebih besar daripada jumlah ditaksir untuk Item {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Baris # {0}: Tidak boleh menetapkan Kadar jika amaun lebih besar daripada jumlah ditaksir untuk Item {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,tetapan cetak dikemaskini dalam format cetak masing
 DocType: Package Code,Package Code,Kod pakej
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Perantis
@@ -2425,7 +2425,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} kekosongan dan {1} belanjawan untuk {2} yang telah dirancang untuk anak-anak syarikat {3}. Anda hanya boleh merancang untuk kekosongan dan kekayaan {4} sehingga {5} sebagai pelan kakitangan {6} untuk syarikat induk {3}.
 DocType: HR Settings,Stop Birthday Reminders,Stop Hari Lahir Peringatan
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Sila menetapkan Payroll Akaun Belum Bayar Lalai dalam Syarikat {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Sila menetapkan Payroll Akaun Belum Bayar Lalai dalam Syarikat {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Dapatkan pecahan kewangan Cukai dan caj data oleh Amazon
 DocType: SMS Center,Receiver List,Penerima Senarai
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Cari Item
@@ -2495,7 +2495,7 @@
 DocType: Vital Signs,Constipated,Sembelit
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Terhadap Pembekal Invois {0} bertarikh {1}
 DocType: Customer,Default Price List,Senarai Harga Default
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,rekod Pergerakan Aset {0} dicipta
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,rekod Pergerakan Aset {0} dicipta
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Tiada item dijumpai.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Anda tidak boleh memadam Tahun Anggaran {0}. Tahun Anggaran {0} ditetapkan sebagai piawai dalam Tetapan Global
 DocType: Share Transfer,Equity/Liability Account,Akaun Ekuiti / Liabiliti
@@ -2635,6 +2635,7 @@
 DocType: Blanket Order,Order Type,Perintah Jenis
 ,Item-wise Sales Register,Perkara-bijak Jualan Daftar
 DocType: Asset,Gross Purchase Amount,Jumlah Pembelian Kasar
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kod Item&gt; Kumpulan Item&gt; Jenama
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Baki Pembukaan
 DocType: Asset,Depreciation Method,Kaedah susut nilai
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Cukai ini adalah termasuk dalam Kadar Asas?
@@ -2718,7 +2719,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Tindakan jika Bajet Tahunan Melebihi PO
 DocType: Student Leave Application,Student Leave Application,Pelajar Permohonan Cuti
 DocType: Item,Will also apply for variants,Juga akan memohon varian
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Aset tidak boleh dibatalkan, kerana ia sudah {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Aset tidak boleh dibatalkan, kerana ia sudah {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Pekerja {0} pada hari Half pada {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Jumlah jam kerja tidak harus lebih besar daripada waktu kerja max {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Pada
@@ -2742,6 +2743,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Ambil Data
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Cuti maksimum dibenarkan dalam cuti jenis {0} adalah {1}
 DocType: SMS Center,Create Receiver List,Cipta Senarai Penerima
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Tarikh sedia untuk digunakan hendaklah selepas tarikh pembelian
 DocType: Vehicle,Wheels,Wheels
 DocType: Packing Slip,To Package No.,Untuk Pakej No.
 DocType: Patient Relation,Family,Keluarga
@@ -2755,7 +2757,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Mata wang penagihan mestilah sama dengan mata wang syarikat atau mata wang akaun pihak ketiga
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Menunjukkan bahawa pakej itu adalah sebahagian daripada penghantaran ini (Hanya Draf)
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Baris {0}: Tarikh Hutang tidak dapat sebelum tarikh siaran
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Baris {0}: Tarikh Hutang tidak dapat sebelum tarikh siaran
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Buat Entry Pembayaran
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Kuantiti untuk Perkara {0} mesti kurang daripada {1}
 ,Sales Invoice Trends,Sales Trend Invois
@@ -2828,7 +2830,7 @@
 DocType: Guardian,Guardian Interests,Guardian minat
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Kemas kini Nama / Nombor Akaun
 DocType: Naming Series,Current Value,Nilai semasa
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,tahun fiskal Pelbagai wujud untuk tarikh {0}. Sila menetapkan syarikat dalam Tahun Anggaran
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,tahun fiskal Pelbagai wujud untuk tarikh {0}. Sila menetapkan syarikat dalam Tahun Anggaran
 DocType: Education Settings,Instructor Records to be created by,Rekod Pengajar akan diwujudkan oleh
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} dihasilkan
 DocType: GST Account,GST Account,Akaun GST
@@ -2845,7 +2847,7 @@
 DocType: Sales Person,Name and Employee ID,Nama dan ID Pekerja
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Tarikh Akhir tidak boleh sebelum Tarikh Pos
 DocType: Website Item Group,Website Item Group,Laman Web Perkara Kumpulan
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Tiada slip gaji yang didapati mengemukakan untuk kriteria yang dipilih di atas ATAU slip gaji yang telah diserahkan
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Tiada slip gaji yang didapati mengemukakan untuk kriteria yang dipilih di atas ATAU slip gaji yang telah diserahkan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Tugas dan Cukai
 DocType: Projects Settings,Projects Settings,Tetapan Projek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Sila masukkan tarikh Rujukan
@@ -2854,7 +2856,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Dibekalkan Qty
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Bahan Permintaan Item
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Sila membatalkan Resit Pembelian {0} terlebih dahulu
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Sila membatalkan Resit Pembelian {0} terlebih dahulu
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Pohon Kumpulan Item.
 DocType: Production Plan,Total Produced Qty,Jumlah Dihasilkan Qty
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Tidak boleh merujuk beberapa berturut-turut lebih besar daripada atau sama dengan bilangan baris semasa untuk jenis Caj ini
@@ -2965,6 +2967,7 @@
 ,Vehicle Expenses,Perbelanjaan kenderaan
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Buat Ujian Makmal ke atas Invois Jualan Jualan
 DocType: Serial No,Invoice Details,Butiran invois
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Sila dayakan Tetapan Peta Google untuk menganggarkan dan mengoptimumkan laluan
 DocType: Grant Application,Show on Website,Tunjukkan di Laman Web
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Mulakan
 DocType: Hub Tracked Item,Hub Category,Kategori Hab
@@ -3005,7 +3008,7 @@
 DocType: Inpatient Record,B Positive,B Positif
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Faedah maksimum pekerja {0} melebihi {1} oleh jumlah {2} daripada jumlah yang dituntut sebelumnya
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty mesti menjadi 1, sebagai item adalah aset tetap. Sila gunakan baris berasingan untuk berbilang qty."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty mesti menjadi 1, sebagai item adalah aset tetap. Sila gunakan baris berasingan untuk berbilang qty."
 DocType: Leave Block List Allow,Leave Block List Allow,Tinggalkan Sekat Senarai Benarkan
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr tidak boleh kosong atau senggang
 DocType: Patient Medical Record,Patient Medical Record,Rekod Perubatan Pesakit
@@ -3040,7 +3043,7 @@
 DocType: Workstation,Wages per hour,Upah sejam
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Baki saham dalam batch {0} akan menjadi negatif {1} untuk Perkara {2} di Gudang {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Mengikuti Permintaan Bahan telah dibangkitkan secara automatik berdasarkan pesanan semula tahap Perkara ini
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Akaun {0} tidak sah. Mata Wang Akaun mesti {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Akaun {0} tidak sah. Mata Wang Akaun mesti {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Dari Tarikh {0} tidak boleh selepas Tarikh melegakan pekerja {1}
 DocType: Supplier,Is Internal Supplier,Pembekal Dalaman
 DocType: Employee,Create User Permission,Buat Kebenaran Pengguna
@@ -3186,7 +3189,7 @@
 DocType: Account,Fixed Asset,Aset Tetap
 DocType: Amazon MWS Settings,After Date,Selepas Tarikh
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Inventori bersiri
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Invalid {0} untuk Invois Syarikat Inter.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Invalid {0} untuk Invois Syarikat Inter.
 ,Department Analytics,Jabatan Analisis
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-mel tidak dijumpai dalam hubungan lalai
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Menjana Rahsia
@@ -3199,7 +3202,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Program dalam Struktur Yuran dan Kumpulan Pelajar {0} adalah berbeza.
 DocType: Bank Statement Transaction Entry,Receivable Account,Akaun Belum Terima
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Sah Dari Tarikh mestilah kurang daripada Tarikh Sehingga Valid.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} sudah {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} sudah {2}
 DocType: Quotation Item,Stock Balance,Baki saham
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Perintah Jualan kepada Pembayaran
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,Ketua Pegawai Eksekutif
@@ -3241,6 +3244,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Debit Untuk diperlukan
 DocType: Clinical Procedure,Inpatient Record,Rekod Pesakit Dalam
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets membantu menjejaki masa, kos dan bil untuk kegiatan yang dilakukan oleh pasukan anda"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Pembekal&gt; Jenis Pembekal
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Pembelian Senarai Harga
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Tarikh Transaksi
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Templat pemboleh ubah kad skor pembekal.
@@ -3284,7 +3288,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Exchange Keuntungan / Kerugian
 DocType: Opportunity,Lost Reason,Hilang Akal
 DocType: Amazon MWS Settings,Enable Amazon,Dayakan Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Baris # {0}: Akaun {1} tidak tergolong dalam syarikat {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Baris # {0}: Akaun {1} tidak tergolong dalam syarikat {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Tidak dapat mencari DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Alamat Baru
 DocType: Quality Inspection,Sample Size,Saiz Sampel
@@ -3396,7 +3400,7 @@
 DocType: Water Analysis,Origin,Asal
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dokumen ini melebihi had oleh {0} {1} untuk item {4}. Adakah anda membuat terhadap yang sama satu lagi {3} {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Sila menetapkan berulang selepas menyimpan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Pilih perubahan kira jumlah
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Pilih perubahan kira jumlah
 DocType: Purchase Invoice,Price List Currency,Senarai Harga Mata Wang
 DocType: Naming Series,User must always select,Pengguna perlu sentiasa pilih
 DocType: Stock Settings,Allow Negative Stock,Benarkan Saham Negatif
@@ -3438,7 +3442,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Adakah anda pasti ingin membatalkan janji temu ini?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Pakej Harga Bilik Hotel
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Pipeline jualan
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Sila menetapkan akaun lalai dalam Komponen Gaji {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Sila menetapkan akaun lalai dalam Komponen Gaji {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Diperlukan Pada
 DocType: Rename Tool,File to Rename,Fail untuk Namakan semula
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Sila pilih BOM untuk Item dalam Row {0}
@@ -3459,7 +3463,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kos Item Dibeli
 DocType: Employee Separation,Employee Separation Template,Templat Pemisahan Pekerja
 DocType: Selling Settings,Sales Order Required,Pesanan Jualan Diperlukan
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Menjadi Penjual
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Menjadi Penjual
 DocType: Purchase Invoice,Credit To,Kredit Untuk
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Leads aktif / Pelanggan
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Biarkan kosong untuk menggunakan format Nota Penghantaran standard
@@ -3501,7 +3505,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Buat Templat Cukai
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum pengguna
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Bahan mentah tidak boleh kosong.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Baris # {0} (Jadual Pembayaran): Jumlah mestilah negatif
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Baris # {0} (Jadual Pembayaran): Jumlah mestilah negatif
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Tidak dapat kemas kini saham, invois mengandungi drop item penghantaran."
 DocType: Contract,Fulfilment Status,Status Penyempurnaan
 DocType: Lab Test Sample,Lab Test Sample,Sampel Ujian Makmal
@@ -3641,7 +3645,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Tarikh Dokumen
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Rekod Bayaran Dibuat - {0}
 DocType: Asset Category Account,Asset Category Account,Akaun Kategori Asset
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Baris # {0} (Jadual Pembayaran): Jumlah mestilah positif
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Baris # {0} (Jadual Pembayaran): Jumlah mestilah positif
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Tidak boleh menghasilkan Perkara lebih {0} daripada kuantiti Sales Order {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Pilih Nilai Atribut
 DocType: Purchase Invoice,Reason For Issuing document,Sebab Pembuat dokumen
@@ -3696,7 +3700,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Masa di mana bahan-bahan yang telah diterima
 DocType: Products Settings,Products per Page,Produk setiap halaman
 DocType: Stock Ledger Entry,Outgoing Rate,Kadar keluar
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,atau
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,atau
 DocType: Sales Order,Billing Status,Bil Status
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Laporkan Isu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Perbelanjaan utiliti
@@ -3724,7 +3728,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Pengisytiharan Pengecualian Cukai Pekerja
 DocType: Payment Entry,Cheque/Reference Date,Cek Tarikh / Rujukan
 DocType: Purchase Invoice,Total Taxes and Charges,Jumlah Cukai dan Caj
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Tarikh sedia untuk digunakan dimasukkan sebagai tarikh yang lalu
 DocType: Employee,Emergency Contact,Hubungi Kecemasan
 DocType: Bank Reconciliation Detail,Payment Entry,Kemasukan pembayaran
 ,sales-browser,jualan pelayar
@@ -3771,6 +3774,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Adakah Pulangan (Nota Kredit)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Mula Kerja
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},No siri diperlukan untuk aset {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Sila tetapkan Siri Penamaan untuk {0} melalui Persediaan&gt; Tetapan&gt; Penamaan Siri
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Templat kurang upaya tidak perlu menjadi templat lalai
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Untuk baris {0}: Masukkan qty yang dirancang
 DocType: Account,Income Account,Akaun Pendapatan
@@ -3784,6 +3788,7 @@
 DocType: Loyalty Program,Help Section,Bantuan Bahagian
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,terdahulu
 DocType: Appraisal Goal,Key Responsibility Area,Kawasan Tanggungjawab Utama
+DocType: Delivery Trip,Distance UOM,Jarak UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Kelompok pelajar membantu anda mengesan kehadiran, penilaian dan yuran untuk pelajar"
 DocType: Payment Entry,Total Allocated Amount,Jumlah Diperuntukkan
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Menetapkan akaun inventori lalai untuk inventori yang berterusan
@@ -3825,7 +3830,7 @@
 DocType: Item Supplier,Item Supplier,Perkara Pembekal
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Sila masukkan Kod Item untuk mendapatkan kumpulan tidak
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Sila pilih nilai untuk {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Tiada Item yang dipilih untuk dipindahkan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Tiada Item yang dipilih untuk dipindahkan
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Semua Alamat.
 DocType: Company,Stock Settings,Tetapan saham
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Penggabungan hanya boleh dilakukan jika sifat berikut adalah sama dalam kedua-dua rekod. Adalah Kumpulan, Jenis Akar, Syarikat"
@@ -4111,7 +4116,7 @@
 DocType: Patient,Personal and Social History,Sejarah Peribadi dan Sosial
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Pengguna {0} dibuat
 DocType: Fee Schedule,Fee Breakup for each student,Breakout Fee untuk setiap pelajar
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Pendahuluan ({0}) terhadap Perintah {1} tidak boleh lebih besar daripada Jumlah Besar ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Pendahuluan ({0}) terhadap Perintah {1} tidak boleh lebih besar daripada Jumlah Besar ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Pilih Pengagihan Bulanan untuk tidak sekata mengedarkan sasaran seluruh bulan.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Tukar Kod
 DocType: Purchase Invoice Item,Valuation Rate,Kadar penilaian
@@ -4120,7 +4125,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Berkhidmat ITC Cess
 ,Student Monthly Attendance Sheet,Pelajar Lembaran Kehadiran Bulanan
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Peraturan penghantaran hanya terpakai untuk Jualan
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Susut Susut {0}: Tarikh Susutnilai Seterusnya tidak boleh sebelum Tarikh Pembelian
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Susut Susut {0}: Tarikh Susutnilai Seterusnya tidak boleh sebelum Tarikh Pembelian
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projek Tarikh Mula
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Sehingga
 DocType: Rename Tool,Rename Log,Log menamakan semula
@@ -4138,12 +4143,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Berapa kerapkah projek dan syarikat dikemas kini berdasarkan Transaksi Jualan?
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Luput pada
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Tambahkan Pelajar
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Sila padamkan Pekerja <a href=""#Form/Employee/{0}"">{0}</a> \ untuk membatalkan dokumen ini"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Sila pilih {0}
 DocType: C-Form,C-Form No,C-Borang No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Jarak jauh
+DocType: Delivery Stop,Distance,Jarak jauh
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Senaraikan produk atau perkhidmatan anda yang anda beli atau jual.
 DocType: Water Analysis,Storage Temperature,Suhu Penyimpanan
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4170,7 +4173,7 @@
 DocType: Homepage,Company Description for website homepage,Penerangan Syarikat untuk laman web laman utama
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Untuk kemudahan pelanggan, kod-kod ini boleh digunakan dalam format cetak seperti Invois dan Nota Penghantaran"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nama Suplier
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Tidak boleh mendapatkan maklumat untuk {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Tidak boleh mendapatkan maklumat untuk {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Jurnal Kemasukan Pembukaan
 DocType: Contract,Fulfilment Terms,Terma Sepenuh
 DocType: Sales Invoice,Time Sheet List,Masa Senarai Lembaran
@@ -4353,7 +4356,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Pilih pelajar secara manual untuk Aktiviti berasaskan Kumpulan
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Pilih pelajar secara manual untuk Aktiviti berasaskan Kumpulan
 DocType: Journal Entry,User Remark,Catatan pengguna
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Mengoptimumkan laluan.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Mengoptimumkan laluan.
 DocType: Travel Itinerary,Non Diary,Bukan Diari
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Tidak boleh membuat Bonus Pengekalan untuk Pekerja kiri
 DocType: Lead,Market Segment,Segmen pasaran
@@ -4384,7 +4387,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Program kesetiaan
 DocType: Student Guardian,Father,Bapa
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Tiket Sokongan
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; tidak boleh diperiksa untuk jualan aset tetap
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; tidak boleh diperiksa untuk jualan aset tetap
 DocType: Bank Reconciliation,Bank Reconciliation,Penyesuaian Bank
 DocType: Attendance,On Leave,Bercuti
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Dapatkan Maklumat Terbaru
@@ -4429,7 +4432,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serial No dan Batch
 DocType: Warranty Claim,From Company,Daripada Syarikat
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Jumlah Markah Kriteria Penilaian perlu {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Sila menetapkan Bilangan penurunan nilai Ditempah
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Sila menetapkan Bilangan penurunan nilai Ditempah
 DocType: Supplier Scorecard Period,Calculations,Pengiraan
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Nilai atau Qty
 DocType: Payment Terms Template,Payment Terms,Terma pembayaran
@@ -4449,7 +4452,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Diskaun (%) dalam Senarai Harga Kadar dengan Margin
 DocType: Healthcare Service Unit Type,Rate / UOM,Kadar / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,semua Gudang
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Tiada {0} dijumpai untuk Transaksi Syarikat Antara.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Tiada {0} dijumpai untuk Transaksi Syarikat Antara.
 DocType: Travel Itinerary,Rented Car,Kereta yang disewa
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Mengenai Syarikat anda
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Kredit Untuk akaun perlu menjadi akaun Kunci Kira-kira
@@ -4551,6 +4554,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Kriteria Analisis Loji
 DocType: Cheque Print Template,Cheque Height,Cek Tinggi
 DocType: Supplier,Supplier Details,Butiran Pembekal
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Sila persediaan siri penomboran untuk Kehadiran melalui Persediaan&gt; Penomboran Siri
 DocType: Setup Progress,Setup Progress,Kemajuan Persediaan
 DocType: Expense Claim,Approval Status,Kelulusan Status
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Dari nilai boleh kurang daripada nilai berturut-turut {0}
@@ -4644,7 +4648,6 @@
 DocType: Travel Request,Fully Sponsored,Penuh Disokong
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Kemasukan Jurnal Terbalik
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Pelanggan {0} dibuat.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Sila sediakan Sistem Penamaan Pekerja dalam Sumber Manusia&gt; Tetapan HR
 DocType: Stock Settings,Limit Percent,had Peratus
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Tidak ada stok sedia ada di mana-mana gudang
 ,Payment Period Based On Invoice Date,Tempoh Pembayaran Berasaskan Tarikh Invois
@@ -4703,7 +4706,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Sumber Gudang
 DocType: Installation Note,Installation Date,Tarikh pemasangan
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Kongsi Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} bukan milik syarikat {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} bukan milik syarikat {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Invois Jualan {0} dibuat
 DocType: Employee,Confirmation Date,Pengesahan Tarikh
 DocType: Inpatient Occupancy,Check Out,Semak Keluar
@@ -4723,6 +4726,7 @@
 DocType: Production Plan,Sales Orders Detail,Detail pesanan jualan
 DocType: Bin,Requested Quantity,diminta Kuantiti
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Sila persiapkan Sistem Menamakan Pengajar dalam Pendidikan&gt; Tetapan Pendidikan
 DocType: Patient,Marital Status,Status Perkahwinan
 DocType: Stock Settings,Auto Material Request,Bahan Auto Permintaan
 DocType: Woocommerce Settings,API consumer secret,Rahsia pengguna API
@@ -4775,7 +4779,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Pilih Hari
 DocType: Academic Term,Term Name,Nama jangka
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Kredit ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Membuat Slip Gaji ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Membuat Slip Gaji ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Anda tidak boleh mengedit nod akar.
 DocType: Buying Settings,Purchase Order Required,Pesanan Pembelian Diperlukan
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Pemasa
@@ -4813,7 +4817,7 @@
 DocType: Account,Rate at which this tax is applied,Kadar yang cukai ini dikenakan
 DocType: Cash Flow Mapper,Section Name,Nama Bahagian
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Pesanan semula Qty
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Susut Susut {0}: Nilai yang dijangkakan selepas hayat berguna mestilah lebih besar atau sama dengan {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Susut Susut {0}: Nilai yang dijangkakan selepas hayat berguna mestilah lebih besar atau sama dengan {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Lowongan Kerja Semasa
 DocType: Company,Stock Adjustment Account,Akaun Pelarasan saham
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Tulis Off
@@ -4860,7 +4864,7 @@
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Daripada AMC
 DocType: Opportunity,Opportunity Amount,Jumlah Peluang
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Jumlah penurunan nilai Ditempah tidak boleh lebih besar daripada Jumlah penurunan nilai
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Jumlah penurunan nilai Ditempah tidak boleh lebih besar daripada Jumlah penurunan nilai
 DocType: Purchase Order,Order Confirmation Date,Tarikh Pengesahan Pesanan
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Buat Penyelenggaraan Lawatan
@@ -4901,7 +4905,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Kumpulan:
 DocType: Volunteer,Afternoon,Petang
 DocType: Loyalty Program,Loyalty Program Help,Bantuan Program Kesetiaan
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' dinyahupayakan
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' dinyahupayakan
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ditetapkan sebagai Open
 DocType: Cheque Print Template,Scanned Cheque,diimbas Cek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Hantar e-mel automatik ke Kenalan ke atas urus niaga Mengemukakan.
@@ -4914,7 +4918,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Perkara dan Jaminan Maklumat
 DocType: Chapter,Chapter Members,Ahli Bab
 DocType: Sales Team,Contribution (%),Sumbangan (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota: Entry Bayaran tidak akan diwujudkan sejak &#39;Tunai atau Akaun Bank tidak dinyatakan
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota: Entry Bayaran tidak akan diwujudkan sejak &#39;Tunai atau Akaun Bank tidak dinyatakan
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Projek {0} sudah wujud
 DocType: Clinical Procedure,Nursing User,Pengguna Kejururawatan
 DocType: Employee Benefit Application,Payroll Period,Tempoh Gaji
@@ -4922,6 +4926,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Serial No {0} tidak tergolong dalam Batch {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Tanggungjawab
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Tempoh sah tempoh sebut harga ini telah berakhir.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Sila padamkan Pekerja <a href=""#Form/Employee/{0}"">{0}</a> \ untuk membatalkan dokumen ini"
 DocType: Expense Claim Account,Expense Claim Account,Akaun Perbelanjaan Tuntutan
 DocType: Account,Capital Work in Progress,Kerja Modal dalam Kemajuan
 DocType: Accounts Settings,Allow Stale Exchange Rates,Benarkan Kadar Pertukaran Stale
@@ -5003,7 +5009,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Isu Bahan
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Sambungkan Shopify dengan ERPNext
 DocType: Material Request Item,For Warehouse,Untuk Gudang
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Catatan Penghantaran {0} dikemas kini
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Catatan Penghantaran {0} dikemas kini
 DocType: Employee,Offer Date,Tawaran Tarikh
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Sebut Harga
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Anda berada di dalam mod luar talian. Anda tidak akan dapat untuk menambah nilai sehingga anda mempunyai rangkaian.
@@ -5054,7 +5060,7 @@
 DocType: Shipping Rule,Calculate Based On,Kira Based On
 DocType: Contract,Unfulfilled,Tidak dipenuhi
 DocType: Delivery Note Item,From Warehouse,Dari Gudang
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Tiada pekerja untuk kriteria yang disebutkan
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Tiada pekerja untuk kriteria yang disebutkan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Tiada item dengan Bill Bahan untuk pembuatan
 DocType: Shopify Settings,Default Customer,Pelanggan Lalai
 DocType: Sales Stage,Stage Name,Nama pentas
@@ -5097,7 +5103,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Amaun Cukai Selepas Jumlah Diskaun
 DocType: Patient,Inpatient Status,Status Rawat Inap
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Harian Tetapan Ringkasan Kerja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Senarai Harga Terpilih sepatutnya membeli dan menjual medan diperiksa.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Senarai Harga Terpilih sepatutnya membeli dan menjual medan diperiksa.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Sila masukkan Reqd mengikut Tarikh
 DocType: Payment Entry,Internal Transfer,Pindahan dalaman
 DocType: Asset Maintenance,Maintenance Tasks,Tugas Penyelenggaraan
@@ -5134,7 +5140,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Group By
 DocType: Guardian,Interests,minat
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Membolehkan / melumpuhkan mata wang.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Tidak dapat menghantar beberapa Slip Gaji
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Tidak dapat menghantar beberapa Slip Gaji
 DocType: Exchange Rate Revaluation,Get Entries,Dapatkan penyertaan
 DocType: Production Plan,Get Material Request,Dapatkan Permintaan Bahan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Perbelanjaan pos
@@ -5221,7 +5227,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Akaun perbelanjaan adalah wajib bagi item {0}
 DocType: BOM,Website Description,Laman Web Penerangan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Perubahan Bersih dalam Ekuiti
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Sila membatalkan Invois Belian {0} pertama
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Sila membatalkan Invois Belian {0} pertama
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Tidak dibenarkan. Sila nyahaktifkan Jenis Unit Perkhidmatan
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Alamat e-mel mesti menjadi unik, sudah wujud untuk {0}"
 DocType: Serial No,AMC Expiry Date,AMC Tarikh Tamat
@@ -5261,7 +5267,7 @@
 DocType: Hotel Room,Hotel Room,Bilik hotel
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Akaun {0} tidak dimiliki oleh syarikat {1}
 DocType: Leave Type,Rounding,Pusingan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Nombor siri berturut-turut {0} tidak sepadan dengan penghantaran Nota
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Nombor siri berturut-turut {0} tidak sepadan dengan penghantaran Nota
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Jumlah yang diberikan (Pro-rated)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Kemudian Aturan Harga ditapis berdasarkan Pelanggan, Kumpulan Pelanggan, Wilayah, Pembekal, Kumpulan Pembekal, Kempen, Rakan Kongsi Jualan dll."
 DocType: Student,Guardian Details,Guardian Butiran
@@ -5316,7 +5322,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Gudang diperlukan untuk saham Perkara {0}
 DocType: Leave Allocation,Unused leaves,Daun yang tidak digunakan
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Buat Entri Pembayaran Balik
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Semua Jabatan
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Semua Jabatan
 DocType: Healthcare Service Unit,Vacant,Kosong
 DocType: Patient,Alcohol Past Use,Penggunaan Pasti Alkohol
 DocType: Fertilizer Content,Fertilizer Content,Kandungan Baja
@@ -5327,7 +5333,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Perintah Kerja {0} mesti dibatalkan sebelum membatalkan Perintah Jualan ini
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Kutip BOM meletup (termasuk sub-pemasangan)
 DocType: Authorization Rule,Applicable To (Employee),Terpakai Untuk (Pekerja)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Tarikh Akhir adalah wajib
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Tarikh Akhir adalah wajib
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Kenaikan untuk Atribut {0} tidak boleh 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Jenis dan Amaun Manfaat
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Bilik yang dipesan
@@ -5476,7 +5482,7 @@
 DocType: Purchase Invoice Item,Total Weight,Berat keseluruhan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Suruhanjaya Jualan
 DocType: Job Offer Term,Value / Description,Nilai / Penerangan
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} tidak boleh dikemukakan, ia sudah {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} tidak boleh dikemukakan, ia sudah {2}"
 DocType: Tax Rule,Billing Country,Bil Negara
 DocType: Purchase Order Item,Expected Delivery Date,Jangkaan Tarikh Penghantaran
 DocType: Restaurant Order Entry,Restaurant Order Entry,Kemasukan Pesanan Restoran
@@ -5515,12 +5521,13 @@
 DocType: Maintenance Visit,Breakdown,Pecahan
 DocType: Travel Itinerary,Vegetarian,Vegetarian
 DocType: Patient Encounter,Encounter Date,Tarikh Pertemuan
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Akaun: {0} dengan mata wang: {1} tidak boleh dipilih
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Akaun: {0} dengan mata wang: {1} tidak boleh dipilih
 DocType: Bank Statement Transaction Settings Item,Bank Data,Data Bank
 DocType: Purchase Receipt Item,Sample Quantity,Contoh Kuantiti
 DocType: Bank Guarantee,Name of Beneficiary,Nama Penerima
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Perbarui kos BOM secara automatik melalui Penjadual, berdasarkan kadar penilaian terkini / harga senarai harga / kadar pembelian terakhir bahan mentah."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Pembekal&gt; Kumpulan Pembekal
 DocType: Bank Reconciliation Detail,Cheque Date,Cek Tarikh
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Akaun {0}: akaun Induk {1} bukan milik syarikat: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Berjaya memadam semua transaksi yang berkaitan dengan syarikat ini!
@@ -5548,7 +5555,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,nod kanak-kanak hanya boleh diwujudkan di bawah nod jenis &#39;Kumpulan
 DocType: Attendance Request,Half Day Date,Half Day Tarikh
 DocType: Academic Year,Academic Year Name,Nama Akademik Tahun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} tidak dibenarkan berurusniaga dengan {1}. Sila tukar Syarikat.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} tidak dibenarkan berurusniaga dengan {1}. Sila tukar Syarikat.
 DocType: Sales Partner,Contact Desc,Hubungi Deskripsi
 DocType: Email Digest,Send regular summary reports via Email.,Hantar laporan ringkasan tetap melalui E-mel.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Sila menetapkan akaun lalai dalam Jenis Perbelanjaan Tuntutan {0}
@@ -5581,7 +5588,7 @@
 DocType: Hotel Room,Hotel Manager,Pengurus Hotel
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Menetapkan Peraturan Cukai untuk troli membeli-belah
 DocType: Purchase Invoice,Taxes and Charges Added,Cukai dan Caj Tambahan
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Susut Susut {0}: Tarikh Susutnilai Seterusnya tidak boleh sebelum Tarikh Tersedia untuk Penggunaan
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Susut Susut {0}: Tarikh Susutnilai Seterusnya tidak boleh sebelum Tarikh Tersedia untuk Penggunaan
 ,Sales Funnel,Saluran Jualan
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Singkatan adalah wajib
 DocType: Project,Task Progress,Task Progress
@@ -5595,7 +5602,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Semua Kumpulan Pelanggan
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,terkumpul Bulanan
 DocType: Attendance Request,On Duty,On Duty
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin rekod Pertukaran Matawang tidak dihasilkan untuk {1} hingga {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin rekod Pertukaran Matawang tidak dihasilkan untuk {1} hingga {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Rancangan Kakitangan {0} sudah wujud untuk penunjukan {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Template cukai adalah wajib.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Akaun {0}: akaun Induk {1} tidak wujud
@@ -5675,11 +5682,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Atleast satu gudang adalah wajib
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Konfigurasi Bidang Item seperti UOM, Kumpulan Item, Deskripsi dan Waktu Tidak."
 DocType: Certification Application,Certification Status,Status Persijilan
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Pasaran
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Pasaran
 DocType: Travel Itinerary,Travel Advance Required,Pelancongan Perjalanan Diperlukan
 DocType: Subscriber,Subscriber Name,Nama Pelanggan
 DocType: Serial No,Out of Warranty,Daripada Waranti
-DocType: Cashier Closing,Cashier-closing-,Penutupan tunai-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Jenis Data Dipetakan
 DocType: BOM Update Tool,Replace,Ganti
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Belum ada produk found.
@@ -5767,7 +5773,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Templat cukai lalai untuk jualan dan pembelian dicipta.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Rekod Keputusan Penilaian {0} sudah wujud.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Contoh: ABCD. #####. Jika siri ditetapkan dan No Batch tidak disebutkan dalam urus niaga, maka nombor batch automatik akan dibuat berdasarkan siri ini. Sekiranya anda sentiasa ingin menyatakan secara terperinci Batch No untuk item ini, biarkan kosong ini. Nota: tetapan ini akan diberi keutamaan di atas Prefix Prefix Prefix dalam Tetapan Stok."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Sila persediaan siri penomboran untuk Kehadiran melalui Persediaan&gt; Penomboran Siri
 DocType: BOM,Materials Required (Exploded),Bahan yang diperlukan (Meletup)
 DocType: Contract,Party User,Pengguna Parti
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Sila tetapkan Syarikat menapis kosong jika Group By adalah &#39;Syarikat&#39;
@@ -5970,7 +5975,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Tarikh Mulai Tempoh Percubaan dan Tarikh Akhir Tempoh Percubaan mesti ditetapkan
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Kadar purata
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Jumlah Amaun Pembayaran dalam Jadual Pembayaran mestilah sama dengan Jumlah Besar / Bulat
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Jumlah Amaun Pembayaran dalam Jadual Pembayaran mestilah sama dengan Jumlah Besar / Bulat
 DocType: Subscription Plan Detail,Plan,Rancang
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Baki Penyata Bank seperti Lejar Am
 DocType: Job Applicant,Applicant Name,Nama pemohon
@@ -6039,7 +6044,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sabun &amp; Detergen
 DocType: BOM,Show Items,persembahan Item
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Dari Masa tidak boleh lebih besar daripada ke semasa.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Adakah anda ingin memberitahu semua pelanggan melalui e-mel?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Adakah anda ingin memberitahu semua pelanggan melalui e-mel?
 DocType: Subscription Plan,Billing Interval,Selang Pengebilan
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Mengarahkan
@@ -6048,9 +6053,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Baris {0}: {1} mesti lebih besar daripada 0
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteria Penilaian Kumpulan
 DocType: Healthcare Settings,Patient Name By,Nama Pesakit Mengikut
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Kemasukan Jurnal Akruan untuk gaji dari {0} hingga {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Kemasukan Jurnal Akruan untuk gaji dari {0} hingga {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Membolehkan Pendapatan Ditangguhkan
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Membuka Susut Nilai Terkumpul mesti kurang dari sama dengan {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Membuka Susut Nilai Terkumpul mesti kurang dari sama dengan {0}
 DocType: Warehouse,Warehouse Name,Nama Gudang
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Tarikh mula sebenar mestilah kurang daripada tarikh akhir sebenar
 DocType: Naming Series,Select Transaction,Pilih Transaksi
@@ -6202,7 +6207,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Pekerja {0} gred {1} tidak mempunyai dasar cuti lalai
 DocType: Salary Detail,Salary Detail,Detail gaji
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Sila pilih {0} pertama
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Menambah {0} pengguna
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Menambah {0} pengguna
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","Dalam hal program multi-tier, Pelanggan akan ditugaskan secara automatik ke peringkat yang bersangkutan seperti yang dibelanjakannya"
 DocType: Appointment Type,Physician,Pakar Perubatan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Batch {0} Item {1} telah tamat.
@@ -6347,7 +6352,7 @@
 DocType: Asset,Custodian,Kustodian
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Point-of-Sale Profil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} harus bernilai antara 0 dan 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Pembayaran {0} dari {1} ke {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Pembayaran {0} dari {1} ke {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Pinjaman tidak bercagar
 DocType: Cost Center,Cost Center Name,Kos Nama Pusat
 DocType: Student,B+,B +
@@ -6379,6 +6384,7 @@
 DocType: Employee,Date of Issue,Tarikh Keluaran
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Sebagai satu Tetapan Membeli jika Pembelian penerimaannya Diperlukan == &#39;YA&#39;, maka untuk mewujudkan Invois Belian, pengguna perlu membuat Pembelian Resit pertama bagi item {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Row # {0}: Tetapkan Pembekal untuk item {1}
+DocType: Global Defaults,Default Distance Unit,Unit Jarak Jauh
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Row {0}: Nilai Waktu mesti lebih besar daripada sifar.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Laman web Image {0} melekat Perkara {1} tidak boleh didapati
 DocType: Issue,Content Type,Jenis kandungan
@@ -6434,7 +6440,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Debit Untuk akaun perlu menjadi akaun Kunci Kira-kira
 DocType: Asset,Naming Series,Menamakan Siri
 DocType: Vital Signs,Coated,Bersalut
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Baris {0}: Nilai yang Diharapkan Selepas Kehidupan Berguna mestilah kurang daripada Jumlah Pembelian Kasar
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Baris {0}: Nilai yang Diharapkan Selepas Kehidupan Berguna mestilah kurang daripada Jumlah Pembelian Kasar
 DocType: GoCardless Settings,GoCardless Settings,Tetapan GoCardless
 DocType: Leave Block List,Leave Block List Name,Tinggalkan Nama Sekat Senarai
 DocType: Certified Consultant,Certification Validity,Kesahan Sijil
@@ -6503,6 +6509,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Header Bank
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Lihat Ujian Makmal
 DocType: Hub Users,Hub Users,Pengguna Hub
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Tarikh Penyelenggaraan
 DocType: Purchase Invoice Item,Rejected Serial No,Tiada Serial Ditolak
@@ -6517,7 +6524,7 @@
 DocType: SG Creation Tool Course,Max Strength,Max Kekuatan
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Memasang pratetap
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Tiada Nota Penghantaran yang dipilih untuk Pelanggan {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Tiada Nota Penghantaran yang dipilih untuk Pelanggan {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Pekerja {0} tidak mempunyai jumlah faedah maksimum
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Pilih Item berdasarkan Tarikh Penghantaran
 DocType: Grant Application,Has any past Grant Record,Mempunyai Rekod Geran yang lalu
@@ -6545,7 +6552,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Tempahan Bilik Hotel
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Khidmat Pelanggan
 DocType: BOM,Thumbnail,Thumbnail
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Tiada kenalan dengan ID e-mel dijumpai.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Tiada kenalan dengan ID e-mel dijumpai.
 DocType: Item Customer Detail,Item Customer Detail,Item Pelanggan Detail
 DocType: Notification Control,Prompt for Email on Submission of,Meminta untuk e-mel pada Penyerahan
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Jumlah faedah maksimum pekerja {0} melebihi {1}
@@ -6806,7 +6813,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,Tidak boleh Covert kepada Kumpulan kerana Jenis Akaun dipilih.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} telah diubah suai. Sila muat semula.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Menghentikan pengguna daripada membuat Permohonan Cuti pada hari-hari berikut.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kod Item&gt; Kumpulan Item&gt; Jenama
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Jika tamat tempoh tanpa had untuk Mata Kesetiaan, pastikan Tempoh Tamat Tempoh kosong atau 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Ahli Pasukan Penyelenggaraan
 DocType: Loyalty Point Entry,Purchase Amount,Jumlah pembelian
@@ -6814,7 +6820,7 @@
 											to fullfill Sales Order {2}",Tidak boleh menghantar Serial No {0} dari item {1} kerana ia terpelihara \ untuk memenuhi Perintah Jualan {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Sebutharga Pembekal {0} dicipta
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Akhir Tahun tidak boleh sebelum Start Tahun
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Akhir Tahun tidak boleh sebelum Start Tahun
 DocType: Employee Benefit Application,Employee Benefits,Manfaat Pekerja
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Makan kuantiti mestilah sama dengan kuantiti untuk Perkara {0} berturut-turut {1}
 DocType: Work Order,Manufactured Qty,Dikilangkan Qty
@@ -6830,6 +6836,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Pilih Nombor Batch
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Kepada GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Bil dinaikkan kepada Pelanggan.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Sila sediakan Sistem Penamaan Pekerja dalam Sumber Manusia&gt; Tetapan HR
 DocType: Healthcare Settings,Invoice Appointments Automatically,Pelantikan Invois Secara Automatik
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Projek
 DocType: Salary Component,Variable Based On Taxable Salary,Variabel Berdasarkan Gaji Boleh Dituntut
@@ -6878,7 +6885,7 @@
 DocType: POS Profile,Account for Change Amount,Akaun untuk Perubahan Jumlah
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Menyambung ke QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Jumlah Keuntungan / Kerugian
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Syarikat tidak sah untuk Invois Syarikat Inter.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Syarikat tidak sah untuk Invois Syarikat Inter.
 DocType: Purchase Invoice,input service,perkhidmatan input
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Majlis / Akaun tidak sepadan dengan {1} / {2} dalam {3} {4}
 DocType: Employee Promotion,Employee Promotion,Promosi Pekerja
@@ -7009,7 +7016,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Kawasan Pilihan untuk Penginapan
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Troli kosong
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Sila persiapkan Sistem Menamakan Pengajar dalam Pendidikan&gt; Tetapan Pendidikan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Item {0} tidak mempunyai Siri Serial sahaja. Hanya serilialized item \ boleh mempunyai penghantaran berdasarkan Serial No
 DocType: Vehicle,Model,model
@@ -7039,7 +7045,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Tiada perubahan
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Sila pilih fail csv
 DocType: Holiday List,Total Holidays,Jumlah Cuti
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Templat e-mel hilang untuk penghantaran. Sila tetapkan satu dalam Tetapan Pengiriman.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Templat e-mel hilang untuk penghantaran. Sila tetapkan satu dalam Tetapan Pengiriman.
 DocType: Student Leave Application,Mark as Present,Tanda sebagai Sekarang
 DocType: Supplier Scorecard,Indicator Color,Warna Petunjuk
 DocType: Purchase Order,To Receive and Bill,Terima dan Rang Undang-undang
@@ -7048,7 +7054,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Pilih Serial No
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Terma dan Syarat Template
-DocType: Serial No,Delivery Details,Penghantaran Details
+DocType: Delivery Trip,Delivery Details,Penghantaran Details
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},PTJ diperlukan berturut-turut {0} dalam Cukai meja untuk jenis {1}
 DocType: Program,Program Code,Kod program
 DocType: Terms and Conditions,Terms and Conditions Help,Terma dan Syarat Bantuan
@@ -7072,7 +7078,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Membawa Hari Masa
 DocType: Cash Flow Mapping,Is Income Tax Expense,Adakah Perbelanjaan Cukai Pendapatan
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Pesanan anda untuk penghantaran!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Pos Tarikh mesti sama dengan tarikh pembelian {1} aset {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Pos Tarikh mesti sama dengan tarikh pembelian {1} aset {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Semak ini jika Pelajar itu yang menetap di Institut Hostel.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Sila masukkan Pesanan Jualan dalam jadual di atas
 ,Stock Summary,Ringkasan Stock
diff --git a/erpnext/translations/my.csv b/erpnext/translations/my.csv
index 55991cb..a705d36 100644
--- a/erpnext/translations/my.csv
+++ b/erpnext/translations/my.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,ကာလအမည်
 DocType: Employee,Salary Mode,လစာ Mode ကို
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,စာရင်း
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,စာရင်း
 DocType: Patient,Divorced,ကွာရှင်း
 DocType: Support Settings,Post Route Key,Post ကိုလမ်းကြောင်း Key ကို
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,ပစ္စည်းတစ်ခုအရောင်းအဝယ်အတွက်အကြိမ်ပေါင်းများစွာကဆက်ပြောသည်ခံရဖို့ Allow
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,နယူးချိန်းနှုန်း
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},ငွေကြေးစျေးနှုန်းစာရင်း {0} သည်လိုအပ်သည်
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ထိုအရောင်းအဝယ်အတွက်တွက်ချက်ခြင်းကိုခံရလိမ့်မည်။
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,ပေးသွင်း&gt; ပေးသွင်းအမျိုးအစား
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-၎င်းကို-.YYYY.-
 DocType: Purchase Order,Customer Contact,customer ဆက်သွယ်ရန်
 DocType: Patient Appointment,Check availability,check ရရှိနိုင်မှု
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,ပွင့်လင်းပြရန်
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,စီးရီးအောင်မြင်စွာကျင်းပပြီးစီး Updated
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,ထွက်ခွာသည်
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} {1} အတန်းအတွက်
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} {1} အတန်းအတွက်
 DocType: Asset Finance Book,Depreciation Start Date,တန်ဖိုးလျော့ Start ကိုနေ့စွဲ
 DocType: Pricing Rule,Apply On,တွင် Apply
 DocType: Item Price,Multiple Item prices.,အကွိမျမြားစှာ Item ဈေးနှုန်းများ။
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Lab ကညွှန်း
 ,Delay Days,နှောင့်နှေးနေ့ရက်များ
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ဝန်ဆောင်မှုကုန်ကျစရိတ်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} ပြီးသားအရောင်းပြေစာအတွက်ရည်ညွှန်းသည်: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} ပြီးသားအရောင်းပြေစာအတွက်ရည်ညွှန်းသည်: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,ဝယ်ကုန်စာရင်း
 DocType: Purchase Invoice Item,Item Weight Details,item အလေးချိန်အသေးစိတ်
 DocType: Asset Maintenance Log,Periodicity,ကာလ
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,စာရင်းကိုင်
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,စျေးစာရင်းရောင်းချနေ
 DocType: Patient,Tobacco Current Use,ဆေးရွက်ကြီးလက်ရှိအသုံးပြုမှု
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","ရက်စွဲနှင့်အဆုံးနေ့စွဲအလုပ်ကဒ်နှင့်အတူထပ်နေသည် Start <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,ရောင်းချနှုန်း
 DocType: Cost Center,Stock User,စတော့အိတ်အသုံးပြုသူတို့၏
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K သည်
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Related
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,တက်ရောက်သူနေ့စွဲန်ထမ်းရဲ့ပူးပေါင်းရက်စွဲထက်လျော့နည်းမဖွစျနိုငျ
 DocType: Grading Scale,Grading Scale Name,grade စကေးအမည်
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Marketplace မှအသုံးပြုသူများ Add
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Marketplace မှအသုံးပြုသူများ Add
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,ဒါကအမြစ်အကောင့်ကိုဖြစ်ပါတယ်နှင့်တည်းဖြတ်မရနိုင်ပါ။
 DocType: Sales Invoice,Company Address,ကုမ္ပဏီလိပ်စာ
 DocType: BOM,Operations,စစ်ဆင်ရေး
@@ -322,7 +322,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,ကွဲပြားမှုအရည်အတွက်
 DocType: Production Plan,Material Request Detail,ပစ္စည်းတောင်းဆိုခြင်းအသေးစိတ်
 DocType: Selling Settings,Default Quotation Validity Days,default စျေးနှုန်းသက်တမ်းနေ့ရက်များ
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","အခွန်ကိုထည့်သွင်းရန်အတန်းအတွက် {0} Item မှုနှုန်း, အတန်း {1} အတွက်အခွန်ကိုလည်းထည့်သွင်းရပါမည်"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","အခွန်ကိုထည့်သွင်းရန်အတန်းအတွက် {0} Item မှုနှုန်း, အတန်း {1} အတွက်အခွန်ကိုလည်းထည့်သွင်းရပါမည်"
 DocType: SMS Center,SMS Center,SMS ကို Center က
 DocType: Payroll Entry,Validate Attendance,တက်ရောက်ကိုအတည်ပြုပြီး
 DocType: Sales Invoice,Change Amount,ပြောင်းလဲမှုပမာဏ
@@ -441,7 +441,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,စကားငွေပမာဏအဘို့အလိုင်းအကွာ
 DocType: Vehicle,Additional Details,နောက်ထပ်အသေးစိတ်
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,ဖော်ပြချက်ပေးအပ်မရှိပါ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,ပေးသွင်း&gt; ပေးသွင်း Group မှ
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ဝယ်ယူတောင်းဆိုခြင်း။
 DocType: POS Closing Voucher Details,Collected Amount,စုဆောင်းငွေပမာဏ
 DocType: Lab Test,Submitted Date,Submitted နေ့စွဲ
@@ -486,7 +485,7 @@
 DocType: Student Admission,Student Admission,ကျောင်းသားသမဂ္ဂင်ခွင့်
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,တန်ဖိုးလျော့ Row {0}: တန်ဖိုး Start ကိုနေ့စွဲအတိတ်နေ့စွဲအဖြစ်ထဲသို့ဝင်နေသည်
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,တန်ဖိုးလျော့ Row {0}: တန်ဖိုး Start ကိုနေ့စွဲအတိတ်နေ့စွဲအဖြစ်ထဲသို့ဝင်နေသည်
 DocType: Contract Template,Fulfilment Terms and Conditions,ပွညျ့စုံစည်းကမ်းသတ်မှတ်ချက်များ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,material တောင်းဆိုခြင်း
 DocType: Bank Reconciliation,Update Clearance Date,Update ကိုရှင်းလင်းရေးနေ့စွဲ
@@ -543,6 +542,7 @@
 DocType: Accounts Settings,Settings for Accounts,ငွေစာရင်းသည် Settings ကို
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},ပေးသွင်းငွေတောင်းခံလွှာဘယ်သူမျှမကအရစ်ကျငွေတောင်းခံလွှာ {0} အတွက်တည်ရှိ
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,အရောင်းပုဂ္ဂိုလ် Tree Manage ။
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.",Google Maps ကိုချိန်ညှိမှုများကိုပိတ်ထားသည်ကတည်းကလမ်းကြောင်းမစီမံနိုင်ပါ။
 DocType: Job Applicant,Cover Letter,ပေးပို့သည့်အကြောင်းရင်းအားရှင်းပြသည့်စာ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ရှင်းရှင်းလင်းလင်းမှထူးချွန်ထက်မြက် Cheques နှင့်စာရင်း
 DocType: Item,Synced With Hub,Hub နှင့်အတူ Sync လုပ်ထား
@@ -602,7 +602,7 @@
 DocType: Asset Value Adjustment,New Asset Value,နယူးပိုင်ဆိုင်မှုတန်ဖိုး
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,ဖောက်သည်ငွေကြေးဖောက်သည်ရဲ့အခြေစိုက်စခန်းငွေကြေးအဖြစ်ပြောင်းလဲသောအချိန်တွင် rate
 DocType: Course Scheduling Tool,Course Scheduling Tool,သင်တန်းစီစဉ်ခြင်း Tool ကို
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},အတန်း # {0}: အရစ်ကျငွေတောင်းခံလွှာရှိပြီးသားပိုင်ဆိုင်မှု {1} ဆန့်ကျင်ရာ၌မရနိုငျ
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},အတန်း # {0}: အရစ်ကျငွေတောင်းခံလွှာရှိပြီးသားပိုင်ဆိုင်မှု {1} ဆန့်ကျင်ရာ၌မရနိုငျ
 DocType: Crop Cycle,LInked Analysis,နှင့်ဆက်စပ်သုံးသပ်ခြင်း
 DocType: POS Closing Voucher,POS Closing Voucher,POS ပိတ်ခြင်း voucher
 DocType: Contract,Lapsed,သက်တမ်းလည်းကုန်ဆုံးသွားပြီ
@@ -637,6 +637,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} အဆိုပါသင်တန်း {2} စာရင်းသွင်းမဟုတ်ပါ
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,ကျောင်းသားအမည်:
 DocType: POS Closing Voucher Details,Difference,ခြားနားချက်
+DocType: Delivery Settings,Delay between Delivery Stops,Delivery ရပ်နားမှုများအကြားနှောင့်နှေး
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},serial No {0} Delivery မှတ်ချက် {1} ပိုင်ပါဘူး
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","ဆာဗာ၏ GoCardless configuration နဲ့အတူပြဿနာရှိပုံရသည်။ ပမာဏကိုသင့်အကောင့်ပြန်အမ်းရလိမ့်မည်, ကျရှုံးခြင်း၏အမှု၌, မစိုးရိမ်ပါနဲ့။"
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -697,7 +698,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,အရေအတွက်နှင့် Rate
 DocType: Delivery Note,% Installed,% Installed
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,စာသင်ခန်း / Laboratories စသည်တို့ကိုပို့ချချက်စီစဉ်ထားနိုင်ပါတယ်ဘယ်မှာ။
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,နှစ်ဦးစလုံးကုမ္ပဏီများ၏ကုမ္ပဏီငွေကြေးအင်တာမီလန်ကုမ္ပဏီအရောင်းအဝယ်ကိုက်ညီသင့်ပါတယ်။
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,နှစ်ဦးစလုံးကုမ္ပဏီများ၏ကုမ္ပဏီငွေကြေးအင်တာမီလန်ကုမ္ပဏီအရောင်းအဝယ်ကိုက်ညီသင့်ပါတယ်။
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,ကုမ္ပဏီအမည်ကိုပထမဦးဆုံးရိုက်ထည့်ပေးပါ
 DocType: Travel Itinerary,Non-Vegetarian,non-သတ်သတ်လွတ်
 DocType: Purchase Invoice,Supplier Name,ပေးသွင်းအမည်
@@ -784,7 +785,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,နေ့စွဲကနေငှား
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Build ဖို့လုံလောက်တဲ့အစိတ်အပိုင်းများ
 DocType: POS Profile User,POS Profile User,POS ကိုယ်ရေးဖိုင်အသုံးပြုသူ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,အတန်း {0}: တန်ဖိုး Start ကိုနေ့စွဲလိုအပ်ပါသည်
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,အတန်း {0}: တန်ဖိုး Start ကိုနေ့စွဲလိုအပ်ပါသည်
 DocType: Purchase Invoice Item,Service Start Date,Service ကိုစတင်ရက်စွဲ
 DocType: Subscription Invoice,Subscription Invoice,subscription ငွေတောင်းခံလွှာ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,တိုက်ရိုက်ဝင်ငွေခွန်
@@ -853,7 +854,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,ပြီးသားအခြားကုမ္ပဏီအတွက်အသုံးပြုအတိုကောက်
 DocType: Selling Settings,Default Customer Group,default ဖောက်သည်အုပ်စု
 DocType: Employee,IFSC Code,IFSC Code ကို
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","ရက်စွဲနှင့်အဆုံးနေ့စွဲအလုပ်ကဒ်နှင့်အတူထပ်နေသည် Start <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Disable လုပ်ထားမယ်ဆိုရင်, &#39;&#39; Rounded စုစုပေါင်း &#39;&#39; လယ်ပြင်၌မည်သည့်အရောင်းအဝယ်အတွက်မြင်နိုင်လိမ့်မည်မဟုတ်ပေ"
 DocType: BOM,Operating Cost,operating ကုန်ကျစရိတ်
 DocType: Crop,Produced Items,ထုတ်လုပ်ပစ္စည်းများ
@@ -905,7 +905,7 @@
 DocType: Supplier,Prevent RFQs,ကာကွယ်ဆေး RFQs
 DocType: Hub User,Hub User,hub အသုံးပြုသူ
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,အရောင်းအမိန့်လုပ်ပါ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},{1} မှ {0} ကနေကာလအတွက်တင်သွင်းလစာစလစ်ဖြတ်ပိုင်းပုံစံ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},{1} မှ {0} ကနေကာလအတွက်တင်သွင်းလစာစလစ်ဖြတ်ပိုင်းပုံစံ
 DocType: Project Task,Project Task,စီမံကိန်းရဲ့ Task
 DocType: Loyalty Point Entry Redemption,Redeemed Points,ရွေးနှုတ်သောအချက်များ
 ,Lead Id,ခဲ Id
@@ -1037,7 +1037,7 @@
 DocType: Fee Validity,Max number of visit,ခရီးစဉ်၏မက်စ်အရေအတွက်က
 ,Hotel Room Occupancy,ဟိုတယ်အခန်းနေထိုင်မှု
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet ကဖန်တီး:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},ငွေပေးချေမှုရမည့်၏ Mode ကို {0} အတွက် default အနေနဲ့ငွေသို့မဟုတ်ဘဏ်မှအကောင့်ကိုသတ်မှတ်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},ငွေပေးချေမှုရမည့်၏ Mode ကို {0} အတွက် default အနေနဲ့ငွေသို့မဟုတ်ဘဏ်မှအကောင့်ကိုသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,စာရင်းသွင်း
 DocType: GST Settings,GST Settings,GST က Settings
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},ငွေကြေးစျေးနှုန်းစာရင်းငွေကြေးအဖြစ်အတူတူပင်ဖြစ်သင့်သည်: {0}
@@ -1092,7 +1092,7 @@
 DocType: Vehicle Log,Service Details,ဝန်ဆောင်မှုအသေးစိတ်
 DocType: Lab Test Template,Grouped,အုပ်စုဖွဲ့
 DocType: Selling Settings,Delivery Note Required,Delivery မှတ်ချက်လိုအပ်သော
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,လစာစလစ်တင်သွင်းနေ ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,လစာစလစ်တင်သွင်းနေ ...
 DocType: Bank Guarantee,Bank Guarantee Number,ဘဏ်အာမခံနံပါတ်
 DocType: Bank Guarantee,Bank Guarantee Number,ဘဏ်အာမခံနံပါတ်
 DocType: Assessment Criteria,Assessment Criteria,အကဲဖြတ်လိုအပ်ချက်
@@ -1118,13 +1118,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,ငွေပေးချေမှုရမည့် Entry &#39;ပြီးသားနေသူများကဖန်တီး
 DocType: Request for Quotation,Get Suppliers,ပေးသွင်းရယူလိုက်ပါ
 DocType: Purchase Receipt Item Supplied,Current Stock,လက်ရှိစတော့အိတ်
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} Item {2} နှင့်ဆက်စပ်ပါဘူး
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} Item {2} နှင့်ဆက်စပ်ပါဘူး
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,ကို Preview လစာစလစ်ဖြတ်ပိုင်းပုံစံ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,အကောင့် {0} အကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့
 DocType: Account,Expenses Included In Valuation,အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်တွင်ထည့်သွင်းကုန်ကျစရိတ်
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,သင့်ရဲ့အဖွဲ့ဝင်ရက်ပေါင်း 30 အတွင်းကုန်ဆုံးလျှင်သင်သာသက်တမ်းတိုးလို့ရပါတယ်
 DocType: Shopping Cart Settings,Show Stock Availability,စတော့အိတ်ရရှိနိုင်ပြရန်
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},ပိုင်ဆိုင်မှုအမျိုးအစား {1} သို့မဟုတ်ကုမ္ပဏီအတွက် set {0} {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},ပိုင်ဆိုင်မှုအမျိုးအစား {1} သို့မဟုတ်ကုမ္ပဏီအတွက် set {0} {2}
 DocType: Location,Longitude,လောင်ဂျီတွဒ်
 ,Absent Student Report,ပျက်ကွက်ကျောင်းသားအစီရင်ခံစာ
 DocType: Crop,Crop Spacing UOM,UOM ကွာဟချက်တွေတူပါတယ်သီးနှံ
@@ -1197,7 +1197,7 @@
 DocType: Soil Texture,Sand,သဲ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,စွမ်းအင်ဝန်ကြီးဌာန
 DocType: Opportunity,Opportunity From,မှစ. အခွင့်အလမ်း
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,အတန်း {0}: {1} Serial နံပါတ်များကို Item {2} ဘို့လိုအပ်သည်။ သင် {3} ထောက်ပံ့ပေးခဲ့ကြသည်။
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,အတန်း {0}: {1} Serial နံပါတ်များကို Item {2} ဘို့လိုအပ်သည်။ သင် {3} ထောက်ပံ့ပေးခဲ့ကြသည်။
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,စားပွဲတစ်ခုကို select ပေးပါ
 DocType: BOM,Website Specifications,website သတ်မှတ်ချက်များ
 DocType: Special Test Items,Particulars,အထူးသဖြင့်
@@ -1289,7 +1289,7 @@
 DocType: Item,Items with higher weightage will be shown higher,ပိုမိုမြင့်မားသော weightage နှင့်အတူပစ္စည်းများပိုမိုမြင့်မားပြသပါလိမ့်မည်
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Lab ကစမ်းသပ်မှုများနှင့်အရေးပါသောလက္ခဏာများ
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ဘဏ်မှပြန်လည်ရင်ကြားစေ့ရေး Detail
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,အတန်း # {0}: ပိုင်ဆိုင်မှု {1} တင်သွင်းရဦးမည်
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,အတန်း # {0}: ပိုင်ဆိုင်မှု {1} တင်သွင်းရဦးမည်
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ဝန်ထမ်းမျှမတွေ့ပါ
 DocType: Item,If subcontracted to a vendor,တစ်ရောင်းချသူမှ subcontracted မယ်ဆိုရင်
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,ကျောင်းသားအုပ်စုပြီးသား updated ဖြစ်ပါတယ်။
@@ -1344,7 +1344,6 @@
 DocType: Loyalty Program Collection,Tier Name,tier အမည်
 DocType: HR Settings,Enter retirement age in years,နှစ်များတွင်အငြိမ်းစားအသက်အရွယ် Enter
 DocType: Crop,Target Warehouse,Target ကဂိုဒေါင်
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup ကို&gt; Setting&gt; အမည်ဖြင့်သမုတ်စီးရီးကနေတဆင့် {0} များအတွက်စီးရီးအမည်ဖြင့်သမုတ်သတ်မှတ်ထား ကျေးဇူးပြု.
 DocType: Payroll Employee Detail,Payroll Employee Detail,လုပ်ခလစာထမ်းအသေးစိတ်
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,ဂိုဒေါင်တစ်ခုကို select ပေးပါ
 DocType: Cheque Print Template,Starting location from left edge,ကျန်ရစ်အစွန်းကနေတည်နေရာစတင်ခြင်း
@@ -1434,7 +1433,7 @@
 DocType: Work Order,Plan material for sub-assemblies,က sub-အသင်းတော်တို့အဘို့အစီအစဉ်ကိုပစ္စည်း
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,အရောင်းအပေါင်းအဖေါ်များနှင့်နယ်မြေတွေကို
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} တက်ကြွဖြစ်ရမည်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,လွှဲပြောင်းရရှိနိုင်ပစ္စည်းများအဘယ်သူမျှမ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,လွှဲပြောင်းရရှိနိုင်ပစ္စည်းများအဘယ်သူမျှမ
 DocType: Employee Boarding Activity,Activity Name,activity ကိုအမည်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,ပြောင်းလဲမှုကိုဖြန့်ချိနေ့စွဲ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,ကိုလက်စသတ်ကုန်ပစ္စည်းအရေအတွက် <b>{0}</b> နှင့်အရေအတွက်သည် <b>{1}</b> ကွဲပြားခြားနားသောမဖွစျနိုငျ
@@ -1664,6 +1663,7 @@
 DocType: Project,First Email,ပထမဦးစွာအီးမေးလ်
 DocType: Company,Exception Budget Approver Role,ခြွင်းချက်ဘတ်ဂျက်သဘောတူညီချက်ပေးအခန်းက္ပ
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date",ထားပြီးတာနဲ့ဒီငွေတောင်းခံလွှာအတွက်အစုရက်စွဲမကုန်မှီတိုင်အောင်ကိုင်ပေါ်ပါလိမ့်မည်
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,အရောင်းအမိန့် / Finished ကုန်စည်ဂိုဒေါင်ထဲမှာ Reserved ဂိုဒေါင်
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,ငွေပမာဏရောင်းချနေ
 DocType: Repayment Schedule,Interest Amount,အကျိုးစီးပွားငွေပမာဏ
@@ -1675,7 +1675,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,မှတ်တမ်းများ
 DocType: Asset,Scrapped,ဖျက်သိမ်း
 DocType: Item,Item Defaults,item Defaults ကို
-DocType: Purchase Invoice,Returns,ပြန်
+DocType: Cashier Closing,Returns,ပြန်
 DocType: Job Card,WIP Warehouse,WIP ဂိုဒေါင်
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},serial No {0} {1} ထိပြုပြင်ထိန်းသိမ်းမှုစာချုပ်အောက်မှာဖြစ်ပါတယ်
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,်ထမ်းခေါ်ယူမှု
@@ -1689,7 +1689,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,လွှဲပြောင်းခြင်းပုံစံ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,အရောင်းအသုံးစရိတ်များ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ဖောက်သည်&gt; ဖောက်သည် Group မှ&gt; နယ်မြေတွေကို
 DocType: Diagnosis,Diagnosis,ရောဂါအမည်ဖေါ်ခြင်း
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,စံဝယ်ယူ
 DocType: Attendance Request,Explanation,ရှင်းလင်းချက်
@@ -1702,7 +1701,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,ရက်လွန်အမိန့်ပစ္စည်းများဝယ်ယူရန်
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,စာပို့သင်္ကေတ
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},အရောင်းအမှာစာ {0} {1} ဖြစ်ပါသည်
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},ချေးငွေ {0} စိတ်ဝင်စားကြောင်းဝင်ငွေအကောင့်ကိုရွေးချယ်ပါ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},ချေးငွေ {0} စိတ်ဝင်စားကြောင်းဝင်ငွေအကောင့်ကိုရွေးချယ်ပါ
 DocType: Opportunity,Contact Info,Contact Info
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,စတော့အိတ် Entries ဖော်ဆောင်ရေး
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,status ကိုလက်ဝဲနှင့်အတူန်ထမ်းမြှင့်တင်ရန်မပေးနိုင်
@@ -1714,7 +1713,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,ငွေတောင်းခံလွှာသုညငွေတောင်းခံနာရီများအတွက်လုပ်မရနိုငျ
 DocType: Company,Date of Commencement,စတင်တဲ့ရက်စွဲ
 DocType: Sales Person,Select company name first.,ပထမဦးဆုံးကုမ္ပဏီ၏နာမကိုရွေးချယ်ပါ။
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},{0} မှစလှေတျတျောအီးမေးလ်
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},{0} မှစလှေတျတျောအီးမေးလ်
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ကိုးကားချက်များပေးသွင်းထံမှလက်ခံရရှိခဲ့သည်။
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOM အစားထိုးမည်အပေါင်းတို့နှင့် BOMs အတွက်နောက်ဆုံးပေါ်စျေးနှုန်းကို update
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},{1} {2} | {0} မှ
@@ -1736,7 +1735,7 @@
 DocType: Asset Movement,From Employee,န်ထမ်းအနေဖြင့်
 DocType: Driver,Cellphone Number,ဆဲလ်ဖုန်းနံပါတ်
 DocType: Project,Monitor Progress,တိုးတက်မှုစောင့်ကြည့်
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,သတိပေးချက်: စနစ် Item {0} သည်ငွေပမာဏကတည်းက overbilling စစ်ဆေးမည်မဟုတ် {1} သုညဖြစ်ပါသည်အတွက်
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,သတိပေးချက်: စနစ် Item {0} သည်ငွေပမာဏကတည်းက overbilling စစ်ဆေးမည်မဟုတ် {1} သုညဖြစ်ပါသည်အတွက်
 DocType: Journal Entry,Make Difference Entry,Difference Entry &#39;ပါစေ
 DocType: Supplier Quotation,Auto Repeat Section,အော်တိုထပ်ခါတလဲလဲပုဒ်မ
 DocType: Upload Attendance,Attendance From Date,နေ့စွဲ မှစ. တက်ရောက်
@@ -1839,7 +1838,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,row # {0}: ငြင်းပယ် Qty ဝယ်ယူခြင်းသို့ပြန်သွားသည်ဝင်မသတ်နိုင်
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,ရွေးချယ်ထားသောဖောက်သည်များအတွက်ဖောက်သည်အုပ်စုပြောင်းခြင်းခွင့်ပြုမထားပေ။
 ,Purchase Order Items To Be Billed,ကြေညာတဲ့ခံရဖို့အမိန့်ပစ္စည်းများဝယ်ယူရန်
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,ခန့်မှန်းဆိုက်ရောက်အချိန်များကိုအသစ်ပြောင်းခြင်း။
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,ခန့်မှန်းဆိုက်ရောက်အချိန်များကိုအသစ်ပြောင်းခြင်း။
 DocType: Program Enrollment Tool,Enrollment Details,ကျောင်းအပ်အသေးစိတ်
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,ကုမ္ပဏီအဘို့အမျိုးစုံ Item Defaults ကိုမသတ်မှတ်နိုင်ပါ။
 DocType: Purchase Invoice Item,Net Rate,Net က Rate
@@ -1853,7 +1852,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,ခွင့်အမျိုးအစား madatory ဖြစ်ပါသည်
 DocType: Support Settings,Close Issue After Days,နေ့ရက်များပြီးနောက်နီးကပ် Issue
 ,Eway Bill,Eway ဘီလ်
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,သငျသညျ Marketplace မှအသုံးပြုသူများကိုထည့်သွင်းဖို့အတွက် System Manager ကိုနှင့် Item Manager ကိုအခန်းကဏ္ဍနှင့်အတူအသုံးပြုသူတစ်ဦးဖြစ်ဖို့လိုအပ်ပါတယ်။
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,သငျသညျ Marketplace မှအသုံးပြုသူများကိုထည့်သွင်းဖို့အတွက် System Manager ကိုနှင့် Item Manager ကိုအခန်းကဏ္ဍနှင့်အတူအသုံးပြုသူတစ်ဦးဖြစ်ဖို့လိုအပ်ပါတယ်။
 DocType: Leave Control Panel,Leave blank if considered for all branches,အားလုံးအကိုင်းအခက်စဉ်းစားလျှင်အလွတ် Leave
 DocType: Job Opening,Staffing Plan,ဝန်ထမ်းများအစီအစဉ်
 DocType: Bank Guarantee,Validity in Days,နေ့ရက်များအတွက်တရားဝင်မှု
@@ -1875,7 +1874,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},{1} တူညီနှင့်အတူအတန်း {0} Duplicate
 DocType: Marketplace Settings,Disable Marketplace,Marketplace disable
 ,Trial Balance,ရုံးတင်စစ်ဆေး Balance
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} မတွေ့ရှိ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} မတွေ့ရှိ
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,ဝန်ထမ်းများကိုတည်ဆောက်ခြင်း
 DocType: Hotel Room Reservation,Hotel Reservation User,ဟိုတယ် Reservation များအသုံးပြုသူ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,ပထမဦးဆုံးရှေ့ဆက်ကိုရွေးပါ ကျေးဇူးပြု.
@@ -1983,7 +1982,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,login ရန်မအောင်မြင်ခဲ့ပါ
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,ပိုင်ဆိုင်မှု {0} created
 DocType: Special Test Items,Special Test Items,အထူးစမ်းသပ်ပစ္စည်းများ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,သငျသညျ Marketplace တွင်မှတ်ပုံတင်ရန် System ကိုမန်နေဂျာနှင့် Item Manager ကိုအခန်းကဏ္ဍနှင့်အတူအသုံးပြုသူတစ်ဦးဖြစ်ဖို့လိုအပ်ပါတယ်။
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,သငျသညျ Marketplace တွင်မှတ်ပုံတင်ရန် System ကိုမန်နေဂျာနှင့် Item Manager ကိုအခန်းကဏ္ဍနှင့်အတူအသုံးပြုသူတစ်ဦးဖြစ်ဖို့လိုအပ်ပါတယ်။
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,ငွေပေးချေမှုရမည့်၏ Mode ကို
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,သင့်ရဲ့တာဝန်ပေးလစာဖွဲ့စည်းပုံနှုန်းသကဲ့သို့သင်တို့အကျိုးခံစားခွင့်များအတွက်လျှောက်ထားလို့မရပါဘူး
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,website က Image ကိုအများသုံးတဲ့ဖိုင်သို့မဟုတ် website ကို URL ကိုဖြစ်သင့်
@@ -1995,7 +1994,7 @@
 DocType: Warehouse,Warehouse Contact Info,ဂိုဒေါင် Contact Info
 DocType: Payment Entry,Write Off Difference Amount,Difference ငွေပမာဏဟာ Off ရေးထား
 DocType: Volunteer,Volunteer Name,စေတနာ့ဝန်ထမ်းအမည်
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},အခြားအတနျးထဲမှာထပ်နေမှုများကြောင့်ရက်စွဲများနှင့်အတူတန်းစီတွေ့ရှိခဲ့သည်: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},အခြားအတနျးထဲမှာထပ်နေမှုများကြောင့်ရက်စွဲများနှင့်အတူတန်းစီတွေ့ရှိခဲ့သည်: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: ဤအရပ်အီးမေးလ်ပို့မပို့နိုင်မတွေ့ရှိထမ်းအီးမေးလ်,"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},ပေးထားသည့်ရက်စွဲ {1} အပေါ်ထမ်း {0} ဘို့တာဝန်ပေးအပ်ခြင်းမရှိပါလစာဖွဲ့စည်းပုံ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},တိုင်းပြည် {0} များအတွက်သက်ဆိုင်မဟုတ် shipping အုပ်ချုပ်မှုကို
@@ -2086,6 +2085,7 @@
 DocType: Salary Component,Earning,ဝင်ငွေ
 DocType: Supplier Scorecard,Scoring Criteria,သွင်းယူလိုအပ်ချက်
 DocType: Purchase Invoice,Party Account Currency,ပါတီ၏အကောင့်ကိုငွေကြေးစနစ်
+DocType: Delivery Trip,Total Estimated Distance,စုစုပေါင်းမှန်းခြေအကွာအဝေး
 ,BOM Browser,BOM Browser ကို
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,ဒီလေ့ကျင့်ရေးအဖြစ်အပျက်အဘို့သင့် status ကိုအပ်ဒိတ်လုပ် ကျေးဇူးပြု.
 DocType: Item Barcode,EAN,Ean
@@ -2124,7 +2124,7 @@
 DocType: Activity Cost,Projects,စီမံကိန်းများ
 DocType: Payment Request,Transaction Currency,ငွေသွင်းငွေထုတ်ငွေကြေးစနစ်
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},{0} ကနေ | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,တချို့ကအီးမေးလ်တွေမမှန်ပါ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,တချို့ကအီးမေးလ်တွေမမှန်ပါ
 DocType: Work Order Operation,Operation Description,စစ်ဆင်ရေးဖော်ပြချက်များ
 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.,ဘဏ္ဍာရေးနှစ်အတွင်းကယ်တင်ခြင်းသို့ရောက်ကြသည်တစ်ချိန်ကဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ Start ကိုနေ့စွဲနှင့်ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ End Date ကိုမပြောင်းနိုင်ပါ။
 DocType: Quotation,Shopping Cart,စျေးဝယ်တွန်းလှည်း
@@ -2148,7 +2148,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Fixed Asset အတွက်ပိုက်ကွန်ကိုပြောင်းရန်
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd အရည်အတွက်
 DocType: Leave Control Panel,Leave blank if considered for all designations,အားလုံးပုံစံတခုစဉ်းစားလျှင်အလွတ် Leave
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,&#39;&#39; အမှန်တကယ် &#39;&#39; အမျိုးအစားတာဝန်ခံအတန်းအတွက် {0} Item နှုန်းတွင်ထည့်သွင်းမရနိုင်ပါ
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,&#39;&#39; အမှန်တကယ် &#39;&#39; အမျိုးအစားတာဝန်ခံအတန်းအတွက် {0} Item နှုန်းတွင်ထည့်သွင်းမရနိုင်ပါ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Datetime ကနေ
 DocType: Shopify Settings,For Company,ကုမ္ပဏီ
@@ -2162,7 +2162,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,သင်တန်းဇယားကိုအမှားအယွင်းများရှိခဲ့သည်
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,အဆိုပါစာရင်းထဲတွင်ပထမဦးဆုံးသုံးစွဲမှုသဘောတူညီချက်ကို default သုံးစွဲမှုသဘောတူညီချက်ပေးအဖြစ်သတ်မှတ်ထားပါလိမ့်မည်။
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,100 ကိုထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,သငျသညျ Marketplace တွင်မှတ်ပုံတင်ရန် System ကိုမန်နေဂျာနှင့် Item Manager ကိုအခန်းကဏ္ဍနှင့်အတူအုပ်ချုပ်ရေးမှူးထက်အခြားအသုံးပြုသူတစ်ဦးဖြစ်ဖို့လိုအပ်ပါတယ်။
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,သငျသညျ Marketplace တွင်မှတ်ပုံတင်ရန် System ကိုမန်နေဂျာနှင့် Item Manager ကိုအခန်းကဏ္ဍနှင့်အတူအုပ်ချုပ်ရေးမှူးထက်အခြားအသုံးပြုသူတစ်ဦးဖြစ်ဖို့လိုအပ်ပါတယ်။
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Unscheduled
@@ -2191,7 +2191,7 @@
 DocType: HR Settings,Employee Settings,ဝန်ထမ်း Settings ကို
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Loading ငွေပေးချေစနစ်
 ,Batch-Wise Balance History,batch-ပညာရှိ Balance သမိုင်း
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,အတန်း # {0}: ငွေပမာဏ Item {1} များအတွက်ငွေကောက်ခံငွေပမာဏထက် သာ. ကြီးမြတ်ပါလျှင်နှုန်းမသတ်မှတ်နိုင်ပါ။
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,အတန်း # {0}: ငွေပမာဏ Item {1} များအတွက်ငွေကောက်ခံငွေပမာဏထက် သာ. ကြီးမြတ်ပါလျှင်နှုန်းမသတ်မှတ်နိုင်ပါ။
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,သက်ဆိုင်ရာပုံနှိပ် format နဲ့ updated ပုံနှိပ် settings ကို
 DocType: Package Code,Package Code,package Code ကို
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,အလုပ်သင်သူ
@@ -2425,7 +2425,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} နေရာလွတ်များနှင့် {2} ပြီးသား {3} ၏လက်အောက်ခံကုမ္ပဏီများအတွက်စီစဉ်ထားများအတွက် {1} ဘတ်ဂျက်။ \ သင်သည်သာ {6} မိဘကုမ္ပဏီ {3} ဝန်ထမ်းများနှုန်းအစီအစဉ်အဖြစ် {5} နူန်းကျော်ကျော် {4} နေရာလွတ်အဘို့အစီစဉ်များနှင့်များနှင့်ဘတ်ဂျက်နိုင်ပါတယ်။
 DocType: HR Settings,Stop Birthday Reminders,မွေးနေသတိပေးချက်များကိုရပ်တန့်
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},ကုမ္ပဏီ {0} အတွက်ပုံမှန်လစာပေးချေအကောင့်ကိုသတ်မှတ်ပေးပါ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},ကုမ္ပဏီ {0} အတွက်ပုံမှန်လစာပေးချေအကောင့်ကိုသတ်မှတ်ပေးပါ
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,အမေဇုံတို့ကအခွန်နဲ့စွဲချက်အချက်အလက်များ၏ဘဏ္ဍာရေးအဖွဲ့ဟာ Get
 DocType: SMS Center,Receiver List,receiver များစာရင်း
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,ရှာရန် Item
@@ -2495,7 +2495,7 @@
 DocType: Vital Signs,Constipated,ဝမ်းချုပ်ခြင်း
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},ပေးသွင်းပြေစာ {0} ဆန့်ကျင် {1} ရက်စွဲပါ
 DocType: Customer,Default Price List,default စျေးနှုန်းများစာရင်း
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,ပိုင်ဆိုင်မှုလပ်ြရြားမြစံချိန် {0} ကဖန်တီး
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,ပိုင်ဆိုင်မှုလပ်ြရြားမြစံချိန် {0} ကဖန်တီး
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,ပစ္စည်းများကိုမျှမတွေ့ပါ။
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,သငျသညျဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} မဖျက်နိုင်ပါ။ ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} ကမ္တာ့ချိန်ညှိအတွက် default အနေနဲ့အဖြစ်သတ်မှတ်
 DocType: Share Transfer,Equity/Liability Account,equity / တာဝန်ဝတ္တရားအကောင့်
@@ -2635,6 +2635,7 @@
 DocType: Blanket Order,Order Type,အမိန့် Type
 ,Item-wise Sales Register,item-ပညာရှိသအရောင်းမှတ်ပုံတင်မည်
 DocType: Asset,Gross Purchase Amount,စုစုပေါင်းအရစ်ကျငွေပမာဏ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,item Code ကို&gt; item Group မှ&gt; အမှတ်တံဆိပ်
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,ဖွင့်လှစ် balance
 DocType: Asset,Depreciation Method,တန်ဖိုး Method ကို
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,အခြေခံပညာနှုန်းတွင်ထည့်သွင်းဒီအခွန်ဖြစ်သနည်း
@@ -2718,7 +2719,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,လှုပ်ရှားမှုနှစ်ပတ်လည်ဘတ်ဂျက်စာတိုက်အပေါ်ကိုကျြောသှားပါလျှင်
 DocType: Student Leave Application,Student Leave Application,ကျောင်းသားသမဂ္ဂခွင့်လျှောက်လွှာ
 DocType: Item,Will also apply for variants,စမျိုးကွဲလျှောက်ထားလိမ့်မည်ဟု
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","ဒါကြောင့် {0} ပြီးသားဖြစ်သကဲ့သို့ပိုင်ဆိုင်မှု, ဖျက်သိမ်းမရနိုငျ"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","ဒါကြောင့် {0} ပြီးသားဖြစ်သကဲ့သို့ပိုင်ဆိုင်မှု, ဖျက်သိမ်းမရနိုငျ"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},{1} အပေါ်တစ်ဝက်နေ့၌ဝန်ထမ်း {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},စုစုပေါင်းအလုပ်ချိန်နာရီ {0} အလုပ်လုပ် max ကိုထက် သာ. ကြီးမြတ်မဖြစ်သင့်ပါဘူး
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,အပေါ်
@@ -2742,6 +2743,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,ဒေတာများကိုဆွဲယူ
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},အရွက်အမျိုးအစား {0} အတွက်ခွင့်ပြုအများဆုံးခွင့် {1} ဖြစ်ပါသည်
 DocType: SMS Center,Create Receiver List,Receiver များစာရင်း Create
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,ရရှိနိုင်-for-အသုံးပြုမှုနေ့စွဲဝယ်ယူနေ့စွဲနောက်မှာဖြစ်သင့်ပါတယ်
 DocType: Vehicle,Wheels,ရထားဘီး
 DocType: Packing Slip,To Package No.,အမှတ် Package မှ
 DocType: Patient Relation,Family,မိသားစု
@@ -2755,7 +2757,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,ငွေတောင်းခံငွေကြေးသော်လည်းကောင်း default အကုမ္ပဏီ၏ငွေကြေးသို့မဟုတ်ပါတီအကောင့်ငွေကြေးညီမျှရှိရမည်
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),(သာလျှင် Draft) ကို package ကိုဒီပို့ဆောင်မှု၏အစိတ်အပိုင်းတစ်ခုဖြစ်တယ်ဆိုတာဆိုတာကိုပြသ
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,အတန်း {0}: ကြောင့်နေ့စွဲရက်စွဲကိုပို့စ်တင်မတိုင်မီမဖွစျနိုငျ
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,အတန်း {0}: ကြောင့်နေ့စွဲရက်စွဲကိုပို့စ်တင်မတိုင်မီမဖွစျနိုငျ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,ငွေပေးချေမှုရမည့် Entry &#39;ပါစေ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Item {0} သည်အရေအတွက် {1} ထက်နည်းရှိရမည်
 ,Sales Invoice Trends,အရောင်းပြေစာခေတ်ရေစီးကြောင်း
@@ -2828,7 +2830,7 @@
 DocType: Guardian,Guardian Interests,ဂါးဒီးယန်းစိတ်ဝင်စားမှုများ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Update ကို Account Name ကို / နံပါတ်
 DocType: Naming Series,Current Value,လက်ရှိ Value တစ်ခု
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,အကွိမျမြားစှာဘဏ္ဍာရေးနှစ်အနှစ်ရက်စွဲ {0} အဘို့တည်ရှိတယ်။ ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွက်ကုမ္ပဏီသတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,အကွိမျမြားစှာဘဏ္ဍာရေးနှစ်အနှစ်ရက်စွဲ {0} အဘို့တည်ရှိတယ်။ ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွက်ကုမ္ပဏီသတ်မှတ်ထားပေးပါ
 DocType: Education Settings,Instructor Records to be created by,အသုံးပြုနေသူများကဖန်တီးခံရဖို့နည်းပြမှတ်တမ်း
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} နေသူများကဖန်တီး
 DocType: GST Account,GST Account,GST အကောင့်
@@ -2845,7 +2847,7 @@
 DocType: Sales Person,Name and Employee ID,အမည်နှင့်ထမ်း ID ကို
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,ကြောင့်နေ့စွဲနေ့စွဲများသို့တင်ပြခြင်းမပြုမီမဖွစျနိုငျ
 DocType: Website Item Group,Website Item Group,website Item Group က
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ပြီးသားတင်သွင်းအထက်ပါရွေးချယ်ထားသည့်စံနှုန်းများ OR လစာစလစ်ဘို့တင်ပြမျှမတွေ့လစာစလစ်
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ပြီးသားတင်သွင်းအထက်ပါရွေးချယ်ထားသည့်စံနှုန်းများ OR လစာစလစ်ဘို့တင်ပြမျှမတွေ့လစာစလစ်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,တာဝန်နှင့်အခွန်
 DocType: Projects Settings,Projects Settings,စီမံကိန်းများ Settings များ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,ကိုးကားစရာနေ့စွဲကိုရိုက်ထည့်ပေးပါ
@@ -2854,7 +2856,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,supply Qty
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,ဆဆ-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,material တောင်းဆိုမှု Item
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,ပထမဦးဆုံးဝယ်ယူငွေလက်ခံပြေစာ {0} ကိုပယ်ဖျက်ပေးပါ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,ပထမဦးဆုံးဝယ်ယူငွေလက်ခံပြေစာ {0} ကိုပယ်ဖျက်ပေးပါ
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Item အဖွဲ့များ၏ပင်လည်းရှိ၏။
 DocType: Production Plan,Total Produced Qty,စုစုပေါင်းထုတ်လုပ်အရည်အတွက်
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,ဒီတာဝန်ခံအမျိုးအစားသည်ထက် သာ. ကြီးမြတ်သို့မဟုတ်လက်ရှိအတန်းအရေအတွက်တန်းတူအတန်းအရေအတွက်ကိုရည်ညွှန်းနိုင်ဘူး
@@ -2965,6 +2967,7 @@
 ,Vehicle Expenses,ယာဉ်ကုန်ကျစရိတ်
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,အရောင်းပြေစာအပေါ် Lab ကစမ်းသပ် (s) ကို Create Submit
 DocType: Serial No,Invoice Details,ငွေတောင်းခံလွှာအသေးစိတ်
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,လမ်းကြောင်းခန့်မှန်းမှုနှင့်ပိုကောင်းအောင်ရန် Google Maps က Settings ကို enable ပေးပါ
 DocType: Grant Application,Show on Website,ဝက်ဘ်ဆိုက်ပေါ်တွင်ပြရန်
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,အပေါ် Start
 DocType: Hub Tracked Item,Hub Category,hub Category:
@@ -3005,7 +3008,7 @@
 DocType: Inpatient Record,B Positive,B ကအပြုသဘောဆောင်သော
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",ဝန်ထမ်းအများဆုံးအကျိုးရှိ {0} ယခင်အခိုင်အမာ \ ငွေပမာဏ၏ပေါင်းလဒ် {2} အားဖြင့် {1} ထက်ကျော်လွန်
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","အတန်း # {0}: item ကိုသတ်မှတ်ထားတဲ့အရာတစ်ခုပါပဲအဖြစ်အရည်အတွက်, 1 ဖြစ်ရမည်။ မျိုးစုံအရည်အတွက်ကိုခွဲတန်းကိုသုံးပေးပါ။"
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","အတန်း # {0}: item ကိုသတ်မှတ်ထားတဲ့အရာတစ်ခုပါပဲအဖြစ်အရည်အတွက်, 1 ဖြစ်ရမည်။ မျိုးစုံအရည်အတွက်ကိုခွဲတန်းကိုသုံးပေးပါ။"
 DocType: Leave Block List Allow,Leave Block List Allow,Allow Block List ကို Leave
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr အလွတ်သို့မဟုတ်အာကာသမဖွစျနိုငျ
 DocType: Patient Medical Record,Patient Medical Record,လူနာဆေးဘက်ဆိုင်ရာမှတ်တမ်း
@@ -3040,7 +3043,7 @@
 DocType: Workstation,Wages per hour,တစ်နာရီလုပ်ခ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Batch အတွက်စတော့အိတ်ချိန်ခွင် {0} ဂိုဒေါင် {3} မှာ Item {2} သည် {1} အနုတ်လက္ခဏာဖြစ်လိမ့်မည်
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,အောက်ပါပစ္စည်းများတောင်းဆိုမှုများပစ္စည်းရဲ့ Re-အမိန့် level ကိုအပေါ်အခြေခံပြီးအလိုအလြောကျထမြောက်ကြပါပြီ
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},အကောင့်ကို {0} မမှန်ကန်ဘူး။ အကောင့်ကိုငွေကြေးစနစ် {1} ဖြစ်ရပါမည်
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},အကောင့်ကို {0} မမှန်ကန်ဘူး။ အကောင့်ကိုငွေကြေးစနစ် {1} ဖြစ်ရပါမည်
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},နေ့စွဲကနေ {0} ဝန်ထမ်းရဲ့စိတ်သက်သာရာနေ့စွဲ {1} ပြီးနောက်မဖွစျနိုငျ
 DocType: Supplier,Is Internal Supplier,ပြည်တွင်းပေးသွင်းဖြစ်ပါသည်
 DocType: Employee,Create User Permission,အသုံးပြုသူခွင့်ပြုချက် Create
@@ -3186,7 +3189,7 @@
 DocType: Account,Fixed Asset,ပုံသေ Asset
 DocType: Amazon MWS Settings,After Date,နေ့စွဲပြီးနောက်
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Serial Inventory
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,အင်တာမီလန်ကုမ္ပဏီပြေစာများအတွက် {0} မှားနေသော။
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,အင်တာမီလန်ကုမ္ပဏီပြေစာများအတွက် {0} မှားနေသော။
 ,Department Analytics,ဦးစီးဌာန Analytics မှ
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,အီးမေးလ်ပို့ရန်က default အဆက်အသွယ်မတွေ့ရှိ
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,လျှို့ဝှက်ချက် Generate
@@ -3199,7 +3202,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,အဆိုပါကြေးဖွဲ့စည်းပုံနဲ့ Student Group မှ {0} အတွက်အစီအစဉ်ကိုကွဲပြားခြားနားပါသည်။
 DocType: Bank Statement Transaction Entry,Receivable Account,receiver အကောင့်
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,နေ့စွဲ မှစ. သက်တမ်းရှိသက်တမ်းရှိနူန်းကျော်ကျော်နေ့စွဲထက်ပြောင်ဖြစ်ရပါမည်။
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} {2} ပြီးသားဖြစ်ပါတယ်
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} {2} ပြီးသားဖြစ်ပါတယ်
 DocType: Quotation Item,Stock Balance,စတော့အိတ် Balance
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,ငွေပေးချေမှုရမည့်မှအရောင်းအမိန့်
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,စီအီးအို
@@ -3241,6 +3244,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,debit ရန်လိုအပ်သည်
 DocType: Clinical Procedure,Inpatient Record,အတွင်းလူနာမှတ်တမ်း
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets သင့်ရဲ့အဖွဲ့ကအမှုကိုပြု Activite ဘို့အချိန်, ကုန်ကျစရိတ်နှင့်ငွေတောင်းခံခြေရာခံစောင့်ရှောက်ကူညီပေးရန်"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,ပေးသွင်း&gt; ပေးသွင်းအမျိုးအစား
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,ဝယ်ယူစျေးနှုန်းများစာရင်း
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,ငွေသွင်းငွေထုတ်၏နေ့စွဲ
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,ကုန်ပစ္စည်းပေးသွင်း scorecard variable တွေကို၏ Templates ကို။
@@ -3284,7 +3288,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,ချိန်း Gain / ပျောက်ဆုံးခြင်း
 DocType: Opportunity,Lost Reason,ပျောက်ဆုံးသွားရသည့်အကြောင်းရင်း
 DocType: Amazon MWS Settings,Enable Amazon,အမေဇုံ Enable
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},အတန်း # {0}: အကောင့် {1} ကုမ္ပဏီမှ {2} ပိုင်ပါဘူး
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},အတန်း # {0}: အကောင့် {1} ကုမ္ပဏီမှ {2} ပိုင်ပါဘူး
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DOCTYPE {0} ကိုရှာဖွေနိုင်ခြင်း
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,နယူးလိပ်စာ
 DocType: Quality Inspection,Sample Size,နမူနာ Size အ
@@ -3396,7 +3400,7 @@
 DocType: Water Analysis,Origin,မူလ
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ဤစာရွက်စာတမ်းကို item {4} ဘို့ {0} {1} အားဖြင့်ကန့်သတ်ကျော်ပြီဖြစ်ပါသည်။ သငျသညျ {2} အတူတူဆန့်ကျင်သည်အခြား {3} လုပ်နေပါတယ်?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,ချွေပြီးနောက်ထပ်တလဲလဲသတ်မှတ်ထားပေးပါ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,ပြောင်းလဲမှုငွေပမာဏကိုအကောင့်ကို Select လုပ်ပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,ပြောင်းလဲမှုငွေပမာဏကိုအကောင့်ကို Select လုပ်ပါ
 DocType: Purchase Invoice,Price List Currency,စျေးနှုန်း List ကိုငွေကြေးစနစ်
 DocType: Naming Series,User must always select,အသုံးပြုသူအမြဲရွေးချယ်ရမည်
 DocType: Stock Settings,Allow Negative Stock,အပြုသဘောမဆောင်သောစတော့အိတ် Allow
@@ -3438,7 +3442,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,သင်ဤချိန်းသင်ပယ်ဖျက်လိုတာသေချာလား?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,ဟိုတယ်အခန်းစျေးနှုန်းပက်ကေ့
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,အရောင်းပိုက်လိုင်း
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},လစာစိတျအပိုငျး {0} အတွက် default အနေနဲ့အကောင့်သတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},လစာစိတျအပိုငျး {0} အတွက် default အနေနဲ့အကောင့်သတ်မှတ်ထားပေးပါ
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,တွင်လိုအပ်သော
 DocType: Rename Tool,File to Rename,Rename မှ File
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Row {0} အတွက် Item ဘို့ BOM ကို select လုပ်ပါကျေးဇူးပြုပြီး
@@ -3459,7 +3463,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ဝယ်ယူပစ္စည်းများ၏ကုန်ကျစရိတ်
 DocType: Employee Separation,Employee Separation Template,ဝန်ထမ်း Separation Template ကို
 DocType: Selling Settings,Sales Order Required,အရောင်းအမိန့်လိုအပ်ပါသည်
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,တစ်ဦးရောင်းချသူဖြစ်လာ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,တစ်ဦးရောင်းချသူဖြစ်လာ
 DocType: Purchase Invoice,Credit To,ခရက်ဒစ်ရန်
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Active ကိုခဲ / Customer များ
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,စံ Delivery မှတ်ချက် format နဲ့သုံးစွဲဖို့အလွတ် Leave
@@ -3501,7 +3505,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,အခွန် Template: Make
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,အသုံးပြုသူဖိုရမ်
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,ကုန်ကြမ်းပစ္စည်းများအလွတ်မဖြစ်နိုင်။
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,အတန်း # {0} (ငွေပေးချေမှုရမည့်စားပွဲတင်): ငွေပမာဏအနုတ်လက္ခဏာဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,အတန်း # {0} (ငွေပေးချေမှုရမည့်စားပွဲတင်): ငွေပမာဏအနုတ်လက္ခဏာဖြစ်ရပါမည်
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","ငွေတောင်းခံလွှာတစ်စက်ရေကြောင်းကို item များပါရှိသည်, စတော့ရှယ်ယာကို update မရနိုင်ပါ။"
 DocType: Contract,Fulfilment Status,ပွညျ့စုံအခြေအနေ
 DocType: Lab Test Sample,Lab Test Sample,Lab ကစမ်းသပ်နမူနာ
@@ -3641,7 +3645,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,doc နေ့စွဲ
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Created ကြေး Records ကို - {0}
 DocType: Asset Category Account,Asset Category Account,ပိုင်ဆိုင်မှုအမျိုးအစားအကောင့်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,အတန်း # {0} (ငွေပေးချေမှုရမည့်စားပွဲတင်): ငွေပမာဏအပြုသဘောဖြစ်ရမည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,အတန်း # {0} (ငွေပေးချေမှုရမည့်စားပွဲတင်): ငွေပမာဏအပြုသဘောဖြစ်ရမည်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},အရောင်းအမိန့်အရေအတွက် {1} ထက်ပိုပစ္စည်း {0} မထုတ်လုပ်နိုင်သ
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,ကို Select လုပ်ပါ Attribute တန်ဖိုးများ
 DocType: Purchase Invoice,Reason For Issuing document,စာရွက်စာတမ်းထုတ်ပေးခြင်းသည်အကြောင်းပြချက်
@@ -3696,7 +3700,7 @@
 DocType: Purchase Receipt,Time at which materials were received,ပစ္စည်းများလက်ခံရရှိခဲ့ကြသည်မှာအချိန်
 DocType: Products Settings,Products per Page,စာမျက်နှာနှုန်းထုတ်ကုန်များ
 DocType: Stock Ledger Entry,Outgoing Rate,outgoing Rate
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,သို့မဟုတ်
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,သို့မဟုတ်
 DocType: Sales Order,Billing Status,ငွေတောင်းခံနဲ့ Status
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,တစ်ဦး Issue သတင်းပို့
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Utility ကိုအသုံးစရိတ်များ
@@ -3724,7 +3728,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,ဝန်ထမ်းအခွန်ကင်းလွတ်ခွင့်ကြေညာစာတမ်း
 DocType: Payment Entry,Cheque/Reference Date,Cheque တစ်စောင်လျှင် / ကိုးကားစရာနေ့စွဲ
 DocType: Purchase Invoice,Total Taxes and Charges,စုစုပေါင်းအခွန်နှင့်စွပ်စွဲချက်
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,ရရှိနိုင်-for-အသုံးပြုမှုနေ့စွဲအတိတ်နေ့စွဲအဖြစ်ထဲသို့ဝင်နေသည်
 DocType: Employee,Emergency Contact,အရေးပေါ်ဆက်သွယ်ရန်
 DocType: Bank Reconciliation Detail,Payment Entry,ငွေပေးချေမှုရမည့် Entry &#39;
 ,sales-browser,အရောင်း-browser ကို
@@ -3771,6 +3774,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),ပြန်သွားစဉ် (Credit မှတ်ချက်) ဖြစ်ပါသည်
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,ယောဘသည် Start
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},serial မပိုင်ဆိုင်မှု {0} ဘို့လိုအပ်ပါသည်
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup ကို&gt; Setting&gt; အမည်ဖြင့်သမုတ်စီးရီးကနေတဆင့် {0} များအတွက်စီးရီးအမည်ဖြင့်သမုတ်သတ်မှတ်ထား ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,မသန်စွမ်း template ကို default အနေနဲ့ template ကိုမဖွစျရပါမညျ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,အတန်းများအတွက် {0}: စီစဉ်ထားအရည်အတွက် Enter
 DocType: Account,Income Account,ဝင်ငွေခွန်အကောင့်
@@ -3784,6 +3788,7 @@
 DocType: Loyalty Program,Help Section,အကူအညီပုဒ်မ
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,Key ကိုတာဝန်သိမှုဧရိယာ
+DocType: Delivery Trip,Distance UOM,အဝေးသင် UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","ကျောင်းသား batch သင်ကျောင်းသားများအတွက်တက်ရောက်သူ, အကဲဖြတ်ခြင်းနှင့်အဖိုးအခကိုခြေရာခံကိုကူညီ"
 DocType: Payment Entry,Total Allocated Amount,စုစုပေါင်းခွဲဝေပမာဏ
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,အစဉ်အမြဲစာရင်းမဘို့ရာခန့်က default စာရင်းအကောင့်
@@ -3825,7 +3830,7 @@
 DocType: Item Supplier,Item Supplier,item ပေးသွင်း
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,အဘယ်သူမျှမသုတ်ရ Item Code ကိုရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},{1} quotation_to {0} လို့တန်ဖိုးကို select ကျေးဇူးပြု.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,အပြောင်းအရွှေ့အတွက်ရွေးချယ်ပစ္စည်းများအဘယ်သူမျှမ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,အပြောင်းအရွှေ့အတွက်ရွေးချယ်ပစ္စည်းများအဘယ်သူမျှမ
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,အားလုံးသည်လိပ်စာ။
 DocType: Company,Stock Settings,စတော့အိတ် Settings ကို
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးမှတ်တမ်းများအတွက်တူညီသော အကယ်. merge သာဖြစ်နိုင်ပါတယ်။ အုပ်စု, Root Type, ကုမ္ပဏီဖြစ်ပါတယ်"
@@ -4111,7 +4116,7 @@
 DocType: Patient,Personal and Social History,ပုဂ္ဂိုလ်ရေးနှင့်လူမှုသမိုင်း
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,အသုံးပြုသူ {0} created
 DocType: Fee Schedule,Fee Breakup for each student,တစ်ခုချင်းစီကိုကျောင်းသားများအတွက်အခကြေးငွေအဖွဲ့ဟာ
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),အမိန့်ဆန့်ကျင်စုစုပေါင်းကြိုတင်မဲ ({0}) {1} ({2}) ကိုဂရန်းစုစုပေါင်းထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),အမိန့်ဆန့်ကျင်စုစုပေါင်းကြိုတင်မဲ ({0}) {1} ({2}) ကိုဂရန်းစုစုပေါင်းထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ညီလအတွင်းအနှံ့ပစ်မှတ်ဖြန့်ဝေရန်လစဉ်ဖြန့်ဖြူးကိုရွေးချယ်ပါ။
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,ပြောင်းလဲမှုကို Code ကို
 DocType: Purchase Invoice Item,Valuation Rate,အဘိုးပြတ် Rate
@@ -4120,7 +4125,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,ရရှိနိုင်ပါ ITC အခွန်
 ,Student Monthly Attendance Sheet,ကျောင်းသားသမဂ္ဂလစဉ်တက်ရောက်စာရွက်
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,ရောင်းအားအဘို့ကိုသာသက်ဆိုင် shipping အုပ်ချုပ်မှုကို
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,တန်ဖိုးလျော့ Row {0}: Next ကိုတန်ဖိုးနေ့စွဲဝယ်ယူနေ့စွဲမတိုင်မီမဖွစျနိုငျ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,တန်ဖိုးလျော့ Row {0}: Next ကိုတန်ဖိုးနေ့စွဲဝယ်ယူနေ့စွဲမတိုင်မီမဖွစျနိုငျ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Project မှ Start ကိုနေ့စွဲ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,တိုငျအောငျ
 DocType: Rename Tool,Rename Log,အထဲ Rename
@@ -4138,12 +4143,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,မကြာခဏဘယ်လိုပရောဂျက်သငျ့သညျနှင့်ကုမ္ပဏီအရောင်းအရောင်းအဝယ်ပေါ်တွင်အခြေခံ updated လိမ့်မည်။
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,တွင်သက်တမ်းကုန်ဆုံးမည်
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,ကျောင်းသားများ Add
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","အဆိုပါထမ်း delete ကျေးဇူးပြု. <a href=""#Form/Employee/{0}"">{0}</a> ဤစာရွက်စာတမ်းဖျက်သိမ်းရန် \"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},{0} ကို select ကျေးဇူးပြု.
 DocType: C-Form,C-Form No,C-Form တွင်မရှိပါ
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,အဝေးသင်
+DocType: Delivery Stop,Distance,အဝေးသင်
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,သငျသညျရောင်းမဝယ်သင့်ကုန်ပစ္စည်းသို့မဟုတ်ဝန်ဆောင်မှုစာရင်းပြုစုပါ။
 DocType: Water Analysis,Storage Temperature,သိုလှောင်ခြင်းအပူချိန်
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4170,7 +4173,7 @@
 DocType: Homepage,Company Description for website homepage,ဝက်ဘ်ဆိုက်ပင်မစာမျက်နှာများအတွက်ကုမ္ပဏီဖျေါပွခကျြ
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",ဖောက်သည်များအဆင်ပြေဤ codes တွေကိုငွေတောင်းခံလွှာနှင့် Delivery မှတ်စုများတူပုံနှိပ်ပုံစံများဖြင့်အသုံးပြုနိုင်
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier အမည်
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,{0} များအတွက်သတင်းအချက်အလက်ရယူမပေးနိုင်ခဲ့ပါ။
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,{0} များအတွက်သတင်းအချက်အလက်ရယူမပေးနိုင်ခဲ့ပါ။
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,ဖွင့်လှစ် Entry &#39;ဂျာနယ်
 DocType: Contract,Fulfilment Terms,ပွညျ့စုံစည်းမျဉ်းများ
 DocType: Sales Invoice,Time Sheet List,အချိန်စာရွက်စာရင်း
@@ -4353,7 +4356,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,ယင်းလုပ်ဆောင်ချက်ကိုအခြေခံပြီး Group မှအဘို့ကို manually ကျောင်းသားများကိုကို Select လုပ်ပါ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,ယင်းလုပ်ဆောင်ချက်ကိုအခြေခံပြီး Group မှအဘို့ကို manually ကျောင်းသားများကိုကို Select လုပ်ပါ
 DocType: Journal Entry,User Remark,အသုံးပြုသူမှတ်ချက်
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,လမ်းကြောင်းအားပြုပြင်ခြင်း။
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,လမ်းကြောင်းအားပြုပြင်ခြင်း။
 DocType: Travel Itinerary,Non Diary,non ဒိုင်ယာရီ
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,လက်ဝဲန်ထမ်းများအတွက် retention အပိုဆုမဖန်တီးနိုင်ပါ
 DocType: Lead,Market Segment,Market မှာအပိုင်း
@@ -4384,7 +4387,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,သစ္စာရှိမှုအစီအစဉ်
 DocType: Student Guardian,Father,ဖခင်
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,ပံ့ပိုးမှုလက်မှတ်တွေ
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;&#39; Update ကိုစတော့အိတ် &#39;&#39; သတ်မှတ်ထားတဲ့ပိုင်ဆိုင်မှုရောင်းမည်အမှန်ခြစ်မရနိုငျ
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;&#39; Update ကိုစတော့အိတ် &#39;&#39; သတ်မှတ်ထားတဲ့ပိုင်ဆိုင်မှုရောင်းမည်အမှန်ခြစ်မရနိုငျ
 DocType: Bank Reconciliation,Bank Reconciliation,ဘဏ်မှပြန်လည်ရင်ကြားစေ့ရေး
 DocType: Attendance,On Leave,Leave တွင်
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Updates ကိုရယူပါ
@@ -4429,7 +4432,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,serial ဘယ်သူမျှမကနှင့်အသုတ်လိုက်
 DocType: Warranty Claim,From Company,ကုမ္ပဏီအနေဖြင့်
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,အကဲဖြတ်လိုအပ်ချက်များ၏ရမှတ်များပေါင်းလဒ် {0} ဖြစ်ရန်လိုအပ်ပါသည်။
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,ကြိုတင်ဘွတ်ကင်တန်ဖိုးအရေအတွက်သတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,ကြိုတင်ဘွတ်ကင်တန်ဖိုးအရေအတွက်သတ်မှတ်ထားပေးပါ
 DocType: Supplier Scorecard Period,Calculations,တွက်ချက်မှုများ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Value တစ်ခုသို့မဟုတ် Qty
 DocType: Payment Terms Template,Payment Terms,ငွေပေးချေမှုရမည့်စည်းမျဉ်းစည်းကမ်းများ
@@ -4449,7 +4452,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Margin နှင့်အတူစျေးစာရင်းနှုန်းအပေါ်လျှော့စျေး (%)
 DocType: Healthcare Service Unit Type,Rate / UOM,rate / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,အားလုံးသိုလှောင်ရုံ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,{0} အင်တာမီလန်ကုမ္ပဏီအရောင်းအဝယ်ဘို့မျှမတွေ့ပါ။
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,{0} အင်တာမီလန်ကုမ္ပဏီအရောင်းအဝယ်ဘို့မျှမတွေ့ပါ။
 DocType: Travel Itinerary,Rented Car,ငှားရမ်းထားသောကား
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,သင့်ရဲ့ကုမ္ပဏီအကြောင်း
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,အကောင့်ကိုရန်အကြွေးတစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
@@ -4551,6 +4554,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,စက်ရုံအားသုံးသပ်ခြင်းလိုအပ်ချက်
 DocType: Cheque Print Template,Cheque Height,Cheque တစ်စောင်လျှင်အမြင့်
 DocType: Supplier,Supplier Details,ပေးသွင်းအသေးစိတ်ကို
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ကျေးဇူးပြု. Setup ကို&gt; နံပါတ်စီးရီးကနေတစ်ဆင့်တက်ရောက်ဘို့ setup ကိုစာရငျးစီးရီး
 DocType: Setup Progress,Setup Progress,Setup ကိုတိုးတက်ရေးပါတီ
 DocType: Expense Claim,Approval Status,ခွင့်ပြုချက်နဲ့ Status
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},တန်ဖိုးမြှင်ထံမှအတန်း {0} အတွက်တန်ဖိုးထက်နည်းရှိရမည်
@@ -4644,7 +4648,6 @@
 DocType: Travel Request,Fully Sponsored,အပြည့်အဝထောက်ပံ့ထား
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,ပြောင်းပြန်ဂျာနယ် Entry &#39;
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,ဖောက်သည် {0} နေသူများကဖန်တီး။
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,လူ့စွမ်းအားအရင်းအမြစ်အတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုထမ်း&gt; HR က Settings
 DocType: Stock Settings,Limit Percent,ရာခိုင်နှုန်းကန့်သတ်ရန်
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,မည်သည့်ဂိုဒေါင်ထဲမှာရရှိနိုင်လောလောဆယ်အဘယ်သူမျှမစတော့ရှယ်ယာ
 ,Payment Period Based On Invoice Date,ပြေစာနေ့စွဲတွင် အခြေခံ. ငွေပေးချေမှုရမည့်ကာလ
@@ -4703,7 +4706,7 @@
 DocType: BOM Explosion Item,Source Warehouse,source ဂိုဒေါင်
 DocType: Installation Note,Installation Date,Installation လုပ်တဲ့နေ့စွဲ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,ဝေမျှမယ် Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} ကုမ္ပဏီမှ {2} ပိုင်ပါဘူး
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} ကုမ္ပဏီမှ {2} ပိုင်ပါဘူး
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,အရောင်းပြေစာ {0} created
 DocType: Employee,Confirmation Date,အတည်ပြုချက်နေ့စွဲ
 DocType: Inpatient Occupancy,Check Out,ထွက်ခွာသည်
@@ -4723,6 +4726,7 @@
 DocType: Production Plan,Sales Orders Detail,အရောင်းအမိန့်အသေးစိတ်
 DocType: Bin,Requested Quantity,တောင်းဆိုထားသောပမာဏ
 DocType: Fees,EDU-FEE-.YYYY.-,EDU တွင်-ခ-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,ပညာရေးအတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုနည်းပြ&gt; ပညာရေးကိုဆက်တင်
 DocType: Patient,Marital Status,အိမ်ထောင်ရေးအခြေအနေ
 DocType: Stock Settings,Auto Material Request,မော်တော်ကားပစ္စည်းတောင်းဆိုခြင်း
 DocType: Woocommerce Settings,API consumer secret,API ကိုစားသုံးသူလျှို့ဝှက်ချက်
@@ -4775,7 +4779,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,ကို Select လုပ်ပါနေ့ရက်များ
 DocType: Academic Term,Term Name,သက်တမ်းအမည်
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),ခရက်ဒစ် ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,လစာစလစ်ဖန်တီးနေ ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,လစာစလစ်ဖန်တီးနေ ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,သငျသညျအမြစ် node ကိုတည်းဖြတ်မရနိုင်ပါ။
 DocType: Buying Settings,Purchase Order Required,အမိန့်လိုအပ်ပါသည်ယ်ယူ
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,timer
@@ -4813,7 +4817,7 @@
 DocType: Account,Rate at which this tax is applied,ဒီအခွန်လျှောက်ထားသောအချိန်တွင် rate
 DocType: Cash Flow Mapper,Section Name,ပုဒ်မအမည်
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Reorder Qty
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},တန်ဖိုးလျော့ Row {0}: အသုံးဝင်သောဘဝပြီးနောက်မျှော်မှန်းတန်ဖိုးကိုထက် သာ. ကြီးမြတ်သို့မဟုတ် {1} ညီမျှရှိရမည်
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},တန်ဖိုးလျော့ Row {0}: အသုံးဝင်သောဘဝပြီးနောက်မျှော်မှန်းတန်ဖိုးကိုထက် သာ. ကြီးမြတ်သို့မဟုတ် {1} ညီမျှရှိရမည်
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,လက်ရှိယောဘသည်င့်
 DocType: Company,Stock Adjustment Account,စတော့အိတ်ချိန်ညှိအကောင့်
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,အကြွေးလျှော်ပစ်ခြင်း
@@ -4860,7 +4864,7 @@
 DocType: Program Enrollment,School House,School တွင်အိမ်
 DocType: Serial No,Out of AMC,AMC ထဲက
 DocType: Opportunity,Opportunity Amount,အခွင့်အလမ်းငွေပမာဏ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ကြိုတင်ဘွတ်ကင်တန်ဖိုးအရေအတွက်တန်ဖိုးစုစုပေါင်းအရေအတွက်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ကြိုတင်ဘွတ်ကင်တန်ဖိုးအရေအတွက်တန်ဖိုးစုစုပေါင်းအရေအတွက်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Purchase Order,Order Confirmation Date,အမိန့်အတည်ပြုချက်နေ့စွဲ
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Maintenance ကိုအလည်တစ်ခေါက်လုပ်ပါ
@@ -4901,7 +4905,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,batch:
 DocType: Volunteer,Afternoon,မှနျးလှဲ
 DocType: Loyalty Program,Loyalty Program Help,သစ္စာရှိမှုအစီအစဉ်အကူအညီ
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} {1} &#39;&#39; ပိတ်ထားတယ်
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} {1} &#39;&#39; ပိတ်ထားတယ်
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ပွင့်လင်းအဖြစ် Set
 DocType: Cheque Print Template,Scanned Cheque,Scan Cheque တစ်စောင်လျှင်
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,မ့အရောင်းအပေါ်ဆက်သွယ်ရန်မှအလိုအလျှောက်အီးမေးလ်များကိုပေးပို့ပါ။
@@ -4914,7 +4918,7 @@
 DocType: Warranty Claim,Item and Warranty Details,item နှင့်အာမခံအသေးစိတ်
 DocType: Chapter,Chapter Members,အခနျးင်များ
 DocType: Sales Team,Contribution (%),contribution (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,မှတ်ချက်: &#39;&#39; ငွေသို့မဟုတ်ဘဏ်မှအကောင့် &#39;&#39; သတ်မှတ်ထားသောမဟုတ်ခဲ့ကတည်းကငွေပေးချေမှုရမည့် Entry နေသူများကဖန်တီးမည်မဟုတ်
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,မှတ်ချက်: &#39;&#39; ငွေသို့မဟုတ်ဘဏ်မှအကောင့် &#39;&#39; သတ်မှတ်ထားသောမဟုတ်ခဲ့ကတည်းကငွေပေးချေမှုရမည့် Entry နေသူများကဖန်တီးမည်မဟုတ်
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,စီမံကိန်း {0} ပြီးသားတည်ရှိ
 DocType: Clinical Procedure,Nursing User,သူနာပြုအသုံးပြုသူ
 DocType: Employee Benefit Application,Payroll Period,လုပ်ခလစာကာလ
@@ -4922,6 +4926,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},serial ဘယ်သူမျှမက {0} အသုတ်လိုက်မှ {1} ပိုင်ပါဘူး
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,တာဝန်ဝတ္တရားများ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,ဒီ quotation အများ၏တရားဝင်မှုကာလအဆုံးသတ်ခဲ့သည်။
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","အဆိုပါထမ်း delete ကျေးဇူးပြု. <a href=""#Form/Employee/{0}"">{0}</a> ဤစာရွက်စာတမ်းဖျက်သိမ်းရန် \"
 DocType: Expense Claim Account,Expense Claim Account,စရိတ်တိုင်ကြားအကောင့်
 DocType: Account,Capital Work in Progress,တိုးတက်မှုအတွက်မြို့တော်သူ Work
 DocType: Accounts Settings,Allow Stale Exchange Rates,ဟောင်းနွမ်းငွေလဲနှုန်း Allow
@@ -5003,7 +5009,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,ပြဿနာပစ္စည်း
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,ERPNext နှင့်အတူ Shopify ချိတ်ဆက်ပါ
 DocType: Material Request Item,For Warehouse,ဂိုဒေါင်အကြောင်းမူကား
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Delivery မှတ်စုများ {0} updated
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Delivery မှတ်စုများ {0} updated
 DocType: Employee,Offer Date,ကမ်းလှမ်းမှုကိုနေ့စွဲ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,ကိုးကား
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,သငျသညျအော့ဖ်လိုင်း mode မှာရှိပါတယ်။ သငျသညျကှနျယရှိသည်သည်အထိသင်ပြန်ဖွင့်နိုင်ပါလိမ့်မည်မဟုတ်။
@@ -5054,7 +5060,7 @@
 DocType: Shipping Rule,Calculate Based On,အခြေတွင်တွက်ချက်
 DocType: Contract,Unfulfilled,ညျ့စုံ
 DocType: Delivery Note Item,From Warehouse,ဂိုဒေါင်ထဲကနေ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,အဆိုပါဖော်ပြခဲ့တဲ့စံအဘို့အဘယ်သူမျှမကန်ထမ်း
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,အဆိုပါဖော်ပြခဲ့တဲ့စံအဘို့အဘယ်သူမျှမကန်ထမ်း
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,ထုတ်လုပ်ခြင်းမှပစ္စည်းများ၏ဘီလ်နှင့်အတူပစ္စည်းများအဘယ်သူမျှမ
 DocType: Shopify Settings,Default Customer,default ဖောက်သည်
 DocType: Sales Stage,Stage Name,ဇာတ်စင်အမည်
@@ -5097,7 +5103,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,လျှော့ငွေပမာဏပြီးနောက်အခွန်ပမာဏ
 DocType: Patient,Inpatient Status,အတွင်းလူနာအခြေအနေ
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Daily သတင်းစာလုပ်ငန်းခွင်အနှစ်ချုပ်က Settings
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Selected စျေးစာရင်း check လုပ်ထားလယ်ကွင်းဝယ်ယူရောင်းချခြင်းကြသင့်ပါတယ်။
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Selected စျေးစာရင်း check လုပ်ထားလယ်ကွင်းဝယ်ယူရောင်းချခြင်းကြသင့်ပါတယ်။
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,နေ့စွဲခြင်းဖြင့် Reqd ရိုက်ထည့်ပေးပါ
 DocType: Payment Entry,Internal Transfer,ပြည်တွင်းလွှဲပြောင်း
 DocType: Asset Maintenance,Maintenance Tasks,ကို Maintenance လုပ်ငန်းများ
@@ -5134,7 +5140,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Group မှဖြင့်
 DocType: Guardian,Interests,စိတ်ဝင်စားမှုများ
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Enable / ငွေကြေးများ disable ။
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,တချို့လစာစလစ်တင်သွင်းလို့မရပါ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,တချို့လစာစလစ်တင်သွင်းလို့မရပါ
 DocType: Exchange Rate Revaluation,Get Entries,Entries get
 DocType: Production Plan,Get Material Request,ပစ္စည်းတောင်းဆိုမှု Get
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,စာတိုက်အသုံးစရိတ်များ
@@ -5221,7 +5227,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},စရိတ် account item ကို {0} သည်မသင်မနေရ
 DocType: BOM,Website Description,website ဖော်ပြချက်များ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Equity အတွက်ပိုက်ကွန်ကိုပြောင်းရန်
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,ပထမဦးဆုံးဝယ်ယူငွေတောင်းခံလွှာ {0} ဖျက်သိမ်းပေးပါ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,ပထမဦးဆုံးဝယ်ယူငွေတောင်းခံလွှာ {0} ဖျက်သိမ်းပေးပါ
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,အခွင့်မရှိကြ။ အဆိုပါဝန်ဆောင်မှုယူနစ်အမျိုးအစားကို disable ကျေးဇူးပြု.
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Email လိပ်စာထူးခြားတဲ့သူဖြစ်ရမည်, ပြီးသား {0} များအတွက်တည်ရှိ"
 DocType: Serial No,AMC Expiry Date,AMC သက်တမ်းကုန်ဆုံးသည့်ရက်စွဲ
@@ -5261,7 +5267,7 @@
 DocType: Hotel Room,Hotel Room,ဟိုတယ်အခန်း
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},အကောင့်ကို {0} ကုမ္ပဏီ {1} ပိုင်ပါဘူး
 DocType: Leave Type,Rounding,ရှာနိုင်ပါတယ်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,အတန်းအတွက် serial နံပါတ် {0} Delivery မှတ်ချက်နှင့်အတူမကိုက်ညီ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,အတန်းအတွက် serial နံပါတ် {0} Delivery မှတ်ချက်နှင့်အတူမကိုက်ညီ
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),ထုတ်ပေးငွေပမာဏ (Pro ကို-rated)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","ထိုအခါရောင်းစျေးသတ်မှတ်စည်းကမ်းများဖောက်သည်, ဖောက်သည်အုပ်စု, နယ်မြေတွေကို, ပေးသွင်း, ပေးသွင်း Group ကကင်ပိန်း, etc အရောင်း Partner အပေါ်အခြေခံပြီးထုတ် filtered နေကြတယ်"
 DocType: Student,Guardian Details,ဂါးဒီးယန်းအသေးစိတ်
@@ -5316,7 +5322,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},စတော့ရှယ်ယာ Item {0} လိုအပ်ဂိုဒေါင်
 DocType: Leave Allocation,Unused leaves,အသုံးမပြုသောအရွက်
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,ပြန်ဆပ် Entry &#39;Make
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,အားလုံးဌာန
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,အားလုံးဌာန
 DocType: Healthcare Service Unit,Vacant,လစ်လပ်သော
 DocType: Patient,Alcohol Past Use,အရက်အတိတ်မှအသုံးပြုခြင်း
 DocType: Fertilizer Content,Fertilizer Content,ဓာတ်မြေသြဇာအကြောင်းအရာ
@@ -5327,7 +5333,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,အလုပ်အမိန့် {0} ဤအရောင်းအမိန့်ပယ်ဖျက်မတိုင်မီဖျက်သိမ်းရပါမည်
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),(Sub-အသင်းတော်များအပါအဝင်) ပေါက်ကွဲခဲ့ BOM Fetch
 DocType: Authorization Rule,Applicable To (Employee),(န်ထမ်း) ရန်သက်ဆိုင်သော
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,ကြောင့်နေ့စွဲမသင်မနေရ
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,ကြောင့်နေ့စွဲမသင်မနေရ
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Attribute {0} ပါ 0 င်မဖွစျနိုငျဘို့ increment
 DocType: Employee Benefit Claim,Benefit Type and Amount,အကျိုးခံစားခွင့်အမျိုးအစားနှင့်ပမာဏ
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,ကြိုတင်ဘွတ်ကင်အခန်းပေါင်း
@@ -5476,7 +5482,7 @@
 DocType: Purchase Invoice Item,Total Weight,စုစုပေါင်းအလေးချိန်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,အရောင်းအပေါ်ကော်မရှင်
 DocType: Job Offer Term,Value / Description,Value တစ်ခု / ဖော်ပြချက်များ
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","အတန်း # {0}: ပိုင်ဆိုင်မှု {1} တင်သွင်းမရနိုငျ, က {2} ပြီးသားဖြစ်ပါတယ်"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","အတန်း # {0}: ပိုင်ဆိုင်မှု {1} တင်သွင်းမရနိုငျ, က {2} ပြီးသားဖြစ်ပါတယ်"
 DocType: Tax Rule,Billing Country,ငွေတောင်းခံနိုင်ငံ
 DocType: Purchase Order Item,Expected Delivery Date,မျှော်လင့်ထားသည့် Delivery Date ကို
 DocType: Restaurant Order Entry,Restaurant Order Entry,စားသောက်ဆိုင်အမိန့် Entry &#39;
@@ -5515,12 +5521,13 @@
 DocType: Maintenance Visit,Breakdown,ပျက်သည်
 DocType: Travel Itinerary,Vegetarian,သတ်သတ်လွတ်
 DocType: Patient Encounter,Encounter Date,တှေ့ဆုံနေ့စွဲ
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,အကောင့်ဖွင်: {0} ငွေကြေးနှင့်အတူ: {1} ကိုရှေးခယျြမရနိုငျ
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,အကောင့်ဖွင်: {0} ငွေကြေးနှင့်အတူ: {1} ကိုရှေးခယျြမရနိုငျ
 DocType: Bank Statement Transaction Settings Item,Bank Data,ဘဏ်ဒေတာများ
 DocType: Purchase Receipt Item,Sample Quantity,နမူနာအရေအတွက်
 DocType: Bank Guarantee,Name of Beneficiary,အကျိုးခံစားအမည်
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Update ကို BOM နောက်ဆုံးပေါ်အဘိုးပြတ်မှုနှုန်း / စျေးနှုန်းစာရင်းနှုန်းသည် / ကုန်ကြမ်း၏နောက်ဆုံးဝယ်ယူမှုနှုန်းအပေါ်အခြေခံပြီး, Scheduler ကိုမှတဆင့်အလိုအလျှောက်ကုန်ကျခဲ့ပါတယ်။"
 DocType: Supplier,SUP-.YYYY.-,sup-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,ပေးသွင်း&gt; ပေးသွင်း Group မှ
 DocType: Bank Reconciliation Detail,Cheque Date,Cheques နေ့စွဲ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},အကောင့်ကို {0}: မိဘအကောင့်ကို {1} ကုမ္ပဏီပိုင်ပါဘူး: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,အောင်မြင်စွာဒီကုမ္ပဏီနှင့်ဆက်စပ်သောအားလုံးအရောင်းအဖျက်ပြီး!
@@ -5548,7 +5555,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,ကလေး node များသာ &#39;&#39; Group မှ &#39;&#39; type ကို node များအောက်တွင်ဖန်တီးနိုင်ပါတယ်
 DocType: Attendance Request,Half Day Date,ဝက်နေ့နေ့စွဲ
 DocType: Academic Year,Academic Year Name,ပညာသင်နှစ်တစ်နှစ်တာအမည်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} {1} နှင့်အတူစတင်မည်ခွင့်မပြု။ ကုမ္ပဏီပြောင်းပါ။
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} {1} နှင့်အတူစတင်မည်ခွင့်မပြု။ ကုမ္ပဏီပြောင်းပါ။
 DocType: Sales Partner,Contact Desc,ဆက်သွယ်ရန် Desc
 DocType: Email Digest,Send regular summary reports via Email.,အီးမေးလ်ကနေတဆင့်ပုံမှန်အကျဉ်းချုပ်အစီရင်ခံစာပေးပို့ပါ။
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},သုံးစွဲမှုအရေးဆိုသောအမျိုးအစား {0} အတွက် default အနေနဲ့အကောင့်သတ်မှတ်ထားပေးပါ
@@ -5581,7 +5588,7 @@
 DocType: Hotel Room,Hotel Manager,ဟိုတယ်မန်နေဂျာ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,စျေးဝယ်လှည်းများအတွက်အခွန်နည်းဥပဒေ Set
 DocType: Purchase Invoice,Taxes and Charges Added,အခွန်နှင့်စွပ်စွဲချက် Added
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,တန်ဖိုးလျော့ Row {0}: Next ကိုတန်ဖိုးနေ့စွဲရှိနိုင်-for-အသုံးပြုမှုနေ့စွဲမတိုင်မီမဖွစျနိုငျ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,တန်ဖိုးလျော့ Row {0}: Next ကိုတန်ဖိုးနေ့စွဲရှိနိုင်-for-အသုံးပြုမှုနေ့စွဲမတိုင်မီမဖွစျနိုငျ
 ,Sales Funnel,အရောင်းကတော့
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,အတိုကောက်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Project,Task Progress,task ကိုတိုးတက်ရေးပါတီ
@@ -5595,7 +5602,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,အားလုံးသည်ဖောက်သည်အဖွဲ့များ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,လစဉ်စုဆောင်း
 DocType: Attendance Request,On Duty,Duty တွင်
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} မဖြစ်မနေဖြစ်ပါတယ်။ ဖြစ်ရင်ငွေကြေးစနစ်ချိန်းစံချိန် {1} {2} မှဖန်တီးသည်မဟုတ်။
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} မဖြစ်မနေဖြစ်ပါတယ်။ ဖြစ်ရင်ငွေကြေးစနစ်ချိန်းစံချိန် {1} {2} မှဖန်တီးသည်မဟုတ်။
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},ဝန်ထမ်းများအစီအစဉ် {0} ပြီးသားသတ်မှတ်ရေး {1} များအတွက်တည်ရှိ
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,အခွန် Template ကိုမဖြစ်မနေဖြစ်ပါတယ်။
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,အကောင့်ကို {0}: မိဘအကောင့်ကို {1} မတည်ရှိပါဘူး
@@ -5675,11 +5682,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Atleast တယောက်ဂိုဒေါင်မသင်မနေရ
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","UOM, Item Group မှ, ဖော်ပြချက်များနှင့်နာရီ၏အဘယ်သူမျှမများကဲ့သို့အရာဝတ္ထု Fields ပြုပြင်မည်။"
 DocType: Certification Application,Certification Status,လက်မှတ်အခြေအနေ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Marketplace
 DocType: Travel Itinerary,Travel Advance Required,ခရီးသွားကြိုတင်လိုအပ်ပါသည်
 DocType: Subscriber,Subscriber Name,စာရင်းပေးသွင်းသူအမည်
 DocType: Serial No,Out of Warranty,အာမခံထဲက
-DocType: Cashier Closing,Cashier-closing-,ငွေကိုင်-closing-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,မြေပုံနှင့်ညှိထားသောဒေတာအမျိုးအစား
 DocType: BOM Update Tool,Replace,အစားထိုးဖို့
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,အဘယ်သူမျှမထုတ်ကုန်တွေ့ရှိခဲ့ပါတယ်။
@@ -5767,7 +5773,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,အရောင်းနှင့်ဝယ်ယူဘို့ default အခွန်တင်းပလိတ်များဖန်တီးနေကြသည်။
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,အကဲဖြတ်ရလဒ်စံချိန် {0} ရှိပြီးဖြစ်သည်။
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","ဥပမာ: ABCD ##### ။ ။ စီးရီးသတ်မှတ်နှင့်အသုတ်လိုက်အဘယ်သူမျှမငွေကြေးလွှဲပြောင်းမှုမှာဖော်ပြခဲ့တဲ့သည်မဟုတ်, ထို့နောက်အလိုအလျှောက်အသုတ်အရေအတွက်ကဒီစီးရီးအပေါ်အခြေခံပြီးဖန်တီးလိမ့်မည်။ အကယ်. သင်အမြဲအတိအလင်းဤအရာအတွက်အဘယ်သူမျှမဘတ်ချ်ဖော်ပြထားခြင်းချင်လျှင်, ဤအလွတ်ထားခဲ့ပါ။ မှတ်ချက်: ဒီ setting ကိုစတော့အိတ်ချိန်ညှိမှုများအတွက်အမည်ဖြင့်သမုတ်စီးရီးရှေ့စာလုံးကျော်ဦးစားပေးကိုယူပါလိမ့်မယ်။"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ကျေးဇူးပြု. Setup ကို&gt; နံပါတ်စီးရီးကနေတစ်ဆင့်တက်ရောက်ဘို့ setup ကိုစာရငျးစီးရီး
 DocType: BOM,Materials Required (Exploded),လိုအပ်သောပစ္စည်းများ (ပေါက်ကွဲ)
 DocType: Contract,Party User,ပါတီအသုံးပြုသူ
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',အုပ်စုအားဖြင့် &#39;&#39; ကုမ္ပဏီ &#39;&#39; လျှင်အလွတ် filter ကုမ္ပဏီသတ်မှတ်ပေးပါ
@@ -5970,7 +5975,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp အရေအတွက်
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,စမ်းသပ်ကာလကို Start နေ့စွဲနှင့်စမ်းသပ်ကာလပြီးဆုံးရက်စွဲကိုသတ်မှတ်ရမည်ဖြစ်သည်နှစ်ဦးစလုံး
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,ပျမ်းမျှနှုန်း
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ငွေပေးချေမှုရမည့်ဇယားများတွင်စုစုပေါင်းငွေပေးချေမှုရမည့်ငွေပမာဏက Grand / Rounded စုစုပေါင်းညီမျှရှိရမည်
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ငွေပေးချေမှုရမည့်ဇယားများတွင်စုစုပေါင်းငွေပေးချေမှုရမည့်ငွေပမာဏက Grand / Rounded စုစုပေါင်းညီမျှရှိရမည်
 DocType: Subscription Plan Detail,Plan,စီမံကိန်း
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,အထွေထွေလယ်ဂျာနှုန်းအဖြစ် Bank မှဖော်ပြချက်ချိန်ခွင်လျှာ
 DocType: Job Applicant,Applicant Name,လျှောက်ထားသူအမည်
@@ -6039,7 +6044,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,ဆပ်ပြာ &amp; ဆပ်ပြာ
 DocType: BOM,Show Items,Show ကိုပစ္စည်းများ
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,အခြိနျမှနျမှထက် သာ. ကြီးမြတ်မဖြစ်နိုင်ပါ။
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,သငျသညျအီးမေးလ်ဖြင့်လူအပေါင်းတို့သည်ဖောက်သည်အကြောင်းကြားချင်ပါသလား?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,သငျသညျအီးမေးလ်ဖြင့်လူအပေါင်းတို့သည်ဖောက်သည်အကြောင်းကြားချင်ပါသလား?
 DocType: Subscription Plan,Billing Interval,ငွေတောင်းခံ Interval သည်
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; ဗီဒီယို
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,အမိန့်ထုတ်
@@ -6048,9 +6053,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,အတန်း {0}: {1} 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 DocType: Assessment Criteria,Assessment Criteria Group,အကဲဖြတ်လိုအပ်ချက် Group မှ
 DocType: Healthcare Settings,Patient Name By,အားဖြင့်လူနာအမည်
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},{0} {1} မှလစာများအတွက်တိုးပွားလာသောဂျာနယ် Entry &#39;
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},{0} {1} မှလစာများအတွက်တိုးပွားလာသောဂျာနယ် Entry &#39;
 DocType: Sales Invoice Item,Enable Deferred Revenue,ရွှေ့ဆိုင်းအခွန်ဝန်ကြီးဌာန Enable
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},စုဆောင်းတန်ဖိုးဖွင့်လှစ် {0} ညီမျှထက်လျော့နည်းဖြစ်ရပါမည်
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},စုဆောင်းတန်ဖိုးဖွင့်လှစ် {0} ညီမျှထက်လျော့နည်းဖြစ်ရပါမည်
 DocType: Warehouse,Warehouse Name,ဂိုဒေါင်အမည်
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,အမှန်တကယ်စတင်နေ့စွဲအမှန်တကယ်အဆုံးသည့်ရက်စွဲထက်လျော့နည်းဖြစ်ရမည်
 DocType: Naming Series,Select Transaction,Transaction ကိုရွေးပါ
@@ -6202,7 +6207,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,တန်း၏ဝန်ထမ်း {0} {1} မျှမက default ခွင့်မူဝါဒအရှိ
 DocType: Salary Detail,Salary Detail,လစာ Detail
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,ပထမဦးဆုံး {0} ကို select ကျေးဇူးပြု.
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Added {0} အသုံးပြုသူများသည်
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Added {0} အသုံးပြုသူများသည်
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","Multi-tier အစီအစဉ်၏အမှု၌, Customer များအလိုအလျောက်သူတို့ရဲ့သုံးစွဲနှုန်းအတိုင်းစိုးရိမ်ပူပန်ဆင့်မှတာဝန်ပေးအပ်ပါလိမ့်မည်"
 DocType: Appointment Type,Physician,ဆရာဝန်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,batch {0} Item ၏ {1} သက်တမ်းကုန်ဆုံးခဲ့သည်။
@@ -6347,7 +6352,7 @@
 DocType: Asset,Custodian,အုပ်ထိန်းသူ
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,point-of-Sale ကိုယ်ရေးအချက်အလက်များ profile
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} 0 င် 100 ကြားတန်ဖိုးတစ်ခုဖြစ်သင့်တယ်
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},{2} မှ {1} ကနေ {0} ၏ငွေပေးချေမှုရမည့်
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},{2} မှ {1} ကနေ {0} ၏ငွေပေးချေမှုရမည့်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,မလုံခြုံချေးငွေ
 DocType: Cost Center,Cost Center Name,ကုန်ကျ Center ကအမည်
 DocType: Student,B+,B +
@@ -6379,6 +6384,7 @@
 DocType: Employee,Date of Issue,ထုတ်ဝေသည့်ရက်စွဲ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","အဆိုပါဝယ်ချိန်ညှိမှုများနှုန်းအဖြစ်ဝယ်ယူ Reciept လိုအပ်ပါသည် == &#39;&#39; ဟုတ်ကဲ့ &#39;&#39;, ထို့နောက်အရစ်ကျငွေတောင်းခံလွှာအတွက်, အသုံးပြုသူကို item {0} များအတွက်ပထမဦးဆုံးဝယ်ယူငွေလက်ခံပြေစာကိုဖန်တီးရန်လိုအပ်တယ်ဆိုရင်"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},row # {0}: ကို item များအတွက် Set ပေးသွင်း {1}
+DocType: Global Defaults,Default Distance Unit,default အဝေးသင်ယူနစ်
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,အတန်း {0}: နာရီတန်ဖိုးကိုသုညထက်ကြီးမြတ်ဖြစ်ရပါမည်။
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,website က Image ကို {0} ပစ္စည်းမှပူးတွဲပါ {1} မတွေ့ရှိနိုင်
 DocType: Issue,Content Type,content Type
@@ -6434,7 +6440,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,အကောင့်ကိုရန် debit တစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
 DocType: Asset,Naming Series,စီးရီးအမည်
 DocType: Vital Signs,Coated,ကုတ်အင်္ကျီ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,အတန်း {0}: အသုံးဝင်သောဘဝပြီးနောက်မျှော်မှန်းတန်ဖိုးစုစုပေါင်းအရစ်ကျငွေပမာဏထက်လျော့နည်းဖြစ်ရမည်
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,အတန်း {0}: အသုံးဝင်သောဘဝပြီးနောက်မျှော်မှန်းတန်ဖိုးစုစုပေါင်းအရစ်ကျငွေပမာဏထက်လျော့နည်းဖြစ်ရမည်
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Settings များ
 DocType: Leave Block List,Leave Block List Name,Block List ကိုအမည် Leave
 DocType: Certified Consultant,Certification Validity,လက်မှတ်သက်တမ်း
@@ -6503,6 +6509,7 @@
 DocType: Bank Statement Settings Item,Bank Header,ဘဏ် Header ကို
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,ကြည့်ရန် Lab မှစမ်းသပ်မှု
 DocType: Hub Users,Hub Users,hub အသုံးပြုသူများ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ဖောက်သည်&gt; ဖောက်သည် Group မှ&gt; နယ်မြေတွေကို
 DocType: Purchase Invoice,Y,Y က
 DocType: Maintenance Visit,Maintenance Date,ပြုပြင်ထိန်းသိမ်းမှုနေ့စွဲ
 DocType: Purchase Invoice Item,Rejected Serial No,ပယ်ချ Serial No
@@ -6517,7 +6524,7 @@
 DocType: SG Creation Tool Course,Max Strength,မက်စ်အစွမ်းသတ္တိ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,ရလာဒ်ကဒိ Installing
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU တွင်-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},ဖောက်သည်များအတွက်မရွေး Delivery မှတ်ချက် {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},ဖောက်သည်များအတွက်မရွေး Delivery မှတ်ချက် {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,ဝန်ထမ်း {0} မျှအကျိုးအမြတ်အများဆုံးပမာဏကိုရှိပါတယ်
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Delivery နေ့စွဲအပေါ်အခြေခံပြီးပစ္စည်းများကို Select လုပ်ပါ
 DocType: Grant Application,Has any past Grant Record,မည်သည့်အတိတ် Grant ကစံချိန်တင်ထားပါတယ်
@@ -6545,7 +6552,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,ဟိုတယ်အခန်းကြိုတင်မှာယူမှု
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,ဧည့်ဝန်ဆောင်မှု
 DocType: BOM,Thumbnail,thumbnail
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,အီးမေးလ်က၏ ID နှင့်အတူအဆက်အသွယ်မတွေ့ပါ။
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,အီးမေးလ်က၏ ID နှင့်အတူအဆက်အသွယ်မတွေ့ပါ။
 DocType: Item Customer Detail,Item Customer Detail,item ဖောက်သည် Detail
 DocType: Notification Control,Prompt for Email on Submission of,၏လကျအောကျခံအပေါ်အီးမေးလ်သည် Prompt ကို
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},ဝန်ထမ်းအများဆုံးအကျိုးရှိငွေပမာဏ {0} {1} ထက်ကျော်လွန်
@@ -6806,7 +6813,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,Account Type ကိုရွေးချယ်သောကွောငျ့ Group ကမှရောက်မှလုံခြုံနိုင်ဘူး။
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} modified သိရသည်။ refresh ပေးပါ။
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,အောက်ပါရက်ထွက်ခွာ Applications ကိုအောင်ကနေအသုံးပြုသူများကိုရပ်တန့်။
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,item Code ကို&gt; item Group မှ&gt; အမှတ်တံဆိပ်
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.",အဆိုပါသစ္စာရှိမှုအမှတ်အဘို့အလိုလျှင်န့်အသတ်သက်တမ်းကုန်ဆုံးချည်းသို့မဟုတ် 0 Expiry Duration: စောင့်ရှောက်လော့။
 DocType: Asset Maintenance Team,Maintenance Team Members,ကို Maintenance အဖွဲ့အဖွဲ့ဝင်များ
 DocType: Loyalty Point Entry,Purchase Amount,အရစ်ကျငွေပမာဏ
@@ -6814,7 +6820,7 @@
 											to fullfill Sales Order {2}",အရောင်းအမိန့် {2} fullfill မှ \ ကို item {1} က reserved ဖြစ်ပါတယ်အဖြစ်၏ {0} Serial အဘယ်သူမျှမကယ်မနှုတ်နိုင်မလား
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,ပေးသွင်းစျေးနှုန်း {0} ကဖန်တီး
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,အဆုံးတစ်နှစ်တာ Start ကိုတစ်နှစ်တာမတိုင်မီမဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,အဆုံးတစ်နှစ်တာ Start ကိုတစ်နှစ်တာမတိုင်မီမဖွစျနိုငျ
 DocType: Employee Benefit Application,Employee Benefits,ဝန်ထမ်းအကျိုးကျေးဇူးများ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},ထုပ်ပိုးအရေအတွက်အတန်း {1} အတွက် Item {0} သည်အရေအတွက်တူညီရမယ်
 DocType: Work Order,Manufactured Qty,ထုတ်လုပ်သော Qty
@@ -6830,6 +6836,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,ကို Select လုပ်ပါအသုတ်လိုက်နံပါတ်များ
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,GSTIN မှ
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Customer များကြီးပြင်းဥပဒေကြမ်းများ။
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,လူ့စွမ်းအားအရင်းအမြစ်အတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုထမ်း&gt; HR က Settings
 DocType: Healthcare Settings,Invoice Appointments Automatically,အလိုအလျောက်ငွေတောင်းခံလွှာချိန်း
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,စီမံကိန်း Id
 DocType: Salary Component,Variable Based On Taxable Salary,Taxable လစာတွင် အခြေခံ. variable
@@ -6878,7 +6885,7 @@
 DocType: POS Profile,Account for Change Amount,ပြောင်းလဲမှုပမာဏအဘို့အကောင့်
 DocType: QuickBooks Migrator,Connecting to QuickBooks,QuickBooks ချိတ်ဆက်ခြင်း
 DocType: Exchange Rate Revaluation,Total Gain/Loss,စုစုပေါင်း Gain / ပျောက်ဆုံးခြင်း
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,အင်တာမီလန်ကုမ္ပဏီပြေစာများအတွက်မှားနေသောကုမ္ပဏီ။
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,အင်တာမီလန်ကုမ္ပဏီပြေစာများအတွက်မှားနေသောကုမ္ပဏီ။
 DocType: Purchase Invoice,input service,input ကိုဝန်ဆောင်မှု
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},row {0}: ပါတီ / အကောင့်ကို {3} {4} အတွက် {1} / {2} နှင့်ကိုက်ညီမပါဘူး
 DocType: Employee Promotion,Employee Promotion,ဝန်ထမ်းမြှင့်တင်ရေး
@@ -7009,7 +7016,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,တည်းခိုခန်းများအတွက်ဦးစားပေးဧရိယာ
 apps/erpnext/erpnext/config/selling.py +184,Analytics,analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,လှည်း Empty ဖြစ်ပါသည်
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,ပညာရေးအတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုနည်းပြ&gt; ပညာရေးကိုဆက်တင်
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No","item {0} မရှိ, Serial နံပါတ်သာလျှင်ပစ္စည်းများကို serilialized ထားပါတယ် \ Serial အဘယ်သူမျှမပေါ်တွင် အခြေခံ. ပေးအပ်ခြင်းရှိနိုင်ပါသည်"
 DocType: Vehicle,Model,ပုံစံ
@@ -7039,7 +7045,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,ပြောင်းလဲပစ်ရန်အဘယ်အရာကိုမျှ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,တစ် CSV ဖိုင်ကိုရွေးပေးပါ
 DocType: Holiday List,Total Holidays,စုစုပေါင်းအားလပ်ရက်
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,dispatch အတွက်အီးမေးလ် template ကိုပျောက်ဆုံးနေတဲ့။ Delivery ချိန်ညှိမှုများအတွက်တဦးတည်းသတ်မှတ်ပါ။
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,dispatch အတွက်အီးမေးလ် template ကိုပျောက်ဆုံးနေတဲ့။ Delivery ချိန်ညှိမှုများအတွက်တဦးတည်းသတ်မှတ်ပါ။
 DocType: Student Leave Application,Mark as Present,"လက်ရှိအဖြစ်, Mark"
 DocType: Supplier Scorecard,Indicator Color,indicator အရောင်
 DocType: Purchase Order,To Receive and Bill,လက်ခံနှင့်ဘီလ်မှ
@@ -7048,7 +7054,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Serial အဘယ်သူမျှမကို Select လုပ်ပါ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,ပုံစံရေးဆှဲသူ
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,စည်းကမ်းသတ်မှတ်ချက်များ Template:
-DocType: Serial No,Delivery Details,Delivery အသေးစိတ်ကို
+DocType: Delivery Trip,Delivery Details,Delivery အသေးစိတ်ကို
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},ကုန်ကျစရိတ် Center ကအမျိုးအစား {1} သည်အခွန် table ထဲမှာအတန်း {0} အတွက်လိုအပ်သည်
 DocType: Program,Program Code,Program ကို Code ကို
 DocType: Terms and Conditions,Terms and Conditions Help,စည်းကမ်းသတ်မှတ်ချက်များအကူအညီ
@@ -7072,7 +7078,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ခဲအချိန် Days
 DocType: Cash Flow Mapping,Is Income Tax Expense,ဝင်ငွေခွန်စျေးကြီးသည်
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,သင့်ရဲ့အမိန့်ပေးပို့ထွက်ပါ!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ပိုင်ဆိုင်မှု၏ CV ကိုနေ့စွဲဝယ်ယူနေ့စွဲအဖြစ်အတူတူပင်ဖြစ်ရပါမည် {1} {2}: row # {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ပိုင်ဆိုင်မှု၏ CV ကိုနေ့စွဲဝယ်ယူနေ့စွဲအဖြစ်အတူတူပင်ဖြစ်ရပါမည် {1} {2}: row # {0}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,ကျောင်းသားသမဂ္ဂဟာအင်စတီကျုရဲ့ဘော်ဒါဆောင်မှာနေထိုင်လျှင်ဒီစစ်ဆေးပါ။
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,အထက်ပါဇယားတွင်အရောင်းအမိန့်ကိုထည့်သွင်းပါ
 ,Stock Summary,စတော့အိတ်အကျဉ်းချုပ်
diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index a0b4571..0364564 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Periode Naam
 DocType: Employee,Salary Mode,Salaris Modus
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Registreren
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Registreren
 DocType: Patient,Divorced,Gescheiden
 DocType: Support Settings,Post Route Key,Post Routesleutel
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Toestaan Item om meerdere keren in een transactie worden toegevoegd
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Nieuwe wisselkoers
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Munt is nodig voor prijslijst {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Zal worden berekend in de transactie.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Leverancier&gt; leverancier type
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Contactpersoon Klant
 DocType: Patient Appointment,Check availability,Beschikbaarheid controleren
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Toon geopend
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Reeks succesvol bijgewerkt
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Uitchecken
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} in rij {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} in rij {1}
 DocType: Asset Finance Book,Depreciation Start Date,Startdatum afschrijving
 DocType: Pricing Rule,Apply On,toepassing op
 DocType: Item Price,Multiple Item prices.,Meerdere Artikelprijzen .
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Lab Prescription
 ,Delay Days,Vertragingen dagen
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,dienst Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} is reeds verwezen in de verkoopfactuur: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} is reeds verwezen in de verkoopfactuur: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Factuur
 DocType: Purchase Invoice Item,Item Weight Details,Item Gewicht Details
 DocType: Asset Maintenance Log,Periodicity,Periodiciteit
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Accountant
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Verkoopprijslijst
 DocType: Patient,Tobacco Current Use,Tabaksgebruik
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Begindatum en einddatum overlappen met de opdrachtkaart <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Verkoopcijfers
 DocType: Cost Center,Stock User,Aandeel Gebruiker
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Verwant
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Aanwezigheid datum kan niet lager zijn dan het samenvoegen van de datum werknemer zijn
 DocType: Grading Scale,Grading Scale Name,Grading Scale Naam
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Gebruikers toevoegen aan Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Gebruikers toevoegen aan Marketplace
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Dit is een basisrekening en kan niet worden bewerkt.
 DocType: Sales Invoice,Company Address,bedrijfsadres
 DocType: BOM,Operations,Bewerkingen
@@ -322,7 +322,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff
 DocType: Production Plan,Material Request Detail,Materiaal Verzoek Detail
 DocType: Selling Settings,Default Quotation Validity Days,Standaard prijsofferte dagen
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om Belastingen op te nemen in het Artikeltarief in rij {0}, moeten de belastingen in rijen {1} ook worden opgenomen"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om Belastingen op te nemen in het Artikeltarief in rij {0}, moeten de belastingen in rijen {1} ook worden opgenomen"
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Payroll Entry,Validate Attendance,Bevestig aanwezigheid
 DocType: Sales Invoice,Change Amount,Change Bedrag
@@ -441,7 +441,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Regelafstand voor het bedrag in woorden
 DocType: Vehicle,Additional Details,Overige gegevens
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Geen beschrijving gegeven
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Leverancier&gt; Leveranciersgroep
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Inkoopaanvraag
 DocType: POS Closing Voucher Details,Collected Amount,Verzameld bedrag
 DocType: Lab Test,Submitted Date,Datum indienen
@@ -486,7 +485,7 @@
 DocType: Student Admission,Student Admission,student Toelating
 ,Terretory,Regio
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Artikel {0} is geannuleerd
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Afschrijving Rij {0}: Startdatum afschrijving wordt ingevoerd als de vorige datum
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Afschrijving Rij {0}: Startdatum afschrijving wordt ingevoerd als de vorige datum
 DocType: Contract Template,Fulfilment Terms and Conditions,Fulfilment Algemene voorwaarden
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Materiaal Aanvraag
 DocType: Bank Reconciliation,Update Clearance Date,Werk Clearance Datum bij
@@ -543,6 +542,7 @@
 DocType: Accounts Settings,Settings for Accounts,Instellingen voor accounts
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Leverancier factuur nr bestaat in Purchase Invoice {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Beheer Sales Person Boom .
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Kan route niet verwerken, omdat Google Maps-instellingen is uitgeschakeld."
 DocType: Job Applicant,Cover Letter,Voorblad
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Uitstekende Cheques en Deposito&#39;s te ontruimen
 DocType: Item,Synced With Hub,Gesynchroniseerd met Hub
@@ -602,7 +602,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Nieuwe activawaarde
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Koers waarmee de Klant Valuta wordt omgerekend naar de basisvaluta van de klant.
 DocType: Course Scheduling Tool,Course Scheduling Tool,Course Scheduling Tool
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rij # {0}: Aankoop factuur kan niet worden ingediend tegen een bestaand actief {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rij # {0}: Aankoop factuur kan niet worden ingediend tegen een bestaand actief {1}
 DocType: Crop Cycle,LInked Analysis,Geïntegreerde analyse
 DocType: POS Closing Voucher,POS Closing Voucher,POS-sluitingsbon
 DocType: Contract,Lapsed,verlopen
@@ -637,6 +637,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} is niet ingeschreven in de cursus {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Studenten naam:
 DocType: POS Closing Voucher Details,Difference,Verschil
+DocType: Delivery Settings,Delay between Delivery Stops,Vertraging tussen leveringstops
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serienummer {0} behoort niet tot Vrachtbrief {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Er lijkt een probleem te zijn met de GoCardless-configuratie van de server. Maakt u zich geen zorgen, in het geval van een fout, wordt het bedrag teruggestort op uw account."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -695,7 +696,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Hoeveelheid en Tarief
 DocType: Delivery Note,% Installed,% Geïnstalleerd
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Klaslokalen / Laboratories etc, waar lezingen kunnen worden gepland."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Bedrijfsvaluta&#39;s van beide bedrijven moeten overeenkomen voor Inter Company Transactions.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Bedrijfsvaluta&#39;s van beide bedrijven moeten overeenkomen voor Inter Company Transactions.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Vul aub eerst de naam van het bedrijf in
 DocType: Travel Itinerary,Non-Vegetarian,Niet vegetarisch
 DocType: Purchase Invoice,Supplier Name,Leverancier Naam
@@ -782,7 +783,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Gehuurd vanaf datum
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Genoeg Parts te bouwen
 DocType: POS Profile User,POS Profile User,POS-profielgebruiker
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Rij {0}: startdatum van afschrijving is vereist
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Rij {0}: startdatum van afschrijving is vereist
 DocType: Purchase Invoice Item,Service Start Date,Startdatum van de service
 DocType: Subscription Invoice,Subscription Invoice,Abonnementsfactuur
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Directe Inkomsten
@@ -851,7 +852,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Afkorting al gebruikt voor een ander bedrijf
 DocType: Selling Settings,Default Customer Group,Standaard Klant Groep
 DocType: Employee,IFSC Code,IFSC-code
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Begindatum en einddatum overlappen met de opdrachtkaart <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Indien uitgevinkt, zal het 'Afgerond Totaal' veld niet zichtbaar zijn in een transactie"
 DocType: BOM,Operating Cost,Operationele kosten
 DocType: Crop,Produced Items,Geproduceerde items
@@ -903,7 +903,7 @@
 DocType: Supplier,Prevent RFQs,Voorkom RFQs
 DocType: Hub User,Hub User,Hub-gebruiker
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Maak verkooporder
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Salarisslip ingediend voor een periode van {0} tot {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Salarisslip ingediend voor een periode van {0} tot {1}
 DocType: Project Task,Project Task,Project Task
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Verzilverde punten
 ,Lead Id,Lead Id
@@ -1035,7 +1035,7 @@
 DocType: Fee Validity,Max number of visit,Max. Aantal bezoeken
 ,Hotel Room Occupancy,Hotel Kamer bezetting
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Rooster gemaakt:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Stel een standaard Kas- of Bankrekening in bij Betaalwijze {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Stel een standaard Kas- of Bankrekening in bij Betaalwijze {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Inschrijven
 DocType: GST Settings,GST Settings,GST instellingen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Valuta moet hetzelfde zijn als prijsvaluta: {0}
@@ -1089,7 +1089,7 @@
 DocType: Vehicle Log,Service Details,Service Details
 DocType: Lab Test Template,Grouped,gegroepeerd
 DocType: Selling Settings,Delivery Note Required,Vrachtbrief Verplicht
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Salarisbrieven indienen ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Salarisbrieven indienen ...
 DocType: Bank Guarantee,Bank Guarantee Number,Bankgarantie Nummer
 DocType: Bank Guarantee,Bank Guarantee Number,Bankgarantie Nummer
 DocType: Assessment Criteria,Assessment Criteria,Beoordelingscriteria
@@ -1115,13 +1115,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Betaling Entry is al gemaakt
 DocType: Request for Quotation,Get Suppliers,Krijg leveranciers
 DocType: Purchase Receipt Item Supplied,Current Stock,Huidige voorraad
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Rij # {0}: Asset {1} is niet gekoppeld aan artikel {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Rij # {0}: Asset {1} is niet gekoppeld aan artikel {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Voorbeschouwing loonstrook
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Account {0} is meerdere keren ingevoerd
 DocType: Account,Expenses Included In Valuation,Kosten inbegrepen in waardering
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,U kunt alleen verlengen als uw lidmaatschap binnen 30 dagen verloopt
 DocType: Shopping Cart Settings,Show Stock Availability,Voorraadbeschikbaarheid tonen
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Stel {0} in in activacategorie {1} of bedrijf {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Stel {0} in in activacategorie {1} of bedrijf {2}
 DocType: Location,Longitude,Lengtegraad
 ,Absent Student Report,Studenten afwezigheidsrapport
 DocType: Crop,Crop Spacing UOM,Gewasafstand UOM
@@ -1194,7 +1194,7 @@
 DocType: Soil Texture,Sand,Zand
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Opportuniteit Van
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rij {0}: {1} Serienummers vereist voor item {2}. U heeft {3} verstrekt.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rij {0}: {1} Serienummers vereist voor item {2}. U heeft {3} verstrekt.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Selecteer een tafel
 DocType: BOM,Website Specifications,Website Specificaties
 DocType: Special Test Items,Particulars,bijzonderheden
@@ -1305,7 +1305,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Items met een hogere weightage hoger zal worden getoond
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Lab-tests en vitale functies
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Aflettering Detail
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Rij # {0}: Asset {1} moet worden ingediend
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Rij # {0}: Asset {1} moet worden ingediend
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Geen werknemer gevonden
 DocType: Item,If subcontracted to a vendor,Als uitbesteed aan een leverancier
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentgroep is al bijgewerkt.
@@ -1359,7 +1359,6 @@
 DocType: Loyalty Program Collection,Tier Name,Tiernaam
 DocType: HR Settings,Enter retirement age in years,Voer de pensioengerechtigde leeftijd in jaren
 DocType: Crop,Target Warehouse,Doel Magazijn
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series in voor {0} via Setup&gt; Instellingen&gt; Serie benoemen
 DocType: Payroll Employee Detail,Payroll Employee Detail,Loonwerknemersdetail
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Selecteer een magazijn
 DocType: Cheque Print Template,Starting location from left edge,Startlocatie van linkerrand
@@ -1449,7 +1448,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Plan materiaal voor onderdelen
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Sales Partners en Territory
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,Stuklijst {0} moet actief zijn
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Geen items beschikbaar voor overdracht
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Geen items beschikbaar voor overdracht
 DocType: Employee Boarding Activity,Activity Name,Activiteit naam
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Wijzigingsdatum wijzigen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,De hoeveelheid gereed product <b>{0}</b> en voor Hoeveelheid <b>{1}</b> kunnen niet verschillen
@@ -1678,6 +1677,7 @@
 DocType: Project,First Email,Eerste e-mail
 DocType: Company,Exception Budget Approver Role,Uitzondering Budget Approver Role
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Eenmaal ingesteld, wordt deze factuur in de wacht gezet tot de ingestelde datum"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Gereserveerd Magazijn in Verkooporder / Magazijn Gereed Product
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Selling Bedrag
 DocType: Repayment Schedule,Interest Amount,Interestbedrag
@@ -1689,7 +1689,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,archief
 DocType: Asset,Scrapped,gesloopt
 DocType: Item,Item Defaults,Standaard instellingen
-DocType: Purchase Invoice,Returns,opbrengst
+DocType: Cashier Closing,Returns,opbrengst
 DocType: Job Card,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serienummer {0} valt binnen onderhoudscontract tot {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,Werving
@@ -1703,7 +1703,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Overdrachtstype
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Verkoopkosten
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klant&gt; Klantengroep&gt; Gebied
 DocType: Diagnosis,Diagnosis,Diagnose
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standard kopen
 DocType: Attendance Request,Explanation,Uitleg
@@ -1716,7 +1715,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Inwisselorders worden achterhaald
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Postcode
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Sales Order {0} is {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Selecteer rente-inkomstenrekening in lening {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Selecteer rente-inkomstenrekening in lening {0}
 DocType: Opportunity,Contact Info,Contact Info
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Maken Stock Inzendingen
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Kan werknemer met status links niet promoten
@@ -1728,7 +1727,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,De factuur kan niet worden gemaakt voor uren facturering
 DocType: Company,Date of Commencement,Aanvangsdatum
 DocType: Sales Person,Select company name first.,Kies eerst een bedrijfsnaam.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},E-mail verzonden naar {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},E-mail verzonden naar {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Offertes ontvangen van leveranciers.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Vervang BOM en update de laatste prijs in alle BOM&#39;s
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Naar {0} | {1} {2}
@@ -1749,7 +1748,7 @@
 DocType: Asset Movement,From Employee,Van Medewerker
 DocType: Driver,Cellphone Number,mobiel nummer
 DocType: Project,Monitor Progress,Voortgang in de gaten houden
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Waarschuwing: Het systeem zal niet controleren overbilling sinds bedrag voor post {0} in {1} nul
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Waarschuwing: Het systeem zal niet controleren overbilling sinds bedrag voor post {0} in {1} nul
 DocType: Journal Entry,Make Difference Entry,Maak Verschil Entry
 DocType: Supplier Quotation,Auto Repeat Section,Auto Repeat Section
 DocType: Upload Attendance,Attendance From Date,Aanwezigheid Van Datum
@@ -1852,7 +1851,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Rij # {0}: Afgekeurd Aantal niet in Purchase Return kunnen worden ingevoerd
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Het wijzigen van de klantengroep voor de geselecteerde klant is niet toegestaan.
 ,Purchase Order Items To Be Billed,Inkooporder Artikelen nog te factureren
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Bijwerken geschatte aankomsttijden.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Bijwerken geschatte aankomsttijden.
 DocType: Program Enrollment Tool,Enrollment Details,Inschrijfgegevens
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Kan niet meerdere item-standaardwaarden voor een bedrijf instellen.
 DocType: Purchase Invoice Item,Net Rate,Net Rate
@@ -1866,7 +1865,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Verlof Type is maganorie
 DocType: Support Settings,Close Issue After Days,Sluiten Probleem Na Days
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,U moet een gebruiker zijn met de functies System Manager en Item Manager om gebruikers toe te voegen aan Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,U moet een gebruiker zijn met de functies System Manager en Item Manager om gebruikers toe te voegen aan Marketplace.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Laat leeg indien dit voor alle vestigingen is
 DocType: Job Opening,Staffing Plan,Personeelsplan
 DocType: Bank Guarantee,Validity in Days,Geldigheid in dagen
@@ -1888,7 +1887,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Dubbele rij {0} met dezelfde {1}
 DocType: Marketplace Settings,Disable Marketplace,Schakel Marketplace uit
 ,Trial Balance,Proefbalans
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Boekjaar {0} niet gevonden
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Boekjaar {0} niet gevonden
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Het opzetten van Werknemers
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotelreservering Gebruiker
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Selecteer eerst een voorvoegsel
@@ -1996,7 +1995,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Inloggen mislukt
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Asset {0} is gemaakt
 DocType: Special Test Items,Special Test Items,Speciale testartikelen
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,U moet een gebruiker zijn met de functies System Manager en Item Manager om zich te registreren op Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,U moet een gebruiker zijn met de functies System Manager en Item Manager om zich te registreren op Marketplace.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Wijze van betaling
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Vanaf uw toegewezen Salarisstructuur kunt u geen voordelen aanvragen
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Website Afbeelding moet een openbaar bestand of website URL zijn
@@ -2008,7 +2007,7 @@
 DocType: Warehouse,Warehouse Contact Info,Magazijn Contact Info
 DocType: Payment Entry,Write Off Difference Amount,Schrijf Off Verschil Bedrag
 DocType: Volunteer,Volunteer Name,Vrijwilligers naam
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Rijen met dubbele vervaldatums in andere rijen zijn gevonden: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Rijen met dubbele vervaldatums in andere rijen zijn gevonden: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: Employee e-mail niet gevonden, dus geen e-mail verzonden"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Geen salarisstructuur toegewezen voor werknemer {0} op opgegeven datum {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Verzendregel niet van toepassing voor land {0}
@@ -2098,6 +2097,7 @@
 DocType: Salary Component,Earning,Verdienen
 DocType: Supplier Scorecard,Scoring Criteria,Scoring Criteria
 DocType: Purchase Invoice,Party Account Currency,Party account Valuta
+DocType: Delivery Trip,Total Estimated Distance,Totale geschatte afstand
 ,BOM Browser,BOM Browser
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Update uw status voor dit trainingsevenement
 DocType: Item Barcode,EAN,EAN
@@ -2136,7 +2136,7 @@
 DocType: Activity Cost,Projects,Projecten
 DocType: Payment Request,Transaction Currency,transactie Munt
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Van {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Sommige e-mails zijn ongeldig
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Sommige e-mails zijn ongeldig
 DocType: Work Order Operation,Operation Description,Operatie Beschrijving
 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.,Kan boekjaar startdatum en einddatum niet wijzigen eenmaal het boekjaar is opgeslagen.
 DocType: Quotation,Shopping Cart,Winkelwagen
@@ -2160,7 +2160,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Netto wijziging in vaste activa
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Gewenste hoeveelheid
 DocType: Leave Control Panel,Leave blank if considered for all designations,Laat leeg indien overwogen voor alle aanduidingen
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge van het type ' Actual ' in rij {0} kan niet worden opgenomen in Item Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge van het type ' Actual ' in rij {0} kan niet worden opgenomen in Item Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Van Datetime
 DocType: Shopify Settings,For Company,Voor Bedrijf
@@ -2174,7 +2174,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Er zijn fouten opgetreden bij het maken van cursusplanning
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,De eerste onkostende goedkeurder in de lijst wordt ingesteld als de standaard kostenaannemer.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,mag niet groter zijn dan 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,U moet een andere gebruiker dan Administrator met System Manager en Item Manager-rollen zijn om zich te registreren op Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,U moet een andere gebruiker dan Administrator met System Manager en Item Manager-rollen zijn om zich te registreren op Marketplace.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Artikel {0} is geen voorraadartikel
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Ongeplande
@@ -2203,7 +2203,7 @@
 DocType: HR Settings,Employee Settings,Werknemer Instellingen
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Loading Payment System
 ,Batch-Wise Balance History,Batchgewijze balansgeschiedenis
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Rij # {0}: kan Tarief niet instellen als het bedrag groter is dan het gefactureerde bedrag voor artikel {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Rij # {0}: kan Tarief niet instellen als het bedrag groter is dan het gefactureerde bedrag voor artikel {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Print instellingen bijgewerkt in de respectievelijke gedrukte vorm
 DocType: Package Code,Package Code,Package Code
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,leerling
@@ -2438,7 +2438,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} vacatures en {1} budget voor {2} zijn al gepland voor dochterondernemingen van {3}. \ U kunt alleen plannen voor maximaal {4} vacatures en en budget {5} per personeelsplan {6} voor moederbedrijf {3}.
 DocType: HR Settings,Stop Birthday Reminders,Stop verjaardagsherinneringen
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Stel Default Payroll Payable account in Company {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Stel Default Payroll Payable account in Company {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Krijg financiële opsplitsing van Belastingen en kostengegevens door Amazon
 DocType: SMS Center,Receiver List,Ontvanger Lijst
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Zoekitem
@@ -2508,7 +2508,7 @@
 DocType: Vital Signs,Constipated,Verstopt
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Tegen Leverancier Factuur {0} gedateerd {1}
 DocType: Customer,Default Price List,Standaard Prijslijst
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Asset bewegingsartikel {0} aangemaakt
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Asset bewegingsartikel {0} aangemaakt
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Geen items gevonden.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Je kunt niet verwijderen boekjaar {0}. Boekjaar {0} is ingesteld als standaard in Global Settings
 DocType: Share Transfer,Equity/Liability Account,Aandelen / aansprakelijkheidsrekening
@@ -2648,6 +2648,7 @@
 DocType: Blanket Order,Order Type,Order Type
 ,Item-wise Sales Register,Artikelgebaseerde Verkoop Register
 DocType: Asset,Gross Purchase Amount,Gross Aankoopbedrag
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgroep&gt; Merk
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Opening Saldi
 DocType: Asset,Depreciation Method,afschrijvingsmethode
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Is dit inbegrepen in de Basic Rate?
@@ -2731,7 +2732,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Actie als jaarbegroting op PO overschreden
 DocType: Student Leave Application,Student Leave Application,Student verlofaanvraag
 DocType: Item,Will also apply for variants,Geldt ook voor varianten
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Asset kan niet worden geannuleerd, want het is al {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Asset kan niet worden geannuleerd, want het is al {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Employee {0} op een halve dag op {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Totaal aantal werkuren mag niet groter zijn dan max werktijden {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Op
@@ -2755,6 +2756,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Gegevens ophalen
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Maximaal verlof toegestaan in het verloftype {0} is {1}
 DocType: SMS Center,Create Receiver List,Maak Ontvanger Lijst
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Beschikbaar voor gebruik De datum moet na de aankoopdatum zijn
 DocType: Vehicle,Wheels,Wheels
 DocType: Packing Slip,To Package No.,Naar pakket nr
 DocType: Patient Relation,Family,Familie
@@ -2768,7 +2770,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Factuurvaluta moet gelijk zijn aan de valuta van het standaardbedrijf of de valuta van het partijaccount
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Geeft aan dat het pakket een onderdeel is van deze levering (alleen ontwerp)
 DocType: Soil Texture,Loam,Leem
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Rij {0}: vervaldatum kan niet vóór de boekingsdatum zijn
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Rij {0}: vervaldatum kan niet vóór de boekingsdatum zijn
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Betalen Entry
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Hoeveelheid voor artikel {0} moet kleiner zijn dan {1}
 ,Sales Invoice Trends,Verkoopfactuur Trends
@@ -2841,7 +2843,7 @@
 DocType: Guardian,Guardian Interests,Guardian Interesses
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Accountnaam / nummer bijwerken
 DocType: Naming Series,Current Value,Huidige waarde
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Meerdere fiscale jaar bestaan voor de datum {0}. Stel onderneming in het fiscale jaar
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Meerdere fiscale jaar bestaan voor de datum {0}. Stel onderneming in het fiscale jaar
 DocType: Education Settings,Instructor Records to be created by,Instructor Records te creëren door
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} aangemaakt
 DocType: GST Account,GST Account,GST-account
@@ -2859,7 +2861,7 @@
 DocType: Sales Person,Name and Employee ID,Naam en Werknemer ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Vervaldatum mag niet voor de boekingsdatum zijn
 DocType: Website Item Group,Website Item Group,Website Artikel Groep
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Geen salarisstrook gevonden om in te dienen voor de hierboven geselecteerde criteria OF salarisstrook al ingediend
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Geen salarisstrook gevonden om in te dienen voor de hierboven geselecteerde criteria OF salarisstrook al ingediend
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Invoerrechten en Belastingen
 DocType: Projects Settings,Projects Settings,Projectinstellingen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Vul Peildatum in
@@ -2868,7 +2870,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Meegeleverde Aantal
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Materiaal Aanvraag Artikel
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Annuleer eerst Purchase Receipt {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Annuleer eerst Purchase Receipt {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Boom van Artikelgroepen .
 DocType: Production Plan,Total Produced Qty,Totaal geproduceerd aantal
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Kan niet verwijzen rij getal groter dan of gelijk aan de huidige rijnummer voor dit type Charge
@@ -2978,6 +2980,7 @@
 ,Vehicle Expenses,Voertuig kosten
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Maak Lab-test (s) op Sales Invoice Submit
 DocType: Serial No,Invoice Details,Factuurgegevens
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Schakel Google Maps-instellingen in om routes te schatten en te optimaliseren
 DocType: Grant Application,Show on Website,Weergeven op website
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Begin maar
 DocType: Hub Tracked Item,Hub Category,Hubcategorie
@@ -3018,7 +3021,7 @@
 DocType: Inpatient Record,B Positive,B positief
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Het maximale voordeel van werknemer {0} overschrijdt {1} met de som {2} van het vorige geclaimde \ aantal
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",Rij # {0}: Aantal moet 1 als item is een vaste activa. Gebruik aparte rij voor meerdere aantal.
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",Rij # {0}: Aantal moet 1 als item is een vaste activa. Gebruik aparte rij voor meerdere aantal.
 DocType: Leave Block List Allow,Leave Block List Allow,Laat Block List Laat
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr kan niet leeg of ruimte
 DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
@@ -3053,7 +3056,7 @@
 DocType: Workstation,Wages per hour,Loon per uur
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Voorraadbalans in Batch {0} zal negatief worden {1} voor Artikel {2} in Magazijn {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Volgende Material Aanvragen werden automatisch verhoogd op basis van re-order niveau-item
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Account {0} is ongeldig. Account Valuta moet {1} zijn
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Account {0} is ongeldig. Account Valuta moet {1} zijn
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Vanaf datum {0} kan niet worden na ontlastingsdatum van medewerker {1}
 DocType: Supplier,Is Internal Supplier,Is interne leverancier
 DocType: Employee,Create User Permission,Maak gebruiker toestemming
@@ -3198,7 +3201,7 @@
 DocType: Account,Fixed Asset,Vast Activum
 DocType: Amazon MWS Settings,After Date,Na datum
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Geserialiseerde Inventory
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Ongeldige {0} voor factuur voor bedrijfsrekening.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Ongeldige {0} voor factuur voor bedrijfsrekening.
 ,Department Analytics,Afdeling Analytics
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-mailadres niet gevonden in standaardcontact
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Genereer geheim
@@ -3211,7 +3214,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Het programma in de kostenstructuur en studentengroep {0} verschilt.
 DocType: Bank Statement Transaction Entry,Receivable Account,Vorderingen Account
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Geldig vanaf datum moet kleiner zijn dan geldig tot datum.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Rij # {0}: Asset {1} al {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Rij # {0}: Asset {1} al {2}
 DocType: Quotation Item,Stock Balance,Voorraad Saldo
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Sales om de betaling
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,Directeur
@@ -3253,6 +3256,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Debet Om vereist
 DocType: Clinical Procedure,Inpatient Record,Inpatient Record
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets helpen bijhouden van de tijd, kosten en facturering voor activiteiten gedaan door uw team"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Leverancier&gt; leverancier type
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Purchase Price List
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Transactiedatum
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Sjablonen van leveranciers scorecard variabelen.
@@ -3296,7 +3300,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Exchange winst / verlies
 DocType: Opportunity,Lost Reason,Reden van verlies
 DocType: Amazon MWS Settings,Enable Amazon,Schakel Amazon in
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Rij # {0}: account {1} hoort niet bij bedrijf {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Rij # {0}: account {1} hoort niet bij bedrijf {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Kon DocType {0} niet vinden
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nieuw adres
 DocType: Quality Inspection,Sample Size,Monster grootte
@@ -3408,7 +3412,7 @@
 DocType: Water Analysis,Origin,Oorsprong
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dit document is dan limiet van {0} {1} voor punt {4}. Bent u het maken van een andere {3} tegen dezelfde {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Stel terugkerende na het opslaan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Selecteer verandering bedrag rekening
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Selecteer verandering bedrag rekening
 DocType: Purchase Invoice,Price List Currency,Prijslijst Valuta
 DocType: Naming Series,User must always select,Gebruiker moet altijd kiezen
 DocType: Stock Settings,Allow Negative Stock,Laat Negatieve voorraad
@@ -3450,7 +3454,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Weet je zeker dat je deze afspraak wilt annuleren?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Prijsarrangement hotelkamer
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Sales Pipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Stel standaard account aan Salaris Component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Stel standaard account aan Salaris Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Vereist op
 DocType: Rename Tool,File to Rename,Bestand naar hernoemen
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Selecteer BOM voor post in rij {0}
@@ -3471,7 +3475,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kosten van gekochte artikelen
 DocType: Employee Separation,Employee Separation Template,Werknemersscheidingssjabloon
 DocType: Selling Settings,Sales Order Required,Verkooporder Vereist
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Word een verkoper
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Word een verkoper
 DocType: Purchase Invoice,Credit To,Met dank aan
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Actieve Leads / Klanten
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Laat dit leeg om de standaardindeling Notities te gebruiken
@@ -3512,7 +3516,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Maak belastingsjabloon
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Gebruikers Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Grondstoffen kan niet leeg zijn.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Rij # {0} (betalingstabel): bedrag moet negatief zijn
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Rij # {0} (betalingstabel): bedrag moet negatief zijn
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Kon niet bijwerken voorraad, factuur bevat daling van de scheepvaart punt."
 DocType: Contract,Fulfilment Status,Fulfillment-status
 DocType: Lab Test Sample,Lab Test Sample,Lab Test Sample
@@ -3672,7 +3676,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Doc Date
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Fee Records Gemaakt - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Categorie Account
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Rij # {0} (betalingstabel): bedrag moet positief zijn
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Rij # {0} (betalingstabel): bedrag moet positief zijn
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Kan niet meer produceren van Artikel {0} dan de Verkooporder hoeveelheid {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Selecteer kenmerkwaarden
 DocType: Purchase Invoice,Reason For Issuing document,Reden voor afgifte document
@@ -3727,7 +3731,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Tijdstip waarop materialen zijn ontvangen
 DocType: Products Settings,Products per Page,Producten per pagina
 DocType: Stock Ledger Entry,Outgoing Rate,Uitgaande Rate
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,of
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,of
 DocType: Sales Order,Billing Status,Factuurstatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Issue melden?
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Utiliteitskosten
@@ -3754,7 +3758,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Verklaring belastingvrijstelling werknemer
 DocType: Payment Entry,Cheque/Reference Date,Cheque / Reference Data
 DocType: Purchase Invoice,Total Taxes and Charges,Totaal belastingen en toeslagen
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Beschikbaar voor gebruik Datum wordt ingevoerd als datum in het verleden
 DocType: Employee,Emergency Contact,Noodgeval Contact
 DocType: Bank Reconciliation Detail,Payment Entry,betaling Entry
 ,sales-browser,sales-browser
@@ -3801,6 +3804,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Is Return (Credit Note)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Start Job
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Serienr. Is vereist voor het item {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series in voor {0} via Instellingen&gt; Instellingen&gt; Serie benoemen
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Gehandicapte template mag niet standaard template
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Voor rij {0}: Voer het geplande aantal in
 DocType: Account,Income Account,Inkomstenrekening
@@ -3814,6 +3818,7 @@
 DocType: Loyalty Program,Help Section,Help sectie
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Vorige
 DocType: Appraisal Goal,Key Responsibility Area,Key verantwoordelijkheid Area
+DocType: Delivery Trip,Distance UOM,Afstand UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student Batches helpen bijhouden opkomst, evaluaties en kosten voor studenten"
 DocType: Payment Entry,Total Allocated Amount,Totaal toegewezen bedrag
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Stel standaard inventaris rekening voor permanente inventaris
@@ -3855,7 +3860,7 @@
 DocType: Item Supplier,Item Supplier,Artikel Leverancier
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Vul de artikelcode  in om batchnummer op te halen
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Selecteer een waarde voor {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Geen items geselecteerd voor overdracht
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Geen items geselecteerd voor overdracht
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alle adressen.
 DocType: Company,Stock Settings,Voorraad Instellingen
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Samenvoegen kan alleen als volgende eigenschappen in beide registers. Is Group, Root Type, Company"
@@ -4153,7 +4158,7 @@
 DocType: Patient,Personal and Social History,Persoonlijke en sociale geschiedenis
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Gebruiker {0} gemaakt
 DocType: Fee Schedule,Fee Breakup for each student,Fee Breakup voor elke student
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totaal vooraf ({0}) tegen Orde {1} kan niet groter zijn dan de Grand totaal zijn ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totaal vooraf ({0}) tegen Orde {1} kan niet groter zijn dan de Grand totaal zijn ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selecteer Maandelijkse Distribution om ongelijk te verdelen doelen in heel maanden.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Wijzig code
 DocType: Purchase Invoice Item,Valuation Rate,Waardering Tarief
@@ -4162,7 +4167,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Beschikbaar ITC Cess
 ,Student Monthly Attendance Sheet,Student Maandelijkse presentielijst
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Verzendregel alleen van toepassing op verkopen
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Afschrijving Rij {0}: Volgende Afschrijvingsdatum kan niet vóór Aankoopdatum zijn
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Afschrijving Rij {0}: Volgende Afschrijvingsdatum kan niet vóór Aankoopdatum zijn
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Project Start Datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Totdat
 DocType: Rename Tool,Rename Log,Hernoemen Log
@@ -4180,12 +4185,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Hoe vaak moeten project en bedrijf worden bijgewerkt op basis van verkooptransacties.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Verloopt op
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Studenten toevoegen
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Verwijder de werknemer <a href=""#Form/Employee/{0}"">{0}</a> \ om dit document te annuleren"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Selecteer {0}
 DocType: C-Form,C-Form No,C-vorm nr.
 DocType: BOM,Exploded_items,Uitgeklapte Artikelen
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Afstand
+DocType: Delivery Stop,Distance,Afstand
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Maak een overzicht van uw producten of diensten die u koopt of verkoopt.
 DocType: Water Analysis,Storage Temperature,Bewaar temperatuur
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4212,7 +4215,7 @@
 DocType: Homepage,Company Description for website homepage,Omschrijving bedrijf voor website homepage
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Voor het gemak van de klanten, kunnen deze codes worden gebruikt in gedrukte formaten zoals facturen en de leveringsbonnen"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Naam
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Kan informatie niet ophalen voor {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Kan informatie niet ophalen voor {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Opening dagboek
 DocType: Contract,Fulfilment Terms,Fulfillment-voorwaarden
 DocType: Sales Invoice,Time Sheet List,Urenregistratie List
@@ -4395,7 +4398,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Selecteer studenten handmatig voor de activiteit gebaseerde groep
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Selecteer studenten handmatig voor de activiteit gebaseerde groep
 DocType: Journal Entry,User Remark,Gebruiker Opmerking
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Routes optimaliseren.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Routes optimaliseren.
 DocType: Travel Itinerary,Non Diary,Niet dagboek
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Kan retentiebonus niet maken voor medewerkers die links zijn
 DocType: Lead,Market Segment,Marktsegment
@@ -4425,7 +4428,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Loyaliteitsprogramma
 DocType: Student Guardian,Father,Vader
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Ondersteuning tickets
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;Bijwerken Stock&#39; kan niet worden gecontroleerd op vaste activa te koop
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;Bijwerken Stock&#39; kan niet worden gecontroleerd op vaste activa te koop
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Aflettering
 DocType: Attendance,On Leave,Met verlof
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Blijf op de hoogte
@@ -4470,7 +4473,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serienummer en Batch
 DocType: Warranty Claim,From Company,Van Bedrijf
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Som van de scores van de beoordelingscriteria moet {0} te zijn.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Stel Aantal geboekte afschrijvingen
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Stel Aantal geboekte afschrijvingen
 DocType: Supplier Scorecard Period,Calculations,berekeningen
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Waarde of Aantal
 DocType: Payment Terms Template,Payment Terms,Betaalvoorwaarden
@@ -4490,7 +4493,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Korting (%) op prijslijst tarief met marges
 DocType: Healthcare Service Unit Type,Rate / UOM,Tarief / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Alle magazijnen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Geen {0} gevonden voor transacties tussen bedrijven.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Geen {0} gevonden voor transacties tussen bedrijven.
 DocType: Travel Itinerary,Rented Car,Gehuurde auto
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Over uw bedrijf
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Credit Om rekening moet een balansrekening zijn
@@ -4592,6 +4595,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Criteria voor plantanalyse
 DocType: Cheque Print Template,Cheque Height,Cheque Hoogte
 DocType: Supplier,Supplier Details,Leverancier Details
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Stel nummeringsreeksen in voor Aanwezigheid via Setup&gt; Nummeringserie
 DocType: Setup Progress,Setup Progress,Setup Progress
 DocType: Expense Claim,Approval Status,Goedkeuringsstatus
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Van waarde moet minder zijn dan waarde in rij {0}
@@ -4685,7 +4689,6 @@
 DocType: Travel Request,Fully Sponsored,Volledig gesponsord
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Klant {0} is gemaakt.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Stel Employee Naming System in Human Resource&gt; HR-instellingen in
 DocType: Stock Settings,Limit Percent,Limit Procent
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Momenteel geen voorraad beschikbaar in een magazijn
 ,Payment Period Based On Invoice Date,Betaling Periode gebaseerd op factuurdatum
@@ -4744,7 +4747,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Bron Magazijn
 DocType: Installation Note,Installation Date,Installatie Datum
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Deel Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Rij # {0}: Asset {1} hoort niet bij bedrijf {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Rij # {0}: Asset {1} hoort niet bij bedrijf {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Verkoopfactuur {0} gemaakt
 DocType: Employee,Confirmation Date,Bevestigingsdatum
 DocType: Inpatient Occupancy,Check Out,Uitchecken
@@ -4764,6 +4767,7 @@
 DocType: Production Plan,Sales Orders Detail,Detail verkooporders
 DocType: Bin,Requested Quantity,gevraagde hoeveelheid
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Stel het systeem voor instructeursbenaming in Onderwijs&gt; Onderwijsinstellingen in
 DocType: Patient,Marital Status,Burgerlijke staat
 DocType: Stock Settings,Auto Material Request,Automatisch Materiaal Request
 DocType: Woocommerce Settings,API consumer secret,API-gebruikersgeheim
@@ -4816,7 +4820,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Selecteer dagen
 DocType: Academic Term,Term Name,term Naam
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Krediet ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Salarisbrieven maken ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Salarisbrieven maken ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,U kunt het basisknooppunt niet bewerken.
 DocType: Buying Settings,Purchase Order Required,Inkooporder verplicht
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,timer
@@ -4854,7 +4858,7 @@
 DocType: Account,Rate at which this tax is applied,Percentage waarmee deze belasting toegepast wordt
 DocType: Cash Flow Mapper,Section Name,sectie naam
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Bestelaantal
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Afschrijving Rij {0}: de verwachte waarde na nuttige levensduur moet groter zijn dan of gelijk zijn aan {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Afschrijving Rij {0}: de verwachte waarde na nuttige levensduur moet groter zijn dan of gelijk zijn aan {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Huidige vacatures
 DocType: Company,Stock Adjustment Account,Voorraad Aanpassing Rekening
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Afschrijven
@@ -4901,7 +4905,7 @@
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Uit AMC
 DocType: Opportunity,Opportunity Amount,Kansbedrag
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Aantal afschrijvingen geboekt kan niet groter zijn dan het totale aantal van de afschrijvingen zijn
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Aantal afschrijvingen geboekt kan niet groter zijn dan het totale aantal van de afschrijvingen zijn
 DocType: Purchase Order,Order Confirmation Date,Bevestigingsdatum bestellen
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Maak Maintenance Visit
@@ -4942,7 +4946,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Partij:
 DocType: Volunteer,Afternoon,Middag
 DocType: Loyalty Program,Loyalty Program Help,Loyaliteitsprogramma Hulp
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}'is uitgeschakeld
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}'is uitgeschakeld
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Instellen als Open
 DocType: Cheque Print Template,Scanned Cheque,gescande Cheque
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Stuur automatische e-mails naar Contactpersonen op Indienen transacties.
@@ -4955,7 +4959,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Item en garantie Details
 DocType: Chapter,Chapter Members,Hoofdstukleden
 DocType: Sales Team,Contribution (%),Bijdrage (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Opmerking: De betaling wordt niet aangemaakt, aangezien de 'Kas- of Bankrekening' niet gespecificeerd is."
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Opmerking: De betaling wordt niet aangemaakt, aangezien de 'Kas- of Bankrekening' niet gespecificeerd is."
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Project {0} bestaat al
 DocType: Clinical Procedure,Nursing User,Verpleegkundige gebruiker
 DocType: Employee Benefit Application,Payroll Period,Payroll-periode
@@ -4963,6 +4967,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Serienummer {0} hoort niet bij Batch {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Verantwoordelijkheden
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Geldigheidsduur van deze offerte is beëindigd.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Verwijder de werknemer <a href=""#Form/Employee/{0}"">{0}</a> \ om dit document te annuleren"
 DocType: Expense Claim Account,Expense Claim Account,Declaratie Account
 DocType: Account,Capital Work in Progress,Capital Work in Progress
 DocType: Accounts Settings,Allow Stale Exchange Rates,Staale wisselkoersen toestaan
@@ -5044,7 +5050,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Materiaal uitgeven
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Verbind Shopify met ERPNext
 DocType: Material Request Item,For Warehouse,Voor Magazijn
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Bezorgingsnotities {0} bijgewerkt
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Bezorgingsnotities {0} bijgewerkt
 DocType: Employee,Offer Date,Aanbieding datum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Citaten
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Je bent in de offline modus. Je zult niet in staat om te herladen tot je opnieuw verbonden bent met het netwerk.
@@ -5095,7 +5101,7 @@
 DocType: Shipping Rule,Calculate Based On,Berekenen gebaseerd op
 DocType: Contract,Unfulfilled,niet vervuld
 DocType: Delivery Note Item,From Warehouse,Van Warehouse
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Geen werknemers voor de genoemde criteria
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Geen werknemers voor de genoemde criteria
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Geen Items met Bill of Materials voor fabricage
 DocType: Shopify Settings,Default Customer,Standaard klant
 DocType: Sales Stage,Stage Name,Artiestennaam
@@ -5138,7 +5144,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Belasting bedrag na korting
 DocType: Patient,Inpatient Status,Interne status
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Dagelijks Werk Samenvatting Instellingen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,In de geselecteerde prijslijst moeten de velden voor kopen en verkopen worden gecontroleerd.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,In de geselecteerde prijslijst moeten de velden voor kopen en verkopen worden gecontroleerd.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Voer Reqd in op datum
 DocType: Payment Entry,Internal Transfer,Interne overplaatsing
 DocType: Asset Maintenance,Maintenance Tasks,Onderhoudstaken
@@ -5175,7 +5181,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Groeperen volgens
 DocType: Guardian,Interests,Interesses
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,In- / uitschakelen valuta .
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Kon sommige salarisstroken niet indienen
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Kon sommige salarisstroken niet indienen
 DocType: Exchange Rate Revaluation,Get Entries,Ontvang inzendingen
 DocType: Production Plan,Get Material Request,Krijg Materiaal Request
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Portokosten
@@ -5262,7 +5268,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Kostenrekening is verplicht voor artikel {0}
 DocType: BOM,Website Description,Website Beschrijving
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Netto wijziging in het eigen vermogen
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Annuleer Purchase Invoice {0} eerste
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Annuleer Purchase Invoice {0} eerste
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Niet toegestaan. Schakel het type service-eenheid uit
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailadres moet uniek zijn, bestaat al voor {0}"
 DocType: Serial No,AMC Expiry Date,AMC Vervaldatum
@@ -5302,7 +5308,7 @@
 DocType: Hotel Room,Hotel Room,Hotelkamer
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Account {0} behoort niet tot bedrijf {1}
 DocType: Leave Type,Rounding,ronding
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Serienummers in rij {0} komt niet overeen met bezorgingsnota
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Serienummers in rij {0} komt niet overeen met bezorgingsnota
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Beschikbaar bedrag (pro-rated)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Daarna worden prijsregels uitgefilterd op basis van klant, klantgroep, territorium, leverancier, leveranciersgroep, campagne, verkooppartner enz."
 DocType: Student,Guardian Details,Guardian Details
@@ -5357,7 +5363,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Magazijn nodig voor voorraad Artikel {0}
 DocType: Leave Allocation,Unused leaves,Ongebruikte afwezigheden
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Maak terugbetaling
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Alle afdelingen
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Alle afdelingen
 DocType: Healthcare Service Unit,Vacant,Vrijgekomen
 DocType: Patient,Alcohol Past Use,Alcohol voorbij gebruik
 DocType: Fertilizer Content,Fertilizer Content,Kunstmestinhoud
@@ -5368,7 +5374,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Werkorder {0} moet worden geannuleerd voordat deze klantorder wordt geannuleerd
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Haal uitgeklapte Stuklijst op (inclusief onderdelen)
 DocType: Authorization Rule,Applicable To (Employee),Van toepassing zijn op (Werknemer)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Vervaldatum is verplicht
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Vervaldatum is verplicht
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Toename voor Attribute {0} kan niet worden 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Type en bedrag van het voordeel
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Kamers geboekt
@@ -5517,7 +5523,7 @@
 DocType: Purchase Invoice Item,Total Weight,Totale gewicht
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Commissie op de verkoop
 DocType: Job Offer Term,Value / Description,Waarde / Beschrijving
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rij # {0}: Asset {1} kan niet worden ingediend, is het al {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rij # {0}: Asset {1} kan niet worden ingediend, is het al {2}"
 DocType: Tax Rule,Billing Country,Land
 DocType: Purchase Order Item,Expected Delivery Date,Verwachte leverdatum
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurantbestelling
@@ -5556,12 +5562,13 @@
 DocType: Maintenance Visit,Breakdown,Storing
 DocType: Travel Itinerary,Vegetarian,Vegetarisch
 DocType: Patient Encounter,Encounter Date,Encounter Date
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Account: {0} met valuta: {1} kan niet worden geselecteerd
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Account: {0} met valuta: {1} kan niet worden geselecteerd
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bankgegevens
 DocType: Purchase Receipt Item,Sample Quantity,Monsterhoeveelheid
 DocType: Bank Guarantee,Name of Beneficiary,Naam van de begunstigde
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Update BOM kosten automatisch via Scheduler, op basis van de laatste waarderingssnelheid / prijslijst koers / laatste aankoophoeveelheid grondstoffen."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Leverancier&gt; Leveranciersgroep
 DocType: Bank Reconciliation Detail,Cheque Date,Cheque Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Rekening {0}: Bovenliggende rekening {1} hoort niet bij bedrijf: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Succesvol verwijderd alle transacties met betrekking tot dit bedrijf!
@@ -5589,7 +5596,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Child nodes kunnen alleen worden gemaakt op grond van het type nodes &#39;Groep&#39;
 DocType: Attendance Request,Half Day Date,Halve dag datum
 DocType: Academic Year,Academic Year Name,Academisch jaar naam
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} mag niet transacties uitvoeren met {1}. Wijzig het bedrijf.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} mag niet transacties uitvoeren met {1}. Wijzig het bedrijf.
 DocType: Sales Partner,Contact Desc,Contact Omschr
 DocType: Email Digest,Send regular summary reports via Email.,Stuur regelmatige samenvattende rapporten via e-mail.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Stel standaard account aan Expense conclusie Type {0}
@@ -5622,7 +5629,7 @@
 DocType: Hotel Room,Hotel Manager,Hotel Manager
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Stel Tax Regel voor winkelmandje
 DocType: Purchase Invoice,Taxes and Charges Added,Belastingen en Toeslagen toegevoegd
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Afschrijving Rij {0}: Volgende Afschrijvingsdatum kan niet eerder zijn dan Beschikbaar-voor-gebruik Datum
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Afschrijving Rij {0}: Volgende Afschrijvingsdatum kan niet eerder zijn dan Beschikbaar-voor-gebruik Datum
 ,Sales Funnel,Verkoop Trechter
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Afkorting is verplicht
 DocType: Project,Task Progress,Task Progress
@@ -5636,7 +5643,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Alle Doelgroepen
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,Maandelijks geaccumuleerd
 DocType: Attendance Request,On Duty,In functie
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} is verplicht. Misschien is Valuta Koers record niet gemaakt voor {1} naar {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} is verplicht. Misschien is Valuta Koers record niet gemaakt voor {1} naar {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Personeelsplan {0} bestaat al voor aanwijzing {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Belasting Template is verplicht.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Rekening {0}: Bovenliggende rekening {1} bestaat niet
@@ -5717,11 +5724,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Tenminste een magazijn is verplicht
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Configureer artikelvelden zoals UOM, artikelgroep, beschrijving en aantal uren."
 DocType: Certification Application,Certification Status,Certificeringsstatus
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Marktplaats
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Marktplaats
 DocType: Travel Itinerary,Travel Advance Required,Reisvooruitgang vereist
 DocType: Subscriber,Subscriber Name,Naam abonnee
 DocType: Serial No,Out of Warranty,Uit de garantie
-DocType: Cashier Closing,Cashier-closing-,Cashier-closing-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Toegepast gegevenstype
 DocType: BOM Update Tool,Replace,Vervang
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Geen producten gevonden.
@@ -5809,7 +5815,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Standaardbelastingsjablonen voor verkopen en kopen worden gemaakt.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Beoordeling Resultaat record {0} bestaat al.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Voorbeeld: ABCD. #####. Als reeks is ingesteld en Batch-nummer niet in transacties wordt vermeld, wordt op basis van deze reeks automatisch batchnummer gemaakt. Als u Batch-nummer voor dit artikel altijd expliciet wilt vermelden, laat dit veld dan leeg. Opmerking: deze instelling heeft voorrang boven het voorvoegsel Naamgevingsreeks in Voorraadinstellingen."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Stel nummeringsreeksen in voor Aanwezigheid via Setup&gt; Nummeringserie
 DocType: BOM,Materials Required (Exploded),Benodigde materialen (uitgeklapt)
 DocType: Contract,Party User,Partijgebruiker
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Stel alsjeblieft Bedrijfsfilter leeg als Group By is &#39;Company&#39;
@@ -6012,7 +6017,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Zowel de startdatum van de proefperiode als de einddatum van de proefperiode moeten worden ingesteld
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Gemiddelde score
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Het totale betalingsbedrag in het betalingsschema moet gelijk zijn aan het groot / afgerond totaal
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Het totale betalingsbedrag in het betalingsschema moet gelijk zijn aan het groot / afgerond totaal
 DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bankafschrift saldo per General Ledger
 DocType: Job Applicant,Applicant Name,Aanvrager Naam
@@ -6081,7 +6086,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Zeep & Wasmiddel
 DocType: BOM,Show Items,Show items
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Van tijd kan niet groter zijn dan tot tijd.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Wilt u alle klanten per e-mail op de hoogte stellen?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Wilt u alle klanten per e-mail op de hoogte stellen?
 DocType: Subscription Plan,Billing Interval,Factuurinterval
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Besteld
@@ -6090,9 +6095,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Rij {0}: {1} moet groter zijn dan 0
 DocType: Assessment Criteria,Assessment Criteria Group,Beoordelingscriteria Group
 DocType: Healthcare Settings,Patient Name By,Patiëntnaam By
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Inschrijvingsboekingang voor salarissen van {0} tot {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Inschrijvingsboekingang voor salarissen van {0} tot {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Uitgestelde inkomsten inschakelen
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Het openen van de cumulatieve afschrijvingen moet kleiner zijn dan gelijk aan {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Het openen van de cumulatieve afschrijvingen moet kleiner zijn dan gelijk aan {0}
 DocType: Warehouse,Warehouse Name,Magazijn Naam
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,De werkelijke startdatum moet kleiner zijn dan de werkelijke einddatum
 DocType: Naming Series,Select Transaction,Selecteer Transactie
@@ -6243,7 +6248,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Werknemer {0} van rang {1} heeft geen standaard verlofbeleid
 DocType: Salary Detail,Salary Detail,salaris Detail
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Selecteer eerst {0}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,{0} gebruikers toegevoegd
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,{0} gebruikers toegevoegd
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",In het geval van een meerlagig programma worden klanten automatisch toegewezen aan de betreffende laag op basis van hun bestede tijd
 DocType: Appointment Type,Physician,Arts
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Batch {0} van Item {1} is verlopen.
@@ -6388,7 +6393,7 @@
 DocType: Asset,Custodian,Bewaarder
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Point-of-Sale Profile
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} moet een waarde tussen 0 en 100 zijn
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Betaling van {0} van {1} tot {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Betaling van {0} van {1} tot {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Leningen zonder onderpand
 DocType: Cost Center,Cost Center Name,Kostenplaats Naam
 DocType: Student,B+,B +
@@ -6420,6 +6425,7 @@
 DocType: Employee,Date of Issue,Datum van afgifte
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Conform de Aankoop Instellingen indien Aankoopbon Vereist == 'JA', dient de gebruiker eerst een Aankoopbon voor item {0} aan te maken om een Aankoop Factuur aan te kunnen maken"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Rij # {0}: Stel Leverancier voor punt {1}
+DocType: Global Defaults,Default Distance Unit,Standaard afstandseenheid
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Rij {0}: Aantal uren moet groter zijn dan nul.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Website Afbeelding {0} verbonden aan Item {1} kan niet worden gevonden
 DocType: Issue,Content Type,Content Type
@@ -6475,7 +6481,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Debitering van rekening moet een balansrekening zijn
 DocType: Asset,Naming Series,Benoemen Series
 DocType: Vital Signs,Coated,bedekt
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Rij {0}: verwachte waarde na bruikbare levensduur moet lager zijn dan bruto inkoopbedrag
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Rij {0}: verwachte waarde na bruikbare levensduur moet lager zijn dan bruto inkoopbedrag
 DocType: GoCardless Settings,GoCardless Settings,GoCardless-instellingen
 DocType: Leave Block List,Leave Block List Name,Laat Block List Name
 DocType: Certified Consultant,Certification Validity,Geldigheid van certificering
@@ -6544,6 +6550,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Bankkop
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Bekijk Lab Tests
 DocType: Hub Users,Hub Users,Hub-gebruikers
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klant&gt; Klantengroep&gt; Gebied
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Onderhoud Datum
 DocType: Purchase Invoice Item,Rejected Serial No,Afgewezen Serienummer
@@ -6558,7 +6565,7 @@
 DocType: SG Creation Tool Course,Max Strength,Max Strength
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Voorinstellingen installeren
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Geen leveringsbewijs geselecteerd voor klant {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Geen leveringsbewijs geselecteerd voor klant {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Werknemer {0} heeft geen maximale uitkering
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Selecteer items op basis van leveringsdatum
 DocType: Grant Application,Has any past Grant Record,Heeft een eerdere Grant Record
@@ -6586,7 +6593,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Hotelkamerreservering
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Klantenservice
 DocType: BOM,Thumbnail,Miniatuur
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Geen contacten met e-mail-ID&#39;s gevonden.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Geen contacten met e-mail-ID&#39;s gevonden.
 DocType: Item Customer Detail,Item Customer Detail,Artikel Klant Details
 DocType: Notification Control,Prompt for Email on Submission of,Vragen om E-mail op Indiening van
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Maximaal voordeelbedrag van werknemer {0} overschrijdt {1}
@@ -6846,7 +6853,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,Kan niet omzetten naar groep omdat accounttype is geselecteerd.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} is gewijzigd. Vernieuw aub.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Weerhoud gebruikers van het maken van verlofaanvragen op de volgende dagen.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgroep&gt; Merk
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Als de Loyalty Points onbeperkt verlopen, houd dan de vervalduur leeg of 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Onderhoudsteamleden
 DocType: Loyalty Point Entry,Purchase Amount,Aankoopbedrag
@@ -6854,7 +6860,7 @@
 											to fullfill Sales Order {2}",Kan serienummer {0} van artikel {1} niet leveren als het is gereserveerd \ om de verkooporder te vervullen {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Leverancier Offerte {0} aangemaakt
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Eindjaar kan niet voor Start Jaar
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Eindjaar kan niet voor Start Jaar
 DocType: Employee Benefit Application,Employee Benefits,Employee Benefits
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Verpakt hoeveelheid moet hoeveelheid die gelijk is voor post {0} in rij {1}
 DocType: Work Order,Manufactured Qty,Geproduceerd Aantal
@@ -6870,6 +6876,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Selecteer batchnummers
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Naar GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Factureren aan Klanten
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Stel Employee Naming System in Human Resource&gt; HR-instellingen in
 DocType: Healthcare Settings,Invoice Appointments Automatically,Factuurafspraken automatisch
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
 DocType: Salary Component,Variable Based On Taxable Salary,Variabele op basis van belastbaar salaris
@@ -6918,7 +6925,7 @@
 DocType: POS Profile,Account for Change Amount,Account for Change Bedrag
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Verbinden met QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Totale winst / verlies
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Ongeldig bedrijf voor factuur tussen onderneming.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Ongeldig bedrijf voor factuur tussen onderneming.
 DocType: Purchase Invoice,input service,invoerdienst
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rij {0}: Party / Account komt niet overeen met {1} / {2} in {3} {4}
 DocType: Employee Promotion,Employee Promotion,Werknemersbevordering
@@ -7049,7 +7056,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Voorkeursgebied voor logies
 apps/erpnext/erpnext/config/selling.py +184,Analytics,analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Winkelwagen is leeg
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Stel het systeem voor instructeursbenaming in Onderwijs&gt; Onderwijsinstellingen in
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Artikel {0} heeft geen serienummer. Alleen serilialized items kunnen levering hebben op basis van serienr
 DocType: Vehicle,Model,Model
@@ -7079,7 +7085,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Niets om te veranderen
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Selecteer een CSV-bestand
 DocType: Holiday List,Total Holidays,Totaal vakantie
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Ontbrekende e-mailsjabloon voor verzending. Stel een in bij Delivery-instellingen.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Ontbrekende e-mailsjabloon voor verzending. Stel een in bij Delivery-instellingen.
 DocType: Student Leave Application,Mark as Present,Mark als Cadeau
 DocType: Supplier Scorecard,Indicator Color,Indicator Kleur
 DocType: Purchase Order,To Receive and Bill,Te ontvangen en Bill
@@ -7088,7 +7094,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Selecteer serienummer
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Ontwerper
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Algemene voorwaarden Template
-DocType: Serial No,Delivery Details,Levering Details
+DocType: Delivery Trip,Delivery Details,Levering Details
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Kostenplaats is vereist in regel {0} in Belastingen tabel voor type {1}
 DocType: Program,Program Code,programma Code
 DocType: Terms and Conditions,Terms and Conditions Help,Voorwaarden Help
@@ -7112,7 +7118,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time Dagen
 DocType: Cash Flow Mapping,Is Income Tax Expense,Is de inkomstenbelasting
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Je bestelling is uit voor levering!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rij # {0}: Plaatsingsdatum moet hetzelfde zijn als aankoopdatum {1} van de activa {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rij # {0}: Plaatsingsdatum moet hetzelfde zijn als aankoopdatum {1} van de activa {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Controleer dit als de student in het hostel van het Instituut verblijft.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Vul verkooporders in de bovenstaande tabel
 ,Stock Summary,Stock Samenvatting
diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv
index bcdbc06..de1b829 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Periode Navn
 DocType: Employee,Salary Mode,Lønn Mode
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Registrere
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Registrere
 DocType: Patient,Divorced,Skilt
 DocType: Support Settings,Post Route Key,Legg inn rute nøkkel
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Tillat Element som skal legges flere ganger i en transaksjon
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Ny valutakurs
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Valuta er nødvendig for Prisliste {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil bli beregnet i transaksjonen.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Kundekontakt
 DocType: Patient Appointment,Check availability,Sjekk tilgjengelighet
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Vis åpen
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Serien er oppdatert
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Sjekk ut
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} i rad {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} i rad {1}
 DocType: Asset Finance Book,Depreciation Start Date,Avskrivning Startdato
 DocType: Pricing Rule,Apply On,Påfør på
 DocType: Item Price,Multiple Item prices.,Flere varepriser.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Lab Prescription
 ,Delay Days,Forsinkelsesdager
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,tjenesten Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} er allerede referert i salgsfaktura: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} er allerede referert i salgsfaktura: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Faktura
 DocType: Purchase Invoice Item,Item Weight Details,Vektdetaljer
 DocType: Asset Maintenance Log,Periodicity,Periodisitet
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Accountant
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Selge prisliste
 DocType: Patient,Tobacco Current Use,Nåværende bruk av tobakk
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Startdato og sluttdato overlapper jobbkortet <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Selgingsfrekvens
 DocType: Cost Center,Stock User,Stock User
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,I slekt
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Oppmøte dato kan ikke være mindre enn ansattes bli dato
 DocType: Grading Scale,Grading Scale Name,Grading Scale Name
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Legg til brukere på markedsplassen
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Legg til brukere på markedsplassen
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Dette er en rot konto og kan ikke redigeres.
 DocType: Sales Invoice,Company Address,Firma adresse
 DocType: BOM,Operations,Operasjoner
@@ -322,7 +322,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Antall
 DocType: Production Plan,Material Request Detail,Material Request Detail
 DocType: Selling Settings,Default Quotation Validity Days,Standard Quotation Gyldighetsdager
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","For å inkludere skatt i rad {0} i Element rente, skatt i rader {1} må også inkluderes"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","For å inkludere skatt i rad {0} i Element rente, skatt i rader {1} må også inkluderes"
 DocType: SMS Center,SMS Center,SMS-senter
 DocType: Payroll Entry,Validate Attendance,Bekreft tilstedeværelse
 DocType: Sales Invoice,Change Amount,endring Beløp
@@ -441,7 +441,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Linjeavstand for beløpet i ord
 DocType: Vehicle,Additional Details,ekstra detaljer
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Ingen beskrivelse gitt
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Leverandør&gt; Leverandørgruppe
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Be for kjøp.
 DocType: POS Closing Voucher Details,Collected Amount,Samlet beløp
 DocType: Lab Test,Submitted Date,Innleveringsdato
@@ -486,7 +485,7 @@
 DocType: Student Admission,Student Admission,student Entre
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Element {0} er kansellert
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Avskrivningsrute {0}: Avskrivnings startdato er oppgitt som siste dato
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Avskrivningsrute {0}: Avskrivnings startdato er oppgitt som siste dato
 DocType: Contract Template,Fulfilment Terms and Conditions,Oppfyllingsvilkår
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Materialet Request
 DocType: Bank Reconciliation,Update Clearance Date,Oppdater Lagersalg Dato
@@ -543,6 +542,7 @@
 DocType: Accounts Settings,Settings for Accounts,Innstillinger for kontoer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Leverandør Faktura Ingen eksisterer i fakturaen {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Administrer Sales Person treet.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Kan ikke behandle rute, siden Google Maps-innstillinger er deaktivert."
 DocType: Job Applicant,Cover Letter,Cover Letter
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Utestående Sjekker og Innskudd å tømme
 DocType: Item,Synced With Hub,Synkronisert Med Hub
@@ -602,7 +602,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Ny aktiv verdi
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Hastigheten som Kunden Valuta omdannes til kundens basisvaluta
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kurs Planlegging Tool
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Kjøp Faktura kan ikke gjøres mot en eksisterende eiendel {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Kjøp Faktura kan ikke gjøres mot en eksisterende eiendel {1}
 DocType: Crop Cycle,LInked Analysis,Analyse
 DocType: POS Closing Voucher,POS Closing Voucher,POS Closing Voucher
 DocType: Contract,Lapsed,bortfalt
@@ -637,6 +637,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} er ikke påmeldt kurset {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Student navn:
 DocType: POS Closing Voucher Details,Difference,Forskjell
+DocType: Delivery Settings,Delay between Delivery Stops,Forsinkelse mellom Leveringsstopp
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial No {0} tilhører ikke følgeseddel {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Det ser ut til å være et problem med serverens GoCardless-konfigurasjon. Ikke bekymre deg, i tilfelle feil, vil beløpet bli refundert til kontoen din."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -697,7 +698,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Kvantitet og Rate
 DocType: Delivery Note,% Installed,% Installert
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,Klasserom / Laboratorier etc hvor forelesningene kan planlegges.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Bedriftsvalutaer for begge selskapene bør samsvare for Inter Company Transactions.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Bedriftsvalutaer for begge selskapene bør samsvare for Inter Company Transactions.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Skriv inn firmanavn først
 DocType: Travel Itinerary,Non-Vegetarian,Ikke-Vegetarisk
 DocType: Purchase Invoice,Supplier Name,Leverandør Name
@@ -784,7 +785,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Leid fra dato
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Nok Deler bygge
 DocType: POS Profile User,POS Profile User,POS Profil Bruker
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Row {0}: Avskrivnings startdato er nødvendig
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Row {0}: Avskrivnings startdato er nødvendig
 DocType: Purchase Invoice Item,Service Start Date,Service Startdato
 DocType: Subscription Invoice,Subscription Invoice,Abonnementsfaktura
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Direkte Inntekt
@@ -853,7 +854,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Forkortelse allerede brukt for et annet selskap
 DocType: Selling Settings,Default Customer Group,Standard Kundegruppe
 DocType: Employee,IFSC Code,IFSC-kode
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Startdato og sluttdato overlapper jobbkortet <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Hvis deaktivere, &#39;Rounded Total-feltet ikke vil være synlig i enhver transaksjon"
 DocType: BOM,Operating Cost,Driftskostnader
 DocType: Crop,Produced Items,Produserte varer
@@ -905,7 +905,7 @@
 DocType: Supplier,Prevent RFQs,Forhindre RFQs
 DocType: Hub User,Hub User,Hub Bruker
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Gjør Salgsordre
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Lønnsslipp legges inn for perioden fra {0} til {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Lønnsslipp legges inn for perioden fra {0} til {1}
 DocType: Project Task,Project Task,Prosjektet Task
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Innløste poeng
 ,Lead Id,Lead Id
@@ -1037,7 +1037,7 @@
 DocType: Fee Validity,Max number of visit,Maks antall besøk
 ,Hotel Room Occupancy,Hotellrom Occupancy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timeregistrering opprettet:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Vennligst angi standard kontanter eller bankkontoen i modus for betaling {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Vennligst angi standard kontanter eller bankkontoen i modus for betaling {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Registrere
 DocType: GST Settings,GST Settings,GST-innstillinger
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Valuta bør være den samme som Prisliste Valuta: {0}
@@ -1092,7 +1092,7 @@
 DocType: Vehicle Log,Service Details,Servicedetaljer
 DocType: Lab Test Template,Grouped,gruppert
 DocType: Selling Settings,Delivery Note Required,Levering Note Påkrevd
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Innlevering av lønnsslipp ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Innlevering av lønnsslipp ...
 DocType: Bank Guarantee,Bank Guarantee Number,Bankgaranti nummer
 DocType: Bank Guarantee,Bank Guarantee Number,Bankgaranti nummer
 DocType: Assessment Criteria,Assessment Criteria,Vurderingskriterier
@@ -1118,13 +1118,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Betaling Entry er allerede opprettet
 DocType: Request for Quotation,Get Suppliers,Få leverandører
 DocType: Purchase Receipt Item Supplied,Current Stock,Nåværende Stock
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ikke knyttet til Element {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ikke knyttet til Element {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Forhåndsvisning Lønn Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Konto {0} er angitt flere ganger
 DocType: Account,Expenses Included In Valuation,Kostnader som inngår i verdivurderings
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Du kan bare fornye hvis medlemskapet ditt utløper innen 30 dager
 DocType: Shopping Cart Settings,Show Stock Availability,Vis lager tilgjengelighet
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Angi {0} i aktivakategori {1} eller firma {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Angi {0} i aktivakategori {1} eller firma {2}
 DocType: Location,Longitude,lengde~~POS=TRUNC
 ,Absent Student Report,Fraværende Student Rapporter
 DocType: Crop,Crop Spacing UOM,Beskjære plassering UOM
@@ -1197,7 +1197,7 @@
 DocType: Soil Texture,Sand,Sand
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energy
 DocType: Opportunity,Opportunity From,Opportunity Fra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Serienummer som kreves for element {2}. Du har oppgitt {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Serienummer som kreves for element {2}. Du har oppgitt {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vennligst velg en tabell
 DocType: BOM,Website Specifications,Nettstedet Spesifikasjoner
 DocType: Special Test Items,Particulars,opplysninger
@@ -1289,7 +1289,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Elementer med høyere weightage vil bli vist høyere
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Lab Tests og Vital Signs
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bankavstemming Detalj
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} må fremlegges
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} må fremlegges
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Ingen ansatte funnet
 DocType: Item,If subcontracted to a vendor,Dersom underleverandør til en leverandør
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentgruppen er allerede oppdatert.
@@ -1344,7 +1344,6 @@
 DocType: Loyalty Program Collection,Tier Name,Tiernavn
 DocType: HR Settings,Enter retirement age in years,Skriv inn pensjonsalder i år
 DocType: Crop,Target Warehouse,Target Warehouse
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vennligst still inn navngivningsserien for {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Payroll Employee Detail,Payroll Employee Detail,Lønnspersonelldetaljer
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Vennligst velg et lager
 DocType: Cheque Print Template,Starting location from left edge,Starter plassering fra venstre kant
@@ -1434,7 +1433,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Plan materiale for sub-assemblies
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Salgs Partnere og Territory
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} må være aktiv
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Ingen elementer tilgjengelig for overføring
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Ingen elementer tilgjengelig for overføring
 DocType: Employee Boarding Activity,Activity Name,Aktivitetsnavn
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Endre utgivelsesdato
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Ferdig produktmengde <b>{0}</b> og For kvantitet <b>{1}</b> kan ikke være annerledes
@@ -1664,6 +1663,7 @@
 DocType: Project,First Email,Første e-post
 DocType: Company,Exception Budget Approver Role,Unntak Budget Approver Rolle
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Når denne er satt, vil denne fakturaen være på vent til den angitte datoen"
+DocType: Cashier Closing,POS-CLO-,POS-lukningstider
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reservert Industribygg i salgsordre / ferdigvarelageret
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Selge Beløp
 DocType: Repayment Schedule,Interest Amount,rente~~POS=TRUNC
@@ -1675,7 +1675,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Records
 DocType: Asset,Scrapped,skrotet
 DocType: Item,Item Defaults,Elementinnstillinger
-DocType: Purchase Invoice,Returns,returer
+DocType: Cashier Closing,Returns,returer
 DocType: Job Card,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serial No {0} er under vedlikeholdskontrakt opp {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,Rekruttering
@@ -1689,7 +1689,6 @@
 DocType: Student,A-,EN-
 DocType: Share Transfer,Transfer Type,Overføringstype
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Salgs Utgifter
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 DocType: Diagnosis,Diagnosis,Diagnose
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standard Kjøpe
 DocType: Attendance Request,Explanation,Forklaring
@@ -1702,7 +1701,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Innkjøpsordreelementer Forfalt
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Post kode
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Salgsordre {0} er {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Velg renteinntekter konto i lån {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Velg renteinntekter konto i lån {0}
 DocType: Opportunity,Contact Info,Kontaktinfo
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Making Stock Entries
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Kan ikke markedsføre Medarbeider med status til venstre
@@ -1714,7 +1713,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Fakturaen kan ikke gjøres for null faktureringstid
 DocType: Company,Date of Commencement,Dato for oppstart
 DocType: Sales Person,Select company name first.,Velg firmanavn først.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},E-post sendt til {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},E-post sendt til {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Sitater mottatt fra leverandører.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Erstatt BOM og oppdater siste pris i alle BOMs
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Til {0} | {1} {2}
@@ -1736,7 +1735,7 @@
 DocType: Asset Movement,From Employee,Fra Employee
 DocType: Driver,Cellphone Number,Mobiltelefonnummer
 DocType: Project,Monitor Progress,Monitor Progress
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advarsel: System vil ikke sjekke billing siden beløpet for varen {0} i {1} er null
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advarsel: System vil ikke sjekke billing siden beløpet for varen {0} i {1} er null
 DocType: Journal Entry,Make Difference Entry,Gjør forskjell Entry
 DocType: Supplier Quotation,Auto Repeat Section,Auto Repeat Section
 DocType: Upload Attendance,Attendance From Date,Oppmøte Fra dato
@@ -1839,7 +1838,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Avvist Antall kan ikke legges inn i innkjøpsliste
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Endring av kundegruppe for den valgte kunden er ikke tillatt.
 ,Purchase Order Items To Be Billed,Purchase Order Elementer som skal faktureres
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Oppdaterer estimerte ankomsttider.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Oppdaterer estimerte ankomsttider.
 DocType: Program Enrollment Tool,Enrollment Details,Registreringsdetaljer
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Kan ikke angi flere standardinnstillinger for et selskap.
 DocType: Purchase Invoice Item,Net Rate,Net Rate
@@ -1853,7 +1852,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Forlat Type er madatory
 DocType: Support Settings,Close Issue After Days,Lukk Issue Etter dager
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Du må være en bruker med System Manager og Item Manager roller for å legge til brukere på Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Du må være en bruker med System Manager og Item Manager roller for å legge til brukere på Marketplace.
 DocType: Leave Control Panel,Leave blank if considered for all branches,La stå tom hvis vurderes for alle grener
 DocType: Job Opening,Staffing Plan,Bemanning Plan
 DocType: Bank Guarantee,Validity in Days,Gyldighet i dager
@@ -1875,7 +1874,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Duplicate rad {0} med samme {1}
 DocType: Marketplace Settings,Disable Marketplace,Deaktiver Marketplace
 ,Trial Balance,Balanse Trial
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Regnskapsåret {0} ikke funnet
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Regnskapsåret {0} ikke funnet
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Sette opp ansatte
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel Reservation Bruker
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Vennligst velg først prefiks
@@ -1983,7 +1982,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Kunne ikke logge inn
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Asset {0} opprettet
 DocType: Special Test Items,Special Test Items,Spesielle testelementer
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Du må være en bruker med System Manager og Item Manager roller for å registrere deg på Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Du må være en bruker med System Manager og Item Manager roller for å registrere deg på Marketplace.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Modus for betaling
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,I henhold til din tildelte lønnsstruktur kan du ikke søke om fordeler
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Website Bilde bør være en offentlig fil eller nettside URL
@@ -1995,7 +1994,7 @@
 DocType: Warehouse,Warehouse Contact Info,Warehouse Kontaktinfo
 DocType: Payment Entry,Write Off Difference Amount,Skriv Off differansebeløpet
 DocType: Volunteer,Volunteer Name,Frivillig navn
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Rader med dupliserte forfallsdatoer i andre rader ble funnet: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Rader med dupliserte forfallsdatoer i andre rader ble funnet: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: Ansattes e-post ikke funnet, derav e-posten ikke sendt"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Ingen lønnskostnad tildelt for ansatt {0} på gitt dato {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Fraktregel gjelder ikke for land {0}
@@ -2086,6 +2085,7 @@
 DocType: Salary Component,Earning,Tjene
 DocType: Supplier Scorecard,Scoring Criteria,Scoringskriterier
 DocType: Purchase Invoice,Party Account Currency,Partiet konto Valuta
+DocType: Delivery Trip,Total Estimated Distance,Totalt estimert avstand
 ,BOM Browser,BOM Nettleser
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Vennligst oppdatere statusen din for denne treningshendelsen
 DocType: Item Barcode,EAN,EAN
@@ -2124,7 +2124,7 @@
 DocType: Activity Cost,Projects,Prosjekter
 DocType: Payment Request,Transaction Currency,transaksjonsvaluta
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Fra {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Noen e-poster er ugyldige
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Noen e-poster er ugyldige
 DocType: Work Order Operation,Operation Description,Operasjon Beskrivelse
 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.,Kan ikke endre regnskapsåret Startdato og regnskapsår sluttdato når regnskapsåret er lagret.
 DocType: Quotation,Shopping Cart,Handlevogn
@@ -2148,7 +2148,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Netto endring i Fixed Asset
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Antall
 DocType: Leave Control Panel,Leave blank if considered for all designations,La stå tom hvis vurderes for alle betegnelser
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge of type &#39;Actual&#39; i rad {0} kan ikke inkluderes i Element Ranger
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge of type &#39;Actual&#39; i rad {0} kan ikke inkluderes i Element Ranger
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Fra Datetime
 DocType: Shopify Settings,For Company,For selskapet
@@ -2162,7 +2162,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Det var feil å opprette kursplan
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Den første utgiftsgodkjenningen i listen blir satt som standard utgiftsgodkjent.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,kan ikke være større enn 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Du må være en annen bruker enn Administrator med System Manager og Item Manager roller for å registrere deg på Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Du må være en annen bruker enn Administrator med System Manager og Item Manager roller for å registrere deg på Marketplace.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Element {0} er ikke en lagervare
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Ikke planlagt
@@ -2191,7 +2191,7 @@
 DocType: HR Settings,Employee Settings,Medarbeider Innstillinger
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Laster inn betalingssystem
 ,Batch-Wise Balance History,Batch-Wise Balance Historie
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Row # {0}: Kan ikke sette Rate hvis beløpet er større enn fakturert beløp for element {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Row # {0}: Kan ikke sette Rate hvis beløpet er større enn fakturert beløp for element {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Utskriftsinnstillingene oppdatert i respektive utskriftsformat
 DocType: Package Code,Package Code,pakke kode
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Lærling
@@ -2425,7 +2425,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} ledige stillinger og {1} budsjett for {2} som allerede er planlagt for datterselskaper av {3}. \ Du kan bare planlegge opptil {4} ledige stillinger og budsjett {5} i henhold til personaleplan {6} for morselskapet {3}.
 DocType: HR Settings,Stop Birthday Reminders,Stop bursdagspåminnelser
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Vennligst sette Standard Lønn betales konto i selskapet {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Vennligst sette Standard Lønn betales konto i selskapet {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Få økonomisk oppdeling av skatter og avgifter data av Amazon
 DocType: SMS Center,Receiver List,Mottaker List
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Søk Element
@@ -2495,7 +2495,7 @@
 DocType: Vital Signs,Constipated,forstoppelse
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Mot Leverandør Faktura {0} datert {1}
 DocType: Customer,Default Price List,Standard Prisliste
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Asset Movement rekord {0} er opprettet
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Asset Movement rekord {0} er opprettet
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Ingen objekter funnet.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Du kan ikke slette regnskapsår {0}. Regnskapsåret {0} er satt som standard i Globale innstillinger
 DocType: Share Transfer,Equity/Liability Account,Egenkapital / ansvarskonto
@@ -2634,6 +2634,7 @@
 DocType: Blanket Order,Order Type,Ordretype
 ,Item-wise Sales Register,Element-messig Sales Register
 DocType: Asset,Gross Purchase Amount,Bruttobeløpet
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Varenummer&gt; Varegruppe&gt; Varemerke
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Åpningsbalanser
 DocType: Asset,Depreciation Method,avskrivningsmetode
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Er dette inklusiv i Basic Rate?
@@ -2714,7 +2715,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Handling hvis årlig budsjett overskrides på PO
 DocType: Student Leave Application,Student Leave Application,Student La Application
 DocType: Item,Will also apply for variants,Vil også gjelde for varianter
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke avbestilles, som det allerede er {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke avbestilles, som det allerede er {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Employee {0} på halv dag {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Samlet arbeidstid må ikke være større enn maks arbeidstid {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,På
@@ -2738,6 +2739,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Hent data
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Maksimum permisjon tillatt i permisjonstypen {0} er {1}
 DocType: SMS Center,Create Receiver List,Lag Receiver List
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Tilgjengelig for bruk Dato bør være etter kjøpsdato
 DocType: Vehicle,Wheels,hjul
 DocType: Packing Slip,To Package No.,Å pakke No.
 DocType: Patient Relation,Family,Familie
@@ -2751,7 +2753,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Faktureringsvaluta må være lik enten selskapets valuta- eller partikonto-valuta
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indikerer at pakken er en del av denne leveransen (Kun Draft)
 DocType: Soil Texture,Loam,leirjord
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Row {0}: Forfallsdato kan ikke være før innleggsdato
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Row {0}: Forfallsdato kan ikke være før innleggsdato
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Utfør betaling Entry
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Kvantum for Element {0} må være mindre enn {1}
 ,Sales Invoice Trends,Salgsfaktura Trender
@@ -2824,7 +2826,7 @@
 DocType: Guardian,Guardian Interests,Guardian Interesser
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Oppdater kontonavn / nummer
 DocType: Naming Series,Current Value,Nåværende Verdi
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flere regnskapsårene finnes for datoen {0}. Vennligst satt selskapet i regnskapsåret
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flere regnskapsårene finnes for datoen {0}. Vennligst satt selskapet i regnskapsåret
 DocType: Education Settings,Instructor Records to be created by,Instruktørposter som skal opprettes av
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} opprettet
 DocType: GST Account,GST Account,GST-konto
@@ -2841,7 +2843,7 @@
 DocType: Sales Person,Name and Employee ID,Navn og Employee ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Due Date kan ikke være før konteringsdato
 DocType: Website Item Group,Website Item Group,Website varegruppe
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Ingen lønnsslipp funnet å sende inn for ovennevnte utvalgte kriterier ELLER lønnsslipp allerede sendt
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Ingen lønnsslipp funnet å sende inn for ovennevnte utvalgte kriterier ELLER lønnsslipp allerede sendt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Skatter og avgifter
 DocType: Projects Settings,Projects Settings,Prosjekter Innstillinger
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Skriv inn Reference dato
@@ -2850,7 +2852,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Medfølgende Antall
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Materialet Request Element
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Vennligst avbryt kjøp kvittering {0} først
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Vennligst avbryt kjøp kvittering {0} først
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Tree of varegrupper.
 DocType: Production Plan,Total Produced Qty,Totalt produsert antall
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Kan ikke se rad tall større enn eller lik gjeldende rad nummer for denne debiteringstype
@@ -2961,6 +2963,7 @@
 ,Vehicle Expenses,Vehicle Utgifter
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Opprett Lab Test (er) på salgsfaktura Send
 DocType: Serial No,Invoice Details,Fakturadetaljer
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Aktiver Google Maps Innstillinger for å estimere og optimalisere ruter
 DocType: Grant Application,Show on Website,Vis på nettstedet
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Start på
 DocType: Hub Tracked Item,Hub Category,Hub kategori
@@ -3001,7 +3004,7 @@
 DocType: Inpatient Record,B Positive,B Positiv
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Maksimal nytte av arbeidstakeren {0} overstiger {1} med summen {2} av tidligere hevdet \ beløp
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",Row # {0}: Antall må være en som elementet er et anleggsmiddel. Bruk egen rad for flere stk.
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",Row # {0}: Antall må være en som elementet er et anleggsmiddel. Bruk egen rad for flere stk.
 DocType: Leave Block List Allow,Leave Block List Allow,La Block List Tillat
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
 DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
@@ -3036,7 +3039,7 @@
 DocType: Workstation,Wages per hour,Lønn per time
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock balanse i Batch {0} vil bli negativ {1} for Element {2} på Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Følgende materiale Requests har vært reist automatisk basert på element re-order nivå
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Account Valuta må være {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Account Valuta må være {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Fra dato {0} kan ikke være etter ansattes avlastningsdato {1}
 DocType: Supplier,Is Internal Supplier,Er Intern Leverandør
 DocType: Employee,Create User Permission,Opprett brukertillatelse
@@ -3182,7 +3185,7 @@
 DocType: Account,Fixed Asset,Fast Asset
 DocType: Amazon MWS Settings,After Date,Etter dato
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Serialisert Lager
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Ugyldig {0} for interfirmafaktura.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Ugyldig {0} for interfirmafaktura.
 ,Department Analytics,Avdeling Analytics
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-post ikke funnet i standardkontakt
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generer hemmelighet
@@ -3195,7 +3198,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Programmet i avgiftsstrukturen og studentgruppen {0} er forskjellig.
 DocType: Bank Statement Transaction Entry,Receivable Account,Fordring konto
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Gyldig fra dato må være mindre enn gyldig utløpsdato.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} er allerede {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} er allerede {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Salgsordre til betaling
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,administrerende direktør
@@ -3237,6 +3240,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Debet Å kreves
 DocType: Clinical Procedure,Inpatient Record,Inpatient Record
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timelister bidra til å holde styr på tid, kostnader og fakturering for aktiviteter gjort av teamet ditt"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Kjøp Prisliste
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Dato for transaksjon
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Maler av leverandørens scorecard-variabler.
@@ -3280,7 +3284,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Valutagevinst / tap
 DocType: Opportunity,Lost Reason,Mistet Reason
 DocType: Amazon MWS Settings,Enable Amazon,Aktiver Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Rute # {0}: Konto {1} tilhører ikke firma {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Rute # {0}: Konto {1} tilhører ikke firma {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Kan ikke finne DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Ny adresse
 DocType: Quality Inspection,Sample Size,Sample Size
@@ -3392,7 +3396,7 @@
 DocType: Water Analysis,Origin,Opprinnelse
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dette dokumentet er over grensen av {0} {1} for elementet {4}. Er du gjør en annen {3} mot samme {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Vennligst sett gjentakende etter lagring
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Velg endring mengde konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Velg endring mengde konto
 DocType: Purchase Invoice,Price List Currency,Prisliste Valuta
 DocType: Naming Series,User must always select,Brukeren må alltid velge
 DocType: Stock Settings,Allow Negative Stock,Tillat Negative Stock
@@ -3434,7 +3438,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Er du sikker på at du vil avbryte denne avtalen?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Hotellrom Prispakke
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,salgs~~POS=TRUNC
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Vennligst angi standardkonto i Lønn Component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Vennligst angi standardkonto i Lønn Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nødvendig På
 DocType: Rename Tool,File to Rename,Filen til Rename
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Vennligst velg BOM for Element i Rad {0}
@@ -3455,7 +3459,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostnad for kjøpte varer
 DocType: Employee Separation,Employee Separation Template,Medarbeider separasjonsmal
 DocType: Selling Settings,Sales Order Required,Salgsordre Påkrevd
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Bli en selger
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Bli en selger
 DocType: Purchase Invoice,Credit To,Kreditt til
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Aktive Ledninger / Kunder
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,La stå tomt for å bruke standardleveringsformat
@@ -3496,7 +3500,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Lag skatteremne
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,bruker~~POS=TRUNC
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Råvare kan ikke være blank.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Rad # {0} (betalingstabell): beløpet må være negativt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Rad # {0} (betalingstabell): beløpet må være negativt
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Kunne ikke oppdatere lager, inneholder faktura slippe frakt element."
 DocType: Contract,Fulfilment Status,Oppfyllelsesstatus
 DocType: Lab Test Sample,Lab Test Sample,Lab Test prøve
@@ -3636,7 +3640,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Dok dato
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Fee Records Laget - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategori konto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Row # {0} (Betalingstabell): Beløpet må være positivt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Row # {0} (Betalingstabell): Beløpet må være positivt
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke produsere mer Element {0} enn Salgsordre kvantitet {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Velg Attributtverdier
 DocType: Purchase Invoice,Reason For Issuing document,Årsak til utstedelse av dokument
@@ -3691,7 +3695,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Tidspunktet for når materialene ble mottatt
 DocType: Products Settings,Products per Page,Produkter per side
 DocType: Stock Ledger Entry,Outgoing Rate,Utgående Rate
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,eller
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,eller
 DocType: Sales Order,Billing Status,Billing Status
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Melde om et problem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Utility Utgifter
@@ -3719,7 +3723,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Ansvarserklæring om ansattes skattefradrag
 DocType: Payment Entry,Cheque/Reference Date,Sjekk / Reference Date
 DocType: Purchase Invoice,Total Taxes and Charges,Totale skatter og avgifter
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Tilgjengelig for bruk Dato er oppgitt som siste dato
 DocType: Employee,Emergency Contact,Nødtelefon
 DocType: Bank Reconciliation Detail,Payment Entry,betaling Entry
 ,sales-browser,salg-browser
@@ -3766,6 +3769,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Er retur (kredittnota)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Start jobb
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Serienummer er nødvendig for aktiva {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vennligst still inn navngivningsserien for {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Funksjonshemmede malen må ikke være standardmal
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,For rad {0}: Skriv inn planlagt antall
 DocType: Account,Income Account,Inntekt konto
@@ -3779,6 +3783,7 @@
 DocType: Loyalty Program,Help Section,Hjelpseksjon
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,Key Ansvar Område
+DocType: Delivery Trip,Distance UOM,Avstand UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student batcher hjelpe deg med å spore oppmøte, vurderinger og avgifter for studenter"
 DocType: Payment Entry,Total Allocated Amount,Totalt tildelte beløp
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Angi standard beholdningskonto for evigvarende beholdning
@@ -3820,7 +3825,7 @@
 DocType: Item Supplier,Item Supplier,Sak Leverandør
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Skriv inn Element kode for å få batch no
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Velg en verdi for {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Ingen elementer valgt for overføring
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Ingen elementer valgt for overføring
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alle adresser.
 DocType: Company,Stock Settings,Aksje Innstillinger
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenslåing er bare mulig hvis følgende egenskaper er samme i begge postene. Er Group, Root Type, Company"
@@ -4106,7 +4111,7 @@
 DocType: Patient,Personal and Social History,Personlig og sosial historie
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Bruker {0} opprettet
 DocType: Fee Schedule,Fee Breakup for each student,Fee Breakup for hver student
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total forhånd ({0}) mot Bestill {1} kan ikke være større enn totalsummen ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total forhånd ({0}) mot Bestill {1} kan ikke være større enn totalsummen ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Velg Månedlig Distribusjon til ujevnt fordele målene gjennom måneder.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Endre kode
 DocType: Purchase Invoice Item,Valuation Rate,Verdivurdering Rate
@@ -4115,7 +4120,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Benyttet ITC Cess
 ,Student Monthly Attendance Sheet,Student Månedlig Oppmøte Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Fraktregel gjelder kun for salg
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Avskrivningsraden {0}: Neste avskrivningsdato kan ikke være før kjøpsdato
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Avskrivningsraden {0}: Neste avskrivningsdato kan ikke være før kjøpsdato
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Prosjekt startdato
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Inntil
 DocType: Rename Tool,Rename Log,Rename Logg
@@ -4133,12 +4138,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Hvor ofte skal prosjektet og selskapet oppdateres basert på salgstransaksjoner.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Går ut på dato den
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Legg Studenter
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Vennligst slett Medarbeider <a href=""#Form/Employee/{0}"">{0}</a> \ for å avbryte dette dokumentet"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Vennligst velg {0}
 DocType: C-Form,C-Form No,C-Form Nei
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Avstand
+DocType: Delivery Stop,Distance,Avstand
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Oppgi produktene eller tjenestene du kjøper eller selger.
 DocType: Water Analysis,Storage Temperature,Lager temperatur
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4165,7 +4168,7 @@
 DocType: Homepage,Company Description for website homepage,Selskapet beskrivelse for nettstedet hjemmeside
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For det lettere for kunder, kan disse kodene brukes i trykte formater som regningene og leveringssedlene"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Name
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Kunne ikke hente informasjon for {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Kunne ikke hente informasjon for {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Åpningsoppføring Journal
 DocType: Contract,Fulfilment Terms,Oppfyllelsesbetingelser
 DocType: Sales Invoice,Time Sheet List,Timeregistrering List
@@ -4347,7 +4350,7 @@
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Velg studenter manuelt for aktivitetsbasert gruppe
 DocType: Journal Entry,User Remark,Bruker Remark
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Optimalisering av ruter.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Optimalisering av ruter.
 DocType: Travel Itinerary,Non Diary,Ikke-dagbok
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Kan ikke opprette Beholdningsbonus for venstre Ansatte
 DocType: Lead,Market Segment,Markedssegment
@@ -4378,7 +4381,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Lojalitetsprogram
 DocType: Student Guardian,Father,Far
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Støtte Billetter
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;Oppdater Stock &quot;kan ikke kontrolleres for driftsmiddel salg
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;Oppdater Stock &quot;kan ikke kontrolleres for driftsmiddel salg
 DocType: Bank Reconciliation,Bank Reconciliation,Bankavstemming
 DocType: Attendance,On Leave,På ferie
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Få oppdateringer
@@ -4423,7 +4426,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serial No og Batch
 DocType: Warranty Claim,From Company,Fra Company
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Summen av Resultater av vurderingskriterier må være {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Vennligst sett Antall Avskrivninger bestilt
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Vennligst sett Antall Avskrivninger bestilt
 DocType: Supplier Scorecard Period,Calculations,beregninger
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Verdi eller Stk
 DocType: Payment Terms Template,Payment Terms,Betalingsbetingelser
@@ -4442,7 +4445,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Rabatt (%) på prisliste med margin
 DocType: Healthcare Service Unit Type,Rate / UOM,Rate / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,alle Næringslokaler
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Ingen {0} funnet for Inter Company Transactions.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Ingen {0} funnet for Inter Company Transactions.
 DocType: Travel Itinerary,Rented Car,Lei bil
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Om firmaet ditt
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Kreditt til kontoen må være en balansekonto
@@ -4544,6 +4547,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Plantanalyse Kriterier
 DocType: Cheque Print Template,Cheque Height,sjekk Høyde
 DocType: Supplier,Supplier Details,Leverandør Detaljer
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vennligst oppsett nummereringsserie for Tilstedeværelse via Oppsett&gt; Nummereringsserie
 DocType: Setup Progress,Setup Progress,Oppsett Progress
 DocType: Expense Claim,Approval Status,Godkjenningsstatus
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Fra verdien må være mindre enn til verdien i rad {0}
@@ -4637,7 +4641,6 @@
 DocType: Travel Request,Fully Sponsored,Fullt sponset
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Omvendt journalinngang
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Kunden {0} er opprettet.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vennligst oppsett Medarbeiders navngivningssystem i menneskelig ressurs&gt; HR-innstillinger
 DocType: Stock Settings,Limit Percent,grense Prosent
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Foreløpig ingen lager tilgjengelig i varehus
 ,Payment Period Based On Invoice Date,Betaling perioden basert på Fakturadato
@@ -4696,7 +4699,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Kilde Warehouse
 DocType: Installation Note,Installation Date,Installasjonsdato
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Del Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ikke tilhører selskapet {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ikke tilhører selskapet {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Salgsfaktura {0} opprettet
 DocType: Employee,Confirmation Date,Bekreftelse Dato
 DocType: Inpatient Occupancy,Check Out,Sjekk ut
@@ -4716,6 +4719,7 @@
 DocType: Production Plan,Sales Orders Detail,Salgsordre detalj
 DocType: Bin,Requested Quantity,Requested Antall
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Vennligst oppsett Instruktør Navngivningssystem under utdanning&gt; Utdanningsinnstillinger
 DocType: Patient,Marital Status,Sivilstatus
 DocType: Stock Settings,Auto Material Request,Auto Materiell Request
 DocType: Woocommerce Settings,API consumer secret,API forbruker hemmelig
@@ -4768,7 +4772,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Velg dager
 DocType: Academic Term,Term Name,Term Navn
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Kreditt ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Opprette lønnsslipp ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Opprette lønnsslipp ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Du kan ikke redigere rotknutepunktet.
 DocType: Buying Settings,Purchase Order Required,Innkjøpsordre Påkrevd
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Timer
@@ -4806,7 +4810,7 @@
 DocType: Account,Rate at which this tax is applied,Hastigheten som denne skatten er brukt
 DocType: Cash Flow Mapper,Section Name,Seksjonsnavn
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Omgjøre Antall
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Avskrivningsraden {0}: Forventet verdi etter brukstid må være større enn eller lik {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Avskrivningsraden {0}: Forventet verdi etter brukstid må være større enn eller lik {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Nåværende jobb Åpninger
 DocType: Company,Stock Adjustment Account,Stock Adjustment konto
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Skriv Off
@@ -4853,7 +4857,7 @@
 DocType: Program Enrollment,School House,school House
 DocType: Serial No,Out of AMC,Ut av AMC
 DocType: Opportunity,Opportunity Amount,Mulighetsbeløp
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antall Avskrivninger reservert kan ikke være større enn Totalt antall Avskrivninger
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antall Avskrivninger reservert kan ikke være større enn Totalt antall Avskrivninger
 DocType: Purchase Order,Order Confirmation Date,Ordrebekreftelsesdato
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Gjør Vedlikehold Visit
@@ -4894,7 +4898,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Parti:
 DocType: Volunteer,Afternoon,Ettermiddag
 DocType: Loyalty Program,Loyalty Program Help,Lojalitetsprogram Hjelp
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} {1} er deaktivert
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} {1} er deaktivert
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Sett som Åpen
 DocType: Cheque Print Template,Scanned Cheque,skannede Cheque
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Send automatisk e-poster til Kontakter på Sende transaksjoner.
@@ -4907,7 +4911,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Element og Garanti Detaljer
 DocType: Chapter,Chapter Members,Kapittelmedlemmer
 DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Merk: Betaling Entry vil ikke bli laget siden &quot;Cash eller bankkontoen ble ikke spesifisert
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Merk: Betaling Entry vil ikke bli laget siden &quot;Cash eller bankkontoen ble ikke spesifisert
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Prosjektet {0} eksisterer allerede
 DocType: Clinical Procedure,Nursing User,Sykepleier Bruker
 DocType: Employee Benefit Application,Payroll Period,Lønn Periode
@@ -4915,6 +4919,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Serienummer {0} tilhører ikke Batch {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Ansvarsområder
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Gyldighetsperioden for dette sitatet er avsluttet.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Vennligst slett Medarbeider <a href=""#Form/Employee/{0}"">{0}</a> \ for å avbryte dette dokumentet"
 DocType: Expense Claim Account,Expense Claim Account,Expense krav konto
 DocType: Account,Capital Work in Progress,Kapitalarbeid pågår
 DocType: Accounts Settings,Allow Stale Exchange Rates,Tillat uaktuelle valutakurser
@@ -4996,7 +5002,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Issue Material
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Koble Shopify med ERPNext
 DocType: Material Request Item,For Warehouse,For Warehouse
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Leveringsnotater {0} oppdatert
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Leveringsnotater {0} oppdatert
 DocType: Employee,Offer Date,Tilbudet Dato
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Sitater
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Du er i frakoblet modus. Du vil ikke være i stand til å laste før du har nettverk.
@@ -5047,7 +5053,7 @@
 DocType: Shipping Rule,Calculate Based On,Beregn basert på
 DocType: Contract,Unfulfilled,oppfylt
 DocType: Delivery Note Item,From Warehouse,Fra Warehouse
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Ingen ansatte for de nevnte kriteriene
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Ingen ansatte for de nevnte kriteriene
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Ingen elementer med Bill of Materials til Manufacture
 DocType: Shopify Settings,Default Customer,Standardkund
 DocType: Sales Stage,Stage Name,Artistnavnet
@@ -5090,7 +5096,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skattebeløp Etter Rabattbeløp
 DocType: Patient,Inpatient Status,Inpatientstatus
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Daglige arbeid Oppsummering Innstillinger
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Valgt prisliste skal ha kjøps- og salgsfelt sjekket.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Valgt prisliste skal ha kjøps- og salgsfelt sjekket.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Vennligst skriv inn reqd etter dato
 DocType: Payment Entry,Internal Transfer,Internal Transfer
 DocType: Asset Maintenance,Maintenance Tasks,Vedlikeholdsoppgaver
@@ -5127,7 +5133,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Grupper etter
 DocType: Guardian,Interests,Interesser
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Aktivere / deaktivere valutaer.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Kunne ikke sende inn noen Lønnsslipp
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Kunne ikke sende inn noen Lønnsslipp
 DocType: Exchange Rate Revaluation,Get Entries,Få oppføringer
 DocType: Production Plan,Get Material Request,Få Material Request
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Post Utgifter
@@ -5214,7 +5220,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Utgiftskonto er obligatorisk for elementet {0}
 DocType: BOM,Website Description,Website Beskrivelse
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Netto endring i egenkapital
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Vennligst avbryte fakturaen {0} først
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Vennligst avbryte fakturaen {0} først
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Ikke tillatt. Slå av tjenestenhetstype
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-post adresse må være unikt, allerede eksisterer for {0}"
 DocType: Serial No,AMC Expiry Date,AMC Utløpsdato
@@ -5254,7 +5260,7 @@
 DocType: Hotel Room,Hotel Room,Hotellrom
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Konto {0} ikke tilhører selskapet {1}
 DocType: Leave Type,Rounding,avrunding
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Serienumre i rad {0} stemmer ikke overens med leveringsnotat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Serienumre i rad {0} stemmer ikke overens med leveringsnotat
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Dispensed Amount (Pro-vurdert)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Deretter blir prisreglene filtrert ut basert på kunde, kundegruppe, territorium, leverandør, leverandørgruppe, kampanje, salgspartner etc."
 DocType: Student,Guardian Details,Guardian Detaljer
@@ -5309,7 +5315,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Warehouse nødvendig for lager Element {0}
 DocType: Leave Allocation,Unused leaves,Ubrukte blader
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Gjør tilbakebetalingsoppføring
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Alle avdelinger
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Alle avdelinger
 DocType: Healthcare Service Unit,Vacant,Ledig
 DocType: Patient,Alcohol Past Use,Alkohol Tidligere Bruk
 DocType: Fertilizer Content,Fertilizer Content,Gjødselinnhold
@@ -5320,7 +5326,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Arbeidsordre {0} må avbestilles før du kansellerer denne salgsordren
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Hente eksploderte BOM (inkludert underenheter)
 DocType: Authorization Rule,Applicable To (Employee),Gjelder til (Employee)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Due Date er obligatorisk
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Due Date er obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Økning for Egenskap {0} kan ikke være 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Fordeltype og beløp
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Rom bestilles
@@ -5469,7 +5475,7 @@
 DocType: Purchase Invoice Item,Total Weight,Total vekt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Provisjon på salg
 DocType: Job Offer Term,Value / Description,Verdi / beskrivelse
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} kan ikke sendes inn, er det allerede {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} kan ikke sendes inn, er det allerede {2}"
 DocType: Tax Rule,Billing Country,Fakturering Land
 DocType: Purchase Order Item,Expected Delivery Date,Forventet Leveringsdato
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurant Bestillingsinngang
@@ -5508,12 +5514,13 @@
 DocType: Maintenance Visit,Breakdown,Sammenbrudd
 DocType: Travel Itinerary,Vegetarian,Vegetarisk
 DocType: Patient Encounter,Encounter Date,Encounter Date
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: {1} kan ikke velges
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: {1} kan ikke velges
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bankdata
 DocType: Purchase Receipt Item,Sample Quantity,Prøvekvantitet
 DocType: Bank Guarantee,Name of Beneficiary,Navn på mottaker
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Oppdater BOM kostnad automatisk via Scheduler, basert på siste verdivurdering / prisliste rate / siste kjøpshastighet av råvarer."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Leverandør&gt; Leverandørgruppe
 DocType: Bank Reconciliation Detail,Cheque Date,Sjekk Dato
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Parent konto {1} ikke tilhører selskapet: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Slettet alle transaksjoner knyttet til dette selskapet!
@@ -5541,7 +5548,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Ordnede noder kan bare opprettes under &#39;Gruppe&#39; type noder
 DocType: Attendance Request,Half Day Date,Half Day Date
 DocType: Academic Year,Academic Year Name,Akademisk År Navn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} ikke lov til å transaksere med {1}. Vennligst endre firmaet.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} ikke lov til å transaksere med {1}. Vennligst endre firmaet.
 DocType: Sales Partner,Contact Desc,Kontakt Desc
 DocType: Email Digest,Send regular summary reports via Email.,Send vanlige oppsummeringsrapporter via e-post.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Vennligst angi standardkonto i Expense krav Type {0}
@@ -5574,7 +5581,7 @@
 DocType: Hotel Room,Hotel Manager,Hotell sjef
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Still skatteregel for shopping cart
 DocType: Purchase Invoice,Taxes and Charges Added,Skatter og avgifter legges
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Avskrivningsraden {0}: Neste avskrivningsdato kan ikke være før Tilgjengelig-til-bruk-dato
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Avskrivningsraden {0}: Neste avskrivningsdato kan ikke være før Tilgjengelig-til-bruk-dato
 ,Sales Funnel,Sales trakt
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Forkortelsen er obligatorisk
 DocType: Project,Task Progress,Task Progress
@@ -5588,7 +5595,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Alle kundegrupper
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,akkumulert pr måned
 DocType: Attendance Request,On Duty,I tjeneste
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Kanskje Valutaveksling posten ikke er skapt for {1} til {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Kanskje Valutaveksling posten ikke er skapt for {1} til {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Bemanningsplan {0} finnes allerede for betegnelse {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Skatt Mal er obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Konto {0}: Parent konto {1} finnes ikke
@@ -5668,11 +5675,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Minst én lageret er obligatorisk
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Konfigurer produktfelt som UOM, varegruppe, beskrivelse og antall timer."
 DocType: Certification Application,Certification Status,Sertifiseringsstatus
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Marketplace
 DocType: Travel Itinerary,Travel Advance Required,Krav på reisefordeling
 DocType: Subscriber,Subscriber Name,Abonnentnavn
 DocType: Serial No,Out of Warranty,Ut av Garanti
-DocType: Cashier Closing,Cashier-closing-,Kasserer-closing-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Mappet datatype
 DocType: BOM Update Tool,Replace,Erstatt
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Ingen produkter funnet.
@@ -5759,7 +5765,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Standard skattemaler for salg og kjøp opprettes.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Vurderingsresultatrekord {0} eksisterer allerede.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Eksempel: ABCD. #####. Hvis serier er satt og Batch nr ikke er nevnt i transaksjoner, vil automatisk batchnummer bli opprettet basert på denne serien. Hvis du alltid vil uttrykkelig nevne Batch nr for dette elementet, la dette være tomt. Merk: Denne innstillingen vil ha prioritet i forhold til Naming Series Prefix i lagerinnstillinger."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vennligst oppsett nummereringsserie for Tilstedeværelse via Oppsett&gt; Nummereringsserie
 DocType: BOM,Materials Required (Exploded),Materialer som er nødvendige (Exploded)
 DocType: Contract,Party User,Festbruker
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Vennligst sett Company filter blank hvis Group By er &#39;Company&#39;
@@ -5960,7 +5965,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opptelling
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Begge prøveperiodens startdato og prøveperiodens sluttdato må settes
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Gjennomsnittlig rente
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Totalt betalingsbeløp i betalingsplan må være lik Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Totalt betalingsbeløp i betalingsplan må være lik Grand / Rounded Total
 DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Kontoutskrift balanse pr hovedbok
 DocType: Job Applicant,Applicant Name,Søkerens navn
@@ -6029,7 +6034,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Såpe og vaskemiddel
 DocType: BOM,Show Items,Vis Items
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Fra tid kan ikke være større enn til annen.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Vil du varsle alle kundene via e-post?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Vil du varsle alle kundene via e-post?
 DocType: Subscription Plan,Billing Interval,Faktureringsintervall
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestilt
@@ -6038,9 +6043,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Row {0}: {1} må være større enn 0
 DocType: Assessment Criteria,Assessment Criteria Group,Vurderingskriterier Gruppe
 DocType: Healthcare Settings,Patient Name By,Pasientnavn Av
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Periodiseringstidspunkt Oppføring for lønn fra {0} til {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Periodiseringstidspunkt Oppføring for lønn fra {0} til {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Aktiver utsatt inntekt
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Åpning akkumulerte avskrivninger må være mindre enn eller lik {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Åpning akkumulerte avskrivninger må være mindre enn eller lik {0}
 DocType: Warehouse,Warehouse Name,Warehouse Name
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Faktisk startdato må være mindre enn faktisk sluttdato
 DocType: Naming Series,Select Transaction,Velg Transaksjons
@@ -6191,7 +6196,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Medarbeider {0} av klasse {1} har ingen standard permisjon
 DocType: Salary Detail,Salary Detail,lønn Detalj
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Vennligst velg {0} først
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Lagt til {0} brukere
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Lagt til {0} brukere
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","Når det gjelder flerlagsprogram, vil kundene automatisk bli tilordnet den aktuelle delen som brukt"
 DocType: Appointment Type,Physician,lege
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Batch {0} av Element {1} er utløpt.
@@ -6335,7 +6340,7 @@
 DocType: Asset,Custodian,Depotmottaker
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Point-of-Sale Profile
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} skal være en verdi mellom 0 og 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Betaling av {0} fra {1} til {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Betaling av {0} fra {1} til {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Usikret lån
 DocType: Cost Center,Cost Center Name,Kostnadssteds Name
 DocType: Student,B+,B +
@@ -6367,6 +6372,7 @@
 DocType: Employee,Date of Issue,Utstedelsesdato
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","I henhold til kjøpsinnstillingene hvis kjøp tilbakekjøpt er nødvendig == &#39;JA&#39; og deretter for å opprette kjøpfaktura, må brukeren opprette kjøpsmottak først for element {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Row # {0}: Sett Leverandør for elementet {1}
+DocType: Global Defaults,Default Distance Unit,Standard avstandsenhet
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Rad {0}: Timer verdien må være større enn null.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Website Bilde {0} festet til Element {1} kan ikke finnes
 DocType: Issue,Content Type,Innholdstype
@@ -6422,7 +6428,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Uttak fra kontoen må være en balansekonto
 DocType: Asset,Naming Series,Navngi Series
 DocType: Vital Signs,Coated,Coated
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Row {0}: Forventet verdi etter brukbart liv må være mindre enn brutto innkjøpsbeløp
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Row {0}: Forventet verdi etter brukbart liv må være mindre enn brutto innkjøpsbeløp
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Innstillinger
 DocType: Leave Block List,Leave Block List Name,La Block List Name
 DocType: Certified Consultant,Certification Validity,Sertifiserings gyldighet
@@ -6491,6 +6497,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Bankoverskrift
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Se labtester
 DocType: Hub Users,Hub Users,Hub-brukere
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Vedlikehold Dato
 DocType: Purchase Invoice Item,Rejected Serial No,Avvist Serial No
@@ -6505,7 +6512,7 @@
 DocType: SG Creation Tool Course,Max Strength,Max Strength
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Installere forhåndsinnstillinger
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Ingen leveringsnotering valgt for kunden {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Ingen leveringsnotering valgt for kunden {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Medarbeider {0} har ingen maksimal ytelsesbeløp
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Velg elementer basert på leveringsdato
 DocType: Grant Application,Has any past Grant Record,Har noen tidligere Grant Record
@@ -6533,7 +6540,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Hotellrombestilling
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Kundeservice
 DocType: BOM,Thumbnail,Thumbnail
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Ingen kontakter med e-postadresser funnet.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Ingen kontakter med e-postadresser funnet.
 DocType: Item Customer Detail,Item Customer Detail,Sak Customer Detalj
 DocType: Notification Control,Prompt for Email on Submission of,Spør for E-post om innsending av
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Maksimal ytelsesbeløp for ansatt {0} overstiger {1}
@@ -6793,7 +6800,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,Kan ikke covert til konsernet fordi Kontotype er valgt.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} har blitt endret. Vennligst oppdater.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stoppe brukere fra å gjøre La Applications på følgende dager.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Varenummer&gt; Varegruppe&gt; Varemerke
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Hvis ubegrenset utløper for lojalitetspoengene, hold utløpsvarigheten tom eller 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Vedlikeholdsteammedlemmer
 DocType: Loyalty Point Entry,Purchase Amount,kjøpesummen
@@ -6801,7 +6807,7 @@
 											to fullfill Sales Order {2}",Kan ikke levere serienummeret {0} av elementet {1} som det er reservert \ for å fullføre salgsordren {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Leverandør sitat {0} er opprettet
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Slutt År kan ikke være før start År
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Slutt År kan ikke være før start År
 DocType: Employee Benefit Application,Employee Benefits,Ytelser til ansatte
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Pakket mengde må være lik mengde for Element {0} i rad {1}
 DocType: Work Order,Manufactured Qty,Produsert Antall
@@ -6817,6 +6823,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Velg batchnumre
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Til GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Regninger hevet til kundene.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vennligst oppsett Medarbeiders navngivningssystem i menneskelig ressurs&gt; HR-innstillinger
 DocType: Healthcare Settings,Invoice Appointments Automatically,Fakturaavtaler automatisk
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Prosjekt Id
 DocType: Salary Component,Variable Based On Taxable Salary,Variabel basert på skattepliktig lønn
@@ -6865,7 +6872,7 @@
 DocType: POS Profile,Account for Change Amount,Konto for Change Beløp
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Koble til QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Total gevinst / tap
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Ugyldig Company for Inter Company Invoice.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Ugyldig Company for Inter Company Invoice.
 DocType: Purchase Invoice,input service,inntjeningstjeneste
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rad {0}: Party / Account samsvarer ikke med {1} / {2} i {3} {4}
 DocType: Employee Promotion,Employee Promotion,Medarbeideropplæring
@@ -6996,7 +7003,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Foretrukket område for innkvartering
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Handlevognen er tom
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Vennligst oppsett Instruktør Navngivningssystem under utdanning&gt; Utdanningsinnstillinger
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Vare {0} har ingen serienummer. Kun seriliserte artikler \ kan ha levering basert på serienummer
 DocType: Vehicle,Model,Modell
@@ -7026,7 +7032,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Ingenting å forandre seg
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Vennligst velg en csv-fil
 DocType: Holiday List,Total Holidays,Totalt helligdager
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Manglende e-postmal for sending. Vennligst sett inn en i Leveringsinnstillinger.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Manglende e-postmal for sending. Vennligst sett inn en i Leveringsinnstillinger.
 DocType: Student Leave Application,Mark as Present,Merk som Present
 DocType: Supplier Scorecard,Indicator Color,Indikatorfarge
 DocType: Purchase Order,To Receive and Bill,Å motta og Bill
@@ -7035,7 +7041,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Velg serienummer
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Betingelser Mal
-DocType: Serial No,Delivery Details,Levering Detaljer
+DocType: Delivery Trip,Delivery Details,Levering Detaljer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Kostnadssted er nødvendig i rad {0} i skatter tabell for typen {1}
 DocType: Program,Program Code,programkode
 DocType: Terms and Conditions,Terms and Conditions Help,Betingelser Hjelp
@@ -7059,7 +7065,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ledetid Days
 DocType: Cash Flow Mapping,Is Income Tax Expense,Er inntektsskatt utgift
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Din bestilling er ute for levering!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: konteringsdato må være det samme som kjøpsdato {1} av eiendelen {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: konteringsdato må være det samme som kjøpsdato {1} av eiendelen {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Sjekk dette hvis studenten er bosatt ved instituttets Hostel.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Fyll inn salgsordrer i tabellen ovenfor
 ,Stock Summary,Stock oppsummering
diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv
index 041266c..06d1ca2 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Nazwa okresu
 DocType: Employee,Salary Mode,Moduł Wynagrodzenia
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Zarejestrować
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Zarejestrować
 DocType: Patient,Divorced,Rozwiedziony
 DocType: Support Settings,Post Route Key,Wpisz klucz trasy
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Zezwoli na dodał wiele razy w transakcji
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Nowy kurs wymiany
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Waluta jest wymagana dla Cenniku {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Zostanie policzony dla transakcji.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Dostawca&gt; Dostawca Typ
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.RRRR.-
 DocType: Purchase Order,Customer Contact,Kontakt z klientem
 DocType: Patient Appointment,Check availability,Sprawdź dostępność
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Pokaż otwarta
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Seria zaktualizowana
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Sprawdzić
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} w wierszu {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} w wierszu {1}
 DocType: Asset Finance Book,Depreciation Start Date,Data rozpoczęcia amortyzacji
 DocType: Pricing Rule,Apply On,Zastosuj Na
 DocType: Item Price,Multiple Item prices.,Wiele cen przedmiotu.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Lekarz na receptę
 ,Delay Days,Dni opóźnienia
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Koszty usługi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Numer seryjny: {0} znajduje się już w fakturze sprzedaży: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Numer seryjny: {0} znajduje się już w fakturze sprzedaży: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Faktura
 DocType: Purchase Invoice Item,Item Weight Details,Szczegóły dotyczące wagi przedmiotu
 DocType: Asset Maintenance Log,Periodicity,Okresowość
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Księgowy
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Cennik sprzedaży
 DocType: Patient,Tobacco Current Use,Obecne użycie tytoniu
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Data rozpoczęcia i data zakończenia pokrywają się z kartą pracy <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Kurs sprzedaży
 DocType: Cost Center,Stock User,Użytkownik magazynu
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Związane z
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,data frekwencja nie może być mniejsza niż data łączącej pracownika
 DocType: Grading Scale,Grading Scale Name,Skala ocen Nazwa
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Dodaj użytkowników do rynku
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Dodaj użytkowników do rynku
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,To jest konto root i nie może być edytowane.
 DocType: Sales Invoice,Company Address,adres spółki
 DocType: BOM,Operations,Działania
@@ -322,7 +322,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Qty
 DocType: Production Plan,Material Request Detail,Szczegółowy wniosek o materiał
 DocType: Selling Settings,Default Quotation Validity Days,Domyślne dni ważności ofert
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",
 DocType: SMS Center,SMS Center,Centrum SMS
 DocType: Payroll Entry,Validate Attendance,Zatwierdź frekwencję
 DocType: Sales Invoice,Change Amount,Zmień Kwota
@@ -441,7 +441,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Odstępy między wierszami dla kwoty w słowach
 DocType: Vehicle,Additional Details,dodatkowe szczegóły
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Dostawca&gt; Grupa dostawców
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Prośba o zakup
 DocType: POS Closing Voucher Details,Collected Amount,Zebrana kwota
 DocType: Lab Test,Submitted Date,Zaakceptowana Data
@@ -486,7 +485,7 @@
 DocType: Student Admission,Student Admission,Wstęp Student
 ,Terretory,Obszar
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Element {0} jest anulowany
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Wiersz amortyzacji {0}: Data rozpoczęcia amortyzacji jest wprowadzana jako data przeszła
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Wiersz amortyzacji {0}: Data rozpoczęcia amortyzacji jest wprowadzana jako data przeszła
 DocType: Contract Template,Fulfilment Terms and Conditions,Spełnienie warunków
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Zamówienie produktu
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizacja daty rozliczenia
@@ -543,6 +542,7 @@
 DocType: Accounts Settings,Settings for Accounts,Ustawienia Konta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Dostawca Faktura Nie istnieje faktura zakupu {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Zarządzaj Drzewem Sprzedawców
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Nie można przetworzyć trasy, ponieważ ustawienia Map Google są wyłączone."
 DocType: Job Applicant,Cover Letter,List motywacyjny
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,"Wybitni Czeki i depozytów, aby usunąć"
 DocType: Item,Synced With Hub,Synchronizowane z Hub
@@ -602,7 +602,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Nowa wartość aktywów
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Stawka przy użyciu której Waluta Klienta jest konwertowana do podstawowej waluty klienta
 DocType: Course Scheduling Tool,Course Scheduling Tool,Oczywiście Narzędzie Scheduling
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Wiersz # {0}: Zakup Faktura nie może być dokonywane wobec istniejącego zasobu {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Wiersz # {0}: Zakup Faktura nie może być dokonywane wobec istniejącego zasobu {1}
 DocType: Crop Cycle,LInked Analysis,Analiza LInked
 DocType: POS Closing Voucher,POS Closing Voucher,Kupon końcowy na kasę
 DocType: Contract,Lapsed,Nieaktualne
@@ -637,6 +637,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} nie jest zapisany do kursu {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Imię ucznia:
 DocType: POS Closing Voucher Details,Difference,Różnica
+DocType: Delivery Settings,Delay between Delivery Stops,Opóźnienie między przerwami w dostawie
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Nr seryjny {0} nie należy do żadnego potwierdzenia dostawy {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Wygląda na to, że problem dotyczy konfiguracji serwera GoCardless. Nie martw się, w przypadku niepowodzenia kwota zostanie zwrócona na Twoje konto."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -697,7 +698,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Ilość i Wskaźnik
 DocType: Delivery Note,% Installed,% Zainstalowanych
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,Sale / laboratoria etc gdzie zajęcia mogą być planowane.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Waluty firmy obu spółek powinny być zgodne z Transakcjami między spółkami.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Waluty firmy obu spółek powinny być zgodne z Transakcjami między spółkami.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Proszę najpierw wpisać nazwę Firmy
 DocType: Travel Itinerary,Non-Vegetarian,Nie wegetarianskie
 DocType: Purchase Invoice,Supplier Name,Nazwa dostawcy
@@ -784,7 +785,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Wynajmowane od daty
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Wystarczające elementy do budowy
 DocType: POS Profile User,POS Profile User,Użytkownik profilu POS
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Wiersz {0}: Wymagana data rozpoczęcia amortyzacji
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Wiersz {0}: Wymagana data rozpoczęcia amortyzacji
 DocType: Purchase Invoice Item,Service Start Date,Data rozpoczęcia usługi
 DocType: Subscription Invoice,Subscription Invoice,Faktura subskrypcyjna
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Przychody bezpośrednie
@@ -853,7 +854,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Skrót już używany przez inną firmę
 DocType: Selling Settings,Default Customer Group,Domyślna grupa klientów
 DocType: Employee,IFSC Code,Kod IFSC
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Data rozpoczęcia i data zakończenia pokrywają się z kartą pracy <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Jeśli wyłączone, pozycja 'Końcowa zaokrąglona suma' nie będzie widoczna w żadnej transakcji"
 DocType: BOM,Operating Cost,Koszty Operacyjne
 DocType: Crop,Produced Items,Produkowane przedmioty
@@ -905,7 +905,7 @@
 DocType: Supplier,Prevent RFQs,Zapobiegaj RFQ
 DocType: Hub User,Hub User,Użytkownik centrum
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Stwórz Zamówienie Sprzedaży
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Przesłane wynagrodzenie za okres od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Przesłane wynagrodzenie za okres od {0} do {1}
 DocType: Project Task,Project Task,Zadanie projektu
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Wykorzystane punkty
 ,Lead Id,ID Tropu
@@ -1037,7 +1037,7 @@
 DocType: Fee Validity,Max number of visit,Maksymalna liczba wizyt
 ,Hotel Room Occupancy,Pokój hotelowy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Grafiku stworzył:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Proszę ustawić domyślne konto Gotówka lub Bank dla płatności typu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Proszę ustawić domyślne konto Gotówka lub Bank dla płatności typu {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Zapisać
 DocType: GST Settings,GST Settings,Ustawienia GST
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},"Waluta powinna być taka sama, jak waluta cennika: {0}"
@@ -1092,7 +1092,7 @@
 DocType: Vehicle Log,Service Details,Szczegóły usługi
 DocType: Lab Test Template,Grouped,Zgrupowane
 DocType: Selling Settings,Delivery Note Required,Dowód dostawy jest wymagany
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Przesyłanie wynagrodzeń ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Przesyłanie wynagrodzeń ...
 DocType: Bank Guarantee,Bank Guarantee Number,Numer Gwarancji Bankowej
 DocType: Bank Guarantee,Bank Guarantee Number,Numer Gwarancji Bankowej
 DocType: Assessment Criteria,Assessment Criteria,Kryteria oceny
@@ -1118,13 +1118,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Zapis takiej Płatności już został utworzony
 DocType: Request for Quotation,Get Suppliers,Dostaj Dostawców
 DocType: Purchase Receipt Item Supplied,Current Stock,Bieżący asortyment
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Wiersz # {0}: {1} aktywami nie związane w pozycji {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Wiersz # {0}: {1} aktywami nie związane w pozycji {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Podgląd Zarobki Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Konto {0} zostało wprowadzone wielokrotnie
 DocType: Account,Expenses Included In Valuation,Zaksięgowane wydatki w wycenie
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Przedłużenie członkostwa można odnowić w ciągu 30 dni
 DocType: Shopping Cart Settings,Show Stock Availability,Pokaż dostępność zapasów
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Ustaw {0} w kategorii aktywów {1} lub firmie {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Ustaw {0} w kategorii aktywów {1} lub firmie {2}
 DocType: Location,Longitude,Długość geograficzna
 ,Absent Student Report,Raport nieobecności studenta
 DocType: Crop,Crop Spacing UOM,Odstępy między plamami UOM
@@ -1197,7 +1197,7 @@
 DocType: Soil Texture,Sand,Piasek
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Szansa od
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Wiersz {0}: {1} wymagane numery seryjne dla elementu {2}. Podałeś {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Wiersz {0}: {1} wymagane numery seryjne dla elementu {2}. Podałeś {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Proszę wybrać tabelę
 DocType: BOM,Website Specifications,Specyfikacja strony WWW
 DocType: Special Test Items,Particulars,Szczegóły
@@ -1308,7 +1308,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Produkty z wyższym weightage zostaną pokazane wyższe
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Testy laboratoryjne i Vital Signs
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Uzgodnienia z wyciągiem bankowym - szczegóły
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Wiersz # {0}: {1} aktywami muszą być złożone
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Wiersz # {0}: {1} aktywami muszą być złożone
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nie znaleziono pracowników
 DocType: Item,If subcontracted to a vendor,Jeśli zlecona dostawcy
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Grupa studentów jest już aktualizowana.
@@ -1363,7 +1363,6 @@
 DocType: Loyalty Program Collection,Tier Name,Nazwa warstwy
 DocType: HR Settings,Enter retirement age in years,Podaj wiek emerytalny w latach
 DocType: Crop,Target Warehouse,Magazyn docelowy
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ustaw Serię Nazewnictwa na {0} za pomocą Setup&gt; Settings&gt; Naming Series
 DocType: Payroll Employee Detail,Payroll Employee Detail,Szczegóły dotyczące kadry płacowej
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Proszę wybrać magazyn
 DocType: Cheque Print Template,Starting location from left edge,Zaczynając od lewej krawędzi lokalizację
@@ -1453,7 +1452,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Materiał plan podzespołów
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partnerzy handlowi i terytorium
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} musi być aktywny
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Brak przedmiotów do przeniesienia
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Brak przedmiotów do przeniesienia
 DocType: Employee Boarding Activity,Activity Name,Nazwa działania
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Zmień datę wydania
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Ilość gotowego produktu <b>{0}</b> i ilość <b>{1}</b> nie mogą się różnić
@@ -1683,6 +1682,7 @@
 DocType: Project,First Email,Pierwszy e-mail
 DocType: Company,Exception Budget Approver Role,Rola zatwierdzającego wyjątku dla budżetu
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date",Po ustawieniu faktura ta będzie zawieszona do wyznaczonej daty
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Kwota sprzedaży
 DocType: Repayment Schedule,Interest Amount,Kwota procentowa
@@ -1694,7 +1694,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Dokumentacja
 DocType: Asset,Scrapped,złomowany
 DocType: Item,Item Defaults,Domyślne elementy
-DocType: Purchase Invoice,Returns,zwroty
+DocType: Cashier Closing,Returns,zwroty
 DocType: Job Card,WIP Warehouse,WIP Magazyn
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Nr seryjny {0} w ramach umowy serwisowej do {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,Rekrutacja
@@ -1708,7 +1708,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Rodzaj transferu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Koszty Sprzedaży
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klientów&gt; Terytorium
 DocType: Diagnosis,Diagnosis,Diagnoza
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standardowe zakupy
 DocType: Attendance Request,Explanation,Wyjaśnienie
@@ -1721,7 +1720,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Przedmioty zamówienia przeterminowane
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Kod pocztowy
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Zamówienie sprzedaży jest {0} {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Wybierz rachunek odsetkowy w banku {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Wybierz rachunek odsetkowy w banku {0}
 DocType: Opportunity,Contact Info,Dane kontaktowe
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Dokonywanie stockowe Wpisy
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Nie można promować pracownika z pozostawionym statusem
@@ -1733,7 +1732,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Faktura nie może zostać wystawiona na zero godzin rozliczeniowych
 DocType: Company,Date of Commencement,Data rozpoczęcia
 DocType: Sales Person,Select company name first.,Wybierz najpierw nazwę firmy
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},Wiadomość wysłana do {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},Wiadomość wysłana do {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Wyceny otrzymane od dostawców
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Zastąp BOM i zaktualizuj ostatnią cenę we wszystkich materiałach
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Do {0} | {1} {2}
@@ -1754,7 +1753,7 @@
 DocType: Asset Movement,From Employee,Od pracownika
 DocType: Driver,Cellphone Number,numer telefonu komórkowego
 DocType: Project,Monitor Progress,Monitorowanie postępu
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,
 DocType: Journal Entry,Make Difference Entry,Wprowadź różnicę
 DocType: Supplier Quotation,Auto Repeat Section,Sekcja automatycznego powtarzania
 DocType: Upload Attendance,Attendance From Date,Obecność od Daty
@@ -1857,7 +1856,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Wiersz # {0}: Odrzucone Ilość nie może być wprowadzone w Purchase Powrót
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Zmiana grupy klientów dla wybranego klienta jest niedozwolona.
 ,Purchase Order Items To Be Billed,Przedmioty oczekujące na rachunkowość Zamówienia Kupna
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Aktualizacja szacunkowych czasów przybycia.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Aktualizacja szacunkowych czasów przybycia.
 DocType: Program Enrollment Tool,Enrollment Details,Szczegóły rejestracji
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Nie można ustawić wielu wartości domyślnych dla danej firmy.
 DocType: Purchase Invoice Item,Net Rate,Cena netto
@@ -1871,7 +1870,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Leave Type jest madatory
 DocType: Support Settings,Close Issue After Days,Po blisko Issue Dni
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Musisz być użytkownikiem z rolami System Manager i Menedżera elementów, aby dodawać użytkowników do Marketplace."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Musisz być użytkownikiem z rolami System Manager i Menedżera elementów, aby dodawać użytkowników do Marketplace."
 DocType: Leave Control Panel,Leave blank if considered for all branches,Zostaw puste jeśli jest to rozważane dla wszystkich oddziałów
 DocType: Job Opening,Staffing Plan,Plan zatrudnienia
 DocType: Bank Guarantee,Validity in Days,Ważność w dniach
@@ -1893,7 +1892,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Wiersz zduplikowany {0} z tym samym {1}
 DocType: Marketplace Settings,Disable Marketplace,Wyłącz Marketplace
 ,Trial Balance,Zestawienie obrotów i sald
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Rok fiskalny {0} Nie znaleziono
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Rok fiskalny {0} Nie znaleziono
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Konfigurowanie Pracownicy
 DocType: Hotel Room Reservation,Hotel Reservation User,Użytkownik rezerwacji hotelu
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Wybierz prefix
@@ -2001,7 +2000,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Nie udało się zalogować
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Utworzono zasoby {0}
 DocType: Special Test Items,Special Test Items,Specjalne przedmioty testowe
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Aby zarejestrować się w Marketplace, musisz być użytkownikiem z rolami System Manager i Item Manager."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Aby zarejestrować się w Marketplace, musisz być użytkownikiem z rolami System Manager i Item Manager."
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Rodzaj płatności
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Zgodnie z przypisaną Ci strukturą wynagrodzeń nie możesz ubiegać się o świadczenia
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Strona Obraz powinien być plik publiczny lub adres witryny
@@ -2013,7 +2012,7 @@
 DocType: Warehouse,Warehouse Contact Info,Dane kontaktowe dla magazynu
 DocType: Payment Entry,Write Off Difference Amount,Różnica Kwota odpisuje
 DocType: Volunteer,Volunteer Name,Nazwisko wolontariusza
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Znaleziono wiersze z powtarzającymi się datami w innych wierszach: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Znaleziono wiersze z powtarzającymi się datami w innych wierszach: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: Email pracownika nie został znaleziony, dlatego wiadomość nie będzie wysłana"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Brak struktury wynagrodzenia dla pracownika {0} w danym dniu {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Reguła wysyłki nie dotyczy kraju {0}
@@ -2104,6 +2103,7 @@
 DocType: Salary Component,Earning,Dochód
 DocType: Supplier Scorecard,Scoring Criteria,Kryteria oceny
 DocType: Purchase Invoice,Party Account Currency,Partia konto Waluta
+DocType: Delivery Trip,Total Estimated Distance,Łączna przewidywana odległość
 ,BOM Browser,Przeglądarka BOM
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Proszę zaktualizować swój status w tym szkoleniu
 DocType: Item Barcode,EAN,EAN
@@ -2142,7 +2142,7 @@
 DocType: Activity Cost,Projects,Projekty
 DocType: Payment Request,Transaction Currency,walucie transakcji
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Od {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Niektóre e-maile są nieprawidłowe
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Niektóre e-maile są nieprawidłowe
 DocType: Work Order Operation,Operation Description,Opis operacji
 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.,"Nie można zmienić Rok obrotowy Data rozpoczęcia i Data zakończenia roku obrotowego, gdy rok obrotowy jest zapisane."
 DocType: Quotation,Shopping Cart,Koszyk
@@ -2166,7 +2166,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Zmiana netto stanu trwałego
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Wymagana ilość
 DocType: Leave Control Panel,Leave blank if considered for all designations,Zostaw puste jeśli jest to rozważane dla wszystkich nominacji
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od DateTime
 DocType: Shopify Settings,For Company,Dla firmy
@@ -2180,7 +2180,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Podczas tworzenia harmonogramu kursów wystąpiły błędy
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Pierwszy zatwierdzający wydatek na liście zostanie ustawiony jako domyślny zatwierdzający koszt.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,nie może być większa niż 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Aby zarejestrować się w Marketplace, musisz być użytkownikiem innym niż Administrator z rolami System Manager i Item Manager."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Aby zarejestrować się w Marketplace, musisz być użytkownikiem innym niż Administrator z rolami System Manager i Item Manager."
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Element {0} nie jest w magazynie
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Nieplanowany
@@ -2209,7 +2209,7 @@
 DocType: HR Settings,Employee Settings,Ustawienia pracownika
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Ładowanie systemu płatności
 ,Batch-Wise Balance History,
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Wiersz nr {0}: nie można ustawić wartości Rate, jeśli kwota jest większa niż kwota rozliczona dla elementu {1}."
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Wiersz nr {0}: nie można ustawić wartości Rate, jeśli kwota jest większa niż kwota rozliczona dla elementu {1}."
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Ustawienia drukowania zaktualizowane w odpowiednim formacie druku
 DocType: Package Code,Package Code,Kod pakietu
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Uczeń
@@ -2444,7 +2444,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} Wolne miejsca i budżet {1} na {2} już zaplanowano dla spółek zależnych w {3}. \ Możesz planować tylko do {4} wolnych miejsc pracy i budżetu {5} zgodnie z planem zatrudnienia {6} dla firmy macierzystej {3}.
 DocType: HR Settings,Stop Birthday Reminders,Zatrzymaj przypomnienia o urodzinach
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Proszę ustawić domyślny Payroll konto płatne w Spółce {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Proszę ustawić domyślny Payroll konto płatne w Spółce {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Uzyskaj rozpad finansowy danych podatkowych i obciążeń przez Amazon
 DocType: SMS Center,Receiver List,Lista odbiorców
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Szukaj przedmiotu
@@ -2514,7 +2514,7 @@
 DocType: Vital Signs,Constipated,Mający zaparcie
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Przeciwko Dostawcę faktury {0} {1} dnia
 DocType: Customer,Default Price List,Domyślna List Cen
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Rekord Ruch atutem {0} tworzone
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Rekord Ruch atutem {0} tworzone
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Nie znaleziono żadnych przedmiotów.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nie można usunąć Fiscal Year {0}. Rok fiskalny {0} jest ustawiona jako domyślna w Ustawienia globalne
 DocType: Share Transfer,Equity/Liability Account,Rachunek akcyjny / zobowiązanie
@@ -2653,6 +2653,7 @@
 DocType: Blanket Order,Order Type,Typ zamówienia
 ,Item-wise Sales Register,
 DocType: Asset,Gross Purchase Amount,Zakup Kwota brutto
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kod towaru&gt; Grupa produktów&gt; Marka
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Saldo otwarcia
 DocType: Asset,Depreciation Method,Metoda amortyzacji
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Czy podatek wliczony jest w opłaty?
@@ -2736,7 +2737,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,"Działanie, jeśli budżet roczny został przekroczony dla zamówienia"
 DocType: Student Leave Application,Student Leave Application,Student Application Leave
 DocType: Item,Will also apply for variants,Również zastosowanie do wariantów
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Aktywów nie mogą być anulowane, ponieważ jest już {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Aktywów nie mogą być anulowane, ponieważ jest już {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Pracownik {0} na pół dnia na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Całkowita liczba godzin pracy nie powinna być większa niż max godzinach pracy {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,włączony
@@ -2760,6 +2761,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Pobierz dane
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Maksymalny dozwolony urlop w typie urlopu {0} to {1}
 DocType: SMS Center,Create Receiver List,Stwórz listę odbiorców
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Data przydatności do użycia powinna być późniejsza niż data zakupu
 DocType: Vehicle,Wheels,Koła
 DocType: Packing Slip,To Package No.,Do zapakowania Nr
 DocType: Patient Relation,Family,Rodzina
@@ -2773,7 +2775,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Waluta rozliczeniowa musi być równa domyślnej walucie firmy lub walucie konta strony
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Wskazuje, że pakiet jest częścią tej dostawy (Tylko projektu)"
 DocType: Soil Texture,Loam,Ił
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Wiersz {0}: termin płatności nie może być wcześniejszy niż data księgowania
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Wiersz {0}: termin płatności nie może być wcześniejszy niż data księgowania
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Wprowadź wpływ płatności
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Ilość dla Przedmiotu {0} musi być mniejsza niż {1}
 ,Sales Invoice Trends,
@@ -2846,7 +2848,7 @@
 DocType: Guardian,Guardian Interests,opiekun Zainteresowania
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Zaktualizuj nazwę / numer konta
 DocType: Naming Series,Current Value,Bieżąca Wartość
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Wiele lat podatkowych istnieją na dzień {0}. Proszę ustawić firmy w roku finansowym
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Wiele lat podatkowych istnieją na dzień {0}. Proszę ustawić firmy w roku finansowym
 DocType: Education Settings,Instructor Records to be created by,"Rekord instruktorski, który zostanie utworzony przez"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} utworzone
 DocType: GST Account,GST Account,Konto GST
@@ -2864,7 +2866,7 @@
 DocType: Sales Person,Name and Employee ID,Imię i Identyfikator Pracownika
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Termin nie może być po Dacie Umieszczenia
 DocType: Website Item Group,Website Item Group,Grupa przedmiotów strony WWW
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nie znaleziono pokwitowania wypłaty za wyżej wymienione kryteria LUB wniosek o wypłatę wynagrodzenia już przesłano
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nie znaleziono pokwitowania wypłaty za wyżej wymienione kryteria LUB wniosek o wypłatę wynagrodzenia już przesłano
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Podatki i cła
 DocType: Projects Settings,Projects Settings,Ustawienia projektów
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,
@@ -2873,7 +2875,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Dostarczane szt
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.RRRR.-
 DocType: Purchase Order Item,Material Request Item,
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Najpierw anuluj potwierdzenie zakupu {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Najpierw anuluj potwierdzenie zakupu {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Drzewo grupy produktów
 DocType: Production Plan,Total Produced Qty,Całkowita ilość wyprodukowanej
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Nie można wskazać numeru wiersza większego lub równego numerowi dla tego typu Opłaty
@@ -2984,6 +2986,7 @@
 ,Vehicle Expenses,Wydatki Samochodowe
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Utwórz test (y) laboratoryjny na stronie Przesłanie faktury sprzedaży
 DocType: Serial No,Invoice Details,Dane do faktury
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,"Włącz ustawienia Map Google, aby oszacować i zoptymalizować trasy"
 DocType: Grant Application,Show on Website,Pokaż na stronie internetowej
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Zaczynaj na
 DocType: Hub Tracked Item,Hub Category,Kategoria koncentratora
@@ -3023,7 +3026,7 @@
 DocType: Inpatient Record,B Positive,B dodatni
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Maksymalna korzyść pracownika {0} przekracza {1} o sumę {2} poprzedniej deklarowanej \ kwoty
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Wiersz # {0}: Ilość musi być jeden, a element jest trwałego. Proszę używać osobny wiersz dla stwardnienia st."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Wiersz # {0}: Ilość musi być jeden, a element jest trwałego. Proszę używać osobny wiersz dla stwardnienia st."
 DocType: Leave Block List Allow,Leave Block List Allow,Możesz opuścić Blok Zablokowanych List
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Skrót nie może być pusty lub być spacją
 DocType: Patient Medical Record,Patient Medical Record,Medyczny dokument medyczny pacjenta
@@ -3057,7 +3060,7 @@
 DocType: Workstation,Wages per hour,Zarobki na godzinę
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Saldo Zdjęcie w serii {0} będzie negatywna {1} dla pozycji {2} w hurtowni {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Niniejszy materiał Wnioski zostały podniesione automatycznie na podstawie poziomu ponownego zamówienia elementu
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Konto {0} jest nieprawidłowe. Walutą konta musi być {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Konto {0} jest nieprawidłowe. Walutą konta musi być {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Od daty {0} nie może być po zwolnieniu pracownika Data {1}
 DocType: Supplier,Is Internal Supplier,Jest dostawcą wewnętrznym
 DocType: Employee,Create User Permission,Utwórz uprawnienia użytkownika
@@ -3203,7 +3206,7 @@
 DocType: Account,Fixed Asset,Trwała własność
 DocType: Amazon MWS Settings,After Date,Po dacie
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Inwentaryzacja w odcinkach
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Nieprawidłowy {0} dla faktury Inter Company.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Nieprawidłowy {0} dla faktury Inter Company.
 ,Department Analytics,Analityka działu
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Nie znaleziono wiadomości e-mail w domyślnym kontakcie
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generuj sekret
@@ -3216,7 +3219,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Program w strukturze opłat i grupa studencka {0} są różne.
 DocType: Bank Statement Transaction Entry,Receivable Account,Konto Należności
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Ważny od daty musi być mniejszy niż ważna data w górę.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Wiersz # {0}: {1} aktywami jest już {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Wiersz # {0}: {1} aktywami jest już {2}
 DocType: Quotation Item,Stock Balance,Bilans zapasów
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Płatności do zamówienia sprzedaży
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,CEO
@@ -3258,6 +3261,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Debetowane Konto jest wymagane
 DocType: Clinical Procedure,Inpatient Record,Zapis ambulatoryjny
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Ewidencja czasu pomaga śledzić czasu, kosztów i rozliczeń dla aktywnosci przeprowadzonych przez zespół"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Dostawca&gt; Dostawca Typ
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Cennik zakupowy
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Data transakcji
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Szablony dostawców zmiennych.
@@ -3301,7 +3305,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Wymiana Zysk / Strata
 DocType: Opportunity,Lost Reason,Powód straty
 DocType: Amazon MWS Settings,Enable Amazon,Włącz Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Wiersz nr {0}: konto {1} nie należy do firmy {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Wiersz nr {0}: konto {1} nie należy do firmy {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Nie można znaleźć DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nowy adres
 DocType: Quality Inspection,Sample Size,Wielkość próby
@@ -3413,7 +3417,7 @@
 DocType: Water Analysis,Origin,Pochodzenie
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Niniejszy dokument ma na granicy przez {0} {1} dla pozycji {4}. Robisz kolejny {3} przeciwko samo {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Proszę ustawić cykliczne po zapisaniu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Wybierz opcję Zmień konto kwotę
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Wybierz opcję Zmień konto kwotę
 DocType: Purchase Invoice,Price List Currency,Waluta cennika
 DocType: Naming Series,User must always select,Użytkownik musi zawsze zaznaczyć
 DocType: Stock Settings,Allow Negative Stock,Dozwolony ujemny stan
@@ -3455,7 +3459,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Czy na pewno chcesz anulować to spotkanie?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Pakiet cen pokoi hotelowych
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Pipeline sprzedaży
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Proszę ustawić domyślne konto wynagrodzenia komponentu {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Proszę ustawić domyślne konto wynagrodzenia komponentu {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Wymagane na
 DocType: Rename Tool,File to Rename,Plik to zmiany nazwy
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Proszę wybrać LM dla pozycji w wierszu {0}
@@ -3476,7 +3480,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Koszt zakupionych towarów
 DocType: Employee Separation,Employee Separation Template,Szablon separacji pracowników
 DocType: Selling Settings,Sales Order Required,Wymagane Zamówienie Sprzedaży
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Zostań sprzedawcą
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Zostań sprzedawcą
 DocType: Purchase Invoice,Credit To,Kredytowane konto (Ma)
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Całość Przewody / Klienci
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,"Pozostaw puste, aby używać standardowego formatu dokumentu dostawy"
@@ -3518,7 +3522,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Zrób szablon podatkowy
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum użytkowników
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Surowce nie może być puste.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Wiersz nr {0} (tabela płatności): kwota musi być ujemna
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Wiersz nr {0} (tabela płatności): kwota musi być ujemna
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Nie można zaktualizować stanu - faktura zawiera pozycję, której proces wysyłki scedowano na dostawcę."
 DocType: Contract,Fulfilment Status,Status realizacji
 DocType: Lab Test Sample,Lab Test Sample,Próbka do badań laboratoryjnych
@@ -3678,7 +3682,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Doc Data
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Utworzono Records Fee - {0}
 DocType: Asset Category Account,Asset Category Account,Konto Aktywów Kategoria
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Wiersz nr {0} (tabela płatności): kwota musi być dodatnia
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Wiersz nr {0} (tabela płatności): kwota musi być dodatnia
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Nie można wyprodukować więcej przedmiotów {0} niż wartość {1} na Zamówieniu
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Wybierz wartości atrybutów
 DocType: Purchase Invoice,Reason For Issuing document,Powód wydania dokumentu
@@ -3733,7 +3737,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Czas doręczenia materiałów
 DocType: Products Settings,Products per Page,Produkty na stronę
 DocType: Stock Ledger Entry,Outgoing Rate,Wychodzące Cena
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,lub
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,lub
 DocType: Sales Order,Billing Status,Status Faktury
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Zgłoś problem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Wydatki na usługi komunalne
@@ -3761,7 +3765,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Deklaracja zwolnienia z podatku od pracowników
 DocType: Payment Entry,Cheque/Reference Date,Czek / Reference Data
 DocType: Purchase Invoice,Total Taxes and Charges,Łączna kwota podatków i opłat
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Dostępna do użycia Data jest wprowadzana jako data przeszła
 DocType: Employee,Emergency Contact,Kontakt na wypadek nieszczęśliwych wypadków
 DocType: Bank Reconciliation Detail,Payment Entry,Płatność
 ,sales-browser,sprzedaży przeglądarkami
@@ -3808,6 +3811,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Jest zwrot (nota kredytowa)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Rozpocznij pracę
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Numer seryjny jest wymagany dla zasobu {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ustaw Serię Nazewnictwa na {0} za pomocą Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Szablon niepełnosprawnych nie może być domyślny szablon
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Dla wiersza {0}: wpisz planowaną liczbę
 DocType: Account,Income Account,Konto przychodów
@@ -3821,6 +3825,7 @@
 DocType: Loyalty Program,Help Section,Sekcja pomocy
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Poprzedni
 DocType: Appraisal Goal,Key Responsibility Area,Kluczowy obszar obowiązków
+DocType: Delivery Trip,Distance UOM,Odległość UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Partie studenckich pomóc śledzenie obecności, oceny i opłat dla studentów"
 DocType: Payment Entry,Total Allocated Amount,Łączna kwota przyznanego wsparcia
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Ustaw domyślne konto zapasów dla zasobów reklamowych wieczystych
@@ -3862,7 +3867,7 @@
 DocType: Item Supplier,Item Supplier,Dostawca
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Proszę wprowadzić Kod Produktu w celu przyporządkowania serii
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Proszę wprowadzić wartość dla wyceny {0} {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Nie wybrano pozycji do przeniesienia
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Nie wybrano pozycji do przeniesienia
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Wszystkie adresy
 DocType: Company,Stock Settings,Ustawienia magazynu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Połączenie jest możliwe tylko wtedy, gdy następujące właściwości są takie same w obu płyt. Czy Grupa Root Typ, Firma"
@@ -4160,7 +4165,7 @@
 DocType: Patient,Personal and Social History,Historia osobista i społeczna
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Utworzono użytkownika {0}
 DocType: Fee Schedule,Fee Breakup for each student,Podział wynagrodzenia dla każdego ucznia
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Suma zaliczki ({0}) przed zamówieniem {1} nie może być większa od ogólnej sumy ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Suma zaliczki ({0}) przed zamówieniem {1} nie może być większa od ogólnej sumy ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Wybierz dystrybucji miesięcznej się nierównomiernie rozprowadzić cele całej miesięcy.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Zmień kod
 DocType: Purchase Invoice Item,Valuation Rate,Wskaźnik wyceny
@@ -4169,7 +4174,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Korzystał z ITC Cess
 ,Student Monthly Attendance Sheet,Student miesięczny Obecność Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Reguła wysyłki dotyczy tylko sprzedaży
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Wiersz amortyzacji {0}: Data następnej amortyzacji nie może być wcześniejsza niż Data zakupu
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Wiersz amortyzacji {0}: Data następnej amortyzacji nie może być wcześniejsza niż Data zakupu
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data startu projektu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Do
 DocType: Rename Tool,Rename Log,Zmień nazwę dziennika
@@ -4187,12 +4192,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Jak często należy aktualizować projekt i firmę na podstawie transakcji sprzedaży.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Upływa w dniu
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Dodaj uczniów
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Usuń pracownika <a href=""#Form/Employee/{0}"">{0}</a> \, aby anulować ten dokument"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Proszę wybrać {0}
 DocType: C-Form,C-Form No,
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Dystans
+DocType: Delivery Stop,Distance,Dystans
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Wymień swoje produkty lub usługi, które kupujesz lub sprzedajesz."
 DocType: Water Analysis,Storage Temperature,Temperatura przechowywania
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4219,7 +4222,7 @@
 DocType: Homepage,Company Description for website homepage,Opis firmy na stronie głównej
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Dla wygody klientów, te kody mogą być użyte w formacie drukowania jak faktury czy dowody dostawy"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nazwa suplier
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Nie można pobrać informacji dla {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Nie można pobrać informacji dla {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Otwarcie dziennika wejścia
 DocType: Contract,Fulfilment Terms,Warunki realizacji
 DocType: Sales Invoice,Time Sheet List,Czas Lista Sheet
@@ -4402,7 +4405,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Wybierz uczniów ręcznie dla grupy działań
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Wybierz uczniów ręcznie dla grupy działań
 DocType: Journal Entry,User Remark,Nota Użytkownika
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Optymalizacja tras.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Optymalizacja tras.
 DocType: Travel Itinerary,Non Diary,Non Diary
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Nie można utworzyć bonusu utrzymania dla leworęcznych pracowników
 DocType: Lead,Market Segment,Segment rynku
@@ -4433,7 +4436,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Program lojalnościowy
 DocType: Student Guardian,Father,Ojciec
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Bilety na wsparcie
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,Opcja 'Aktualizuj Stan' nie może być zaznaczona dla sprzedaży środka trwałego
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,Opcja 'Aktualizuj Stan' nie może być zaznaczona dla sprzedaży środka trwałego
 DocType: Bank Reconciliation,Bank Reconciliation,Uzgodnienia z wyciągiem bankowym
 DocType: Attendance,On Leave,Na urlopie
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Informuj o aktualizacjach
@@ -4478,7 +4481,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Numer seryjny oraz Batch
 DocType: Warranty Claim,From Company,Od Firmy
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Suma punktów kryteriów oceny musi być {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Proszę ustawić ilość amortyzacji zarezerwowano
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Proszę ustawić ilość amortyzacji zarezerwowano
 DocType: Supplier Scorecard Period,Calculations,Obliczenia
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Wartość albo Ilość
 DocType: Payment Terms Template,Payment Terms,Zasady płatności
@@ -4498,7 +4501,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Zniżka (%) w Tabeli Cen Ceny z Marginesem
 DocType: Healthcare Service Unit Type,Rate / UOM,Rate / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Wszystkie Magazyny
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Nie znaleziono {0} dla transakcji między spółkami.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Nie znaleziono {0} dla transakcji między spółkami.
 DocType: Travel Itinerary,Rented Car,Wynajęty samochód
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,O Twojej firmie
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Kredytowane konto powinno być kontem bilansowym
@@ -4599,6 +4602,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Kryteria analizy roślin
 DocType: Cheque Print Template,Cheque Height,Czek Wysokość
 DocType: Supplier,Supplier Details,Szczegóły dostawcy
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Proszę ustawić serię numerów dla Obecności za pośrednictwem Setup&gt; Numbering Series
 DocType: Setup Progress,Setup Progress,Konfiguracja Postępu
 DocType: Expense Claim,Approval Status,Status Zatwierdzenia
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},"Wartość ""od"" musi być mniejsza niż wartość w rzędzie {0}"
@@ -4692,7 +4696,6 @@
 DocType: Travel Request,Fully Sponsored,W pełni sponsorowane
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Utworzono klienta {0}.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Proszę ustawić system nazewnictwa pracowników w Zasobach Ludzkich&gt; Ustawienia HR
 DocType: Stock Settings,Limit Percent,Limit Procent
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Obecnie brak dostępnych zasobów w magazynach
 ,Payment Period Based On Invoice Date,Termin Płatności oparty na dacie faktury
@@ -4751,7 +4754,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Magazyn źródłowy
 DocType: Installation Note,Installation Date,Data instalacji
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Udostępnij księgę
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Wiersz # {0}: {1} aktywami nie należy do firmy {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Wiersz # {0}: {1} aktywami nie należy do firmy {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Utworzono fakturę sprzedaży {0}
 DocType: Employee,Confirmation Date,Data potwierdzenia
 DocType: Inpatient Occupancy,Check Out,Sprawdzić
@@ -4771,6 +4774,7 @@
 DocType: Production Plan,Sales Orders Detail,Szczegóły zamówienia sprzedaży
 DocType: Bin,Requested Quantity,Oczekiwana ilość
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Proszę ustawić Instruktorski System Nazw w Edukacji&gt; Ustawienia edukacyjne
 DocType: Patient,Marital Status,Stan cywilny
 DocType: Stock Settings,Auto Material Request,Zapytanie Auto Materiał
 DocType: Woocommerce Settings,API consumer secret,Tajny klucz klienta API
@@ -4823,7 +4827,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Wybierz dni
 DocType: Academic Term,Term Name,Nazwa Term
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Kredyt ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Tworzenie zarobków ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Tworzenie zarobków ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Nie można edytować węzła głównego.
 DocType: Buying Settings,Purchase Order Required,Wymagane jest Zamówienia Kupna
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Regulator czasowy
@@ -4861,7 +4865,7 @@
 DocType: Account,Rate at which this tax is applied,Stawka przy użyciu której ten podatek jest aplikowany
 DocType: Cash Flow Mapper,Section Name,Nazwa sekcji
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Ilość do ponownego zamówienia
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Wiersz amortyzacji {0}: oczekiwana wartość po okresie użyteczności musi być większa lub równa {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Wiersz amortyzacji {0}: oczekiwana wartość po okresie użyteczności musi być większa lub równa {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Aktualne ofert pracy
 DocType: Company,Stock Adjustment Account,Konto korekty
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Odpis
@@ -4908,7 +4912,7 @@
 DocType: Program Enrollment,School House,school House
 DocType: Serial No,Out of AMC,
 DocType: Opportunity,Opportunity Amount,Kwota możliwości
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Ilość amortyzacją Zarezerwowane nie może być większa od ogólnej liczby amortyzacją
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Ilość amortyzacją Zarezerwowane nie może być większa od ogólnej liczby amortyzacją
 DocType: Purchase Order,Order Confirmation Date,Zamów datę potwierdzenia
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.RRRR.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Stwórz Wizytę Konserwacji
@@ -4949,7 +4953,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Partia:
 DocType: Volunteer,Afternoon,Popołudnie
 DocType: Loyalty Program,Loyalty Program Help,Pomoc programu lojalnościowego
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' jest wyłączony
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' jest wyłączony
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ustaw jako Otwarty
 DocType: Cheque Print Template,Scanned Cheque,zeskanowanych Czek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Automatycznie wysyłać e-maile do kontaktów z transakcji Zgłaszanie.
@@ -4962,7 +4966,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Przedmiot i gwarancji Szczegóły
 DocType: Chapter,Chapter Members,Członkowie rozdziału
 DocType: Sales Team,Contribution (%),Udział (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Uwaga: Płatność nie zostanie utworzona, gdyż nie określono konta 'Gotówka lub Bank'"
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Uwaga: Płatność nie zostanie utworzona, gdyż nie określono konta 'Gotówka lub Bank'"
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Projekt {0} już istnieje
 DocType: Clinical Procedure,Nursing User,Pielęgniarka
 DocType: Employee Benefit Application,Payroll Period,Okres płacy
@@ -4970,6 +4974,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Numer seryjny {0} nie należy do partii {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Obowiązki
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Okres ważności tej oferty zakończył się.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Usuń pracownika <a href=""#Form/Employee/{0}"">{0}</a> \, aby anulować ten dokument"
 DocType: Expense Claim Account,Expense Claim Account,Konto Koszty Roszczenie
 DocType: Account,Capital Work in Progress,Praca kapitałowa w toku
 DocType: Accounts Settings,Allow Stale Exchange Rates,Zezwalaj na Stałe Kursy walut
@@ -5051,7 +5057,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Wydanie Materiał
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Połącz Shopify z ERPNext
 DocType: Material Request Item,For Warehouse,Dla magazynu
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Zaktualizowano uwagi dotyczące dostawy {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Zaktualizowano uwagi dotyczące dostawy {0}
 DocType: Employee,Offer Date,Data oferty
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Notowania
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Jesteś w trybie offline. Nie będzie mógł przeładować dopóki masz sieć.
@@ -5102,7 +5108,7 @@
 DocType: Shipping Rule,Calculate Based On,Obliczone na podstawie
 DocType: Contract,Unfulfilled,Niespełnione
 DocType: Delivery Note Item,From Warehouse,Z magazynu
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Brak pracowników dla wymienionych kryteriów
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Brak pracowników dla wymienionych kryteriów
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Brak przedmioty z Bill of Materials do produkcji
 DocType: Shopify Settings,Default Customer,Domyślny klient
 DocType: Sales Stage,Stage Name,Pseudonim artystyczny
@@ -5145,7 +5151,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Kwota podatku po odliczeniu wysokości rabatu
 DocType: Patient,Inpatient Status,Status stacjonarny
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Codzienne podsumowanie Ustawienia Pracuj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Wybrany cennik powinien mieć sprawdzone pola kupna i sprzedaży.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Wybrany cennik powinien mieć sprawdzone pola kupna i sprzedaży.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Wprowadź Reqd według daty
 DocType: Payment Entry,Internal Transfer,Transfer wewnętrzny
 DocType: Asset Maintenance,Maintenance Tasks,Zadania konserwacji
@@ -5182,7 +5188,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Grupuj według
 DocType: Guardian,Interests,Zainteresowania
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Włącz/wyłącz waluty.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Nie można przesłać niektórych zwrotów wynagrodzeń
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Nie można przesłać niektórych zwrotów wynagrodzeń
 DocType: Exchange Rate Revaluation,Get Entries,Uzyskaj wpisy
 DocType: Production Plan,Get Material Request,Uzyskaj Materiał Zamówienie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Wydatki pocztowe
@@ -5269,7 +5275,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Konto wydatków jest obowiązkowe dla przedmiotu {0}
 DocType: BOM,Website Description,Opis strony WWW
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Zmiana netto w kapitale własnym
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Anuluj faktura zakupu {0} Pierwszy
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Anuluj faktura zakupu {0} Pierwszy
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Nie dozwolone. Wyłącz opcję Service Unit Type
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adres e-mail musi być unikalny, istnieje już dla {0}"
 DocType: Serial No,AMC Expiry Date,AMC Data Ważności
@@ -5309,7 +5315,7 @@
 DocType: Hotel Room,Hotel Room,Pokój hotelowy
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Konto {0} nie należy do firmy {1}
 DocType: Leave Type,Rounding,Zaokrąglanie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Numery seryjne w wierszu {0} nie pasują do opisu dostawy
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Numery seryjne w wierszu {0} nie pasują do opisu dostawy
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Dawka dodana (zaszeregowana)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Następnie reguły cenowe są filtrowane na podstawie klienta, grupy klientów, terytorium, dostawcy, grupy dostawców, kampanii, partnera handlowego itp."
 DocType: Student,Guardian Details,Szczegóły Stróża
@@ -5364,7 +5370,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Magazyn wymagany dla przedmiotu {0}
 DocType: Leave Allocation,Unused leaves,Niewykorzystane urlopy
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Dokonaj wpisu o spłatę
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Wszystkie departamenty
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Wszystkie departamenty
 DocType: Healthcare Service Unit,Vacant,Pusty
 DocType: Patient,Alcohol Past Use,Alkohol w przeszłości
 DocType: Fertilizer Content,Fertilizer Content,Zawartość nawozu
@@ -5375,7 +5381,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Zamówienie pracy {0} musi zostać anulowane przed anulowaniem tego zamówienia sprzedaży
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),
 DocType: Authorization Rule,Applicable To (Employee),Stosowne dla (Pracownik)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Due Date jest obowiązkowe
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Due Date jest obowiązkowe
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Przyrost dla atrybutu {0} nie może być 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Rodzaj świadczenia i kwota
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Pokoje zarezerwowane
@@ -5524,7 +5530,7 @@
 DocType: Purchase Invoice Item,Total Weight,Waga całkowita
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Prowizja od sprzedaży
 DocType: Job Offer Term,Value / Description,Wartość / Opis
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Wiersz # {0}: {1} aktywami nie mogą być składane, jest już {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Wiersz # {0}: {1} aktywami nie mogą być składane, jest już {2}"
 DocType: Tax Rule,Billing Country,Kraj fakturowania
 DocType: Purchase Order Item,Expected Delivery Date,Spodziewana data odbioru przesyłki
 DocType: Restaurant Order Entry,Restaurant Order Entry,Wprowadzanie do restauracji
@@ -5563,12 +5569,13 @@
 DocType: Maintenance Visit,Breakdown,Rozkład
 DocType: Travel Itinerary,Vegetarian,Wegetariański
 DocType: Patient Encounter,Encounter Date,Data spotkania
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Konto: {0} z waluty: nie można wybrać {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Konto: {0} z waluty: nie można wybrać {1}
 DocType: Bank Statement Transaction Settings Item,Bank Data,Dane bankowe
 DocType: Purchase Receipt Item,Sample Quantity,Ilość próbki
 DocType: Bank Guarantee,Name of Beneficiary,Imię beneficjenta
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Zaktualizuj koszt BOM automatycznie za pomocą harmonogramu, w oparciu o ostatnią wycenę / kurs cen / ostatni kurs zakupu surowców."
 DocType: Supplier,SUP-.YYYY.-,SUP-.RRRR.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Dostawca&gt; Grupa dostawców
 DocType: Bank Reconciliation Detail,Cheque Date,Data czeku
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Konto nadrzędne {1} nie należy do firmy: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Pomyślnie usunięte wszystkie transakcje związane z tą firmą!
@@ -5596,7 +5603,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,węzły potomne mogą być tworzone tylko w węzłach typu &quot;grupa&quot;
 DocType: Attendance Request,Half Day Date,Pół Dzień Data
 DocType: Academic Year,Academic Year Name,Nazwa Roku Akademickiego
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} nie może przeprowadzać transakcji z {1}. Zmień firmę.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} nie może przeprowadzać transakcji z {1}. Zmień firmę.
 DocType: Sales Partner,Contact Desc,Opis kontaktu
 DocType: Email Digest,Send regular summary reports via Email.,Wyślij regularne raporty podsumowujące poprzez e-mail.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Proszę ustawić domyślne konto w Expense Claim typu {0}
@@ -5629,7 +5636,7 @@
 DocType: Hotel Room,Hotel Manager,Kierownik hotelu
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Ustaw regułę podatkowa do koszyka
 DocType: Purchase Invoice,Taxes and Charges Added,Dodano podatki i opłaty
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Wiersz amortyzacji {0}: Data następnej amortyzacji nie może być wcześniejsza niż data przydatności do użycia
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Wiersz amortyzacji {0}: Data następnej amortyzacji nie może być wcześniejsza niż data przydatności do użycia
 ,Sales Funnel,Lejek Sprzedaży
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Skrót jest obowiązkowy
 DocType: Project,Task Progress,Postęp wykonywania zadania
@@ -5643,7 +5650,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Wszystkie grupy klientów
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,skumulowane miesięcznie
 DocType: Attendance Request,On Duty,Na służbie
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} jest obowiązkowe. Możliwe, że rekord Wymiana walut nie jest utworzony dla {1} do {2}."
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} jest obowiązkowe. Możliwe, że rekord Wymiana walut nie jest utworzony dla {1} do {2}."
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Plan zatrudnienia {0} już istnieje dla wyznaczenia {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Szablon podatkowa jest obowiązkowe.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Konto {0}: Konto nadrzędne {1} nie istnieje
@@ -5724,11 +5731,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Co najmniej jeden magazyn jest wymagany
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Skonfiguruj pola pozycji, takie jak UOM, Grupa produktów, Opis i liczba godzin."
 DocType: Certification Application,Certification Status,Status certyfikacji
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Rynek
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Rynek
 DocType: Travel Itinerary,Travel Advance Required,Wymagane wcześniejsze podróżowanie
 DocType: Subscriber,Subscriber Name,Nazwa subskrybenta
 DocType: Serial No,Out of Warranty,Brak Gwarancji
-DocType: Cashier Closing,Cashier-closing-,Kasjer-zamykanie
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Zmapowany typ danych
 DocType: BOM Update Tool,Replace,Zamień
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Nie znaleziono produktów.
@@ -5816,7 +5822,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Definiowane są domyślne szablony podatkowe dla sprzedaży i zakupu.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Wynik Wynik {0} już istnieje.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Przykład: ABCD. #####. Jeśli seria jest ustawiona, a numer partii nie jest wymieniony w transakcjach, na podstawie tej serii zostanie utworzony automatyczny numer partii. Jeśli zawsze chcesz wyraźnie podać numer partii dla tego produktu, pozostaw to pole puste. Uwaga: to ustawienie ma pierwszeństwo przed prefiksem serii nazw w Ustawieniach fotografii."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Proszę ustawić serię numerów dla Obecności za pośrednictwem Setup&gt; Numbering Series
 DocType: BOM,Materials Required (Exploded),Materiał Wymaga (Rozdzielony)
 DocType: Contract,Party User,Użytkownik strony
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Proszę wyłączyć filtr firmy, jeśli Group By jest &quot;Company&quot;"
@@ -6019,7 +6024,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,"Należy ustawić zarówno datę rozpoczęcia okresu próbnego, jak i datę zakończenia okresu próbnego"
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Średnia stawka
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Całkowita kwota płatności w harmonogramie płatności musi być równa sumie całkowitej / zaokrąglonej
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Całkowita kwota płatności w harmonogramie płatności musi być równa sumie całkowitej / zaokrąglonej
 DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bilans wyciągów bankowych wedle Księgi Głównej
 DocType: Job Applicant,Applicant Name,Imię Aplikanta
@@ -6088,7 +6093,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Środki czystości i Detergenty
 DocType: BOM,Show Items,jasnowidze
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Od czasu nie może być większa niż do czasu.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Czy chcesz powiadomić wszystkich klientów pocztą e-mail?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Czy chcesz powiadomić wszystkich klientów pocztą e-mail?
 DocType: Subscription Plan,Billing Interval,Okres rozliczeniowy
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Ruchomy Obraz i Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Zamówione
@@ -6097,9 +6102,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Wiersz {0}: {1} musi być większy niż 0
 DocType: Assessment Criteria,Assessment Criteria Group,Kryteria oceny grupowej
 DocType: Healthcare Settings,Patient Name By,Nazwisko pacjenta
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Zapis wstępny w dzienniku dla zarobków od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Zapis wstępny w dzienniku dla zarobków od {0} do {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Włącz odroczone przychody
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Otwarcie Skumulowana amortyzacja powinna być mniejsza niż równa {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Otwarcie Skumulowana amortyzacja powinna być mniejsza niż równa {0}
 DocType: Warehouse,Warehouse Name,Nazwa magazynu
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Rzeczywista data rozpoczęcia musi być mniejsza niż faktyczna data zakończenia
 DocType: Naming Series,Select Transaction,Wybierz Transakcję
@@ -6251,7 +6256,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Pracownik {0} stopnia {1} nie ma domyślnych zasad dotyczących urlopu
 DocType: Salary Detail,Salary Detail,Wynagrodzenie Szczegóły
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Proszę najpierw wybrać {0}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Dodano {0} użytkowników
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Dodano {0} użytkowników
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","W przypadku programu wielowarstwowego Klienci zostaną automatycznie przypisani do danego poziomu, zgodnie z wydatkami"
 DocType: Appointment Type,Physician,Lekarz
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Batch {0} pozycji {1} wygasł.
@@ -6396,7 +6401,7 @@
 DocType: Asset,Custodian,Kustosz
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Point-of-Sale profil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} powinno być wartością z zakresu od 0 do 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Płatność {0} od {1} do {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Płatność {0} od {1} do {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Pożyczki bez pokrycia
 DocType: Cost Center,Cost Center Name,Nazwa Centrum Kosztów
 DocType: Student,B+,B +
@@ -6428,6 +6433,7 @@
 DocType: Employee,Date of Issue,Data wydania
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Zgodnie z ustawieniami zakupów, jeśli wymagany jest zakup recieptu == &#39;YES&#39;, to w celu utworzenia faktury zakupu użytkownik musi najpierw utworzyć pokwitowanie zakupu dla elementu {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Wiersz # {0}: Ustaw Dostawca dla pozycji {1}
+DocType: Global Defaults,Default Distance Unit,Domyślna jednostka odległości
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Wiersz {0}: Godziny wartość musi być większa od zera.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Strona Obraz {0} dołączone do pozycji {1} nie można znaleźć
 DocType: Issue,Content Type,Typ zawartości
@@ -6483,7 +6489,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Debetowane konto musi być kontem bilansowym
 DocType: Asset,Naming Series,Seria nazw
 DocType: Vital Signs,Coated,Pokryty
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Wiersz {0}: oczekiwana wartość po przydatności musi być mniejsza niż kwota zakupu brutto
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Wiersz {0}: oczekiwana wartość po przydatności musi być mniejsza niż kwota zakupu brutto
 DocType: GoCardless Settings,GoCardless Settings,Ustawienia bez karty
 DocType: Leave Block List,Leave Block List Name,Opuść Zablokowaną Listę Nazw
 DocType: Certified Consultant,Certification Validity,Ważność certyfikacji
@@ -6552,6 +6558,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Nagłówek banku
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Wyświetl testy laboratoryjne
 DocType: Hub Users,Hub Users,Użytkownicy centrum
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klientów&gt; Terytorium
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Data Konserwacji
 DocType: Purchase Invoice Item,Rejected Serial No,Odrzucony Nr Seryjny
@@ -6567,7 +6574,7 @@
 DocType: SG Creation Tool Course,Max Strength,Maksymalna siła
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Instalowanie ustawień wstępnych
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Nie wybrano uwagi dostawy dla klienta {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Nie wybrano uwagi dostawy dla klienta {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Pracownik {0} nie ma maksymalnej kwoty świadczenia
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Wybierz pozycje w oparciu o datę dostarczenia
 DocType: Grant Application,Has any past Grant Record,Ma jakąkolwiek przeszłość Grant Record
@@ -6595,7 +6602,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Rezerwacja pokoju hotelowego
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Obsługa Klienta
 DocType: BOM,Thumbnail,Miniaturka
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Nie znaleziono kontaktów z identyfikatorami e-mail.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Nie znaleziono kontaktów z identyfikatorami e-mail.
 DocType: Item Customer Detail,Item Customer Detail,Element Szczegóły klienta
 DocType: Notification Control,Prompt for Email on Submission of,Potwierdzenie dla zgłoszeń dla email dla
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Maksymalna kwota świadczenia pracownika {0} przekracza {1}
@@ -6856,7 +6863,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,"Nie można konwertowanie do grupy, ponieważ jest wybrany rodzaj konta."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} został zmodyfikowany. Proszę odświeżyć.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Zatrzymaj możliwość składania zwolnienia chorobowego użytkownikom w następujące dni.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kod towaru&gt; Grupa produktów&gt; Marka
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.",W przypadku nielimitowanego wygaśnięcia punktów lojalnościowych czas trwania ważności jest pusty lub 0.
 DocType: Asset Maintenance Team,Maintenance Team Members,Członkowie zespołu ds. Konserwacji
 DocType: Loyalty Point Entry,Purchase Amount,Kwota zakupu
@@ -6864,7 +6870,7 @@
 											to fullfill Sales Order {2}","Nie można dostarczyć numeru seryjnego {0} elementu {1}, ponieważ jest on zarezerwowany \, aby wypełnić zamówienie sprzedaży {2}"
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.RRRR.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Dostawca notowań {0} tworzone
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Koniec roku nie może być przed rozpoczęciem Roku
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Koniec roku nie może być przed rozpoczęciem Roku
 DocType: Employee Benefit Application,Employee Benefits,Świadczenia pracownicze
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Wartość spakowana musi równać się ilości dla przedmiotu {0} w rzędzie {1}
 DocType: Work Order,Manufactured Qty,Ilość wyprodukowanych
@@ -6880,6 +6886,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Wybierz numery partii
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Do GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Rachunki dla klientów.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Proszę ustawić system nazewnictwa pracownika w dziale Zasoby ludzkie&gt; Ustawienia HR
 DocType: Healthcare Settings,Invoice Appointments Automatically,Zgłaszanie faktur automatycznie
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt Id
 DocType: Salary Component,Variable Based On Taxable Salary,Zmienna oparta na podlegającym opodatkowaniu wynagrodzeniu
@@ -6928,7 +6935,7 @@
 DocType: POS Profile,Account for Change Amount,Konto dla zmiany kwoty
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Łączenie z QuickBookami
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Całkowity wzrost / strata
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Nieprawidłowa firma dla faktury między firmami.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Nieprawidłowa firma dla faktury między firmami.
 DocType: Purchase Invoice,input service,usługa wprowadzania danych
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Wiersz {0}: Party / konto nie jest zgodny z {1} / {2} w {3} {4}
 DocType: Employee Promotion,Employee Promotion,Promocja pracowników
@@ -7059,7 +7066,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Preferowany obszar zakwaterowania
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analityka
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Koszyk jest pusty
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Proszę ustawić Instruktorski System Nazw w Edukacji&gt; Ustawienia edukacyjne
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Element {0} nie ma numeru seryjnego Tylko pozycje z zapasów \ mogą mieć dostawę na podstawie numeru seryjnego
 DocType: Vehicle,Model,Model
@@ -7089,7 +7095,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Nic do zmiany
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Proszę wybrać plik .csv
 DocType: Holiday List,Total Holidays,Suma dni świątecznych
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Brakujący szablon wiadomości e-mail do wysyłki. Ustaw jeden w Ustawieniach dostawy.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Brakujący szablon wiadomości e-mail do wysyłki. Ustaw jeden w Ustawieniach dostawy.
 DocType: Student Leave Application,Mark as Present,Oznacz jako Present
 DocType: Supplier Scorecard,Indicator Color,Kolor wskaźnika
 DocType: Purchase Order,To Receive and Bill,Do odbierania i Bill
@@ -7098,7 +7104,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Wybierz Nr seryjny
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Projektant
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Szablony warunków i regulaminów
-DocType: Serial No,Delivery Details,Szczegóły dostawy
+DocType: Delivery Trip,Delivery Details,Szczegóły dostawy
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},
 DocType: Program,Program Code,Kod programu
 DocType: Terms and Conditions,Terms and Conditions Help,Warunki Pomoc
@@ -7122,7 +7128,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Czas realizacji (dni)
 DocType: Cash Flow Mapping,Is Income Tax Expense,Jest kosztem podatku dochodowego
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Twoje zamówienie jest na dostawę!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Wiersz # {0}: Data księgowania musi być taka sama jak data zakupu {1} z {2} aktywów
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Wiersz # {0}: Data księgowania musi być taka sama jak data zakupu {1} z {2} aktywów
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Sprawdź, czy Student mieszka w Hostelu Instytutu."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Proszę podać zleceń sprzedaży w powyższej tabeli
 ,Stock Summary,Podsumowanie Zdjęcie
diff --git a/erpnext/translations/ps.csv b/erpnext/translations/ps.csv
index b6fc832..1737ccb 100644
--- a/erpnext/translations/ps.csv
+++ b/erpnext/translations/ps.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,د مودې نوم
 DocType: Employee,Salary Mode,معاش په اکر کې
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,راجستر
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,راجستر
 DocType: Patient,Divorced,طلاق
 DocType: Support Settings,Post Route Key,د پوسټ کلید
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,اجازه د قالب چې په یوه معامله څو ځله زياته شي
@@ -35,7 +35,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,د نوی بدلولو کچه
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},د اسعارو د بیې په لېست کې د اړتیا {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* به په راکړې ورکړې محاسبه شي.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,عرضه کوونکي&gt; د عرضه کوونکي ډول
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT -YYYY-
 DocType: Purchase Order,Customer Contact,پيرودونکو سره اړيکي
 DocType: Patient Appointment,Check availability,د لاسرسي کتنه
@@ -71,7 +70,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,وښایاست خلاص
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,لړۍ Updated په بریالیتوب
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,بشپړ ی وګوره
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{1} په قطار کې {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{1} په قطار کې {1}
 DocType: Asset Finance Book,Depreciation Start Date,د استهالک نیټه د پیل نیټه
 DocType: Pricing Rule,Apply On,Apply د
 DocType: Item Price,Multiple Item prices.,څو د قالب بيه.
@@ -117,7 +116,7 @@
 DocType: Lab Prescription,Lab Prescription,د لابراتوار نسخه
 ,Delay Days,ناوخته ورځ
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,خدمتونو د اخراجاتو
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},مسلسله شمېره: {0} د مخکې نه په خرڅلاو صورتحساب ماخذ: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},مسلسله شمېره: {0} د مخکې نه په خرڅلاو صورتحساب ماخذ: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,صورتحساب
 DocType: Purchase Invoice Item,Item Weight Details,د وزن وزن توضیحات
 DocType: Asset Maintenance Log,Periodicity,Periodicity
@@ -142,6 +141,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,محاسب
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,د نرخ پلور لیست
 DocType: Patient,Tobacco Current Use,تمباکو اوسنی کارول
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","د پیل نیټه او د نیټې نیټه د کارت کارت سره د زغملو وړ دی <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,د پلور کچه
 DocType: Cost Center,Stock User,دحمل کارن
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -161,7 +161,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,اړوند
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,د حاضرۍ نېټه نه شي کولای د کارکوونکي د یوځای نېټې څخه کم وي
 DocType: Grading Scale,Grading Scale Name,د رتبو او مقياس نوم
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,د بازار موندنې لپاره کاروونکي اضافه کړئ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,د بازار موندنې لپاره کاروونکي اضافه کړئ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,دا یو د ريښو په حساب او د نه تصحيح شي.
 DocType: Sales Invoice,Company Address,شرکت پته
 DocType: BOM,Operations,عملیاتو په
@@ -318,7 +318,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,مختلف مقدار
 DocType: Production Plan,Material Request Detail,د موادو غوښتنې وړاندیز
 DocType: Selling Settings,Default Quotation Validity Days,د داوطلبۍ د داوطلبۍ ورځې ورځې
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",په قطار {0} په قالب کچه د ماليې شامل دي، چې په قطارونو ماليه {1} هم باید شامل شي
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",په قطار {0} په قالب کچه د ماليې شامل دي، چې په قطارونو ماليه {1} هم باید شامل شي
 DocType: SMS Center,SMS Center,SMS مرکز
 DocType: Payroll Entry,Validate Attendance,حاضری تصدیق کول
 DocType: Sales Invoice,Change Amount,د بدلون لپاره د مقدار
@@ -437,7 +437,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,لپاره په لفظ اندازه ليکې تشه
 DocType: Vehicle,Additional Details,اضافي نورولوله
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,نه توضيحات ورکړل
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,سپلائر&gt; سپلائر ګروپ
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,لپاره د اخیستلو غوښتنه وکړي.
 DocType: POS Closing Voucher Details,Collected Amount,راغونډ شوي مقدار
 DocType: Lab Test,Submitted Date,سپارل شوی نیټه
@@ -482,7 +481,7 @@
 DocType: Student Admission,Student Admission,د زده کونکو د شاملیدو
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,{0} د قالب دی لغوه
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,د استهالک صف {0}: د استهالک نیټه د تیر نیټې په توګه داخل شوې ده
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,د استهالک صف {0}: د استهالک نیټه د تیر نیټې په توګه داخل شوې ده
 DocType: Contract Template,Fulfilment Terms and Conditions,د بشپړتیا شرایط او شرایط
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,د موادو غوښتنه
 DocType: Bank Reconciliation,Update Clearance Date,تازه چاڼېزو نېټه
@@ -539,6 +538,7 @@
 DocType: Accounts Settings,Settings for Accounts,لپاره حسابونه امستنې
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},په رانيول صورتحساب عرضه صورتحساب شتون نه لري {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Manage خرڅلاو شخص د ونو.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.",د لارو پروسس نشي کولی، ځکه چې د ګوګل نقشه ترتیبونه نافعال شوي دي.
 DocType: Job Applicant,Cover Letter,د خط کور
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,بيالنس Cheques او سپما او پاکول
 DocType: Item,Synced With Hub,دفارسی د مرکزي
@@ -598,7 +598,7 @@
 DocType: Asset Value Adjustment,New Asset Value,د نوي شتمني ارزښت
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,په ميزان کي پيرودونکو د اسعارو له دی چې د مشتريانو د اډې اسعارو بدل
 DocType: Course Scheduling Tool,Course Scheduling Tool,کورس اوقات اوزار
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},د کتارونو تر # {0}: رانيول صورتحساب د شته شتمنیو په وړاندې نه شي کولای شي د {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},د کتارونو تر # {0}: رانيول صورتحساب د شته شتمنیو په وړاندې نه شي کولای شي د {1}
 DocType: Crop Cycle,LInked Analysis,محدود معلومات
 DocType: POS Closing Voucher,POS Closing Voucher,د POS وتلو سوغاتر
 DocType: Contract,Lapsed,تاوان
@@ -633,6 +633,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} په کورس کې شامل نه {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,د زده کونکی نوم:
 DocType: POS Closing Voucher Details,Difference,توپیر
+DocType: Delivery Settings,Delay between Delivery Stops,د سپارلو بندیزونو ترمنځ ځنډ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},شعبه {0} نه د سپارنې يادونه سره تړاو نه لري {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.",داسې ښکاري چې د سرور د ګورتورډ کنټرول سره یو مسله وي. اندیښنه مه کوئ، د ناکامۍ په صورت کې، ستاسو د حساب رقم به بیرته ترلاسه شي.
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext قالب
@@ -693,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,کمیت او Rate
 DocType: Delivery Note,% Installed,٪ ولګول شو
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,درسي / لابراتوارونو او نور هلته د لکچر کولای ټاکل شي.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,د شرکتونو دواړو شرکتونو باید د انټرنیټ د راکړې ورکړې سره سمون ولري.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,د شرکتونو دواړو شرکتونو باید د انټرنیټ د راکړې ورکړې سره سمون ولري.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,مهرباني وکړئ د شرکت نوم د لومړي ننوځي
 DocType: Travel Itinerary,Non-Vegetarian,غیر سبزیج
 DocType: Purchase Invoice,Supplier Name,عرضه کوونکي نوم
@@ -776,7 +777,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,له نېټه څخه کرایه شوی
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,بس برخي د جوړولو
 DocType: POS Profile User,POS Profile User,د پی ایس پی پی ایل کارن
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Row {0}: د استملاک د پیل نیټه اړینه ده
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Row {0}: د استملاک د پیل نیټه اړینه ده
 DocType: Purchase Invoice Item,Service Start Date,د خدماتو د پیل نیټه
 DocType: Subscription Invoice,Subscription Invoice,د ګډون تفتیش
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,مستقيم عايداتو
@@ -845,7 +846,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Abbreviation لا د بل شرکت لپاره کارول
 DocType: Selling Settings,Default Customer Group,Default پيرودونکو ګروپ
 DocType: Employee,IFSC Code,د IFSC کود
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","د پیل نیټه او د نیټې نیټه د کارت کارت سره د زغملو وړ دی <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",که ناتوان، &#39;غونډ مونډ Total&#39; ډګر به په هيڅ معامله د لیدو وړ وي
 DocType: BOM,Operating Cost,عادي لګښت
 DocType: Crop,Produced Items,تولید شوي توکي
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,د آر ایف پی څخه مخنیوی وکړئ
 DocType: Hub User,Hub User,حب کارن
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,د کمکیانو لپاره د خرڅلاو د ترتیب پر اساس
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},د معاش معاش چې د {1} څخه تر {1} پورې مودې لپاره وسپارل شو
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},د معاش معاش چې د {1} څخه تر {1} پورې مودې لپاره وسپارل شو
 DocType: Project Task,Project Task,د پروژې د کاري
 DocType: Loyalty Point Entry Redemption,Redeemed Points,سپارل شوي ټکي
 ,Lead Id,سرب د Id
@@ -1029,7 +1029,7 @@
 DocType: Fee Validity,Max number of visit,د کتنې ډیره برخه
 ,Hotel Room Occupancy,د هوټل روم Occupancy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet جوړ:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},لطفا د تادیاتو په اکر کې default د نغدي او يا بانک حساب جوړ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},لطفا د تادیاتو په اکر کې default د نغدي او يا بانک حساب جوړ {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,کې شامل کړي
 DocType: GST Settings,GST Settings,GST امستنې
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},پیسو باید د قیمت د لیست کرنسی په شان وي: {0}
@@ -1084,7 +1084,7 @@
 DocType: Vehicle Log,Service Details,خدمتونو نورولوله
 DocType: Lab Test Template,Grouped,ګروپ شوی
 DocType: Selling Settings,Delivery Note Required,د سپارنې پرمهال يادونه اړينه ده
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,د معاشاتو سلونه جمع کول ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,د معاشاتو سلونه جمع کول ...
 DocType: Bank Guarantee,Bank Guarantee Number,بانکي تضمین شمیره
 DocType: Bank Guarantee,Bank Guarantee Number,بانکي تضمین شمیره
 DocType: Assessment Criteria,Assessment Criteria,د ارزونې معیارونه
@@ -1110,13 +1110,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,د پیسو د داخلولو د مخکې نه جوړ
 DocType: Request for Quotation,Get Suppliers,سپلائر ترلاسه کړئ
 DocType: Purchase Receipt Item Supplied,Current Stock,اوسني دحمل
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},د کتارونو تر # {0}: د شتمنیو د {1} نه د قالب تړاو نه {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},د کتارونو تر # {0}: د شتمنیو د {1} نه د قالب تړاو نه {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,د مخکتنې معاش ټوټه
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,ګڼون {0} په څو ځله داخل شوي دي
 DocType: Account,Expenses Included In Valuation,لګښتونه شامل په ارزښت
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,تاسو کولی شئ یواځې نوی توب وکړئ که ستاسو غړیتوب په 30 ورځو کې پای ته ورسیږي
 DocType: Shopping Cart Settings,Show Stock Availability,د ذخیرې شتون ښودل
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},{0} د شتمني په کټګوری {1} یا کمپنۍ {2} کې مقرر کړئ.
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},{0} د شتمني په کټګوری {1} یا کمپنۍ {2} کې مقرر کړئ.
 DocType: Location,Longitude,اوږد مهاله
 ,Absent Student Report,غیر حاضر زده کوونکو راپور
 DocType: Crop,Crop Spacing UOM,د کرهنې فاصله UOM
@@ -1189,7 +1189,7 @@
 DocType: Soil Texture,Sand,رڼا
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,د انرژۍ د
 DocType: Opportunity,Opportunity From,فرصت له
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,د {0}: {1} سیریل شمېره د 2 {2} لپاره اړین ده. تاسو {3} چمتو کړی.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,د {0}: {1} سیریل شمېره د 2 {2} لپاره اړین ده. تاسو {3} چمتو کړی.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,مهرباني وکړئ یو میز انتخاب کړئ
 DocType: BOM,Website Specifications,وېب پاڼه ځانګړتیاو
 DocType: Special Test Items,Particulars,درسونه
@@ -1280,7 +1280,7 @@
 DocType: Item,Items with higher weightage will be shown higher,سره د لوړو weightage توکي به د لوړو ښودل شي
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,د لابراتوار آزموینې او حیاتي نښانې
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,بانک پخلاينې تفصیلي
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,د کتارونو تر # {0}: د شتمنیو د {1} بايد وسپارل شي
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,د کتارونو تر # {0}: د شتمنیو د {1} بايد وسپارل شي
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,هیڅ یو کارمند وموندل شول
 DocType: Item,If subcontracted to a vendor,که قرارداد ته د يو خرڅوونکي په
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,د زده کوونکو د ډلې لا تازه.
@@ -1335,7 +1335,6 @@
 DocType: Loyalty Program Collection,Tier Name,د ټیر نوم
 DocType: HR Settings,Enter retirement age in years,په کلونو کې د تقاعد د عمر وليکئ
 DocType: Crop,Target Warehouse,هدف ګدام
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,مهرباني وکړئ د سایټ نوم نومول د Setup&gt; ترتیباتو له لارې {0} لپاره د نومونې لړۍ وټاکئ
 DocType: Payroll Employee Detail,Payroll Employee Detail,د پیسو کارمندان تفصیل
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,لطفا یو ګودام انتخاب
 DocType: Cheque Print Template,Starting location from left edge,کيڼې څنډې څخه پیل ځای
@@ -1424,7 +1423,7 @@
 DocType: Work Order,Plan material for sub-assemblies,فرعي شوراګانو لپاره پلان مواد
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,خرڅلاو همکارانو او خاوره
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,هیښ {0} بايد فعال وي
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,د لیږد لپاره کوم توکي شتون نلري
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,د لیږد لپاره کوم توکي شتون نلري
 DocType: Employee Boarding Activity,Activity Name,د فعالیت نوم
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,د خپریدو نیټه
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,د محصول مقدار ختمول <b>{0}</b> او د مقدار لپاره <b>{1}</b> توپیر نلري
@@ -1647,6 +1646,7 @@
 DocType: Project,First Email,لومړی برېښلیک
 DocType: Company,Exception Budget Approver Role,د استثنا د بودیجې موقعیت رول
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date",یو ځل بیا ټاکل شوی، دا رسید به د نیټې نیټه پورې تر سره شي
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,په خرڅلاو نظم / د بشپړو شویو جنسونو ګدام خوندي دي ګدام
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,پلورل مقدار
 DocType: Repayment Schedule,Interest Amount,په زړه مقدار
@@ -1658,7 +1658,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,ریکارډونه
 DocType: Asset,Scrapped,پرزه
 DocType: Item,Item Defaults,د توکو خوندیتوب
-DocType: Purchase Invoice,Returns,په راستنېدو
+DocType: Cashier Closing,Returns,په راستنېدو
 DocType: Job Card,WIP Warehouse,WIP ګدام
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},شعبه {0} ترمړوندونو مراقبت د قرارداد په اساس دی {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,د استخدام
@@ -1672,7 +1672,6 @@
 DocType: Student,A-,خبرتیاوي
 DocType: Share Transfer,Transfer Type,د لېږد ډول
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,خرڅلاو داخراجاتو
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,پیرودونکي&gt; پیرودونکي ګروپ&gt; ساحه
 DocType: Diagnosis,Diagnosis,تشخیص
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,معياري خريداري
 DocType: Attendance Request,Explanation,تشریح
@@ -1696,7 +1695,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,د صفر د بلې ساعتونو لپاره رسیدنه نشي کیدی
 DocType: Company,Date of Commencement,د پیل نیټه
 DocType: Sales Person,Select company name first.,انتخاب شرکت نوم د لومړي.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},ایمیل ته لېږل شوی {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},ایمیل ته لېږل شوی {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,د داوطلبۍ څخه عرضه ترلاسه کړ.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOM بدله کړئ او په ټولو BOMs کې وروستي قیمت تازه کړئ
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},د {0} | {1} {2}
@@ -1718,7 +1717,7 @@
 DocType: Asset Movement,From Employee,له کارګر
 DocType: Driver,Cellphone Number,د ګرڅنده ټیلیفون شمېره
 DocType: Project,Monitor Progress,پرمختګ څارنه
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,خبرداری: د سیستم به راهیسې لپاره د قالب اندازه overbilling وګورئ نه {0} د {1} صفر ده
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,خبرداری: د سیستم به راهیسې لپاره د قالب اندازه overbilling وګورئ نه {0} د {1} صفر ده
 DocType: Journal Entry,Make Difference Entry,بدلون د داخلولو د کمکیانو لپاره
 DocType: Supplier Quotation,Auto Repeat Section,د اتوماتیک برخې برخه
 DocType: Upload Attendance,Attendance From Date,د حاضرۍ له نېټه
@@ -1820,7 +1819,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,د کتارونو تر # {0}: رد Qty په رانيول بیرته نه داخل شي
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,د ټاکل شوي پیرودونکو لپاره د پیرودونکي ګروپ بدلول اجازه نه لري.
 ,Purchase Order Items To Be Billed,د اخستلو امر توکي چې د محاسبې ته شي
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,د رسیدلو اټکل وخت.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,د رسیدلو اټکل وخت.
 DocType: Program Enrollment Tool,Enrollment Details,د نومونې تفصیلات
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,د شرکت لپاره د ډیرو شواهدو غلطی ندی ټاکلی.
 DocType: Purchase Invoice Item,Net Rate,خالص Rate
@@ -1834,7 +1833,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,د پریښودو اجازه درملنه ده
 DocType: Support Settings,Close Issue After Days,بندول Issue ورځې وروسته
 ,Eway Bill,د تل لپاره
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,تاسو ته اړتیا لرئ چې د سیسټم مدیر او د مدیر مدیر رول سره د کاروونکو لپاره د کاروونکو اضافه کولو لپاره یو کارن وي.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,تاسو ته اړتیا لرئ چې د سیسټم مدیر او د مدیر مدیر رول سره د کاروونکو لپاره د کاروونکو اضافه کولو لپاره یو کارن وي.
 DocType: Leave Control Panel,Leave blank if considered for all branches,خالي پريږدئ که د ټولو څانګو په پام کې
 DocType: Job Opening,Staffing Plan,د کار کولو پلان
 DocType: Bank Guarantee,Validity in Days,د ورځو د اعتبار
@@ -1855,7 +1854,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},{0} دوه ګونو قطار سره ورته {1}
 DocType: Marketplace Settings,Disable Marketplace,د بازار ځای بندول
 ,Trial Balance,د محاکمې بیلانس
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,مالي کال د {0} ونه موندل شو
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,مالي کال د {0} ونه موندل شو
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,مامورین ترتیبول
 DocType: Hotel Room Reservation,Hotel Reservation User,د هوټل رژیم کارن
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,مهرباني وکړئ لومړی مختاړی وټاکئ
@@ -1960,7 +1959,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +138,Your Products or Services,ستاسو د تولیداتو يا خدمتونو
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,ننوتل کې ناکام شو
 DocType: Special Test Items,Special Test Items,د ځانګړي ازموینې توکي
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,تاسو اړتیا لرئ چې د کاروونکي راجستر کولو لپاره د سیسټم مدیر او د مدیر مدیر رول سره یو کارن وي.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,تاسو اړتیا لرئ چې د کاروونکي راجستر کولو لپاره د سیسټم مدیر او د مدیر مدیر رول سره یو کارن وي.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,د تادیاتو اکر
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,ستاسو د ټاکل شوې تنخواې جوړښت سره سم تاسو د ګټو لپاره درخواست نشو کولی
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,وېب پاڼه د انځور بايد د عامه دوتنه يا ويب URL وي
@@ -1972,7 +1971,7 @@
 DocType: Warehouse,Warehouse Contact Info,ګدام تماس پيژندنه
 DocType: Payment Entry,Write Off Difference Amount,ولیکئ پړاو بدلون مقدار
 DocType: Volunteer,Volunteer Name,رضاکار نوم
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},په نورو قطارونو کې د دوه ځله ټاکل شوي نیټې سره قطعونه وموندل شول: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},په نورو قطارونو کې د دوه ځله ټاکل شوي نیټې سره قطعونه وموندل شول: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent",{0}: د کارګر ایمیل ونه موندل، نو برېښناليک نه استول
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},د معاش ورکولو جوړښت د کارمندانو لپاره ټاکل شوی نیټه {0} په ټاکل شوي نیټه {1}
 DocType: Item,Foreign Trade Details,د بهرنیو چارو د سوداګرۍ نورولوله
@@ -2061,6 +2060,7 @@
 DocType: Salary Component,Earning,وټې
 DocType: Supplier Scorecard,Scoring Criteria,د معیار معیار
 DocType: Purchase Invoice,Party Account Currency,ګوند حساب د اسعارو
+DocType: Delivery Trip,Total Estimated Distance,ټول اټکل شوی فاصله
 ,BOM Browser,هیښ د لټووني
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,مهرباني وکړئ د دې روزنیز پروګرام لپاره خپل حالت تازه کړئ
 DocType: Item Barcode,EAN,EAN
@@ -2099,7 +2099,7 @@
 DocType: Activity Cost,Projects,د پروژو
 DocType: Payment Request,Transaction Currency,د راکړې ورکړې د اسعارو
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},څخه د {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,ځینې برېښلیکونه ناباوره دي
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,ځینې برېښلیکونه ناباوره دي
 DocType: Work Order Operation,Operation Description,د عملياتو Description
 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.,مالي کال د پیل نیټه او د مالي کال د پای نیټه نه بدلون کولای شي کله چې د مالي کال دی وژغوره.
 DocType: Quotation,Shopping Cart,د سودا لاس ګاډی
@@ -2123,7 +2123,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,په ثابته شتمني خالص د بدلون
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,ریق مقدار
 DocType: Leave Control Panel,Leave blank if considered for all designations,خالي پريږدئ که د ټولو هغو کارونو په پام کې
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,د ډول &#39;واقعي په قطار چارج په قالب Rate نه {0} شامل شي
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,د ډول &#39;واقعي په قطار چارج په قالب Rate نه {0} شامل شي
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},اعظمي: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,له Datetime
 DocType: Shopify Settings,For Company,د شرکت
@@ -2137,7 +2137,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,د غلطۍ شتون شتون لري د کورس مهال ویش جوړول
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,په لیست کې د لومړنۍ لګښتونو ارزونه به د اصلي لګښت لګښت په توګه وټاکل شي.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,نه شي کولای په پرتله 100 وي
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,تاسو اړتیا لرئ چې د مدیر څخه پرته د سیسټم مدیر او د منجمنت مدیر رول سره په مارکیټ کې ثبت کولو لپاره بلکې.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,تاسو اړتیا لرئ چې د مدیر څخه پرته د سیسټم مدیر او د منجمنت مدیر رول سره په مارکیټ کې ثبت کولو لپاره بلکې.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,{0} د قالب يو سټاک د قالب نه دی
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC -YYYY-
 DocType: Maintenance Visit,Unscheduled,ناپلان شوې
@@ -2396,7 +2396,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} تشخیص او {1} بودیجه د {2} لپاره لا دمخه د {3} فرعي شرکتونو لپاره پلان شوې. \ تاسو کولی شئ د پلار پالن {6} لپاره د {4} تشخیص او بودیجه {5} په اړه یوازې پالن جوړ کړئ {6}.
 DocType: HR Settings,Stop Birthday Reminders,Stop کالیزې په دوراني ډول
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},لطفا په شرکت Default د معاشاتو د راتلوونکې حساب جوړ {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},لطفا په شرکت Default د معاشاتو د راتلوونکې حساب جوړ {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,د مالیې مالي مالیه ترلاسه کړئ او د ایمیزون لخوا ډاټا چارج کړئ
 DocType: SMS Center,Receiver List,د اخيستونکي بشپړفهرست
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,د لټون د قالب
@@ -2466,7 +2466,7 @@
 DocType: Vital Signs,Constipated,قبضه شوی
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},په وړاندې د عرضه صورتحساب {0} د میاشتې په {1}
 DocType: Customer,Default Price List,Default د بیې په لېست
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,د شتمنیو د غورځنګ ریکارډ {0} جوړ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,د شتمنیو د غورځنګ ریکارډ {0} جوړ
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,کوم توکي ونه موندل شول.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,تاسې کولای شی نه ړنګول مالي کال {0}. مالي {0} کال په توګه په نړیوال امستنې default ټاکل
 DocType: Share Transfer,Equity/Liability Account,د مسؤلیت / مسؤلیت حساب
@@ -2606,6 +2606,7 @@
 DocType: Blanket Order,Order Type,نظم ډول
 ,Item-wise Sales Register,د قالب-هوښيار خرڅلاو د نوم ثبتول
 DocType: Asset,Gross Purchase Amount,Gross رانيول مقدار
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,د توکو کود&gt; توکي ګروپ&gt; برنامه
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,د توازن خلاصول
 DocType: Asset,Depreciation Method,د استهالک Method
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,آیا دا د مالياتو په اساسي Rate شامل دي؟
@@ -2686,7 +2687,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,عمل که چیرې د پیسو په اړه کلنۍ بودیجه تیریږي
 DocType: Student Leave Application,Student Leave Application,د زده کوونکو ته لاړل کاریال
 DocType: Item,Will also apply for variants,به هم د بېرغونو درخواست
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}",د شتمنیو د نه لغوه شي، لکه څنګه چې د مخه دی {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}",د شتمنیو د نه لغوه شي، لکه څنګه چې د مخه دی {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},کارکوونکی د {0} په نيمه ورځ په {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Total کار ساعتونو کې باید په پرتله max کار ساعتونو زيات نه وي {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,د
@@ -2709,6 +2710,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,ډاټا ترلاسه کړئ
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},د لیږد ډول کې {1} {1} دی.
 DocType: SMS Center,Create Receiver List,جوړول د اخيستونکي بشپړفهرست
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,د کارولو لپاره شتون باید د پیرودنې نیټې وروسته وي
 DocType: Vehicle,Wheels,په عرابو
 DocType: Packing Slip,To Package No.,ته بسته شمیره
 DocType: Patient Relation,Family,کورنۍ
@@ -2722,7 +2724,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,د بلې پیسو پیسې باید د یاغیانو د کمپنۍ یا د ګوند حساب حساب سره مساوي وي
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),ښيي چې د کڅوړه ده د دې د وړاندې کولو (یوازې مسوده) یوه برخه
 DocType: Soil Texture,Loam,لوام
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,صف {0}: د تاریخ نیټه د نیټې نیټې څخه مخکې نشي کیدی
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,صف {0}: د تاریخ نیټه د نیټې نیټې څخه مخکې نشي کیدی
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,د پیسو د داخلولو د کمکیانو لپاره
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},لپاره د قالب مقدار {0} بايد په پرتله کمه وي {1}
 ,Sales Invoice Trends,خرڅلاو صورتحساب رجحانات
@@ -2793,7 +2795,7 @@
 DocType: Guardian,Guardian Interests,ګارډین علاقه
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,د محاسبې نوم / شمېره تازه کړه
 DocType: Naming Series,Current Value,اوسنی ارزښت
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,لپاره د نېټې {0} څو مالي کلونو کې شتون لري. لطفا د مالي کال په شرکت جوړ
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,لپاره د نېټې {0} څو مالي کلونو کې شتون لري. لطفا د مالي کال په شرکت جوړ
 DocType: Education Settings,Instructor Records to be created by,د روزونکي ریکارډونه باید جوړ شي
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} جوړ
 DocType: GST Account,GST Account,د GST حساب
@@ -2810,7 +2812,7 @@
 DocType: Sales Person,Name and Employee ID,نوم او د کارګر ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,له امله نېټه پست کوي نېټه مخکې نه شي
 DocType: Website Item Group,Website Item Group,وېب پاڼه د قالب ګروپ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,د پورته ټاکل شوي معیارونو لپاره جمع کولو لپاره هیڅ معاش ندی موندلی یا د معاش معاشی دمخه وړاندیز شوی
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,د پورته ټاکل شوي معیارونو لپاره جمع کولو لپاره هیڅ معاش ندی موندلی یا د معاش معاشی دمخه وړاندیز شوی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,دندې او مالیات
 DocType: Projects Settings,Projects Settings,د پروژې ترتیبونه
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,لطفا ماخذ نېټې ته ننوځي
@@ -2819,7 +2821,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,تهيه Qty
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR -YYYY-
 DocType: Purchase Order Item,Material Request Item,د موادو غوښتنه د قالب
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,مهرباني وکړئ لومړی د {1} پیرود رسيد رد کړئ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,مهرباني وکړئ لومړی د {1} پیرود رسيد رد کړئ
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,د قالب ډلې ونه ده.
 DocType: Production Plan,Total Produced Qty,ټول تولید شوي مقدار
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,نه قطار شمېر په پرتله لویه یا مساوي دې مسؤوليت په ډول د اوسني قطار شمېر ته راجع
@@ -2930,6 +2932,7 @@
 ,Vehicle Expenses,موټر داخراجاتو
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,د پلور انوائس جمعې په اړه د لابراتوار ازموینې جوړول
 DocType: Serial No,Invoice Details,صورتحساب نورولوله
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,مهرباني وکړئ د لارښوونو اټکل او غوره کولو لپاره د Google نقشې ترتیبات فعال کړئ
 DocType: Grant Application,Show on Website,په ویب پاڼه کې ښودل
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,پېل کول
 DocType: Hub Tracked Item,Hub Category,حب کټګوري
@@ -2968,7 +2971,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1797,Get Items from Prescriptions,د نسخې څخه توکي ترلاسه کړئ
 DocType: Patient,Patient Details,د ناروغ توضیحات
 DocType: Inpatient Record,B Positive,B مثبت
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",د کتارونو تر # {0}: Qty باید 1، لکه توکی يوه ثابته شتمني ده. لورينه وکړئ د څو qty جلا قطار وکاروي.
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",د کتارونو تر # {0}: Qty باید 1، لکه توکی يوه ثابته شتمني ده. لورينه وکړئ د څو qty جلا قطار وکاروي.
 DocType: Leave Block List Allow,Leave Block List Allow,پريږدئ بالک بشپړفهرست اجازه
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr نه شي خالي يا ځای وي
 DocType: Patient Medical Record,Patient Medical Record,د ناروغ درملنه
@@ -3003,7 +3006,7 @@
 DocType: Workstation,Wages per hour,په هر ساعت کې د معاشونو
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},دحمل په دسته توازن {0} به منفي {1} لپاره د قالب {2} په ګدام {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,مادي غوښتنې لاندې پر بنسټ د قالب د بيا نظم په کچه دي په اتوماتيک ډول راپورته شوې
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},ګڼون {0} ناباوره دی. حساب د اسعارو باید د {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},ګڼون {0} ناباوره دی. حساب د اسعارو باید د {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},د نیټې څخه {0} نشي کولی د کارمندانو د رعایت کولو نیټه وروسته {1}
 DocType: Supplier,Is Internal Supplier,آیا داخلي سپلائر
 DocType: Employee,Create User Permission,د کارن اجازه جوړول
@@ -3149,7 +3152,7 @@
 DocType: Account,Fixed Asset,د ثابت د شتمنیو
 DocType: Amazon MWS Settings,After Date,د نیټې وروسته
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Serialized موجودي
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,د انټرنیټ انو انو لپاره غلط {0}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,د انټرنیټ انو انو لپاره غلط {0}.
 ,Department Analytics,د څانګې انټرنېټ
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,په بریښناليک اړیکه کې ای میل ونه موندل شو
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,پټ ساتل
@@ -3162,7 +3165,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,د فیس جوړښت او د زده کوونکو ګروپ {0} پروګرام مختلف دی.
 DocType: Bank Statement Transaction Entry,Receivable Account,ترلاسه اکانټ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,د نیټې څخه باید د نیټې څخه لږ وي.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},د کتارونو تر # {0}: د شتمنیو د {1} ده لا د {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},د کتارونو تر # {0}: د شتمنیو د {1} ده لا د {2}
 DocType: Quotation Item,Stock Balance,دحمل بیلانس
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,ته قطعا د خرڅلاو د ترتیب پر اساس
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,اجرايوي ريس
@@ -3204,6 +3207,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,ډیبیټ ته اړتيا ده
 DocType: Clinical Procedure,Inpatient Record,د داخل بستر ناروغانو ریکارډ
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",ویشونو لپاره activites ستاسو د ډلې له خوا تر سره د وخت، لګښت او د بلونو د تګلورې کې مرسته وکړي
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,عرضه کوونکي&gt; د عرضه کوونکي ډول
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,رانيول بیې لېست
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,د لیږد نیټه
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,د عرضه کونکي سکورټ کارډ متغیرات.
@@ -3247,7 +3251,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,په بدل کې لاسته راغلې ګټه / له لاسه ورکول
 DocType: Opportunity,Lost Reason,له لاسه دلیل
 DocType: Amazon MWS Settings,Enable Amazon,ایمیزون فعال کړئ
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Row # {0}: حساب {1} د شرکت سره تړاو نلري {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Row # {0}: حساب {1} د شرکت سره تړاو نلري {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},د ډاټا ټائپ موندلو توان نلري {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,نوې پته
 DocType: Quality Inspection,Sample Size,نمونه اندازه
@@ -3358,7 +3362,7 @@
 DocType: Water Analysis,Origin,اصلي
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,دغه سند له خوا حد دی {0} د {1} لپاره توکی {4}. آیا تاسو د ورته په وړاندې د بل {3} {2}؟
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,لطفا جوړ ژغورلو وروسته تکراري
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,انتخاب بدلون اندازه حساب
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,انتخاب بدلون اندازه حساب
 DocType: Purchase Invoice,Price List Currency,د اسعارو بیې لېست
 DocType: Naming Series,User must always select,کارن بايد تل انتخاب
 DocType: Stock Settings,Allow Negative Stock,د منفی دحمل اجازه
@@ -3400,7 +3404,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,ایا تاسو ډاډه یاست چې تاسو دا ټاکل رد کړئ؟
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,د هوټل خونه د قیمت ارزونه
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,خرڅلاو نل
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},لطفا په معاش برخه default ګڼون جوړ {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},لطفا په معاش برخه default ګڼون جوړ {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,اړتیا ده
 DocType: Rename Tool,File to Rename,د نوم بدلول د دوتنې
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},لطفا په کتارونو لپاره د قالب هیښ غوره {0}
@@ -3421,7 +3425,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,د رانیولې سامان لګښت
 DocType: Employee Separation,Employee Separation Template,د کارموندنې جلا کول
 DocType: Selling Settings,Sales Order Required,خرڅلاو نظم مطلوب
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,پلورونکی بن
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,پلورونکی بن
 DocType: Purchase Invoice,Credit To,د اعتبار
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,فعال د ياه / پېرودونکي
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,د معیاري سپارلو نوټ فارم بڼه کارولو لپاره خالي پریږدئ
@@ -3463,7 +3467,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,د مالیې ټیکنالوژي جوړه کړئ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,کارن فورم
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,خام مواد نه شي خالي وي.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,رو # {0} (د تادياتو جدول): مقدار باید منفي وي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,رو # {0} (د تادياتو جدول): مقدار باید منفي وي
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.",کیدای شي سټاک د اوسمهالولو لپاره نه، صورتحساب لرونکی د څاڅکی انتقال توکی.
 DocType: Contract,Fulfilment Status,د بشپړتیا حالت
 DocType: Lab Test Sample,Lab Test Sample,د لابراتوار ازموینه
@@ -3603,7 +3607,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,د ډاټا تاریخ
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},فیس سوابق ايجاد - {0}
 DocType: Asset Category Account,Asset Category Account,د شتمنیو د حساب کټه ګورۍ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,رو # {0} (د تادياتو جدول): مقدار باید مثبت وي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,رو # {0} (د تادياتو جدول): مقدار باید مثبت وي
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},آیا د پلورنې نظم کمیت څخه زیات د قالب {0} د توليد نه {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,د ځانګړتیا ارزښتونه غوره کړئ
 DocType: Purchase Invoice,Reason For Issuing document,د سند د صادرولو لپاره دلیل
@@ -3658,7 +3662,7 @@
 DocType: Purchase Receipt,Time at which materials were received,د وخت په کوم توکي ترلاسه کړ
 DocType: Products Settings,Products per Page,محصول په هر مخ
 DocType: Stock Ledger Entry,Outgoing Rate,د تېرې Rate
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,او یا
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,او یا
 DocType: Sales Order,Billing Status,د بیلونو په حالت
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,یو Issue راپور
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,ټولګټې داخراجاتو
@@ -3686,7 +3690,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,د کارکونکي مالیې معافیت اعلامیه
 DocType: Payment Entry,Cheque/Reference Date,آرډر / ماخذ نېټه
 DocType: Purchase Invoice,Total Taxes and Charges,Total مالیات او په تور
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,د کار لپاره شتون د تیر نیټې په توګه داخل شوی
 DocType: Employee,Emergency Contact,بېړنۍ اړيکشمېره
 DocType: Bank Reconciliation Detail,Payment Entry,د پیسو د داخلولو
 ,sales-browser,د پلورنې-کتنمل
@@ -3732,6 +3735,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Depreciation Amount during the period,په دغه موده کې د استهالک مقدار
 DocType: Sales Invoice,Is Return (Credit Note),بیرته ستنیدنه (کریډیټ یادښت)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,د پیل پیل
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,مهرباني وکړئ د سایټ نوم نومول د Setup&gt; ترتیباتو له لارې {0} لپاره د نومونې لړۍ وټاکئ
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,معلولینو کېنډۍ باید default کېنډۍ نه وي
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,د قطار لپاره {0}: پلان شوي مقدار درج کړئ
 DocType: Account,Income Account,پر عايداتو باندې حساب
@@ -3745,6 +3749,7 @@
 DocType: Loyalty Program,Help Section,د مرستې برخه
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,قبلی
 DocType: Appraisal Goal,Key Responsibility Area,مهم مسوولیت په سیمه
+DocType: Delivery Trip,Distance UOM,فاصله UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",د زده کوونکو دستو مرسته وکړي چې تاسو د زده کوونکو لپاره د حاضرۍ، د ارزونو او د فيس تعقیب کړي
 DocType: Payment Entry,Total Allocated Amount,ټولې پیسې د
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,جوړ تلوالیزه لپاره د دايمي انبار انبار حساب
@@ -3784,7 +3789,7 @@
 DocType: Item Supplier,Item Supplier,د قالب عرضه
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,لطفا د قالب کوډ داخل ته داځکه تر لاسه نه
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},لورينه وکړئ د {0} quotation_to د ارزښت ټاکلو {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,د لېږد لپاره ټاکل شوي توکي نشته
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,د لېږد لپاره ټاکل شوي توکي نشته
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ټول Addresses.
 DocType: Company,Stock Settings,دحمل امستنې
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",آژانسونو هغه مهال ممکنه ده که لاندې شتمنۍ په دواړو اسنادو يو شان دي. دی ګروپ، د ریښی ډول، د شرکت
@@ -4069,7 +4074,7 @@
 DocType: Patient,Personal and Social History,شخصي او ټولنیز تاریخ
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,کارن {0} جوړ شوی
 DocType: Fee Schedule,Fee Breakup for each student,د هر زده کوونکی لپاره د فیس ماتونکی
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total دمخه ({0}) د ترتیب پر وړاندې د {1} نه شي کولای د Grand ټولو څخه ډيره وي ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Total دمخه ({0}) د ترتیب پر وړاندې د {1} نه شي کولای د Grand ټولو څخه ډيره وي ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,میاشتنی ویش وټاکئ نا متوازنه توګه په ټول مياشتو هدفونو وویشي.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,د بدلولو کوډ
 DocType: Purchase Invoice Item,Valuation Rate,سنجي Rate
@@ -4078,7 +4083,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,د آی ټي ټي سي انټرنیټ ترلاسه کول
 ,Student Monthly Attendance Sheet,د زده کوونکو میاشتنی حاضرۍ پاڼه
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,د پلور کولو لپاره یوازې د لیږد حاکمیت
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,د استهالک صف {0}: د استملاک نیټه د پیرودنې نیټې څخه وړاندې نشي
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,د استهالک صف {0}: د استملاک نیټه د پیرودنې نیټې څخه وړاندې نشي
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,د پروژې د پیل نیټه
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,تر
 DocType: Rename Tool,Rename Log,د رښتو يادښت
@@ -4096,12 +4101,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,د پلور او راکړې ورکړې پر بنسټ باید پروژه او شرکت څو ځله تمدید شي.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,په ختمېږي
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,زده کوونکي ورزیات کړئ
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","لطفا د ړنګولو د کارکوونکی د <a href=""#Form/Employee/{0}"">{0}</a> \ د دې سند د لغوه"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},مهرباني غوره {0}
 DocType: C-Form,C-Form No,C-فورمه نشته
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,فاصله
+DocType: Delivery Stop,Distance,فاصله
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,خپل محصولات یا خدمات لیست کړئ کوم چې تاسو یې اخلئ یا پلورئ.
 DocType: Water Analysis,Storage Temperature,د ذخیرې درجه
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD -YYYY-
@@ -4126,7 +4129,7 @@
 DocType: Homepage,Company Description for website homepage,د ویب پاڼه Company Description
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",د مشتريانو د مناسب وخت، دغو کوډونو په چاپي فرمت څخه په څېر بلونه او د محصول سپارل یاداښتونه وکارول شي
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier نوم
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,د {0} لپاره معلومات نشي ترلاسه کولی.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,د {0} لپاره معلومات نشي ترلاسه کولی.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,د ننوتنې د ژورنال پرانيستل
 DocType: Contract,Fulfilment Terms,د بشپړتیا شرایط
 DocType: Sales Invoice,Time Sheet List,د وخت پاڼه بشپړفهرست
@@ -4308,7 +4311,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,د فعالیت پر بنسټ د ګروپ لپاره د انتخاب کوونکو لاسي
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,د فعالیت پر بنسټ د ګروپ لپاره د انتخاب کوونکو لاسي
 DocType: Journal Entry,User Remark,کارن تبصره
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,د لارې غوره کول.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,د لارې غوره کول.
 DocType: Travel Itinerary,Non Diary,غیر عریضه
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,د پاتې کارمندانو لپاره د ساتلو بونس نشي رامینځته کولی
 DocType: Lead,Market Segment,بازار برخه
@@ -4339,7 +4342,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,د وفادارۍ پروګرام
 DocType: Student Guardian,Father,پلار
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,ملاتړ ټکټونه
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;تازه سټاک لپاره ثابته شتمني خرڅلاو نه وکتل شي
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;تازه سټاک لپاره ثابته شتمني خرڅلاو نه وکتل شي
 DocType: Bank Reconciliation,Bank Reconciliation,بانک پخلاينې
 DocType: Attendance,On Leave,په اړه چې رخصت
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ترلاسه تازه خبرونه
@@ -4384,7 +4387,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,شعبه او دسته
 DocType: Warranty Claim,From Company,له شرکت
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,د ارزونې معیارونه په لسګونو Sum ته اړتيا لري د {0} وي.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,مهرباني وکړئ ټاکل د Depreciations شمېر بک
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,مهرباني وکړئ ټاکل د Depreciations شمېر بک
 DocType: Supplier Scorecard Period,Calculations,حسابونه
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,ارزښت او يا د Qty
 DocType: Payment Terms Template,Payment Terms,د تادیاتو شرایط
@@ -4403,7 +4406,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,تخفیف (٪) د بیې په لېست کې و ارزوئ سره څنډی
 DocType: Healthcare Service Unit Type,Rate / UOM,کچه / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,ټول Warehouses
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,No {0} د انټرنیټ د راکړې ورکړې لپاره موندل شوی.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,No {0} د انټرنیټ د راکړې ورکړې لپاره موندل شوی.
 DocType: Travel Itinerary,Rented Car,کرایټ کار
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,ستاسو د شرکت په اړه
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,د حساب د پور باید د موازنې د پاڼه په پام کې وي
@@ -4504,6 +4507,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,د پلان تحلیل معیار
 DocType: Cheque Print Template,Cheque Height,آرډر لوړوالی
 DocType: Supplier,Supplier Details,عرضه نورولوله
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,مهرباني وکړئ د سیٹ اپ&gt; شمېره لړۍ له لارې د حاضریدو لړۍ سیسټم
 DocType: Setup Progress,Setup Progress,پرمختللی پرمختګ
 DocType: Expense Claim,Approval Status,تصویب حالت
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},له ارزښت باید په پرتله د ارزښت په قطار کمه وي {0}
@@ -4596,7 +4600,6 @@
 DocType: Travel Request,Fully Sponsored,په بشپړه توګه تمویل شوي
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,د ژورنالیستانو ننوتلو ته
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,پیرودونکی {0} جوړ شوی.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,مهرباني وکړئ د بشري منابعو&gt; بشري سیسټمونو کې د کارمندانو نومونې سیستم ترتیب کړئ
 DocType: Stock Settings,Limit Percent,حد سلنه
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,اوس مهال په کوم ګودام کې هیڅ ذخیره شتون نلري
 ,Payment Period Based On Invoice Date,د پیسو د دورې پر بنسټ د صورتحساب نېټه
@@ -4653,7 +4656,7 @@
 DocType: BOM Explosion Item,Source Warehouse,سرچینه ګدام
 DocType: Installation Note,Installation Date,نصب او نېټه
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,شریک لیجر
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},د کتارونو تر # {0}: د شتمنیو د {1} نه شرکت سره تړاو نه لري {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},د کتارونو تر # {0}: د شتمنیو د {1} نه شرکت سره تړاو نه لري {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,د پلور انوائس {0} جوړ شوی
 DocType: Employee,Confirmation Date,باوريينه نېټه
 DocType: Inpatient Occupancy,Check Out,بشپړ ی وګوره
@@ -4673,6 +4676,7 @@
 DocType: Production Plan,Sales Orders Detail,د خرڅلاو حکمونه
 DocType: Bin,Requested Quantity,غوښتل شوي مقدار
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE -YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,مهرباني وکړئ په تعلیم کې د ښوونکي د نومونې سیسټم جوړ کړئ&gt; د زده کړې ترتیبات
 DocType: Patient,Marital Status,مدني حالت
 DocType: Stock Settings,Auto Material Request,د موټرونو د موادو غوښتنه
 DocType: Woocommerce Settings,API consumer secret,د API مصرف راز
@@ -4725,7 +4729,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,ورځونه وټاکئ
 DocType: Academic Term,Term Name,اصطلاح نوم
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),کریډیټ ({0}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,د معاشونو سلونه جوړول ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,د معاشونو سلونه جوړول ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,تاسو د ریډ نوډ سمون نشو کولی.
 DocType: Buying Settings,Purchase Order Required,پیري نظم مطلوب
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,تیمر
@@ -4808,7 +4812,7 @@
 DocType: Program Enrollment,School House,د ښوونځي ماڼۍ
 DocType: Serial No,Out of AMC,د AMC له جملې څخه
 DocType: Opportunity,Opportunity Amount,د فرصت مقدار
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,د Depreciations بک شمېر نه شي کولای ټول د Depreciations شمېر څخه ډيره وي
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,د Depreciations بک شمېر نه شي کولای ټول د Depreciations شمېر څخه ډيره وي
 DocType: Purchase Order,Order Confirmation Date,د امر تایید نیټه
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI -YYYY-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,د کمکیانو لپاره د ساتنې او سفر
@@ -4849,7 +4853,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,ډله:
 DocType: Volunteer,Afternoon,ماسپښین
 DocType: Loyalty Program,Loyalty Program Help,د وفادارۍ پروګرام مرسته
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} &#39;{1}&#39; معلول دی
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} &#39;{1}&#39; معلول دی
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,د ټاکل شويو Open
 DocType: Cheque Print Template,Scanned Cheque,سکن آرډر
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,اتومات بریښنالیکونو ته سپارل معاملو د اړيکې وليږئ.
@@ -4862,13 +4866,15 @@
 DocType: Warranty Claim,Item and Warranty Details,د قالب او ګرنټی نورولوله
 DocType: Chapter,Chapter Members,د فصل غړي
 DocType: Sales Team,Contribution (%),بسپنه)٪ (
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,يادونه: د پیسو د داخلولو به راهیسې جوړ نه شي &#39;د نغدي او يا بانک حساب ته&#39; نه مشخص
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,يادونه: د پیسو د داخلولو به راهیسې جوړ نه شي &#39;د نغدي او يا بانک حساب ته&#39; نه مشخص
 DocType: Clinical Procedure,Nursing User,د نرس کولو کارن
 DocType: Employee Benefit Application,Payroll Period,د معاشونو موده
 DocType: Plant Analysis,Plant Analysis Criterias,د پلان تحلیل کونکيري
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},سیریل نمبر {1} د بچ پورې تړاو نلري {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,مسؤليتونه
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,د دې نرخ د اعتبار موده پای ته رسیدلې ده.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","لطفا د ړنګولو د کارکوونکی د <a href=""#Form/Employee/{0}"">{0}</a> \ د دې سند د لغوه"
 DocType: Expense Claim Account,Expense Claim Account,اخراجاتو ادعا اکانټ
 DocType: Account,Capital Work in Progress,په پرمختګ کې د پانګونې کار
 DocType: Accounts Settings,Allow Stale Exchange Rates,د سټلایټ تبادلې نرخونو ته اجازه ورکړئ
@@ -4950,7 +4956,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Issue مواد
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,نښلول د ERPNext سره وپلټئ
 DocType: Material Request Item,For Warehouse,د ګدام
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,د سپارلو یادښتونه {0} تازه شوي
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,د سپارلو یادښتونه {0} تازه شوي
 DocType: Employee,Offer Date,وړاندیز نېټه
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Quotations
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,تاسو په نالیکي اکر کې دي. تاسو به ونه کړای شي تر هغه وخته چې د شبکې لري بيا راولېښئ.
@@ -5000,7 +5006,7 @@
 DocType: Shipping Rule,Calculate Based On,محاسبه په اساس
 DocType: Contract,Unfulfilled,ناڅاپه
 DocType: Delivery Note Item,From Warehouse,له ګدام
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,د ذکر شویو معیارونو لپاره هیڅ کارمندان نشته
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,د ذکر شویو معیارونو لپاره هیڅ کارمندان نشته
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,سره د توکو بیل نه توکي تولید
 DocType: Shopify Settings,Default Customer,اصلي پیرودونکی
 DocType: Sales Stage,Stage Name,د مرحلې نوم
@@ -5043,7 +5049,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,د مالیې د مقدار کمښت مقدار وروسته
 DocType: Patient,Inpatient Status,د داخل بستر حالت
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,هره ورځ د کار لنډیز امستنې
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,د ټاکل شوي نرخ لیست باید وپلورل شي او پلوري یې وپلورل شي.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,د ټاکل شوي نرخ لیست باید وپلورل شي او پلوري یې وپلورل شي.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,مهرباني وکړئ د رادډ نیټه په نیټه درج کړئ
 DocType: Payment Entry,Internal Transfer,کورني انتقال
 DocType: Asset Maintenance,Maintenance Tasks,د ترمیم دندې
@@ -5080,7 +5086,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,ډله په
 DocType: Guardian,Interests,د ګټو
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,فعال / معلول اسعارو.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,نشي کولی د معاشاتو ځینې سایټونه وسپاري
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,نشي کولی د معاشاتو ځینې سایټونه وسپاري
 DocType: Exchange Rate Revaluation,Get Entries,ننوتل ترلاسه کړئ
 DocType: Production Plan,Get Material Request,د موادو غوښتنه ترلاسه کړئ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,د پستي داخراجاتو
@@ -5165,7 +5171,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},اخراجاتو حساب لپاره توکی الزامی دی {0}
 DocType: BOM,Website Description,وېب پاڼه Description
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,په مساوات خالص د بدلون
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,لطفا لغوه رانيول صورتحساب {0} په لومړي
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,لطفا لغوه رانيول صورتحساب {0} په لومړي
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,اجازه نشته. مهرباني وکړئ د خدماتو څانګه غیر فعال کړئ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",دبرېښنا ليک پته بايد د بې سارې وي، له مخکې د شتون {0}
 DocType: Serial No,AMC Expiry Date,AMC د پای نېټه
@@ -5205,7 +5211,7 @@
 DocType: Hotel Room,Hotel Room,د هوټل کوټه
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},ګڼون {0} کوي شرکت ته نه پورې {1}
 DocType: Leave Type,Rounding,ګرځي
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,په قطار {0} سریال شمیرې سره د سپارلو يادونه سره سمون نه خوري
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,په قطار {0} سریال شمیرې سره د سپارلو يادونه سره سمون نه خوري
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),بې ځایه شوي مقدار (پروتوکول شوی)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.",بيا د قيمت اصول د پيرودونکي، پيرودونکي ګروپ، ساحه، عرضه کوونکي، د سپلوي ګروپ ګروپ، کمپاين، د پلور شريکونکي په اساس فلټر شوي دي.
 DocType: Student,Guardian Details,د ګارډین په بشپړه توګه کتل
@@ -5260,7 +5266,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},ګدام لپاره سټاک د قالب اړتیا {0}
 DocType: Leave Allocation,Unused leaves,ناکارېدلې پاڼي
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,د بیرته راستنیدلو داخله واخلئ
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,ټولې څانګې
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,ټولې څانګې
 DocType: Healthcare Service Unit,Vacant,خالی
 DocType: Patient,Alcohol Past Use,الکولي پخوانی کارول
 DocType: Fertilizer Content,Fertilizer Content,د سرې وړ منځپانګه
@@ -5271,7 +5277,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,د کار امر {0} باید د دې خرڅلاو د سپارلو مخه ونیسي
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),چاودنه هیښ (فرعي شوراګانو په ګډون) د راوړلو
 DocType: Authorization Rule,Applicable To (Employee),د تطبیق وړ د (کارکوونکی)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,له امله نېټه الزامی دی
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,له امله نېټه الزامی دی
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,د خاصې لپاره بهرمن {0} 0 نه شي
 DocType: Employee Benefit Claim,Benefit Type and Amount,د ګټې ډول او مقدار
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,خونه
@@ -5420,7 +5426,7 @@
 DocType: Purchase Invoice Item,Total Weight,ټول وزن
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,د کمیسیون په خرڅلاو
 DocType: Job Offer Term,Value / Description,د ارزښت / Description
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",د کتارونو تر # {0}: د شتمنیو د {1} نه شي وړاندې شي، دا لا دی {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",د کتارونو تر # {0}: د شتمنیو د {1} نه شي وړاندې شي، دا لا دی {2}
 DocType: Tax Rule,Billing Country,د بیلونو د هېواد
 DocType: Purchase Order Item,Expected Delivery Date,د تمی د سپارلو نېټه
 DocType: Restaurant Order Entry,Restaurant Order Entry,د رستورانت امر
@@ -5459,12 +5465,13 @@
 DocType: Maintenance Visit,Breakdown,د ماشین یا د ګاډي ناڅاپه خرابېدل
 DocType: Travel Itinerary,Vegetarian,سبزيجات
 DocType: Patient Encounter,Encounter Date,د نیونې نیټه
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,ګڼون: {0} سره اسعارو: {1} غوره نه شي
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,ګڼون: {0} سره اسعارو: {1} غوره نه شي
 DocType: Bank Statement Transaction Settings Item,Bank Data,د بانک ډاټا
 DocType: Purchase Receipt Item,Sample Quantity,نمونې مقدار
 DocType: Bank Guarantee,Name of Beneficiary,د ګټه اخیستونکي نوم
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",د BOM تازه معلومات د مهال ویش له لارې لګښت کوي، د قیمت د قیمت د نرخ / د نرخونو نرخ / د خامو موادو اخیستل شوي نرخ پر اساس.
 DocType: Supplier,SUP-.YYYY.-,SUP-YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,سپلائر&gt; سپلائر ګروپ
 DocType: Bank Reconciliation Detail,Cheque Date,آرډر نېټه
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},ګڼون {0}: Parent حساب {1} نه پورې شرکت نه لري چې: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,په بریالیتوب سره د دې شرکت ته اړوند ټولو معاملو ړنګ!
@@ -5492,7 +5499,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,د ماشومانو د غوټو يوازې ډله &#39;ډول غوټو لاندې جوړ شي
 DocType: Attendance Request,Half Day Date,نيمه ورځ نېټه
 DocType: Academic Year,Academic Year Name,تعليمي کال د نوم
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{1} اجازه نه لري چې د {1} سره معامله وکړي. مهرباني وکړئ شرکت بدل کړئ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{1} اجازه نه لري چې د {1} سره معامله وکړي. مهرباني وکړئ شرکت بدل کړئ.
 DocType: Sales Partner,Contact Desc,تماس نزولی
 DocType: Email Digest,Send regular summary reports via Email.,منظم لنډیز راپورونه ليک له لارې واستوئ.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},لطفا په اخراجاتو ادعا ډول default ګڼون جوړ {0}
@@ -5525,7 +5532,7 @@
 DocType: Hotel Room,Hotel Manager,د هوټل مدیر
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,د سودا کراچۍ جوړ د مالياتو د حاکمیت
 DocType: Purchase Invoice,Taxes and Charges Added,مالیه او په تور د ورزیاتولو
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,د استهالک صف {0}: د استملاک نیټه د لاسرسي لپاره د لاس رسی نیولو څخه وړاندې نشي
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,د استهالک صف {0}: د استملاک نیټه د لاسرسي لپاره د لاس رسی نیولو څخه وړاندې نشي
 ,Sales Funnel,خرڅلاو کیږدئ
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Abbreviation الزامی دی
 DocType: Project,Task Progress,کاري پرمختګ
@@ -5539,7 +5546,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,ټول پيرودونکو ډلې
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,جمع میاشتنی
 DocType: Attendance Request,On Duty,د دندې په اړه
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} الزامی دی. ښايي د پیسو د بدلولو ریکارډ نه د {1} د {2} جوړ.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} الزامی دی. ښايي د پیسو د بدلولو ریکارډ نه د {1} د {2} جوړ.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},د کارکونکي پلان {0} لا د مخه د نومونې لپاره {1} شتون لري.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,د مالياتو د کينډۍ الزامی دی.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,ګڼون {0}: Parent حساب {1} نه شته
@@ -5619,11 +5626,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,تيروخت يو ګودام الزامی دی
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.",د توکي ساحه لکه UOM، د ګروپ ګروپ، توضیحي او د ساعتونو شمیره ترتیب کړئ.
 DocType: Certification Application,Certification Status,د تصدیق حالت
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,بازار موندنه
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,بازار موندنه
 DocType: Travel Itinerary,Travel Advance Required,د سفر پرمختیا اړتیا
 DocType: Subscriber,Subscriber Name,د ګډون کونکي نوم
 DocType: Serial No,Out of Warranty,د ګرنټی له جملې څخه
-DocType: Cashier Closing,Cashier-closing-,کیشیر - تړل -
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,د ډاټا ډاټا ډول
 DocType: BOM Update Tool,Replace,ځاېناستول
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,نه محصولات وموندل.
@@ -5710,7 +5716,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,د پلور او اخیستلو لپاره د اصلي مالیې ټیکنالوژي جوړېږي.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,د ارزونې پایلې ریکارډ {0} لا د مخه وجود لري.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",بېلګه: ABCD. #####. که چیرې سلسله جوړه شي او بسته نه په لیږد کې ذکر شوي، نو د دې لړۍ پر بنسټ به د اتوماتیک بچ شمیره جوړه شي. که تاسو غواړئ چې په ښکاره توګه د دې شیدو لپاره د بچ نښې یادونه وکړئ، دا خالي کړئ. یادونه: دا ترتیب به د سټاک په سیسټمونو کې د نومونې سیریلیز انفکس په ترڅ کې لومړیتوب واخلي.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,مهرباني وکړئ د سیٹ اپ&gt; شمېره لړۍ له لارې د حاضریدو لړۍ سیسټم
 DocType: BOM,Materials Required (Exploded),د توکو ته اړتیا ده (چاودنه)
 DocType: Contract,Party User,د ګوند کارن
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',لطفا جوړ شرکت چاڼ خالي که ډله په دی شرکت
@@ -5912,7 +5917,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,د کارموندنۍ شمېرنې
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,د آزموینې دواړه د پیل نیټه د پیل نیټه او د آزموینې دورې پای نیټه باید وټاکل شي
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,اوسط کچه
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,د تادیاتو مهال ویش کې د مجموعي تادیاتو اندازه باید د ګردي / ګردي ګرد مجموعي سره مساوي وي
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,د تادیاتو مهال ویش کې د مجموعي تادیاتو اندازه باید د ګردي / ګردي ګرد مجموعي سره مساوي وي
 DocType: Subscription Plan Detail,Plan,پلان
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,بانک اعلامیه سلنه له بلونو په توګه انډول
 DocType: Job Applicant,Applicant Name,متقاضي نوم
@@ -5980,7 +5985,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Soap &amp; پاکونکو
 DocType: BOM,Show Items,خپرونه توکی
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,له وخت نه شي کولای د وخت څخه ډيره وي.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,ایا تاسو غواړئ ټول پیرودونکي د بریښنالیک له لارې خبر کړئ؟
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,ایا تاسو غواړئ ټول پیرودونکي د بریښنالیک له لارې خبر کړئ؟
 DocType: Subscription Plan,Billing Interval,د بل کولو منځګړیتوب
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,حرکت انځوريز &amp; ویډیو
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,امر وکړ
@@ -5989,9 +5994,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,صف {0}: {1} باید د 0 څخه ډیر وي
 DocType: Assessment Criteria,Assessment Criteria Group,د ارزونې معیارونه ګروپ
 DocType: Healthcare Settings,Patient Name By,د ناروغ نوم
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},د {1} څخه تر {1} معاشونو لپاره د اشتراوی ژورنال ننوت
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},د {1} څخه تر {1} معاشونو لپاره د اشتراوی ژورنال ننوت
 DocType: Sales Invoice Item,Enable Deferred Revenue,د ټاکل شوې عاید فعالول
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},د استهلاک د پرانيستلو باید په پرتله مساوي کمه وي {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},د استهلاک د پرانيستلو باید په پرتله مساوي کمه وي {0}
 DocType: Warehouse,Warehouse Name,ګدام نوم
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,د پیل پیل نیټه باید د پای نیټې څخه کم وي
 DocType: Naming Series,Select Transaction,انتخاب معامالتو
@@ -6314,6 +6319,7 @@
 DocType: Employee,Date of Issue,د صدور نېټه
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",لکه څنګه چې هر د خريداري امستنې که رانيول Reciept مطلوب ==: هو، بیا د رانيول صورتحساب د رامنځته کولو، د کارونکي باید رانيول رسيد لومړي لپاره توکی جوړ {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},د کتارونو تر # {0}: د جنس د ټاکلو په عرضه {1}
+DocType: Global Defaults,Default Distance Unit,د اصلي فاصلې واحد
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,د کتارونو تر {0}: ساعتونه ارزښت باید له صفر څخه زیات وي.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,وېب پاڼه Image {0} چې په قالب {1} وصل ونه موندل شي
 DocType: Issue,Content Type,منځپانګه ډول
@@ -6368,7 +6374,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,د حساب ډیبیټ باید د موازنې د پاڼه په پام کې وي
 DocType: Asset,Naming Series,نوم لړۍ
 DocType: Vital Signs,Coated,لیټ شوی
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,صف {0}: متوقع ارزښت د ګټور ژوند څخه وروسته باید د خالص پیرود پیسو څخه کم وي
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,صف {0}: متوقع ارزښت د ګټور ژوند څخه وروسته باید د خالص پیرود پیسو څخه کم وي
 DocType: GoCardless Settings,GoCardless Settings,د کډوال بې سارې ترتیبونه
 DocType: Leave Block List,Leave Block List Name,پريږدئ بالک بشپړفهرست نوم
 DocType: Certified Consultant,Certification Validity,د تصدیق تصدیق
@@ -6437,6 +6443,7 @@
 DocType: Bank Statement Settings Item,Bank Header,د بانک سرپرست
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,د لابراتوار آزموینه وګورئ
 DocType: Hub Users,Hub Users,حب کاروونکي
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,پېرودونکي&gt; پیرودونکي ګروپ&gt; ساحه
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,د ساتنې او نېټه
 DocType: Purchase Invoice Item,Rejected Serial No,رد شعبه
@@ -6451,7 +6458,7 @@
 DocType: SG Creation Tool Course,Max Strength,Max پياوړتيا
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,لګول شوي سایټونه
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH -YYYY-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},د سپارښتنې یادښت د پیرودونکو لپاره غوره شوی {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},د سپارښتنې یادښت د پیرودونکو لپاره غوره شوی {}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,د سپارلو نیټه پر بنسټ د توکو توکي وټاکئ
 DocType: Grant Application,Has any past Grant Record,د تیر وړیا مرستې ریکارډ لري
 ,Sales Analytics,خرڅلاو Analytics
@@ -6478,7 +6485,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,د هوټل خوندیتوب
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,د پیرودونکو خدمت
 DocType: BOM,Thumbnail,بټنوک
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,د بریښناليک ID سره نښې نښانې موندل شوي.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,د بریښناليک ID سره نښې نښانې موندل شوي.
 DocType: Item Customer Detail,Item Customer Detail,د قالب پيرودونکو تفصیلي
 DocType: Notification Control,Prompt for Email on Submission of,د ليک د وړاندې کول دې ته وهڅول
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +102,Total allocated leaves are more than days in the period,ټولې پاڼي په دې موده کې د ورځو څخه زیات دي
@@ -6735,7 +6742,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,آيا له ګروپ د پټو نه ځکه حساب ډول انتخاب.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} د {1} بدل شوی دی. لطفا تازه.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,څخه په لاندې ورځو کولو اجازه غوښتنلیکونه کاروونکو ودروي.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,د توکو کود&gt; توکي ګروپ&gt; برنامه
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.",که د وفادارۍ پوائنټ لپاره نامحدود ختمیدل، د پای نیټې موده خالي یا 0 موده وساتئ.
 DocType: Asset Maintenance Team,Maintenance Team Members,د ساتنې د ټیم غړي
 DocType: Loyalty Point Entry,Purchase Amount,رانيول مقدار
@@ -6743,7 +6749,7 @@
 											to fullfill Sales Order {2}",نشي کولی د سیریل نمبر {0} د توکي {1} وړاندې کړي لکه څنګه چې دا خوندي دی \ د سیلډر آرډر ډکولو لپاره {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN -YYYY-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,عرضه کوونکي د داوطلبۍ {0} جوړ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,د پای کال د پیل کال مخکې نه شي
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,د پای کال د پیل کال مخکې نه شي
 DocType: Employee Benefit Application,Employee Benefits,د کارګر ګټې
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},ډک اندازه بايد په قطار د {0} د قالب اندازه برابر {1}
 DocType: Work Order,Manufactured Qty,جوړيږي Qty
@@ -6759,6 +6765,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,انتخاب دسته شمیرې
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,GSTIN ته
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,بلونه د پېرېدونکي راپورته کړې.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,مهرباني وکړئ د بشري منابعو&gt; بشري سیسټمونو کې د کارمندانو نومونې سیستم ترتیب کړئ
 DocType: Healthcare Settings,Invoice Appointments Automatically,د انوائس استوګنې په خپله توګه
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,د پروژې Id
 DocType: Salary Component,Variable Based On Taxable Salary,د مالیې وړ معاش په اساس متغیر
@@ -6807,7 +6814,7 @@
 DocType: POS Profile,Account for Change Amount,د بدلون لپاره د مقدار حساب
 DocType: QuickBooks Migrator,Connecting to QuickBooks,د بکسونو سره نښلول
 DocType: Exchange Rate Revaluation,Total Gain/Loss,ټول لاسته راوړنې / ضایع
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,د انټرنیټ انو انو لپاره غلط شرکت.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,د انټرنیټ انو انو لپاره غلط شرکت.
 DocType: Purchase Invoice,input service,تڼۍ خدمت
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},د کتارونو تر {0}: ګوند / حساب سره سمون نه خوري {1} / {2} د {3} {4}
 DocType: Employee Promotion,Employee Promotion,د کارموندنې وده
@@ -6936,7 +6943,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,د لوډنګ لپاره غوره انتخابی ساحه
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,کراچۍ ده خالي
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,مهرباني وکړئ په تعلیم کې د ښوونکي د نومونې سیسټم جوړ کړئ&gt; د زده کړې ترتیبات
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",توکي {0} لري د سیریل نمبر نه یواځې سیریلیز شوي توکي \ د سیریل نمبر پر اساس ترسیل کولی شي
 DocType: Vehicle,Model,د نمونوي
@@ -6966,7 +6972,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,هیڅ بدلون نشي کولی
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,لطفا یو csv دوتنه انتخاب
 DocType: Holiday List,Total Holidays,ټول هټۍ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,د لېږد لپاره د بریښناليک ای میل ساند مهرباني وکړئ د سپارلو ترتیباتو کې یو یې وټاکئ.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,د لېږد لپاره د بریښناليک ای میل ساند مهرباني وکړئ د سپارلو ترتیباتو کې یو یې وټاکئ.
 DocType: Student Leave Application,Mark as Present,مارک په توګه د وړاندې
 DocType: Supplier Scorecard,Indicator Color,د شاخص رنګ
 DocType: Purchase Order,To Receive and Bill,تر لاسه کول او د بیل
@@ -6975,7 +6981,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,سیریل نمبر غوره کړئ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,په سکښتګر کې
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,د قرارداد شرايط کينډۍ
-DocType: Serial No,Delivery Details,د وړاندې کولو په بشپړه توګه کتل
+DocType: Delivery Trip,Delivery Details,د وړاندې کولو په بشپړه توګه کتل
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},لګښت په مرکز کې قطار ته اړتیا لیدل کیږي {0} په مالیات لپاره ډول جدول {1}
 DocType: Program,Program Code,پروګرام کوډ
 DocType: Terms and Conditions,Terms and Conditions Help,د قرارداد شرايط مرسته
@@ -6999,7 +7005,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,د وخت ورځې سوق
 DocType: Cash Flow Mapping,Is Income Tax Expense,د عایداتو مالی لګښت دی
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,ستاسو امر د سپارلو لپاره دی.
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},د کتارونو تر # {0}: پست کوي نېټه بايد په توګه د اخیستلو نېټې ورته وي {1} د شتمنیو د {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},د کتارونو تر # {0}: پست کوي نېټه بايد په توګه د اخیستلو نېټې ورته وي {1} د شتمنیو د {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,وګورئ دا که د زده کوونکو د ده په انستیتیوت په ليليه درلوده.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,مهرباني وکړی په پورته جدول خرڅلاو امر ته ننوځي
 ,Stock Summary,دحمل لنډيز
diff --git a/erpnext/translations/pt-BR.csv b/erpnext/translations/pt-BR.csv
index bd1096e..12d71f6 100644
--- a/erpnext/translations/pt-BR.csv
+++ b/erpnext/translations/pt-BR.csv
@@ -120,7 +120,7 @@
 DocType: Item,Supply Raw Materials for Purchase,Abastecimento de Matérias-primas para a Compra
 DocType: Products Settings,Show Products as a List,Mostrar Produtos como uma Lista
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.py +43,Item {0} is not active or end of life has been reached,Item {0} não está ativo ou fim de vida útil foi atingido
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos em linhas {1} também deve ser incluída"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos em linhas {1} também deve ser incluída"
 DocType: Sales Invoice,Change Amount,Troco
 DocType: Depreciation Schedule,Make Depreciation Entry,Fazer Lançamento de Depreciação
 DocType: Appraisal Template Goal,KRA,APR
@@ -239,7 +239,7 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total considerado em pedidos
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Taxa na qual a moeda do cliente é convertida para a moeda base do cliente
 DocType: Course Scheduling Tool,Course Scheduling Tool,Ferramenta de Agendamento de Cursos
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Linha #{0}: Não pode ser criada uma Nota Fiscal de Compra para um ativo existente {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Linha #{0}: Não pode ser criada uma Nota Fiscal de Compra para um ativo existente {1}
 DocType: Item Tax,Tax Rate,Alíquota do Imposto
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +73,{0} already allocated for Employee {1} for period {2} to {3},{0} já está alocado para o Colaborador {1} para o período de {2} até {3}
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +145,Purchase Invoice {0} is already submitted,A Nota Fiscal de Compra  {0} já foi enviada
@@ -418,7 +418,7 @@
 DocType: Work Order Operation,In minutes,Em Minutos
 DocType: Issue,Resolution Date,Data da Solução
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Registro de Tempo criado:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Defina Caixa padrão ou conta bancária no Modo de pagamento {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Defina Caixa padrão ou conta bancária no Modo de pagamento {0}
 DocType: Selling Settings,Customer Naming By,Nomeação de Cliente por
 DocType: Depreciation Schedule,Depreciation Amount,Valor de Depreciação
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +105,Convert to Group,Converter em Grupo
@@ -455,7 +455,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +351,Marketing,marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Entrada de pagamento já foi criada
 DocType: Purchase Receipt Item Supplied,Current Stock,Estoque Atual
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Linha # {0}: Ativo {1} não vinculado ao item {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Linha # {0}: Ativo {1} não vinculado ao item {2}
 DocType: Account,Expenses Included In Valuation,Despesas Incluídas na Avaliação
 ,Absent Student Report,Relatório de Frequência do Aluno
 DocType: Email Digest,Next email will be sent on:,Próximo email será enviado em:
@@ -552,7 +552,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py +146,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Os itens com maior weightage será mostrado maior
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detalhe da conciliação bancária
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Linha # {0}: Ativo {1} deve ser apresentado
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Linha # {0}: Ativo {1} deve ser apresentado
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nenhum colaborador encontrado
 DocType: Item,If subcontracted to a vendor,Se subcontratada a um fornecedor
 DocType: SMS Center,All Customer Contact,Todo o Contato do Cliente
@@ -732,7 +732,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,Todas as LDMs
 DocType: Asset Movement,From Employee,Do Colaborador
 DocType: Driver,Cellphone Number,Número do celular
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Aviso : O sistema não irá verificar superfaturamento uma vez que o valor para o item {0} em {1} é zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Aviso : O sistema não irá verificar superfaturamento uma vez que o valor para o item {0} em {1} é zero
 DocType: Journal Entry,Make Difference Entry,Criar Lançamento de Contrapartida
 DocType: Upload Attendance,Attendance From Date,Data Inicial de Comparecimento
 DocType: Appraisal Template Goal,Key Performance Area,Área de performance principal
@@ -916,7 +916,7 @@
 DocType: Item,Maintain Stock,Manter Estoque
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Variação Líquida do Ativo Imobilizado
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixe em branco se considerado para todas as designações
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge do tipo ' real ' na linha {0} não pode ser incluído no item Taxa
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge do tipo ' real ' na linha {0} não pode ser incluído no item Taxa
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,A partir da data e hora
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log de Comunicação.
@@ -1061,7 +1061,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Advance against Supplier must be debit,Linha {0}: Adiantamento relacionado com o fornecedor deve ser um débito
 DocType: Expense Claim,Total Amount Reimbursed,Quantia total reembolsada
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Relacionado à nota fiscal do fornecedor nº {0} emitida em {1}
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Registro de Movimentação de Ativos {0} criado
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Registro de Movimentação de Ativos {0} criado
 DocType: Journal Entry,Entry Type,Tipo de Lançamento
 ,Customer Credit Balance,Saldo de Crédito do Cliente
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Necessário para ' Customerwise Discount ' Cliente
@@ -1152,7 +1152,7 @@
 DocType: Course,Course Abbreviation,Abreviação do Curso
 DocType: Student Leave Application,Student Leave Application,Pedido de Licença do Aluno
 DocType: Item,Will also apply for variants,Também se aplica às variantes
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Activo não podem ser canceladas, como já é {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Activo não podem ser canceladas, como já é {0}"
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Empacotar itens no momento da venda.
 DocType: Material Request Plan Item,Actual Qty,Qtde Real
 DocType: Hub Tracked Item,Hub Node,Hub Node
@@ -1198,7 +1198,7 @@
 ,Amount to Deliver,Total à Entregar
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +201,There were errors.,Ocorreram erros.
 DocType: Guardian,Guardian Interests,Interesses do Responsável
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Vários anos fiscais existem para a data {0}. Por favor, defina empresa no ano fiscal"
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Vários anos fiscais existem para a data {0}. Por favor, defina empresa no ano fiscal"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} criou
 DocType: Delivery Note Item,Against Sales Order,Relacionado ao Pedido de Venda
 ,Serial No Status,Status do Nº de Série
@@ -1280,7 +1280,7 @@
 DocType: HR Settings,HR Settings,Configurações de RH
 DocType: Salary Slip,net pay info,Informações de remuneração líquida
 DocType: Purchase Invoice,Additional Discount Amount,Total do Desconto Adicional
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Linha #{0}: A qtde deve ser 1, pois o item é um ativo imobilizado. Por favor, utilize uma linha separada para múltiplas qtdes."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Linha #{0}: A qtde deve ser 1, pois o item é um ativo imobilizado. Por favor, utilize uma linha separada para múltiplas qtdes."
 DocType: Leave Block List Allow,Leave Block List Allow,Deixe Lista de Bloqueios Permitir
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Group to Non-Group,Grupo para Não-Grupo
@@ -1300,7 +1300,7 @@
 DocType: Workstation,Wages per hour,Salário por hora
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Da balança em Batch {0} se tornará negativo {1} para item {2} no Armazém {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,As seguintes Requisições de Material foram criadas automaticamente com base no nível de reposição do item
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Conta {0} é inválido. Conta de moeda deve ser {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Conta {0} é inválido. Conta de moeda deve ser {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Fator de Conversão da Unidade de Medida é necessário na linha {0}
 DocType: Production Plan Item,material_request_item,material_request_item
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1120,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Linha #{0}: O Tipo de Documento de Referência deve ser um Pedido de Venda, uma Nota Fiscal de Venda ou um Lançamento Contábil"
@@ -1371,7 +1371,7 @@
 DocType: Activity Type,Default Billing Rate,Preço de Faturamento Padrão
 DocType: Sales Invoice,Total Billing Amount,Valor Total do Faturamento
 DocType: Bank Statement Transaction Entry,Receivable Account,Contas a Receber
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Linha # {0}: Ativo {1} já é {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Linha # {0}: Ativo {1} já é {2}
 DocType: Quotation Item,Stock Balance,Balanço de Estoque
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Pedido de Venda para Pagamento
 DocType: Expense Claim Detail,Expense Claim Detail,Detalhe do Pedido de Reembolso de Despesas
@@ -1456,7 +1456,7 @@
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar as operações, custos operacionais e dar um número único de operação às suas operações."
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Este documento está fora do limite {0} {1} para o item {4}. Você está fazendo outro(a) {3} relacionado(a) a(o) mesmo(a) {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,"Por favor, defina recorrentes depois de salvar"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Selecione a conta de troco
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Selecione a conta de troco
 DocType: Naming Series,User must always select,O Usuário deve sempre selecionar
 DocType: Stock Settings,Allow Negative Stock,Permitir Estoque Negativo
 DocType: Topic,Topic,Tópico
@@ -1615,7 +1615,7 @@
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,Resultado do Treinamento
 DocType: Salary Structure,Total Earning,Total de ganhos
 DocType: Purchase Receipt,Time at which materials were received,Horário em que os materiais foram recebidos
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,ou
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,ou
 DocType: Sales Order,Billing Status,Status do Faturamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Despesas com Serviços Públicos
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Acima de 90
@@ -1811,7 +1811,7 @@
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Solicitação de orçamento.
 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","Por favor, selecione o item em que &quot;é o estoque item&quot; é &quot;Não&quot; e &quot;é o item Vendas&quot; é &quot;Sim&quot; e não há nenhum outro pacote de produtos"
 DocType: Student Log,Academic,Acadêmico
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avanço total ({0}) contra Pedido {1} não pode ser maior do que o total geral ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avanço total ({0}) contra Pedido {1} não pode ser maior do que o total geral ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selecione distribuição mensal para distribuir desigualmente metas nos meses.
 DocType: Vehicle,Diesel,Diesel
 apps/erpnext/erpnext/stock/get_item_details.py +546,Price List Currency not selected,Lista de Preço Moeda não selecionado
@@ -1931,7 +1931,7 @@
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Total Faturado
 DocType: Asset,Double Declining Balance,Equilíbrio decrescente duplo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Closed order cannot be cancelled. Unclose to cancel.,ordem fechada não pode ser cancelada. Unclose para cancelar.
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,"""Atualizar Estoque"" não pode ser selecionado para venda de ativo fixo"
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,"""Atualizar Estoque"" não pode ser selecionado para venda de ativo fixo"
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliação bancária
 DocType: Attendance,On Leave,De Licença
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Receber notícias
@@ -2054,7 +2054,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Selecione a natureza do seu negócio.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Onde as operações de fabricação são realizadas.
 DocType: BOM Explosion Item,Source Warehouse,Armazém de origem
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Linha # {0}: Ativo {1} não pertence à empresa {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Linha # {0}: Ativo {1} não pertence à empresa {2}
 DocType: C-Form,Total Invoiced Amount,Valor Total Faturado
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +51,Min Qty can not be greater than Max Qty,Qtde mínima não pode ser maior do que qtde máxima
 DocType: Stock Entry,Customer or Supplier Details,Detalhes do Cliente ou Fornecedor
@@ -2148,13 +2148,13 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Date of Birth cannot be greater than today.,Data de nascimento não pode ser maior do que hoje.
 ,Stock Ageing,Envelhecimento do Estoque
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Registro de Tempo
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' está desativado
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' está desativado
 DocType: Cheque Print Template,Scanned Cheque,Cheque Escaneado
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar emails automáticos para Contatos sobre transações de enviar.
 DocType: Customer,Credit Limit and Payment Terms,Limite de Crédito e Termos de Pagamento
 DocType: Purchase Order,Customer Contact Email,Cliente Fale Email
 DocType: Warranty Claim,Item and Warranty Details,Itens e Garantia Detalhes
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota: Entrada pagamento não será criado desde 'Cash ou conta bancária ' não foi especificado
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota: Entrada pagamento não será criado desde 'Cash ou conta bancária ' não foi especificado
 DocType: Accounts Settings,Allow Stale Exchange Rates,Permitir taxas de câmbio defasadas
 DocType: Sales Person,Sales Person Name,Nome do Vendedor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Por favor, indique pelo menos uma fatura na tabela"
@@ -2271,7 +2271,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Conta de despesa é obrigatória para item {0}
 DocType: BOM,Website Description,Descrição do Site
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Mudança no Patrimônio Líquido
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Por favor cancelar a Nota Fiscal de Compra {0} primeiro
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Por favor cancelar a Nota Fiscal de Compra {0} primeiro
 DocType: Serial No,AMC Expiry Date,Data de Validade do CAM
 ,Sales Register,Registro de Vendas
 DocType: Daily Work Summary Group,Send Emails At,Enviar Emails em
@@ -2311,7 +2311,7 @@
 DocType: Tax Rule,Billing State,Estado de Faturamento
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Buscar LDM explodida (incluindo sub-conjuntos )
 DocType: Authorization Rule,Applicable To (Employee),Aplicável para (Colaborador)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,A data de vencimento é obrigatória
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,A data de vencimento é obrigatória
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Atributo incremento para {0} não pode ser 0
 DocType: Journal Entry,Pay To / Recd From,Pagar Para / Recebido De
 DocType: Naming Series,Setup Series,Configuração de Séries
@@ -2372,7 +2372,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cannot convert Cost Center to ledger as it has child nodes,"Não é possível converter Centro de Custo de contabilidade , uma vez que tem nós filhos"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +83,Opening Value,Valor de Abertura
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +59,Serial #,Serial #
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Linha # {0}: Ativo {1} não pode ser enviado, já é {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Linha # {0}: Ativo {1} não pode ser enviado, já é {2}"
 DocType: Tax Rule,Billing Country,País de Faturamento
 DocType: Purchase Order Item,Expected Delivery Date,Data Prevista de Entrega
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Debit and Credit not equal for {0} #{1}. Difference is {2}.,O Débito e Crédito não são iguais para {0} # {1}. A diferença é de {2}.
@@ -2395,7 +2395,7 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Receita com novos clientes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Travel Expenses,Despesas com viagem
 DocType: Maintenance Visit,Breakdown,Pane
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,A Conta: {0} com moeda: {1} não pode ser selecionada
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,A Conta: {0} com moeda: {1} não pode ser selecionada
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Atualize o custo da lista lista de materiais automaticamente através do Agendador, com base na taxa de avaliação / taxa de preços mais recente / última taxa de compra de matérias-primas."
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Conta {0}: A Conta Superior {1} não pertence à empresa: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Todas as transações relacionadas a esta empresa foram excluídas com sucesso!
@@ -2430,7 +2430,7 @@
 DocType: Stock Settings,Role Allowed to edit frozen stock,Papel permissão para editar estoque congelado
 ,Territory Target Variance Item Group-Wise,Variação Territorial de Público por Grupo de Item
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Todos os grupos de clientes
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez o valor de câmbio não exista de {1} para {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez o valor de câmbio não exista de {1} para {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Modelo de impostos é obrigatório.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Conta {0}: A Conta Superior {1} não existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Preço da Lista de Preços (moeda da empresa)
@@ -2945,7 +2945,7 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Impedir que usuários solicitem licenças em dias seguintes
 DocType: Loyalty Point Entry,Purchase Amount,Valor de Compra
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Orçamento do fornecedor {0} criado
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,O ano final não pode ser antes do ano de início
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,O ano final não pode ser antes do ano de início
 DocType: Employee Benefit Application,Employee Benefits,Benefícios a Colaboradores
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Embalado quantidade deve ser igual a quantidade de item {0} na linha {1}
 DocType: Work Order,Manufactured Qty,Qtde Fabricada
@@ -3031,7 +3031,7 @@
 DocType: Student Leave Application,Mark as Present,Marcar como presente
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Produtos em Destaque
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Modelo de Termos e Condições
-DocType: Serial No,Delivery Details,Detalhes da entrega
+DocType: Delivery Trip,Delivery Details,Detalhes da entrega
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Centro de Custo é necessária na linha {0} no Imposto de mesa para o tipo {1}
 ,Item-wise Purchase Register,Registro de Compras por Item
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +381,Please select Category first,Por favor selecione a Categoria primeiro
diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index 193db3b..3823760 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Nome do Período
 DocType: Employee,Salary Mode,Modalidade de Salário
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,registo
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,registo
 DocType: Patient,Divorced,Divorciado
 DocType: Support Settings,Post Route Key,Post Route Key
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permitir que o item a seja adicionado várias vezes em uma transação
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Nova taxa de câmbio
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Moeda é necessária para a Lista de Preços {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado na transação.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Fornecedor&gt; Tipo de Fornecedor
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Contato do Cliente
 DocType: Patient Appointment,Check availability,Verificar disponibilidade
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Mostrar aberto
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Série Atualizada com Sucesso
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Check-out
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} na linha {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} na linha {1}
 DocType: Asset Finance Book,Depreciation Start Date,Data de início da depreciação
 DocType: Pricing Rule,Apply On,Aplicar Em
 DocType: Item Price,Multiple Item prices.,Preços de Vários Artigos.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Prescrição de laboratório
 ,Delay Days,Delay Days
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Despesa de Serviço
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de série: {0} já está referenciado na fatura de vendas: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de série: {0} já está referenciado na fatura de vendas: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Fatura
 DocType: Purchase Invoice Item,Item Weight Details,Detalhes do peso do item
 DocType: Asset Maintenance Log,Periodicity,Periodicidade
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Contabilista
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Lista de preços de venda
 DocType: Patient,Tobacco Current Use,Uso atual do tabaco
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","A data de início e de término estão sobrepostas ao cartão de trabalho <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Taxa de vendas
 DocType: Cost Center,Stock User,Utilizador de Stock
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Relacionado
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Data de presença não pode ser inferior á data de admissão do funcionário
 DocType: Grading Scale,Grading Scale Name,Nome escala de classificação
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Adicionar usuários ao mercado
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Adicionar usuários ao mercado
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Esta é uma conta principal e não pode ser editada.
 DocType: Sales Invoice,Company Address,Endereço da companhia
 DocType: BOM,Operations,Operações
@@ -322,7 +322,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Qty
 DocType: Production Plan,Material Request Detail,Detalhes do pedido de material
 DocType: Selling Settings,Default Quotation Validity Days,Dias de validade de cotação padrão
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos nas linhas {1} também deverão ser incluídos"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos nas linhas {1} também deverão ser incluídos"
 DocType: SMS Center,SMS Center,Centro de SMS
 DocType: Payroll Entry,Validate Attendance,Validar Participação
 DocType: Sales Invoice,Change Amount,Alterar Montante
@@ -441,7 +441,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Espaçamento entre linhas para o valor por extenso
 DocType: Vehicle,Additional Details,Dados Adicionais
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Não foi dada qualquer descrição
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Fornecedor&gt; Grupo de Fornecedores
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Pedido de compra.
 DocType: POS Closing Voucher Details,Collected Amount,Montante Recolhido
 DocType: Lab Test,Submitted Date,Data enviada
@@ -486,7 +485,7 @@
 DocType: Student Admission,Student Admission,Admissão de Estudante
 ,Terretory,Território
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,O Item {0} foi cancelado
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Linha de depreciação {0}: a data de início da depreciação é entrada como data anterior
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Linha de depreciação {0}: a data de início da depreciação é entrada como data anterior
 DocType: Contract Template,Fulfilment Terms and Conditions,Termos e Condições de Cumprimento
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Solicitação de Material
 DocType: Bank Reconciliation,Update Clearance Date,Atualizar Data de Liquidação
@@ -543,6 +542,7 @@
 DocType: Accounts Settings,Settings for Accounts,Definições de Contas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},O Nr. de Fatura do Fornecedor existe na Fatura de Compra {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Gerir Organograma de Vendedores.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Não é possível processar a rota, pois as configurações do Google Maps estão desativadas."
 DocType: Job Applicant,Cover Letter,Carta de Apresentação
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cheques a Cobrar e Depósitos a receber
 DocType: Item,Synced With Hub,Sincronizado com a Plataforma
@@ -602,7 +602,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Novo valor do ativo
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Taxa a que a Moeda do Cliente é convertida para a moeda principal do cliente
 DocType: Course Scheduling Tool,Course Scheduling Tool,Ferramenta de Agendamento de Curso
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Linha #{0}: Não pode ser efetuada uma Fatura de Compra para o ativo existente {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Linha #{0}: Não pode ser efetuada uma Fatura de Compra para o ativo existente {1}
 DocType: Crop Cycle,LInked Analysis,LInked Analysis
 DocType: POS Closing Voucher,POS Closing Voucher,Voucher de Fechamento de PDV
 DocType: Contract,Lapsed,Caducado
@@ -637,6 +637,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} não está inscrito no Curso {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Nome do aluno:
 DocType: POS Closing Voucher Details,Difference,Diferença
+DocType: Delivery Settings,Delay between Delivery Stops,Atraso entre paradas de entrega
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},O Nr. de Série {0} não pertence à Guia de Remessa {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Parece haver um problema com a configuração GoCardless do servidor. Não se preocupe, em caso de falha, o valor será reembolsado na sua conta."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demonstração
@@ -697,7 +698,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Quantidade e Valor
 DocType: Delivery Note,% Installed,% Instalada
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Salas de Aula / Laboratórios, etc. onde podem ser agendadas palestras."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,As moedas da empresa de ambas as empresas devem corresponder às transações da empresa.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,As moedas da empresa de ambas as empresas devem corresponder às transações da empresa.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,"Por favor, insira o nome da empresa primeiro"
 DocType: Travel Itinerary,Non-Vegetarian,Não Vegetariana
 DocType: Purchase Invoice,Supplier Name,Nome do Fornecedor
@@ -784,7 +785,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Alugado da data
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Peças suficiente para construir
 DocType: POS Profile User,POS Profile User,Usuário do perfil POS
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Linha {0}: Data de Início da Depreciação é obrigatória
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Linha {0}: Data de Início da Depreciação é obrigatória
 DocType: Purchase Invoice Item,Service Start Date,Data de início do serviço
 DocType: Subscription Invoice,Subscription Invoice,Fatura de Subscrição
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Rendimento Direto
@@ -853,7 +854,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Esta abreviatura já foi utilizada para outra empresa
 DocType: Selling Settings,Default Customer Group,Grupo de Clientes Padrão
 DocType: Employee,IFSC Code,Código IFSC
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","A data de início e de término estão sobrepostas ao cartão de trabalho <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Se desativar, o campo 'Total Arredondado' não será visível em nenhuma transação"
 DocType: BOM,Operating Cost,Custo de Funcionamento
 DocType: Crop,Produced Items,Artigos produzidos
@@ -905,7 +905,7 @@
 DocType: Supplier,Prevent RFQs,Prevenir PDOs
 DocType: Hub User,Hub User,Usuário do Hub
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Criar Pedido de Venda
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Salário Slip enviado para o período de {0} a {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Salário Slip enviado para o período de {0} a {1}
 DocType: Project Task,Project Task,Tarefa do Projeto
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Pontos redimidos
 ,Lead Id,ID de Potencial Cliente
@@ -1035,7 +1035,7 @@
 DocType: Fee Validity,Max number of visit,Número máximo de visitas
 ,Hotel Room Occupancy,Ocupação do quarto do hotel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Registo de Horas criado:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Por favor defina o Dinheiro ou Conta Bancária padrão no Modo de Pagamento {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Por favor defina o Dinheiro ou Conta Bancária padrão no Modo de Pagamento {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Matricular
 DocType: GST Settings,GST Settings,Configurações de GST
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},A moeda deve ser a mesma que a Moeda da lista de preços: {0}
@@ -1089,7 +1089,7 @@
 DocType: Vehicle Log,Service Details,Detalhes do serviço
 DocType: Lab Test Template,Grouped,Agrupados
 DocType: Selling Settings,Delivery Note Required,Guia de Remessa Necessária
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Enviando Slips Salariais ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Enviando Slips Salariais ...
 DocType: Bank Guarantee,Bank Guarantee Number,Número de Garantia Bancária
 DocType: Assessment Criteria,Assessment Criteria,Critérios de avaliação
 DocType: BOM Item,Basic Rate (Company Currency),Preço Unitário (Moeda da Empresa)
@@ -1114,13 +1114,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,O Registo de Pagamento já tinha sido criado
 DocType: Request for Quotation,Get Suppliers,Obter Fornecedores
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock Atual
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Linha #{0}: O Ativo {1} não está vinculado ao Item {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Linha #{0}: O Ativo {1} não está vinculado ao Item {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Pré-visualizar Folha de Pagamento
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,A Conta {0} foi inserida várias vezes
 DocType: Account,Expenses Included In Valuation,Despesas Incluídas na Estimativa
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Você só pode renovar se a sua adesão expirar dentro de 30 dias
 DocType: Shopping Cart Settings,Show Stock Availability,Mostrar disponibilidade de estoque
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Defina {0} na categoria de recurso {1} ou na empresa {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Defina {0} na categoria de recurso {1} ou na empresa {2}
 DocType: Location,Longitude,Longitude
 ,Absent Student Report,Relatório de Faltas de Estudante
 DocType: Crop,Crop Spacing UOM,UOM de espaçamento de colheitas
@@ -1192,7 +1192,7 @@
 DocType: Soil Texture,Sand,Areia
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Oportunidade De
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Linha {0}: {1} Números de série necessários para o Item {2}. Você forneceu {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Linha {0}: {1} Números de série necessários para o Item {2}. Você forneceu {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Selecione uma tabela
 DocType: BOM,Website Specifications,Especificações do Website
 DocType: Special Test Items,Particulars,Informações
@@ -1303,7 +1303,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Os itens com maior peso serão mostrados em primeiro lugar
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Testes laboratoriais e sinais vitais
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Dados de Conciliação Bancária
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Linha #{0}: O Ativo {1} deve ser enviado
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Linha #{0}: O Ativo {1} deve ser enviado
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Não foi encontrado nenhum funcionário
 DocType: Item,If subcontracted to a vendor,Se for subcontratado a um fornecedor
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,O grupo de alunos já está atualizado.
@@ -1357,7 +1357,6 @@
 DocType: Loyalty Program Collection,Tier Name,Nome do Nível
 DocType: HR Settings,Enter retirement age in years,Insira a idade da reforma em anos
 DocType: Crop,Target Warehouse,Armazém Alvo
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Por favor, defina a série de nomenclatura para {0} via Configuração&gt; Configurações&gt; Naming Series"
 DocType: Payroll Employee Detail,Payroll Employee Detail,Detalhe do empregado da folha de pagamento
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Selecione um armazém
 DocType: Cheque Print Template,Starting location from left edge,Localização inicial a partir do lado esquerdo
@@ -1447,7 +1446,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Planear material para subconjuntos
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Parceiros de Vendas e Território
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,A LDM {0} deve estar ativa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Nenhum item disponível para transferência
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Nenhum item disponível para transferência
 DocType: Employee Boarding Activity,Activity Name,Nome da Atividade
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Alterar data de liberação
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Quantidade de produto finalizada <b>{0}</b> e para Quantidade <b>{1}</b> não pode ser diferente
@@ -1677,6 +1676,7 @@
 DocType: Project,First Email,Primeiro email
 DocType: Company,Exception Budget Approver Role,Função de Aprovação do Orçamento de Exceção
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Depois de definida, esta fatura ficará em espera até a data definida"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Armazém Reservado na Ordem de Vendas / Armazém de Produtos Acabados
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Valor de Vendas
 DocType: Repayment Schedule,Interest Amount,Montante de juros
@@ -1688,7 +1688,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Registos
 DocType: Asset,Scrapped,Descartado
 DocType: Item,Item Defaults,Padrões de item
-DocType: Purchase Invoice,Returns,Devoluções
+DocType: Cashier Closing,Returns,Devoluções
 DocType: Job Card,WIP Warehouse,Armazém WIP
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},O Nr. de Série {0} está sob o contrato de manutenção até {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,Recrutamento
@@ -1702,7 +1702,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Tipo de transferência
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Despesas com Vendas
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de Clientes&gt; Território
 DocType: Diagnosis,Diagnosis,Diagnóstico
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Compra Padrão
 DocType: Attendance Request,Explanation,Explicação
@@ -1715,7 +1714,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Itens de Pedidos de Compra em Atraso
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Código Postal
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},A Ordem de Venda {0} é {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Selecione a conta de receita de juros no empréstimo {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Selecione a conta de receita de juros no empréstimo {0}
 DocType: Opportunity,Contact Info,Informações de Contacto
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Efetuar Registos de Stock
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Não é possível promover funcionários com status
@@ -1727,7 +1726,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,A fatura não pode ser feita para zero hora de cobrança
 DocType: Company,Date of Commencement,Data de início
 DocType: Sales Person,Select company name first.,Selecione o nome da empresa primeiro.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},E-mail enviado para {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},E-mail enviado para {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Cotações recebidas de Fornecedores.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Substitua a Lista de BOM e atualize o preço mais recente em todas as BOMs
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Para {0} | {1} {2}
@@ -1749,7 +1748,7 @@
 DocType: Asset Movement,From Employee,Do(a) Funcionário(a)
 DocType: Driver,Cellphone Number,Número de telemóvel
 DocType: Project,Monitor Progress,Monitorar o progresso
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Aviso: O sistema não irá verificar a sobre faturação pois o montante para o Item {0} em {1} é zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Aviso: O sistema não irá verificar a sobre faturação pois o montante para o Item {0} em {1} é zero
 DocType: Journal Entry,Make Difference Entry,Efetuar Registo de Diferença
 DocType: Supplier Quotation,Auto Repeat Section,Seção de Repetição Automática
 DocType: Upload Attendance,Attendance From Date,Assiduidade a Partir De
@@ -1852,7 +1851,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Linha #{0}: A Qtd Rejeitada não pode ser inserida na Devolução de Compra
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,A alteração do grupo de clientes para o cliente selecionado não é permitida.
 ,Purchase Order Items To Be Billed,Itens da Ordem de Compra a faturar
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Atualizando os horários de chegada estimados.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Atualizando os horários de chegada estimados.
 DocType: Program Enrollment Tool,Enrollment Details,Detalhes da inscrição
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Não é possível definir vários padrões de item para uma empresa.
 DocType: Purchase Invoice Item,Net Rate,Taxa Líquida
@@ -1866,7 +1865,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Deixe o tipo é uma coisa louca
 DocType: Support Settings,Close Issue After Days,Fechar incidentes após dias
 ,Eway Bill,Conta de saída
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Você precisa ser um usuário com as funções System Manager e Item Manager para adicionar usuários ao Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Você precisa ser um usuário com as funções System Manager e Item Manager para adicionar usuários ao Marketplace.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Deixe em branco se for para todas as filiais
 DocType: Job Opening,Staffing Plan,Plano de Pessoal
 DocType: Bank Guarantee,Validity in Days,Validade em Dias
@@ -1886,7 +1885,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Linha duplicada {0} com o mesmo {1}
 DocType: Marketplace Settings,Disable Marketplace,Desativar mercado
 ,Trial Balance,Balancete
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,O Ano Fiscal de {0} não foi encontrado
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,O Ano Fiscal de {0} não foi encontrado
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,A Configurar Funcionários
 DocType: Hotel Room Reservation,Hotel Reservation User,Usuário de reserva de hotel
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,"Por favor, seleccione o prefixo primeiro"
@@ -1994,7 +1993,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Falha ao fazer o login
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Ativo {0} criado
 DocType: Special Test Items,Special Test Items,Itens de teste especiais
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Você precisa ser um usuário com as funções System Manager e Item Manager para registrar no Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Você precisa ser um usuário com as funções System Manager e Item Manager para registrar no Marketplace.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Modo de Pagamento
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,"De acordo com a estrutura salarial atribuída, você não pode solicitar benefícios"
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,O Website de Imagem deve ser um ficheiro público ou um URL de website
@@ -2006,7 +2005,7 @@
 DocType: Warehouse,Warehouse Contact Info,Informações de Contacto do Armazém
 DocType: Payment Entry,Write Off Difference Amount,Liquidar Montante de Diferença
 DocType: Volunteer,Volunteer Name,Nome do voluntário
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Linhas com datas de vencimento duplicadas em outras linhas foram encontradas: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Linhas com datas de vencimento duplicadas em outras linhas foram encontradas: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: Não foi encontrado o email do funcionário, portanto, o email  não será enviado"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Nenhuma estrutura salarial atribuída para o empregado {0} em determinada data {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Regra de envio não aplicável para o país {0}
@@ -2096,6 +2095,7 @@
 DocType: Salary Component,Earning,Remuneração
 DocType: Supplier Scorecard,Scoring Criteria,Critérios de pontuação
 DocType: Purchase Invoice,Party Account Currency,Moeda da Conta da Parte
+DocType: Delivery Trip,Total Estimated Distance,Distância total estimada
 ,BOM Browser,Navegador da LDM
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Atualize seu status para este evento de treinamento
 DocType: Item Barcode,EAN,EAN
@@ -2134,7 +2134,7 @@
 DocType: Activity Cost,Projects,Projetos
 DocType: Payment Request,Transaction Currency,Moeda de Transação
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},De {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Alguns emails são inválidos
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Alguns emails são inválidos
 DocType: Work Order Operation,Operation Description,Descrição da Operação
 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.,Não é possível alterar a Data de Início do Ano Fiscal  e Data de Término do Ano Fiscal pois o Ano Fiscal foi guardado.
 DocType: Quotation,Shopping Cart,Carrinho de Compras
@@ -2158,7 +2158,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Variação Líquida no Ativo Imobilizado
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixe em branco se for para todas as designações
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"A cobrança do tipo ""Real"" na linha {0} não pode ser incluída no preço do Item"
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"A cobrança do tipo ""Real"" na linha {0} não pode ser incluída no preço do Item"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Máx.: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Data e Hora De
 DocType: Shopify Settings,For Company,Para a Empresa
@@ -2172,7 +2172,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Houve erros na criação da programação do curso
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,O primeiro Aprovador de despesas na lista será definido como o Aprovador de despesas padrão.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,não pode ser maior do que 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Você precisa ser um usuário diferente das funções Administrador com Gerente do Sistema e Gerenciador de Itens para registrar no Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Você precisa ser um usuário diferente das funções Administrador com Gerente do Sistema e Gerenciador de Itens para registrar no Marketplace.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,O Item {0} não é um item de stock
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Sem Marcação
@@ -2201,7 +2201,7 @@
 DocType: HR Settings,Employee Settings,Definições de Funcionário
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Sistema de pagamento de carregamento
 ,Batch-Wise Balance History,Histórico de Saldo em Lote
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Linha # {0}: Não é possível definir Taxa se o valor for maior do que o valor faturado do Item {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Linha # {0}: Não é possível definir Taxa se o valor for maior do que o valor faturado do Item {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,As definições de impressão estão atualizadas no respectivo formato de impressão
 DocType: Package Code,Package Code,Código pacote
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Aprendiz
@@ -2436,7 +2436,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} vagas e {1} orçamento para {2} já planejadas para empresas subsidiárias de {3}. \ Você só pode planejar até {4} vagas e e orçamentar {5} como plano de pessoal {6} para a empresa controladora {3}.
 DocType: HR Settings,Stop Birthday Reminders,Parar Lembretes de Aniversário
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Por favor definir Payroll Conta a Pagar padrão in Company {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Por favor definir Payroll Conta a Pagar padrão in Company {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Obtenha a divisão financeira de impostos e encargos por dados da Amazon
 DocType: SMS Center,Receiver List,Lista de Destinatários
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Pesquisar Item
@@ -2506,7 +2506,7 @@
 DocType: Vital Signs,Constipated,Constipado
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Na Fatura de Fornecedor {0} datada de {1}
 DocType: Customer,Default Price List,Lista de Preços Padrão
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Foi criado o registo do Movimento do Ativo {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Foi criado o registo do Movimento do Ativo {0}
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Nenhum item encontrado.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Não pode eliminar o Ano Fiscal de {0}. O Ano Fiscal de {0} está definido como padrão nas Definições Gerais
 DocType: Share Transfer,Equity/Liability Account,Conta de patrimônio / responsabilidade
@@ -2646,6 +2646,7 @@
 DocType: Blanket Order,Order Type,Tipo de Pedido
 ,Item-wise Sales Register,Registo de Vendas de Item Inteligente
 DocType: Asset,Gross Purchase Amount,Montante de Compra Bruto
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Código do item&gt; Grupo de itens&gt; Marca
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Balanços de abertura
 DocType: Asset,Depreciation Method,Método de Depreciação
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Esta Taxa está incluída na Taxa Básica?
@@ -2729,7 +2730,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Ação se o Orçamento Anual Ultrapassar
 DocType: Student Leave Application,Student Leave Application,Solicitação de Licença de Estudante
 DocType: Item,Will also apply for variants,Também se aplicará para as variantes
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","O ativo não pode ser cancelado, pois já é {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","O ativo não pode ser cancelado, pois já é {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Employee {0} no Meio dia em {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},O total de horas de trabalho não deve ser maior que o nr. máx. de horas de trabalho {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Em
@@ -2753,6 +2754,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Buscar dados
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Licença máxima permitida no tipo de licença {0} é {1}
 DocType: SMS Center,Create Receiver List,Criar Lista de Destinatários
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,A data disponível para uso deve ser posterior à data de compra
 DocType: Vehicle,Wheels,Rodas
 DocType: Packing Slip,To Package No.,Para Pacote Nr.
 DocType: Patient Relation,Family,Família
@@ -2766,7 +2768,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,A moeda de faturamento deve ser igual à moeda da empresa padrão ou à moeda da conta do partido
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que o pacote é uma parte desta entrega (Só no Rascunho)
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Linha {0}: data de vencimento não pode ser antes da data de publicação
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Linha {0}: data de vencimento não pode ser antes da data de publicação
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Efetuar Registo de Pagamento
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},A Quantidade do Item {0} deve ser inferior a {1}
 ,Sales Invoice Trends,Tendências de Fatura de Vendas
@@ -2839,7 +2841,7 @@
 DocType: Guardian,Guardian Interests,guardião Interesses
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Atualizar nome / número da conta
 DocType: Naming Series,Current Value,Valor Atual
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Existem diversos anos fiscais para a data {0}. Por favor, defina a empresa nesse Ano Fiscal"
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Existem diversos anos fiscais para a data {0}. Por favor, defina a empresa nesse Ano Fiscal"
 DocType: Education Settings,Instructor Records to be created by,Registros de instrutor a serem criados por
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} criado
 DocType: GST Account,GST Account,Conta GST
@@ -2857,7 +2859,7 @@
 DocType: Sales Person,Name and Employee ID,Nome e ID do Funcionário
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,A Data de Vencimento não pode ser anterior à Data de Lançamento
 DocType: Website Item Group,Website Item Group,Website de Grupo de Item
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nenhum recibo de salário encontrado para enviar para o critério acima selecionado OU recibo de salário já enviado
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nenhum recibo de salário encontrado para enviar para o critério acima selecionado OU recibo de salário já enviado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Impostos e Taxas
 DocType: Projects Settings,Projects Settings,Configurações de projetos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,"Por favor, insira a Data de referência"
@@ -2866,7 +2868,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Qtd Fornecida
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Item de Solicitação de Material
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,"Por favor, cancele o recibo de compra {0} primeiro"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,"Por favor, cancele o recibo de compra {0} primeiro"
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Esquema de Grupos de Itens.
 DocType: Production Plan,Total Produced Qty,Qtd Total Produzido
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Não é possível referir o número da linha como superior ou igual ao número da linha atual para este tipo de Cobrança
@@ -2977,6 +2979,7 @@
 ,Vehicle Expenses,Despesas de Veículos
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Criar teste (s) de laboratório no envio de fatura de vendas
 DocType: Serial No,Invoice Details,Detalhes da fatura
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Ative as configurações do Google Maps para estimar e otimizar rotas
 DocType: Grant Application,Show on Website,Mostrar no site
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Comece em
 DocType: Hub Tracked Item,Hub Category,Categoria Hub
@@ -3017,7 +3020,7 @@
 DocType: Inpatient Record,B Positive,B Positivo
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",O benefício máximo do empregado {0} excede {1} pela soma {2} do valor reivindicado anterior
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Linha #{0}: A qtd deve ser 1, pois o item é um ativo imobilizado. Por favor, utilize uma linha separada para diversas qtds."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Linha #{0}: A qtd deve ser 1, pois o item é um ativo imobilizado. Por favor, utilize uma linha separada para diversas qtds."
 DocType: Leave Block List Allow,Leave Block List Allow,Permissão de Lista de Bloqueio de Licenças
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,A Abr. não pode estar em branco ou conter espaços em branco
 DocType: Patient Medical Record,Patient Medical Record,Registro Médico do Paciente
@@ -3052,7 +3055,7 @@
 DocType: Workstation,Wages per hour,Salários por hora
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},O saldo de stock no Lote {0} vai ficar negativo {1} para o item {2} no Armazém {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,As seguintes Solicitações de Materiais têm sido automaticamente executadas com base no nível de reencomenda do Item
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},A conta {0} é inválida. A Moeda da Conta deve ser {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},A conta {0} é inválida. A Moeda da Conta deve ser {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},A partir da data {0} não pode ser após a data de alívio do empregado {1}
 DocType: Supplier,Is Internal Supplier,É fornecedor interno
 DocType: Employee,Create User Permission,Criar permissão de usuário
@@ -3198,7 +3201,7 @@
 DocType: Account,Fixed Asset,Ativos Imobilizados
 DocType: Amazon MWS Settings,After Date,Depois da data
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Inventário Serializado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,{0} inválido para fatura entre empresas.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,{0} inválido para fatura entre empresas.
 ,Department Analytics,Análise do departamento
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-mail não encontrado em contato padrão
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Gerar Segredo
@@ -3211,7 +3214,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,O programa na estrutura de tarifas e no grupo de alunos {0} são diferentes.
 DocType: Bank Statement Transaction Entry,Receivable Account,Conta a Receber
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Válido da data deve ser menor que a data de validade.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Linha #{0}: O Ativo {1} já é {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Linha #{0}: O Ativo {1} já é {2}
 DocType: Quotation Item,Stock Balance,Balanço de Stock
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Ordem de Venda para Pagamento
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,CEO
@@ -3253,6 +3256,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,É necessário colocar o Débito Para
 DocType: Clinical Procedure,Inpatient Record,Registro de internamento
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","O Registo de Horas ajudar a manter o controlo do tempo, custo e faturação para atividades feitas pela sua equipa"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Fornecedor&gt; Tipo de Fornecedor
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Lista de Preços de Compra
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Data da Transação
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Modelos de variáveis do scorecard do fornecedor.
@@ -3296,7 +3300,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Ganhos / Perdas de Câmbio
 DocType: Opportunity,Lost Reason,Motivo de Perda
 DocType: Amazon MWS Settings,Enable Amazon,Ativar a Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Linha # {0}: Conta {1} não pertence à empresa {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Linha # {0}: Conta {1} não pertence à empresa {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Não foi possível encontrar DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Novo Endereço
 DocType: Quality Inspection,Sample Size,Tamanho da Amostra
@@ -3408,7 +3412,7 @@
 DocType: Water Analysis,Origin,Origem
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Este documento está acima do limite por {0} {1} para o item {4}. Está a fazer outra {3} no/a mesmo/a {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,"Por favor, defina como recorrente depois de guardar"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Selecionar alterar montante de conta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Selecionar alterar montante de conta
 DocType: Purchase Invoice,Price List Currency,Moeda da Lista de Preços
 DocType: Naming Series,User must always select,O utilizador tem sempre que escolher
 DocType: Stock Settings,Allow Negative Stock,Permitir Stock Negativo
@@ -3450,7 +3454,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Tem certeza de que deseja cancelar esse compromisso?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Pacote de preços de quarto de hotel
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Canal de Vendas
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},"Por favor, defina conta padrão no Componente Salarial {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},"Por favor, defina conta padrão no Componente Salarial {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Necessário Em
 DocType: Rename Tool,File to Rename,Ficheiro para Alterar Nome
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Por favor, selecione uma LDM para o Item na Linha {0}"
@@ -3471,7 +3475,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Custo dos Itens Adquiridos
 DocType: Employee Separation,Employee Separation Template,Modelo de Separação de Funcionários
 DocType: Selling Settings,Sales Order Required,Ordem de Venda necessária
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Torne-se um vendedor
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Torne-se um vendedor
 DocType: Purchase Invoice,Credit To,Creditar Em
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Potenciais Clientes / Clientes Ativos
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Deixe em branco para usar o formato padrão de nota de entrega
@@ -3512,7 +3516,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Criar modelo de imposto
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Fórum de Utilizadores
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,As Matérias-primas não podem ficar em branco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Linha # {0} (Tabela de pagamento): o valor deve ser negativo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Linha # {0} (Tabela de pagamento): o valor deve ser negativo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar o stock, a fatura contém um item de envio direto."
 DocType: Contract,Fulfilment Status,Status de Cumprimento
 DocType: Lab Test Sample,Lab Test Sample,Amostra de teste de laboratório
@@ -3672,7 +3676,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Data do Doc
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Registos de Propinas Criados - {0}
 DocType: Asset Category Account,Asset Category Account,Categoria de Conta de Ativo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Linha # {0} (Tabela de pagamento): o valor deve ser positivo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Linha # {0} (Tabela de pagamento): o valor deve ser positivo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Não é possível produzir mais Itens {0} do que a quantidade da Ordem de Vendas {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Selecione os Valores do Atributo
 DocType: Purchase Invoice,Reason For Issuing document,Razão para emitir documento
@@ -3727,7 +3731,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Momento em que os materiais foram recebidos
 DocType: Products Settings,Products per Page,Produtos por Página
 DocType: Stock Ledger Entry,Outgoing Rate,Taxa de Saída
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,ou
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,ou
 DocType: Sales Order,Billing Status,Estado do Faturação
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Relatar um Incidente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Despesas de Serviços
@@ -3755,7 +3759,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Declaração de Isenção de Imposto do Empregado
 DocType: Payment Entry,Cheque/Reference Date,Data do Cheque/Referência
 DocType: Purchase Invoice,Total Taxes and Charges,Impostos e Encargos Totais
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Data disponível para uso é entrada como data passada
 DocType: Employee,Emergency Contact,Contacto de Emergência
 DocType: Bank Reconciliation Detail,Payment Entry,Registo de Pagamento
 ,sales-browser,navegador-de-vendas
@@ -3802,6 +3805,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),É retorno (nota de crédito)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Comece o trabalho
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},O número de série é necessário para o ativo {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Por favor, defina a série de nomenclatura para {0} via Configuração&gt; Configurações&gt; Naming Series"
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,O modelo desativado não deve ser o modelo padrão
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Para a linha {0}: digite a quantidade planejada
 DocType: Account,Income Account,Conta de Rendimento
@@ -3815,6 +3819,7 @@
 DocType: Loyalty Program,Help Section,Seção de ajuda
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Anterior
 DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidade Fundamental
+DocType: Delivery Trip,Distance UOM,Distância UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Os lotes de estudante ajudar a controlar assiduidade, avaliação e taxas para estudantes"
 DocType: Payment Entry,Total Allocated Amount,Valor Total Atribuído
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Defina a conta de inventário padrão para o inventário perpétuo
@@ -3856,7 +3861,7 @@
 DocType: Item Supplier,Item Supplier,Fornecedor do Item
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,"Por favor, insira o Código do Item para obter o nr. de lote"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},"Por favor, selecione um valor para {0} a cotação_para {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Nenhum item selecionado para transferência
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Nenhum item selecionado para transferência
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Todos os Endereços.
 DocType: Company,Stock Settings,Definições de Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","A união só é possível caso as seguintes propriedades sejam iguais em ambos os registos. Estes são o Grupo, Tipo Principal, Empresa"
@@ -4154,7 +4159,7 @@
 DocType: Patient,Personal and Social History,História pessoal e social
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Usuário {0} criado
 DocType: Fee Schedule,Fee Breakup for each student,Fee Breakup para cada aluno
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),O Avanço total ({0}) no Pedido {1} não pode ser maior do que o Total Geral ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),O Avanço total ({0}) no Pedido {1} não pode ser maior do que o Total Geral ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selecione a distribuição mensal para distribuir os objetivos desigualmente através meses.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Código de mudança
 DocType: Purchase Invoice Item,Valuation Rate,Taxa de Avaliação
@@ -4163,7 +4168,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Aproveitou o ITC Cess
 ,Student Monthly Attendance Sheet,Folha de Assiduidade Mensal de Estudante
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Regra de envio aplicável apenas para venda
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Linha de depreciação {0}: a próxima data de depreciação não pode ser anterior à data de compra
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Linha de depreciação {0}: a próxima data de depreciação não pode ser anterior à data de compra
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data de Início do Projeto
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Até
 DocType: Rename Tool,Rename Log,Renomear o Registo
@@ -4181,12 +4186,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Com que frequência o projeto e a empresa devem ser atualizados com base nas transações de vendas.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Expira em
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Adicionar alunos
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Por favor, apague o empregado <a href=""#Form/Employee/{0}"">{0}</a> \ para cancelar este documento"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},"Por favor, selecione {0}"
 DocType: C-Form,C-Form No,Nr. de Form-C
 DocType: BOM,Exploded_items,Vista_expandida_de_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Distância
+DocType: Delivery Stop,Distance,Distância
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Liste seus produtos ou serviços que você compra ou vende.
 DocType: Water Analysis,Storage Temperature,Temperatura de armazenamento
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4213,7 +4216,7 @@
 DocType: Homepage,Company Description for website homepage,A Descrição da Empresa para a página inicial do website
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para a maior comodidade dos clientes, estes códigos podem ser utilizados em formatos de impressão, como Faturas e Guias de Remessa"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nome suplier
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Não foi possível recuperar informações para {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Não foi possível recuperar informações para {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Jornal de entrada de abertura
 DocType: Contract,Fulfilment Terms,Termos de Cumprimento
 DocType: Sales Invoice,Time Sheet List,Lista de Folhas de Presença
@@ -4395,7 +4398,7 @@
 DocType: Serial No,Warranty / AMC Details,Garantia / Dados CMA
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Selecionar os alunos manualmente para o grupo baseado em atividade
 DocType: Journal Entry,User Remark,Observação de Utiliz.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Otimizando rotas.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Otimizando rotas.
 DocType: Travel Itinerary,Non Diary,Não diário
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Não é possível criar bônus de retenção para funcionários da esquerda
 DocType: Lead,Market Segment,Segmento de Mercado
@@ -4426,7 +4429,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Programa de lealdade
 DocType: Student Guardian,Father,Pai
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Bilhetes de suporte
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,"""Atualizar Stock"" não pode ser ativado para a venda de ativos imobilizado"
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,"""Atualizar Stock"" não pode ser ativado para a venda de ativos imobilizado"
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliação Bancária
 DocType: Attendance,On Leave,em licença
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obter Atualizações
@@ -4471,7 +4474,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,O Nr. de Série e de Lote
 DocType: Warranty Claim,From Company,Da Empresa
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Soma dos escores de critérios de avaliação precisa ser {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,"Por favor, defina o Número de Depreciações Marcado"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,"Por favor, defina o Número de Depreciações Marcado"
 DocType: Supplier Scorecard Period,Calculations,Cálculos
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Valor ou Qtd
 DocType: Payment Terms Template,Payment Terms,Termos de pagamento
@@ -4491,7 +4494,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Desconto (%) na Taxa da Lista de Preços com Margem
 DocType: Healthcare Service Unit Type,Rate / UOM,Taxa / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Todos os Armazéns
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Nenhum {0} encontrado para transações entre empresas.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Nenhum {0} encontrado para transações entre empresas.
 DocType: Travel Itinerary,Rented Car,Carro alugado
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Sobre a sua empresa
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,A conta de Crédito Para deve ser uma conta de Balanço
@@ -4593,6 +4596,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Critérios de Análise da Planta
 DocType: Cheque Print Template,Cheque Height,Altura do Cheque
 DocType: Supplier,Supplier Details,Dados de Fornecedor
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Por favor, configure a série de numeração para Presença via Configuração&gt; Série de Numeração"
 DocType: Setup Progress,Setup Progress,Progresso da Instalação
 DocType: Expense Claim,Approval Status,Estado de Aprovação
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},O valor de deve ser inferior ao valor da linha {0}
@@ -4686,7 +4690,6 @@
 DocType: Travel Request,Fully Sponsored,Totalmente Patrocinado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Entrada de Diário Reversa
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,O cliente {0} é criado.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Por favor, configure Employee Naming System em Recursos Humanos&gt; HR Settings"
 DocType: Stock Settings,Limit Percent,limite Percent
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Atualmente não há estoque disponível em qualquer armazém
 ,Payment Period Based On Invoice Date,Período De Pagamento Baseado Na Data Da Fatura
@@ -4745,7 +4748,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Armazém Fonte
 DocType: Installation Note,Installation Date,Data de Instalação
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Share Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Linha #{0}: O Ativo {1} não pertence à empresa {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Linha #{0}: O Ativo {1} não pertence à empresa {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Fatura de vendas {0} criada
 DocType: Employee,Confirmation Date,Data de Confirmação
 DocType: Inpatient Occupancy,Check Out,Confira
@@ -4765,6 +4768,7 @@
 DocType: Production Plan,Sales Orders Detail,Detalhamento das encomendas de vendas
 DocType: Bin,Requested Quantity,Quantidade Solicitada
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Por favor, instale o Sistema de Nomes de Instrutores em Educação&gt; Configurações de Educação"
 DocType: Patient,Marital Status,Estado Civil
 DocType: Stock Settings,Auto Material Request,Solitição de Material Automática
 DocType: Woocommerce Settings,API consumer secret,Segredo do consumidor da API
@@ -4817,7 +4821,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Selecione Dias
 DocType: Academic Term,Term Name,Nome do Termo
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Crédito ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Criando Slips Salariais ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Criando Slips Salariais ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Você não pode editar o nó raiz.
 DocType: Buying Settings,Purchase Order Required,Necessário Ordem de Compra
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Cronômetro
@@ -4855,7 +4859,7 @@
 DocType: Account,Rate at which this tax is applied,Taxa à qual este imposto é aplicado
 DocType: Cash Flow Mapper,Section Name,Nome da Seção
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Qtd de Reencomenda
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Linha de depreciação {0}: o valor esperado após a vida útil deve ser maior ou igual a {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Linha de depreciação {0}: o valor esperado após a vida útil deve ser maior ou igual a {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Vagas de Emprego Atuais
 DocType: Company,Stock Adjustment Account,Conta de Acerto de Stock
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Liquidar
@@ -4902,7 +4906,7 @@
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Sem CMA
 DocType: Opportunity,Opportunity Amount,Valor da oportunidade
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,O Número de Depreciações Reservadas não pode ser maior do que o Número Total de Depreciações
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,O Número de Depreciações Reservadas não pode ser maior do que o Número Total de Depreciações
 DocType: Purchase Order,Order Confirmation Date,Data de confirmação do pedido
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Efetuar Visita de Manutenção
@@ -4943,7 +4947,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Lote:
 DocType: Volunteer,Afternoon,Tarde
 DocType: Loyalty Program,Loyalty Program Help,Ajuda do programa de fidelidade
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' está desativada
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' está desativada
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Definir como Aberto
 DocType: Cheque Print Template,Scanned Cheque,Cheque Digitalizado
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar emails automáticos para Contactos nas transações A Enviar.
@@ -4956,7 +4960,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Itens e Dados de Garantia
 DocType: Chapter,Chapter Members,Membros do capítulo
 DocType: Sales Team,Contribution (%),Contribuição (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Nota: Não será criado nenhum Registo de Pagamento, pois não foi especificado se era a ""Dinheiro ou por Conta Bancária"""
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Nota: Não será criado nenhum Registo de Pagamento, pois não foi especificado se era a ""Dinheiro ou por Conta Bancária"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,O projeto {0} já existe
 DocType: Clinical Procedure,Nursing User,Usuário de enfermagem
 DocType: Employee Benefit Application,Payroll Period,Período da folha de pagamento
@@ -4964,6 +4968,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},O número de série {0} não pertence ao Lote {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Responsabilidades
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,O período de validade desta citação terminou.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Por favor, apague o empregado <a href=""#Form/Employee/{0}"">{0}</a> \ para cancelar este documento"
 DocType: Expense Claim Account,Expense Claim Account,Conta de Reembolso de Despesas
 DocType: Account,Capital Work in Progress,Trabalho de Capital em Progresso
 DocType: Accounts Settings,Allow Stale Exchange Rates,Permitir taxas de câmbio fechadas
@@ -5045,7 +5051,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Enviar Material
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Conecte o Shopify com o ERPNext
 DocType: Material Request Item,For Warehouse,Para o Armazém
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Notas de entrega {0} atualizadas
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Notas de entrega {0} atualizadas
 DocType: Employee,Offer Date,Data de Oferta
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Cotações
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Está em modo offline. Não poderá recarregar até ter rede.
@@ -5096,7 +5102,7 @@
 DocType: Shipping Rule,Calculate Based On,Calcular com Base Em
 DocType: Contract,Unfulfilled,Não cumprido
 DocType: Delivery Note Item,From Warehouse,Armazém De
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Nenhum empregado pelos critérios mencionados
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Nenhum empregado pelos critérios mencionados
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Não há itens com Bill of Materials para Fabricação
 DocType: Shopify Settings,Default Customer,Cliente padrão
 DocType: Sales Stage,Stage Name,Nome artístico
@@ -5139,7 +5145,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impostos Depois do Montante do Desconto
 DocType: Patient,Inpatient Status,Status de internação
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Definições de Resumo de Trabalho Diário
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,A Lista de Preços Selecionada deve ter campos de compra e venda verificados.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,A Lista de Preços Selecionada deve ter campos de compra e venda verificados.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Digite Reqd by Date
 DocType: Payment Entry,Internal Transfer,Transferência Interna
 DocType: Asset Maintenance,Maintenance Tasks,Tarefas de manutenção
@@ -5176,7 +5182,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Agrupar Por
 DocType: Guardian,Interests,Juros
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Ativar / desativar moedas.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Não foi possível enviar alguns recibos de salário
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Não foi possível enviar alguns recibos de salário
 DocType: Exchange Rate Revaluation,Get Entries,Receber Entradas
 DocType: Production Plan,Get Material Request,Obter Solicitação de Material
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Despesas Postais
@@ -5262,7 +5268,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},É obrigatório ter uma conta de despesas para o item {0}
 DocType: BOM,Website Description,Descrição do Website
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Variação Líquida na Equidade
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,"Por favor, cancele a Fatura de Compra {0} primeiro"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,"Por favor, cancele a Fatura de Compra {0} primeiro"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,"Não é permitido. Por favor, desative o tipo de unidade de serviço"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","O ID de Email deve ser único, já existe para {0}"
 DocType: Serial No,AMC Expiry Date,Data de Validade do CMA
@@ -5302,7 +5308,7 @@
 DocType: Hotel Room,Hotel Room,Quarto de hotel
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},A conta {0} não pertence à empresa {1}
 DocType: Leave Type,Rounding,Arredondamento
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Os números de série na linha {0} não correspondem à nota de entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Os números de série na linha {0} não correspondem à nota de entrega
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Quantidade Dispensada (Pro-rated)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Em seguida, as regras de preços são filtradas com base no cliente, grupo de clientes, território, fornecedor, grupo de fornecedores, campanha, parceiro de vendas, etc."
 DocType: Student,Guardian Details,Dados de Responsável
@@ -5357,7 +5363,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Armazém necessário para o Item {0} do stock
 DocType: Leave Allocation,Unused leaves,Licensas não utilizadas
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Fazer entrada de reembolso
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Todos os departamentos
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Todos os departamentos
 DocType: Healthcare Service Unit,Vacant,Vago
 DocType: Patient,Alcohol Past Use,Uso passado do álcool
 DocType: Fertilizer Content,Fertilizer Content,Conteúdo de fertilizante
@@ -5368,7 +5374,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,A ordem de serviço {0} deve ser cancelada antes de cancelar este pedido de venda
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Trazer LDM expandida (incluindo os subconjuntos)
 DocType: Authorization Rule,Applicable To (Employee),Aplicável Ao/À (Funcionário/a)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,É obrigatório colocar a Data de Vencimento
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,É obrigatório colocar a Data de Vencimento
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,O Aumento do Atributo {0} não pode ser 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Tipo de Benefício e Montante
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Quartos reservados
@@ -5517,7 +5523,7 @@
 DocType: Purchase Invoice Item,Total Weight,Peso total
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Comissão sobre Vendas
 DocType: Job Offer Term,Value / Description,Valor / Descrição
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Linha #{0}: O Ativo {1} não pode ser enviado, já é {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Linha #{0}: O Ativo {1} não pode ser enviado, já é {2}"
 DocType: Tax Rule,Billing Country,País de Faturação
 DocType: Purchase Order Item,Expected Delivery Date,Data de Entrega Prevista
 DocType: Restaurant Order Entry,Restaurant Order Entry,Entrada de pedido de restaurante
@@ -5556,12 +5562,13 @@
 DocType: Maintenance Visit,Breakdown,Decomposição
 DocType: Travel Itinerary,Vegetarian,Vegetariano
 DocType: Patient Encounter,Encounter Date,Encontro Data
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Não é possível selecionar a conta: {0} com a moeda: {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Não é possível selecionar a conta: {0} com a moeda: {1}
 DocType: Bank Statement Transaction Settings Item,Bank Data,Dados bancários
 DocType: Purchase Receipt Item,Sample Quantity,Quantidade da amostra
 DocType: Bank Guarantee,Name of Beneficiary,Nome do beneficiário
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Atualize o custo da lista técnica automaticamente através do Agendador, com base na taxa de avaliação / taxa de preços mais recente / última taxa de compra de matérias-primas."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Fornecedor&gt; Grupo de Fornecedores
 DocType: Bank Reconciliation Detail,Cheque Date,Data do Cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},A Conta {0}: da Conta Principal {1} não pertence à empresa: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Todas as transacções relacionadas com esta empresa foram eliminadas com sucesso!
@@ -5589,7 +5596,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,"Os Subgrupos só podem ser criados sob os ramos do tipo ""Grupo"""
 DocType: Attendance Request,Half Day Date,Meio Dia Data
 DocType: Academic Year,Academic Year Name,Nome do Ano Letivo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,"{0} não pode transacionar com {1}. Por favor, altere a empresa."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,"{0} não pode transacionar com {1}. Por favor, altere a empresa."
 DocType: Sales Partner,Contact Desc,Descr. de Contacto
 DocType: Email Digest,Send regular summary reports via Email.,Enviar relatórios de resumo periódicos através do Email.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},"Por favor, defina a conta padrão no Tipo de Despesas de Reembolso {0}"
@@ -5622,7 +5629,7 @@
 DocType: Hotel Room,Hotel Manager,Gerente do hotel
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Estabelecer Regras de Impostos para o carrinho de compras
 DocType: Purchase Invoice,Taxes and Charges Added,Impostos e Encargos Adicionados
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Linha de depreciação {0}: a próxima data de depreciação não pode ser anterior à data disponível para uso
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Linha de depreciação {0}: a próxima data de depreciação não pode ser anterior à data disponível para uso
 ,Sales Funnel,Canal de Vendas
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,É obrigatório colocar uma abreviatura
 DocType: Project,Task Progress,Progresso da Tarefa
@@ -5636,7 +5643,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Todos os Grupos de Clientes
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,Acumulada Mensalmente
 DocType: Attendance Request,On Duty,Em serviço
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez o registo de Câmbio não tenha sido criado para {1} a {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez o registo de Câmbio não tenha sido criado para {1} a {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Plano de Pessoal {0} já existe para designação {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,É obrigatório inserir o Modelo de Impostos.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,A Conta {0}: Conta principal {1} não existe
@@ -5717,11 +5724,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,É obrigatório colocar pelo menos um armazém
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Configure campos de itens como UOM, grupo de itens, descrição e número de horas."
 DocType: Certification Application,Certification Status,Status de Certificação
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Marketplace
 DocType: Travel Itinerary,Travel Advance Required,Avanço de Viagem Necessário
 DocType: Subscriber,Subscriber Name,Nome do Assinante
 DocType: Serial No,Out of Warranty,Fora da Garantia
-DocType: Cashier Closing,Cashier-closing-,Fechamento de caixa
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Tipo de dados mapeados
 DocType: BOM Update Tool,Replace,Substituir
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Não foram encontrados produtos.
@@ -5809,7 +5815,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Os modelos de imposto padrão para vendas e compra são criados.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Avaliação O registro de resultados {0} já existe.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Exemplo: ABCD. #####. Se a série estiver configurada e o número de lote não for mencionado nas transações, o número de lote automático será criado com base nessa série. Se você sempre quiser mencionar explicitamente o Lote Não para este item, deixe em branco. Nota: esta configuração terá prioridade sobre o prefixo da série de nomeação em Configurações de estoque."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Por favor, configure a série de numeração para Presença via Configuração&gt; Série de Numeração"
 DocType: BOM,Materials Required (Exploded),Materiais Necessários (Expandidos)
 DocType: Contract,Party User,Usuário da festa
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Defina o filtro de empresa em branco se Group By for &#39;Company&#39;
@@ -6012,7 +6017,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,A data de início do período de avaliação e a data de término do período de avaliação devem ser definidas
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Taxa média
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,O valor total do pagamento no cronograma de pagamento deve ser igual a total / total arredondado
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,O valor total do pagamento no cronograma de pagamento deve ser igual a total / total arredondado
 DocType: Subscription Plan Detail,Plan,Plano
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Declaração Bancária de Saldo de acordo com a Razão Geral
 DocType: Job Applicant,Applicant Name,Nome do Candidato
@@ -6087,7 +6092,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sabão e Detergentes
 DocType: BOM,Show Items,Exibir itens
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,O Tempo De não pode ser após o Tempo Para.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Deseja notificar todos os clientes por e-mail?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Deseja notificar todos os clientes por e-mail?
 DocType: Subscription Plan,Billing Interval,Intervalo de cobrança
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Filmes e Vídeos
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Pedido
@@ -6096,9 +6101,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Linha {0}: {1} deve ser maior que 0
 DocType: Assessment Criteria,Assessment Criteria Group,Critérios de Avaliação Grupo
 DocType: Healthcare Settings,Patient Name By,Nome do paciente por
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Entrada de diário de acréscimo para salários de {0} a {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Entrada de diário de acréscimo para salários de {0} a {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Ativar receita diferida
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},A Depreciação Acumulada Inicial deve ser menor ou igual a {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},A Depreciação Acumulada Inicial deve ser menor ou igual a {0}
 DocType: Warehouse,Warehouse Name,Nome dp Armazém
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,A data de início real deve ser menor que a data de término real
 DocType: Naming Series,Select Transaction,Selecionar Transação
@@ -6250,7 +6255,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Empregado {0} da nota {1} não tem política de licença padrão
 DocType: Salary Detail,Salary Detail,Dados Salariais
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,"Por favor, seleccione primeiro {0}"
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Adicionados {0} usuários
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Adicionados {0} usuários
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","No caso do programa multicamadas, os Clientes serão atribuídos automaticamente ao nível em questão de acordo com o gasto"
 DocType: Appointment Type,Physician,Médico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,O Lote {0} do Item {1} expirou.
@@ -6395,7 +6400,7 @@
 DocType: Asset,Custodian,Custodiante
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Perfil de Ponto de Venda
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} deve ser um valor entre 0 e 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Pagamento de {0} de {1} a {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Pagamento de {0} de {1} a {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Empréstimos Não Garantidos
 DocType: Cost Center,Cost Center Name,Nome do Centro de Custo
 DocType: Student,B+,B+
@@ -6427,6 +6432,7 @@
 DocType: Employee,Date of Issue,Data de Emissão
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","De acordo com as Configurações de compra, se o Recibo Obtido Obrigatório == &#39;SIM&#39;, então, para criar a Fatura de Compra, o usuário precisa criar o Recibo de Compra primeiro para o item {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Linha #{0}: Definir Fornecedor para o item {1}
+DocType: Global Defaults,Default Distance Unit,Unidade de Distância Padrão
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Linha {0}: O valor por hora deve ser maior que zero.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Não foi possível encontrar a Imagem do Website {0} anexada ao Item {1}
 DocType: Issue,Content Type,Tipo de Conteúdo
@@ -6482,7 +6488,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,A conta de Débito Para deve ser uma conta de Balanço
 DocType: Asset,Naming Series,Série de Atrib. de Nomes
 DocType: Vital Signs,Coated,Revestido
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Linha {0}: o valor esperado após a vida útil deve ser menor que o valor da compra bruta
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Linha {0}: o valor esperado após a vida útil deve ser menor que o valor da compra bruta
 DocType: GoCardless Settings,GoCardless Settings,Configurações GoCardless
 DocType: Leave Block List,Leave Block List Name,Nome de Lista de Bloqueio de Licenças
 DocType: Certified Consultant,Certification Validity,Validade de Certificação
@@ -6551,6 +6557,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Cabeçalho do banco
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Ver testes laboratoriais
 DocType: Hub Users,Hub Users,Usuários do hub
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de Clientes&gt; Território
 DocType: Purchase Invoice,Y,S
 DocType: Maintenance Visit,Maintenance Date,Data de Manutenção
 DocType: Purchase Invoice Item,Rejected Serial No,Nr. de Série Rejeitado
@@ -6565,7 +6572,7 @@
 DocType: SG Creation Tool Course,Max Strength,Força Máx.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Instalando predefinições
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Nenhuma nota de entrega selecionada para o cliente {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Nenhuma nota de entrega selecionada para o cliente {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Empregado {0} não tem valor de benefício máximo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Selecione itens com base na data de entrega
 DocType: Grant Application,Has any past Grant Record,Já havia passado Grant Record
@@ -6593,7 +6600,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Reserva de quarto de hotel
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Apoio ao Cliente
 DocType: BOM,Thumbnail,Miniatura
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Nenhum contato com IDs de e-mail encontrados.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Nenhum contato com IDs de e-mail encontrados.
 DocType: Item Customer Detail,Item Customer Detail,Dados de Cliente do Item
 DocType: Notification Control,Prompt for Email on Submission of,Solicitar Email Mediante o Envio de
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},O valor máximo de benefício do empregado {0} excede {1}
@@ -6852,7 +6859,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,"Não é possível converter para o Grupo, pois o Tipo de Conta está selecionado."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,"{0} {1} foi alterado. Por favor, faça uma atualização."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Impeça os utilizadores de efetuar Pedidos de Licença nos dias seguintes.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Código do item&gt; Grupo de itens&gt; Marca
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Se a expiração for ilimitada para os Pontos de Lealdade, mantenha a Duração de Expiração vazia ou 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Membros da equipe de manutenção
 DocType: Loyalty Point Entry,Purchase Amount,Montante de Compra
@@ -6860,7 +6866,7 @@
 											to fullfill Sales Order {2}",Não é possível entregar o Nº de série {0} do item {1} como está reservado \ para preencher o Pedido de Vendas {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Cotação de Fornecedor {0} criada
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,O Fim do Ano não pode ser antes do Início do Ano
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,O Fim do Ano não pode ser antes do Início do Ano
 DocType: Employee Benefit Application,Employee Benefits,Benefícios do Funcionário
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},A quantidade embalada deve ser igual à quantidade do Item {0} na linha {1}
 DocType: Work Order,Manufactured Qty,Qtd Fabricada
@@ -6876,6 +6882,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Selecione números de lote
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Para GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Contas levantadas a Clientes.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Por favor, configure Employee Naming System em Recursos Humanos&gt; HR Settings"
 DocType: Healthcare Settings,Invoice Appointments Automatically,Nomeações de fatura automaticamente
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID de Projeto
 DocType: Salary Component,Variable Based On Taxable Salary,Variável Baseada no Salário Tributável
@@ -6924,7 +6931,7 @@
 DocType: POS Profile,Account for Change Amount,Conta para a Mudança de Montante
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Conectando-se ao QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Ganho / Perda Total
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Empresa inválida para fatura inter-empresa.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Empresa inválida para fatura inter-empresa.
 DocType: Purchase Invoice,input service,serviço de insumos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Linha {0}: A Parte / Conta não corresponde a {1} / {2} em {3} {4}
 DocType: Employee Promotion,Employee Promotion,Promoção de funcionários
@@ -7055,7 +7062,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Área Preferida de Alojamento
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Análise
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,O Carrinho está Vazio
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Por favor, instale o Sistema de Nomes de Instrutores em Educação&gt; Configurações de Educação"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",O item {0} não possui nº de série. Somente itens serilizados podem ter entrega com base no número de série
 DocType: Vehicle,Model,Modelo
@@ -7085,7 +7091,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Nada para mudar
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,"Por favor, selecione um ficheiro csv"
 DocType: Holiday List,Total Holidays,Total de feriados
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,"Modelo de email ausente para envio. Por favor, defina um em Configurações de Entrega."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,"Modelo de email ausente para envio. Por favor, defina um em Configurações de Entrega."
 DocType: Student Leave Application,Mark as Present,Mark como presente
 DocType: Supplier Scorecard,Indicator Color,Cor do indicador
 DocType: Purchase Order,To Receive and Bill,Para Receber e Faturar
@@ -7094,7 +7100,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Selecione o nº de série
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Termos e Condições de Modelo
-DocType: Serial No,Delivery Details,Dados de Entrega
+DocType: Delivery Trip,Delivery Details,Dados de Entrega
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},É necessário colocar o Centro de Custo na linha {0} na Tabela de Impostos para o tipo {1}
 DocType: Program,Program Code,Código do Programa
 DocType: Terms and Conditions,Terms and Conditions Help,Ajuda de Termos e Condições
@@ -7118,7 +7124,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Dias para Chegar ao Armazém
 DocType: Cash Flow Mapping,Is Income Tax Expense,É a despesa de imposto de renda
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Seu pedido está fora de prazo!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Linha #{0}: A Data de Postagem deve ser igual à data de compra {1} do ativo {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Linha #{0}: A Data de Postagem deve ser igual à data de compra {1} do ativo {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Verifique se o estudante reside no albergue do Instituto.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Insira as Ordens de Venda na tabela acima
 ,Stock Summary,Resumo de Stock
diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index 60c72cd..c7503c4 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Numele perioadei
 DocType: Employee,Salary Mode,Mod de salariu
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Inregistreaza-te
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Inregistreaza-te
 DocType: Patient,Divorced,Divorțat/a
 DocType: Support Settings,Post Route Key,Introduceți cheia de rutare
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permiteți Element care trebuie adăugate mai multe ori într-o tranzacție
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Noul curs de schimb
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Moneda este necesară pentru lista de prețuri {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Va fi calculat în cadrul tranzacției.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Furnizor&gt; Tipul furnizorului
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Clientul A lua legatura
 DocType: Patient Appointment,Check availability,Verifică disponibilitatea
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Afișați deschis
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Seria Actualizat cu succes
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Verifică
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} în rândul {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} în rândul {1}
 DocType: Asset Finance Book,Depreciation Start Date,Data de începere a amortizării
 DocType: Pricing Rule,Apply On,Se aplică pe
 DocType: Item Price,Multiple Item prices.,Mai multe prețuri element.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Lab prescription
 ,Delay Days,Zilele întârziate
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Cheltuieli de serviciu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Numărul de serie: {0} este deja menționat în factura de vânzare: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Numărul de serie: {0} este deja menționat în factura de vânzare: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Factură
 DocType: Purchase Invoice Item,Item Weight Details,Greutate Detalii articol
 DocType: Asset Maintenance Log,Periodicity,Periodicitate
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Contabil
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Lista de prețuri de vânzare
 DocType: Patient,Tobacco Current Use,Utilizarea curentă a tutunului
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Data de începere și data de încheiere se suprapun cu cartea de lucru <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Rata de vanzare
 DocType: Cost Center,Stock User,Stoc de utilizare
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Legate de
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Data de prezență nu poate fi anteriara datii angajarii salariatului
 DocType: Grading Scale,Grading Scale Name,Standard Nume Scala
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Adăugați utilizatori la Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Adăugați utilizatori la Marketplace
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Acesta este un cont de rădăcină și nu pot fi editate.
 DocType: Sales Invoice,Company Address,adresa companiei
 DocType: BOM,Operations,Operatii
@@ -322,7 +322,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Cantitate diferențială
 DocType: Production Plan,Material Request Detail,Detalii privind solicitarea materialului
 DocType: Selling Settings,Default Quotation Validity Days,Valabilitatea zilnică a cotațiilor
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Pentru a include taxa în rândul {0} în rata articol, impozitele în rânduri {1} trebuie de asemenea să fie incluse"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Pentru a include taxa în rândul {0} în rata articol, impozitele în rânduri {1} trebuie de asemenea să fie incluse"
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Payroll Entry,Validate Attendance,Validați participarea
 DocType: Sales Invoice,Change Amount,Sumă schimbare
@@ -441,7 +441,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,distanța dintre rânduri pentru suma în cuvinte
 DocType: Vehicle,Additional Details,Detalii suplimentare
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Nici o descriere dat
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Furnizor&gt; Grupul de furnizori
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Cerere de achizitie.
 DocType: POS Closing Voucher Details,Collected Amount,Suma colectată
 DocType: Lab Test,Submitted Date,Data transmisă
@@ -486,7 +485,7 @@
 DocType: Student Admission,Student Admission,Admiterea studenților
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Articolul {0} este anulat
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Rândul de amortizare {0}: Data de începere a amortizării este introdusă ca dată trecută
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Rândul de amortizare {0}: Data de începere a amortizării este introdusă ca dată trecută
 DocType: Contract Template,Fulfilment Terms and Conditions,Condiții și condiții de îndeplinire
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Cerere de material
 DocType: Bank Reconciliation,Update Clearance Date,Actualizare Clearance Data
@@ -543,6 +542,7 @@
 DocType: Accounts Settings,Settings for Accounts,Setări pentru conturi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Furnizor Factura nr există în factură Purchase {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Gestioneaza Ramificatiile Persoanei responsabila cu Vanzarile
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Traseul nu poate fi procesat, deoarece Setările Google Maps sunt dezactivate."
 DocType: Job Applicant,Cover Letter,Scrisoare de intenție
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cecuri restante și pentru a șterge Depozite
 DocType: Item,Synced With Hub,Sincronizat cu Hub
@@ -602,7 +602,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Valoare nouă a activelor
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Rata la care Clientul valuta este convertită în valuta de bază a clientului
 DocType: Course Scheduling Tool,Course Scheduling Tool,Instrument curs de programare
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rând # {0}: Achiziția Factura nu poate fi făcută împotriva unui activ existent {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rând # {0}: Achiziția Factura nu poate fi făcută împotriva unui activ existent {1}
 DocType: Crop Cycle,LInked Analysis,Analiza analizată
 DocType: POS Closing Voucher,POS Closing Voucher,POS Voucher de închidere
 DocType: Contract,Lapsed,caducă
@@ -637,6 +637,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} nu este înscris la Cursul {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Numele studentului:
 DocType: POS Closing Voucher Details,Difference,Diferență
+DocType: Delivery Settings,Delay between Delivery Stops,Întârziere între opririle de livrare
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial No {0} nu aparține de livrare Nota {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Se pare că există o problemă cu configurația serverului GoCardless. Nu vă faceți griji, în caz de eșec, suma va fi rambursată în cont."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -697,7 +698,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Cantitatea și rata
 DocType: Delivery Note,% Installed,% Instalat
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Classrooms / Laboratoare, etc, unde prelegeri pot fi programate."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Monedele companiilor ambelor companii ar trebui să se potrivească cu tranzacțiile Inter-Company.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Monedele companiilor ambelor companii ar trebui să se potrivească cu tranzacțiile Inter-Company.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Va rugam sa introduceti numele companiei în primul rând
 DocType: Travel Itinerary,Non-Vegetarian,Non vegetarian
 DocType: Purchase Invoice,Supplier Name,Furnizor Denumire
@@ -784,7 +785,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Închiriat de la data
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Piese de schimb suficient pentru a construi
 DocType: POS Profile User,POS Profile User,Utilizator de profil POS
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Rând {0}: este necesară începerea amortizării
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Rând {0}: este necesară începerea amortizării
 DocType: Purchase Invoice Item,Service Start Date,Data de începere a serviciului
 DocType: Subscription Invoice,Subscription Invoice,Factura de abonament
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Venituri Directe
@@ -853,7 +854,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Abreviere deja folosita pentru o altă companie
 DocType: Selling Settings,Default Customer Group,Grup Clienți Implicit
 DocType: Employee,IFSC Code,Codul IFSC
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Data de începere și data de încheiere se suprapun cu cartea de lucru <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Dacă este dezactivat, câmpul 'Total Rotunjit' nu va fi vizibil in nici o tranzacție"
 DocType: BOM,Operating Cost,Costul de operare
 DocType: Crop,Produced Items,Articole produse
@@ -905,7 +905,7 @@
 DocType: Supplier,Prevent RFQs,Preveniți RFQ-urile
 DocType: Hub User,Hub User,Utilizator Hub
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Realizeaza Comandă de Vânzări
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Plata salariului trimisă pentru perioada de la {0} la {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Plata salariului trimisă pentru perioada de la {0} la {1}
 DocType: Project Task,Project Task,Proiect Sarcina
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Răscumpărate Puncte
 ,Lead Id,Id Conducere
@@ -1037,7 +1037,7 @@
 DocType: Fee Validity,Max number of visit,Numărul maxim de vizite
 ,Hotel Room Occupancy,Hotel Ocuparea camerei
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Pontajul creat:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Vă rugăm să setați Cash implicit sau cont bancar în modul de plată {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Vă rugăm să setați Cash implicit sau cont bancar în modul de plată {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,A se inscrie
 DocType: GST Settings,GST Settings,Setări GST
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Valuta trebuie sa fie aceeasi cu Moneda Preturilor: {0}
@@ -1092,7 +1092,7 @@
 DocType: Vehicle Log,Service Details,Detalii de serviciu
 DocType: Lab Test Template,Grouped,grupate
 DocType: Selling Settings,Delivery Note Required,Nota de Livrare Necesara
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Trimiterea buletinelor de salariu ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Trimiterea buletinelor de salariu ...
 DocType: Bank Guarantee,Bank Guarantee Number,Numărul de garanție bancară
 DocType: Bank Guarantee,Bank Guarantee Number,Numărul de garanție bancară
 DocType: Assessment Criteria,Assessment Criteria,Criterii de evaluare
@@ -1118,13 +1118,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Plata Intrarea este deja creat
 DocType: Request for Quotation,Get Suppliers,Obțineți furnizori
 DocType: Purchase Receipt Item Supplied,Current Stock,Stoc curent
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Rând # {0}: {1} activ nu legat de postul {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Rând # {0}: {1} activ nu legat de postul {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Previzualizare Salariu alunecare
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Contul {0} a fost introdus de mai multe ori
 DocType: Account,Expenses Included In Valuation,Cheltuieli Incluse în Evaluare
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Puteți reînnoi numai dacă expirați în termen de 30 de zile
 DocType: Shopping Cart Settings,Show Stock Availability,Afișați disponibilitatea stocului
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Setați {0} în categoria de active {1} sau în companie {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Setați {0} în categoria de active {1} sau în companie {2}
 DocType: Location,Longitude,Longitudine
 ,Absent Student Report,Raport elev absent
 DocType: Crop,Crop Spacing UOM,Distanțarea culturii UOM
@@ -1196,7 +1196,7 @@
 DocType: Soil Texture,Sand,Nisip
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Oportunitate de la
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rând {0}: {1} Numerele de serie necesare pentru articolul {2}. Ați oferit {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rând {0}: {1} Numerele de serie necesare pentru articolul {2}. Ați oferit {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Selectați un tabel
 DocType: BOM,Website Specifications,Site-ul Specificații
 DocType: Special Test Items,Particulars,Particularități
@@ -1307,7 +1307,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Articole cu weightage mare va fi afișat mai mare
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Teste de laborator și semne vitale
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detaliu reconciliere bancară
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Rând # {0}: {1} activ trebuie să fie depuse
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Rând # {0}: {1} activ trebuie să fie depuse
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nu a fost gasit angajat
 DocType: Item,If subcontracted to a vendor,Dacă subcontractat la un furnizor
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Grupul de studenți este deja actualizat.
@@ -1362,7 +1362,6 @@
 DocType: Loyalty Program Collection,Tier Name,Denumirea nivelului
 DocType: HR Settings,Enter retirement age in years,Introdu o vârsta de pensionare în anii
 DocType: Crop,Target Warehouse,Țintă Warehouse
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setați seria de numire pentru {0} prin Configurare&gt; Setări&gt; Serii de numire
 DocType: Payroll Employee Detail,Payroll Employee Detail,Detaliile salariaților salariați
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Selectați un depozit
 DocType: Cheque Print Template,Starting location from left edge,Punctul de plecare de la marginea din stânga
@@ -1452,7 +1451,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Material Plan de subansambluri
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Parteneri de vânzări și teritoriu
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} trebuie să fie activ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Nu există elemente disponibile pentru transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Nu există elemente disponibile pentru transfer
 DocType: Employee Boarding Activity,Activity Name,Numele activității
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Modificați data de lansare
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Produsul finit <b>{0}</b> și Cantitatea <b>{1}</b> nu pot fi diferite
@@ -1682,6 +1681,7 @@
 DocType: Project,First Email,Primul e-mail
 DocType: Company,Exception Budget Approver Role,Rolul de abordare a bugetului de excepție
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Odată stabilită, această factură va fi reținută până la data stabilită"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Depozit rezervat în Comanda de Vânzări / Depozit Produse Finite
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Vanzarea Suma
 DocType: Repayment Schedule,Interest Amount,Suma Dobânda
@@ -1693,7 +1693,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Înregistrări
 DocType: Asset,Scrapped,dezmembrate
 DocType: Item,Item Defaults,Elemente prestabilite
-DocType: Purchase Invoice,Returns,Se intoarce
+DocType: Cashier Closing,Returns,Se intoarce
 DocType: Job Card,WIP Warehouse,WIP Depozit
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serial Nu {0} este sub contract de întreținere pana {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,Recrutare
@@ -1707,7 +1707,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Tip de transfer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Cheltuieli de vânzare
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clienți&gt; Teritoriu
 DocType: Diagnosis,Diagnosis,Diagnostic
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Cumpararea Standard
 DocType: Attendance Request,Explanation,Explicaţie
@@ -1720,7 +1719,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Elementele comenzilor de cumpărare sunt restante
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Cod postal
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Comandă de vânzări {0} este {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Selectați contul de venituri din dobânzi în împrumut {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Selectați contul de venituri din dobânzi în împrumut {0}
 DocType: Opportunity,Contact Info,Informaţii Persoana de Contact
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Efectuarea de stoc Entries
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Nu puteți promova angajatul cu starea Stânga
@@ -1732,7 +1731,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Factura nu poate fi făcută pentru ora de facturare zero
 DocType: Company,Date of Commencement,Data începerii
 DocType: Sales Person,Select company name first.,Selectați numele companiei în primul rând.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},E-mail trimis la {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},E-mail trimis la {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Cotatiilor primite de la furnizori.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Înlocuiți BOM și actualizați prețul cel mai recent în toate BOM-urile
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Pentru a {0} | {1} {2}
@@ -1753,7 +1752,7 @@
 DocType: Asset Movement,From Employee,Din Angajat
 DocType: Driver,Cellphone Number,număr de telefon
 DocType: Project,Monitor Progress,Monitorizați progresul
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Atenție: Sistemul nu va verifica supraîncărcată din sumă pentru postul {0} din {1} este zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Atenție: Sistemul nu va verifica supraîncărcată din sumă pentru postul {0} din {1} este zero
 DocType: Journal Entry,Make Difference Entry,Realizeaza Intrare de Diferenta
 DocType: Supplier Quotation,Auto Repeat Section,Se repetă secțiunea Auto
 DocType: Upload Attendance,Attendance From Date,Prezenţa de la data
@@ -1856,7 +1855,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Respins Cantitate nu pot fi introduse în Purchase Întoarcere
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Schimbarea Grupului de Clienți pentru Clientul selectat nu este permisă.
 ,Purchase Order Items To Be Billed,Cumparare Ordine Articole Pentru a fi facturat
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Actualizând orele de sosire estimate.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Actualizând orele de sosire estimate.
 DocType: Program Enrollment Tool,Enrollment Details,Detalii de înscriere
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Nu se pot seta mai multe setări implicite pentru o companie.
 DocType: Purchase Invoice Item,Net Rate,Rata netă
@@ -1870,7 +1869,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Tipul de plecare este madatoriu
 DocType: Support Settings,Close Issue After Days,Închide Problemă După Zile
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Trebuie să fii un utilizator cu roluri de manager de sistem și manager de articole pentru a adăuga utilizatori la Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Trebuie să fii un utilizator cu roluri de manager de sistem și manager de articole pentru a adăuga utilizatori la Marketplace.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Lăsați necompletat dacă se consideră pentru toate ramurile
 DocType: Job Opening,Staffing Plan,Planul de personal
 DocType: Bank Guarantee,Validity in Days,Valabilitate în Zile
@@ -1892,7 +1891,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Inregistrare {0} este duplicata cu aceeași {1}
 DocType: Marketplace Settings,Disable Marketplace,Dezactivați Marketplace
 ,Trial Balance,Balanta
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Anul fiscal {0} nu a fost găsit
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Anul fiscal {0} nu a fost găsit
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Configurarea angajati
 DocType: Hotel Room Reservation,Hotel Reservation User,Utilizator rezervare hotel
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Vă rugăm să selectați prefix întâi
@@ -2002,7 +2001,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Eroare la autentificare
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Asset {0} a fost creat
 DocType: Special Test Items,Special Test Items,Elemente speciale de testare
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Trebuie să fiți utilizator cu funcții Manager Manager și Manager de posturi pentru a vă înregistra pe Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Trebuie să fiți utilizator cu funcții Manager Manager și Manager de posturi pentru a vă înregistra pe Marketplace.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Mod de plata
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,"În conformitate cu structura salarială atribuită, nu puteți aplica pentru beneficii"
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Site-ul Image ar trebui să fie un fișier public sau site-ul URL-ul
@@ -2014,7 +2013,7 @@
 DocType: Warehouse,Warehouse Contact Info,Date de contact depozit
 DocType: Payment Entry,Write Off Difference Amount,Diferență Sumă Piertdute
 DocType: Volunteer,Volunteer Name,Nume de voluntar
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Au fost găsite rânduri cu date scadente în alte rânduri: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Au fost găsite rânduri cu date scadente în alte rânduri: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: E-mail-ul angajatului nu a fost găsit, prin urmare, nu a fost trimis mail"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Nu există structură salarială atribuită pentru angajat {0} la data dată {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Norma de transport nu se aplică țării {0}
@@ -2104,6 +2103,7 @@
 DocType: Salary Component,Earning,Câștig Salarial
 DocType: Supplier Scorecard,Scoring Criteria,Criterii de evaluare
 DocType: Purchase Invoice,Party Account Currency,Partidul cont valutar
+DocType: Delivery Trip,Total Estimated Distance,Distanța totală estimată
 ,BOM Browser,BOM Browser
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Actualizați starea dvs. pentru acest eveniment de instruire
 DocType: Item Barcode,EAN,EAN
@@ -2142,7 +2142,7 @@
 DocType: Activity Cost,Projects,Proiecte
 DocType: Payment Request,Transaction Currency,Operațiuni valutare
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},De la {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Unele e-mailuri sunt nevalide
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Unele e-mailuri sunt nevalide
 DocType: Work Order Operation,Operation Description,Operație Descriere
 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.,Nu se poate schimba anul fiscal Data de începere și se termină anul fiscal Data odată ce anul fiscal este salvată.
 DocType: Quotation,Shopping Cart,Cosul de cumparaturi
@@ -2166,7 +2166,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Schimbarea net în active fixe
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Cantitate
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lăsați necompletat dacă se consideră pentru toate denumirile
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Taxa de tip 'Efectiv' în inregistrarea {0} nu poate fi inclus în Rata Articol"""
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Taxa de tip 'Efectiv' în inregistrarea {0} nu poate fi inclus în Rata Articol"""
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,De la Datetime
 DocType: Shopify Settings,For Company,Pentru Companie
@@ -2180,7 +2180,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Au apărut erori la crearea programului de curs
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Primul deținător de cheltuieli din listă va fi setat ca implicit pentru Exportare de cheltuieli.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,nu poate fi mai mare de 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Trebuie să fii alt utilizator decât Administrator cu rolul managerului de sistem și al Managerului de articole pentru a te înregistra pe Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Trebuie să fii alt utilizator decât Administrator cu rolul managerului de sistem și al Managerului de articole pentru a te înregistra pe Marketplace.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Articolul{0} nu este un element de stoc
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Neprogramat
@@ -2209,7 +2209,7 @@
 DocType: HR Settings,Employee Settings,Setări Angajat
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Încărcarea sistemului de plată
 ,Batch-Wise Balance History,Istoricul balanţei principale aferente lotului
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Rândul # {0}: Nu se poate seta Rata dacă suma este mai mare decât suma facturată pentru articolul {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Rândul # {0}: Nu se poate seta Rata dacă suma este mai mare decât suma facturată pentru articolul {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Setările de imprimare actualizate în format de imprimare respectiv
 DocType: Package Code,Package Code,Cod pachet
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Începător
@@ -2445,7 +2445,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} posturile vacante și {1} bugetul pentru {2} deja planificate pentru filialele din {3}. \ Aveți posibilitatea de a planifica doar pentru {4} posturile vacante și bugetul {5} conform planului de personal {6} pentru compania mamă {3}.
 DocType: HR Settings,Stop Birthday Reminders,De oprire de naștere Memento
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Vă rugăm să setați Cont Cheltuieli suplimentare salarizare implicit în companie {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Vă rugăm să setați Cont Cheltuieli suplimentare salarizare implicit în companie {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Obțineți despărțirea financiară a datelor fiscale și taxe de către Amazon
 DocType: SMS Center,Receiver List,Receptor Lista
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,căutare articol
@@ -2515,7 +2515,7 @@
 DocType: Vital Signs,Constipated,Constipat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Contra facturii furnizorului {0} din data {1}
 DocType: Customer,Default Price List,Lista de Prețuri Implicita
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Mișcarea de înregistrare a activelor {0} creat
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Mișcarea de înregistrare a activelor {0} creat
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Nu au fost gasite articolele.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nu puteți șterge Anul fiscal {0}. Anul fiscal {0} este setat ca implicit în Setări globale
 DocType: Share Transfer,Equity/Liability Account,Contul de capitaluri proprii
@@ -2655,6 +2655,7 @@
 DocType: Blanket Order,Order Type,Tip comandă
 ,Item-wise Sales Register,Registru Vanzari Articol-Avizat
 DocType: Asset,Gross Purchase Amount,Sumă brută Cumpărare
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Codul elementului&gt; Element Grup&gt; Brand
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Solduri de deschidere
 DocType: Asset,Depreciation Method,Metoda de amortizare
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Este acest fiscală inclusă în rata de bază?
@@ -2738,7 +2739,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Acțiune în cazul în care bugetul anual depășește PO
 DocType: Student Leave Application,Student Leave Application,Aplicație elev Concediul
 DocType: Item,Will also apply for variants,"Va aplică, de asemenea pentru variante"
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Activul nu poate fi anulat, deoarece este deja {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Activul nu poate fi anulat, deoarece este deja {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Angajat {0} pe jumătate de zi pe {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Numărul total de ore de lucru nu trebuie sa fie mai mare de ore de lucru max {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Pornit
@@ -2762,6 +2763,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Fetch Data
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Permisul maxim permis în tipul de concediu {0} este {1}
 DocType: SMS Center,Create Receiver List,Creare Lista Recipienti
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Data disponibilă pentru utilizare ar trebui să fie după data achiziției
 DocType: Vehicle,Wheels,roţi
 DocType: Packing Slip,To Package No.,La pachetul Nr
 DocType: Patient Relation,Family,Familie
@@ -2775,7 +2777,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,"Valuta de facturare trebuie să fie egală fie cu valuta implicită a companiei, fie cu moneda contului de partid"
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indică faptul că pachetul este o parte din această livrare (Proiect de numai)
 DocType: Soil Texture,Loam,Lut
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Rând {0}: data de scadență nu poate fi înainte de data postării
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Rând {0}: data de scadență nu poate fi înainte de data postării
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Realizeaza Intrare de Plati
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Cantitatea pentru postul {0} trebuie să fie mai mică de {1}
 ,Sales Invoice Trends,Vânzări Tendințe factură
@@ -2848,7 +2850,7 @@
 DocType: Guardian,Guardian Interests,Guardian Interese
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Actualizați numele / numărul contului
 DocType: Naming Series,Current Value,Valoare curenta
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ani fiscali multiple exista in data de {0}. Vă rugăm să setați companie în anul fiscal
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ani fiscali multiple exista in data de {0}. Vă rugăm să setați companie în anul fiscal
 DocType: Education Settings,Instructor Records to be created by,Instructor de înregistrări care urmează să fie create de către
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} creat
 DocType: GST Account,GST Account,Contul GST
@@ -2865,7 +2867,7 @@
 DocType: Sales Person,Name and Employee ID,Nume și ID angajat
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Data Limita nu poate fi anterioara Datei de POstare
 DocType: Website Item Group,Website Item Group,Site-ul Grupa de articole
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nu s-a găsit nicio corespondență salarială pentru criteriile de mai sus sau salariul deja trimis
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Nu s-a găsit nicio corespondență salarială pentru criteriile de mai sus sau salariul deja trimis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Impozite și taxe
 DocType: Projects Settings,Projects Settings,Setări pentru proiecte
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Vă rugăm să introduceți data de referință
@@ -2874,7 +2876,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Furnizat Cantitate
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Material Cerere Articol
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Vă rugăm să anulați primul exemplar de achiziții {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Vă rugăm să anulați primul exemplar de achiziții {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Arborele de Postul grupuri.
 DocType: Production Plan,Total Produced Qty,Cantitate total produsă
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Nu se poate face referire la un număr de inregistare mai mare sau egal cu numărul curent de inregistrare pentru acest tip de Incasare
@@ -2985,6 +2987,7 @@
 ,Vehicle Expenses,Cheltuielile pentru vehicule
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Creați test (e) de laborator pe factura de vânzare
 DocType: Serial No,Invoice Details,Detaliile facturii
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Activați setările Google Maps pentru a estima și a optimiza traseele
 DocType: Grant Application,Show on Website,Afișați pe site
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Începe
 DocType: Hub Tracked Item,Hub Category,Categorie Hub
@@ -3025,7 +3028,7 @@
 DocType: Inpatient Record,B Positive,B pozitiv
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Avantajul maxim al angajatului {0} depășește {1} cu suma {2} a sumelor solicitate anterior
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rând # {0}: Cant trebuie să fie 1, ca element este un activ fix. Vă rugăm să folosiți rând separat pentru cantitati multiple."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rând # {0}: Cant trebuie să fie 1, ca element este un activ fix. Vă rugăm să folosiți rând separat pentru cantitati multiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Permite Lista Concedii Blocate
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abr. nu poate fi gol sau spațiu
 DocType: Patient Medical Record,Patient Medical Record,Dosarul medical al pacientului
@@ -3060,7 +3063,7 @@
 DocType: Workstation,Wages per hour,Salarii pe oră
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},echilibru stoc în Serie {0} va deveni negativ {1} pentru postul {2} la Depozitul {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Ca urmare a solicitărilor de materiale au fost ridicate în mod automat în funcție de nivelul de re-comanda item
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Contul {0} nu este valid. Valuta contului trebuie să fie {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Contul {0} nu este valid. Valuta contului trebuie să fie {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},De la data {0} nu poate fi după data eliberării angajatului {1}
 DocType: Supplier,Is Internal Supplier,Este furnizor intern
 DocType: Employee,Create User Permission,Creați permisiunea utilizatorului
@@ -3205,7 +3208,7 @@
 DocType: Account,Fixed Asset,Activ Fix
 DocType: Amazon MWS Settings,After Date,După data
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Inventarul serializat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Este nevalid {0} pentru factura Intercompanie.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Este nevalid {0} pentru factura Intercompanie.
 ,Department Analytics,Departamentul Analytics
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-mailul nu a fost găsit în contactul implicit
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generați secret
@@ -3218,7 +3221,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Programul din structura taxelor și grupul de studenți {0} este diferit.
 DocType: Bank Statement Transaction Entry,Receivable Account,Contul de încasat
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Valabil din data trebuie să fie mai mică decât valabil până la data.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Rând # {0}: {1} activ este deja {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Rând # {0}: {1} activ este deja {2}
 DocType: Quotation Item,Stock Balance,Stoc Sold
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Comanda de vânzări la plată
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,CEO
@@ -3260,6 +3263,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Pentru debit este necesar
 DocType: Clinical Procedure,Inpatient Record,Înregistrări de pacienți
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Pontaje ajuta să urmăriți timp, costuri și de facturare pentru activitati efectuate de echipa ta"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Furnizor&gt; Tipul furnizorului
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Cumparare Lista de preturi
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Data tranzacției
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Șabloane ale variabilelor pentru scorurile pentru furnizori.
@@ -3303,7 +3307,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Schimb de câștig / Pierdere
 DocType: Opportunity,Lost Reason,Motiv Pierdere
 DocType: Amazon MWS Settings,Enable Amazon,Activați Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Rândul # {0}: Contul {1} nu aparține companiei {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Rândul # {0}: Contul {1} nu aparține companiei {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Nu se poate găsi DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Adresa noua
 DocType: Quality Inspection,Sample Size,Eșantionul de dimensiune
@@ -3415,7 +3419,7 @@
 DocType: Water Analysis,Origin,Origine
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Acest document este peste limita de {0} {1} pentru elementul {4}. Faci un alt {3} împotriva aceleași {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Vă rugăm să setați recurente după salvare
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,cont Selectați suma schimbare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,cont Selectați suma schimbare
 DocType: Purchase Invoice,Price List Currency,Lista de pret Valuta
 DocType: Naming Series,User must always select,Utilizatorul trebuie să selecteze întotdeauna
 DocType: Stock Settings,Allow Negative Stock,Permiteţi stoc negativ
@@ -3457,7 +3461,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Sigur doriți să anulați această întâlnire?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Pachetul pentru tarifarea camerei hotelului
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,conducte de vânzări
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Vă rugăm să setați contul implicit în Salariu Component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Vă rugăm să setați contul implicit în Salariu Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Cerut pe
 DocType: Rename Tool,File to Rename,Fișier de Redenumiți
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Vă rugăm să selectați BOM pentru postul în rândul {0}
@@ -3478,7 +3482,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Costul de produsele cumparate
 DocType: Employee Separation,Employee Separation Template,Șablon de separare a angajaților
 DocType: Selling Settings,Sales Order Required,Comandă de vânzări obligatorii
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Deveniți un vânzător
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Deveniți un vânzător
 DocType: Purchase Invoice,Credit To,De Creditat catre
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Oportunități active / Clienți
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Lăsați necompletat pentru a utiliza formatul standard de livrare
@@ -3519,7 +3523,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Faceți șablon de taxă
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum utilizator
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Materii Prime nu poate fi gol.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Rândul # {0} (tabelul de plată): Suma trebuie să fie negativă
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Rândul # {0} (tabelul de plată): Suma trebuie să fie negativă
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Nu a putut fi actualizat stoc, factura conține drop de transport maritim."
 DocType: Contract,Fulfilment Status,Starea de îndeplinire
 DocType: Lab Test Sample,Lab Test Sample,Test de laborator
@@ -3678,7 +3682,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Data Documentelor
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Taxa de inregistrare Creat - {0}
 DocType: Asset Category Account,Asset Category Account,Cont activ Categorie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Rândul # {0} (tabelul de plată): Suma trebuie să fie pozitivă
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Rândul # {0} (tabelul de plată): Suma trebuie să fie pozitivă
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Nu se pot produce mai multe Articole {0} decât cantitatea din Ordinul de Vânzări {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Selectați valorile atributelor
 DocType: Purchase Invoice,Reason For Issuing document,Motivul pentru documentul de emitere
@@ -3733,7 +3737,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Timp în care s-au primit materiale
 DocType: Products Settings,Products per Page,Produse pe pagină
 DocType: Stock Ledger Entry,Outgoing Rate,Rata de ieșire
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,sau
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,sau
 DocType: Sales Order,Billing Status,Stare facturare
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Raportați o problemă
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Cheltuieli de utilitate
@@ -3761,7 +3765,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Declarația de scutire fiscală a angajaților
 DocType: Payment Entry,Cheque/Reference Date,Cecul / Data de referință
 DocType: Purchase Invoice,Total Taxes and Charges,Total Impozite și Taxe
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Data disponibilă pentru utilizare este introdusă ca dată trecută
 DocType: Employee,Emergency Contact,Contact de Urgență
 DocType: Bank Reconciliation Detail,Payment Entry,Intrare plăţi
 ,sales-browser,vânzări browser
@@ -3808,6 +3811,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Este retur (nota de credit)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Începeți lucrul
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Numărul de serie nu este necesar pentru elementul {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setați seria de numire pentru {0} prin Configurare&gt; Setări&gt; Serii de numire
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,șablon cu handicap nu trebuie să fie șablon implicit
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Pentru rândul {0}: Introduceți cantitatea planificată
 DocType: Account,Income Account,Contul de venit
@@ -3821,6 +3825,7 @@
 DocType: Loyalty Program,Help Section,Secțiunea Ajutor
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Anterior
 DocType: Appraisal Goal,Key Responsibility Area,Domeni de Responsabilitate Cheie
+DocType: Delivery Trip,Distance UOM,Distanță UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student Sarjele ajută să urmăriți prezență, evaluările și taxele pentru studenți"
 DocType: Payment Entry,Total Allocated Amount,Suma totală alocată
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Setați contul inventarului implicit pentru inventarul perpetuu
@@ -3862,7 +3867,7 @@
 DocType: Item Supplier,Item Supplier,Furnizor Articol
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Va rugam sa introduceti codul articol pentru a obține lot nu
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Vă rugăm să selectați o valoare de {0} {1} quotation_to
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Nu există elemente selectate pentru transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Nu există elemente selectate pentru transfer
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Toate adresele.
 DocType: Company,Stock Settings,Setări stoc
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Fuziune este posibilă numai în cazul în care următoarele proprietăți sunt aceleași în ambele registre. Este Group, Root Type, Company"
@@ -4160,7 +4165,7 @@
 DocType: Patient,Personal and Social History,Istoria personală și socială
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Utilizatorul {0} a fost creat
 DocType: Fee Schedule,Fee Breakup for each student,Taxă pentru fiecare student
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),avans total ({0}) împotriva Comanda {1} nu poate fi mai mare decât totalul ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),avans total ({0}) împotriva Comanda {1} nu poate fi mai mare decât totalul ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selectați Distributie lunar pentru a distribui neuniform obiective pe luni.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Modificați codul
 DocType: Purchase Invoice Item,Valuation Rate,Rata de evaluare
@@ -4169,7 +4174,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Avansat ITC Cess
 ,Student Monthly Attendance Sheet,Elev foaia de prezență lunară
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Regulă de expediere aplicabilă numai pentru vânzare
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Rata de amortizare {0}: data următoare a amortizării nu poate fi înainte de data achiziției
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Rata de amortizare {0}: data următoare a amortizării nu poate fi înainte de data achiziției
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data de începere a proiectului
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Până la
 DocType: Rename Tool,Rename Log,Redenumi Conectare
@@ -4187,12 +4192,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Cât de des ar trebui să se actualizeze proiectul și compania pe baza tranzacțiilor de vânzare.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Expira la
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Adăugați elevi
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Stergeți angajatul <a href=""#Form/Employee/{0}"">{0}</a> \ pentru a anula acest document"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Vă rugăm să selectați {0}
 DocType: C-Form,C-Form No,Nr. formular-C
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Distanţă
+DocType: Delivery Stop,Distance,Distanţă
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Listați produsele sau serviciile pe care le cumpărați sau le vindeți.
 DocType: Water Analysis,Storage Temperature,Temperatura de depozitare
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4219,7 +4222,7 @@
 DocType: Homepage,Company Description for website homepage,Descriere companie pentru pagina de start site
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pentru comoditatea clienților, aceste coduri pot fi utilizate în formate de imprimare cum ar fi Facturi și Note de Livrare"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nume furnizo
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Nu s-au putut obține informații pentru {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Nu s-au putut obține informații pentru {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Deschiderea Jurnalului de intrare
 DocType: Contract,Fulfilment Terms,Condiții de îndeplinire
 DocType: Sales Invoice,Time Sheet List,Listă de timp Sheet
@@ -4401,7 +4404,7 @@
 DocType: Serial No,Warranty / AMC Details,Garanție / AMC Detalii
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Selectați manual elevii pentru grupul bazat pe activități
 DocType: Journal Entry,User Remark,Observație utilizator
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Optimizarea rutelor.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Optimizarea rutelor.
 DocType: Travel Itinerary,Non Diary,Non-jurnal
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Nu se poate crea Bonus de retenție pentru angajații stânga
 DocType: Lead,Market Segment,Segmentul de piață
@@ -4432,7 +4435,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Program de fidelizare
 DocType: Student Guardian,Father,tată
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Bilete de sprijin
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&quot;Actualizare stoc&quot; nu poate fi verificată de vânzare de active fixe
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&quot;Actualizare stoc&quot; nu poate fi verificată de vânzare de active fixe
 DocType: Bank Reconciliation,Bank Reconciliation,Reconciliere bancară
 DocType: Attendance,On Leave,La plecare
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obțineți actualizări
@@ -4477,7 +4480,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serial și Lot nr
 DocType: Warranty Claim,From Company,De la Compania
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Suma Scorurile de criterii de evaluare trebuie să fie {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Vă rugăm să setați Numărul de Deprecieri rezervat
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Vă rugăm să setați Numărul de Deprecieri rezervat
 DocType: Supplier Scorecard Period,Calculations,calculele
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Valoare sau Cantitate
 DocType: Payment Terms Template,Payment Terms,Termeni de plată
@@ -4497,7 +4500,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Reducere (%) la rata de listă cu marjă
 DocType: Healthcare Service Unit Type,Rate / UOM,Rata / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,toate Depozite
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Nu a fost găsit {0} pentru tranzacțiile Intercompanie.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Nu a fost găsit {0} pentru tranzacțiile Intercompanie.
 DocType: Travel Itinerary,Rented Car,Mașină închiriată
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Despre compania dvs.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Credit în contul trebuie să fie un cont de bilanț
@@ -4599,6 +4602,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Criterii de analiză a plantelor
 DocType: Cheque Print Template,Cheque Height,Cheque Inaltime
 DocType: Supplier,Supplier Details,Detalii furnizor
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vă rugăm să configurați seria de numerotare pentru Participare prin Configurare&gt; Serie de numerotare
 DocType: Setup Progress,Setup Progress,Progresul de instalare
 DocType: Expense Claim,Approval Status,Status aprobare
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Din valoare trebuie să fie mai mică decat in valoare pentru inregistrarea {0}
@@ -4692,7 +4696,6 @@
 DocType: Travel Request,Fully Sponsored,Sponsorizat complet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Intrare în jurnal invers
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Clientul {0} este creat.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurați sistemul de numire a angajaților în Resurse umane&gt; Setări HR
 DocType: Stock Settings,Limit Percent,Limita procentuală
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,În prezent nu există stoc disponibil în niciun depozit
 ,Payment Period Based On Invoice Date,Perioada de plată Bazat pe Data facturii
@@ -4751,7 +4754,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Depozit sursă
 DocType: Installation Note,Installation Date,Data de instalare
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Împărțiți cartea
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Rând # {0}: {1} activ nu aparține companiei {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Rând # {0}: {1} activ nu aparține companiei {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Factura de vânzări {0} a fost creată
 DocType: Employee,Confirmation Date,Data de Confirmare
 DocType: Inpatient Occupancy,Check Out,Verifică
@@ -4771,6 +4774,7 @@
 DocType: Production Plan,Sales Orders Detail,Detalii privind comenzile de vânzări
 DocType: Bin,Requested Quantity,Cantitate solicitată
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Vă rugăm să configurați Sistemul de denumire a instructorului în Educație&gt; Setări educaționale
 DocType: Patient,Marital Status,Stare civilă
 DocType: Stock Settings,Auto Material Request,Cerere automată de material
 DocType: Woocommerce Settings,API consumer secret,Secretul consumatorului API
@@ -4823,7 +4827,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Selectați Zile
 DocType: Academic Term,Term Name,Nume termen
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Credit ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Crearea salvărilor salariale ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Crearea salvărilor salariale ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Nu puteți edita nodul rădăcină.
 DocType: Buying Settings,Purchase Order Required,Comandă de aprovizionare necesare
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Cronometrul
@@ -4861,7 +4865,7 @@
 DocType: Account,Rate at which this tax is applied,Rata la care se aplică acest impozit
 DocType: Cash Flow Mapper,Section Name,Numele secțiunii
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Cantitatea de comandat
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Rata de amortizare {0}: Valoarea estimată după viața utilă trebuie să fie mai mare sau egală cu {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Rata de amortizare {0}: Valoarea estimată după viața utilă trebuie să fie mai mare sau egală cu {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Locuri de munca disponibile
 DocType: Company,Stock Adjustment Account,Cont Ajustarea stoc
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Achita
@@ -4908,7 +4912,7 @@
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Din AMC
 DocType: Opportunity,Opportunity Amount,Oportunitate Sumă
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numărul de Deprecieri Booked nu poate fi mai mare decât Număr total de Deprecieri
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numărul de Deprecieri Booked nu poate fi mai mare decât Număr total de Deprecieri
 DocType: Purchase Order,Order Confirmation Date,Data de confirmare a comenzii
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Realizeaza Vizita de Mentenanta
@@ -4949,7 +4953,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Lot:
 DocType: Volunteer,Afternoon,Dupa amiaza
 DocType: Loyalty Program,Loyalty Program Help,Programul de ajutor pentru loialitate
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' este dezactivat
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' este dezactivat
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Setați ca Deschis
 DocType: Cheque Print Template,Scanned Cheque,scanate cecului
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Trimite prin email automate de contact pe tranzacțiile Depunerea.
@@ -4962,7 +4966,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Postul și garanție Detalii
 DocType: Chapter,Chapter Members,Capitolul Membri
 DocType: Sales Team,Contribution (%),Contribuție (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Notă: Plata de intrare nu va fi creat deoarece ""Cash sau cont bancar"" nu a fost specificat"
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Notă: Plata de intrare nu va fi creat deoarece ""Cash sau cont bancar"" nu a fost specificat"
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Proiectul {0} există deja
 DocType: Clinical Procedure,Nursing User,Utilizator Nursing
 DocType: Employee Benefit Application,Payroll Period,Perioada de salarizare
@@ -4970,6 +4974,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Numărul de serie {0} nu aparține lotului {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Responsabilitati
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Perioada de valabilitate a acestui citat sa încheiat.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Stergeți angajatul <a href=""#Form/Employee/{0}"">{0}</a> \ pentru a anula acest document"
 DocType: Expense Claim Account,Expense Claim Account,Cont de cheltuieli de revendicare
 DocType: Account,Capital Work in Progress,Capitalul în curs de desfășurare
 DocType: Accounts Settings,Allow Stale Exchange Rates,Permiteți rate de schimb stale
@@ -5051,7 +5057,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Eliberarea Material
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Conectați-vă la Shopify cu ERPNext
 DocType: Material Request Item,For Warehouse,Pentru Depozit
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Notele de livrare {0} sunt actualizate
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Notele de livrare {0} sunt actualizate
 DocType: Employee,Offer Date,Oferta Date
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Cotațiile
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Sunteți în modul offline. Tu nu va fi capabil să reîncărcați până când nu aveți de rețea.
@@ -5102,7 +5108,7 @@
 DocType: Shipping Rule,Calculate Based On,Calculaţi pe baza
 DocType: Contract,Unfulfilled,neîmplinit
 DocType: Delivery Note Item,From Warehouse,Din depozitul
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Nu există angajați pentru criteriile menționate
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Nu există angajați pentru criteriile menționate
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Nu există niciun articol cu Lista de materiale pentru fabricarea
 DocType: Shopify Settings,Default Customer,Clientul implicit
 DocType: Sales Stage,Stage Name,Nume de scena
@@ -5145,7 +5151,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Suma taxa După Discount Suma
 DocType: Patient,Inpatient Status,Starea staționarului
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Setări de zi cu zi de lucru Sumar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Lista de prețuri selectată ar trebui să verifice câmpurile de cumpărare și vânzare.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Lista de prețuri selectată ar trebui să verifice câmpurile de cumpărare și vânzare.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Introduceți Reqd după dată
 DocType: Payment Entry,Internal Transfer,Transfer intern
 DocType: Asset Maintenance,Maintenance Tasks,Sarcini de întreținere
@@ -5182,7 +5188,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Grupul De
 DocType: Guardian,Interests,interese
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Activare / dezactivare valute.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Nu am putut trimite unele Salariile
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Nu am putut trimite unele Salariile
 DocType: Exchange Rate Revaluation,Get Entries,Obțineți intrări
 DocType: Production Plan,Get Material Request,Material Cerere obțineți
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Cheltuieli poștale
@@ -5269,7 +5275,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Cont de cheltuieli este obligatoriu pentru articolul {0}
 DocType: BOM,Website Description,Site-ul Descriere
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Schimbarea net în capitaluri proprii
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Vă rugăm să anulați Achiziționarea factură {0} mai întâi
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Vă rugăm să anulați Achiziționarea factură {0} mai întâi
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Nu sunt acceptate. Dezactivați tipul unității de serviciu
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adresa de e-mail trebuie să fie unic, există deja pentru {0}"
 DocType: Serial No,AMC Expiry Date,Dată expirare AMC
@@ -5309,7 +5315,7 @@
 DocType: Hotel Room,Hotel Room,Cameră de hotel
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Contul {0} nu aparține companiei {1}
 DocType: Leave Type,Rounding,rotunjirea
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Numerele de serie din rândul {0} nu se potrivesc cu Nota de livrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Numerele de serie din rândul {0} nu se potrivesc cu Nota de livrare
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Sumă distribuită (Pro-evaluată)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Apoi, regulile de tarifare sunt filtrate în funcție de client, grup de clienți, teritoriu, furnizor, grup de furnizori, campanie, partener de vânzări etc."
 DocType: Student,Guardian Details,Detalii tutore
@@ -5364,7 +5370,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Depozit necesar pentru stocul de postul {0}
 DocType: Leave Allocation,Unused leaves,Frunze neutilizate
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Faceți intrarea în rambursare
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Toate departamentele
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Toate departamentele
 DocType: Healthcare Service Unit,Vacant,Vacant
 DocType: Patient,Alcohol Past Use,Utilizarea anterioară a alcoolului
 DocType: Fertilizer Content,Fertilizer Content,Conținut de îngrășăminte
@@ -5375,7 +5381,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Ordinul de lucru {0} trebuie anulat înainte de a anula acest ordin de vânzări
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Obtine FDM expandat (inclusiv subansamblurile)
 DocType: Authorization Rule,Applicable To (Employee),Aplicabil pentru (angajat)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Due Date este obligatorie
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Due Date este obligatorie
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Creștere pentru Atribut {0} nu poate fi 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Tip de prestație și sumă
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Camere rezervate
@@ -5524,7 +5530,7 @@
 DocType: Purchase Invoice Item,Total Weight,Greutate totală
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Comision pentru Vânzări
 DocType: Job Offer Term,Value / Description,Valoare / Descriere
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rând # {0}: {1} activ nu poate fi prezentat, este deja {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rând # {0}: {1} activ nu poate fi prezentat, este deja {2}"
 DocType: Tax Rule,Billing Country,Țara facturării
 DocType: Purchase Order Item,Expected Delivery Date,Data de Livrare Preconizata
 DocType: Restaurant Order Entry,Restaurant Order Entry,Intrare comandă de restaurant
@@ -5563,12 +5569,13 @@
 DocType: Maintenance Visit,Breakdown,Avarie
 DocType: Travel Itinerary,Vegetarian,Vegetarian
 DocType: Patient Encounter,Encounter Date,Data întâlnirii
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Contul: {0} cu moneda: {1} nu poate fi selectat
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Contul: {0} cu moneda: {1} nu poate fi selectat
 DocType: Bank Statement Transaction Settings Item,Bank Data,Date bancare
 DocType: Purchase Receipt Item,Sample Quantity,Cantitate de probă
 DocType: Bank Guarantee,Name of Beneficiary,Numele beneficiarului
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Actualizați costul BOM în mod automat prin programator, bazat pe cea mai recentă rată de evaluare / rata de prețuri / ultima rată de achiziție a materiilor prime."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Furnizor&gt; Grupul de furnizori
 DocType: Bank Reconciliation Detail,Cheque Date,Data Cec
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Contul {0}: cont Părinte {1} nu apartine companiei: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Șters cu succes toate tranzacțiile legate de aceasta companie!
@@ -5596,7 +5603,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,noduri pentru copii pot fi create numai în noduri de tip &quot;grup&quot;
 DocType: Attendance Request,Half Day Date,Jumatate de zi Data
 DocType: Academic Year,Academic Year Name,Nume An Universitar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} nu este permis să efectueze tranzacții cu {1}. Vă rugăm să schimbați compania.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} nu este permis să efectueze tranzacții cu {1}. Vă rugăm să schimbați compania.
 DocType: Sales Partner,Contact Desc,Persoana de Contact Desc
 DocType: Email Digest,Send regular summary reports via Email.,Trimite rapoarte de sinteză periodice prin e-mail.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Vă rugăm să setați contul implicit în cheltuielile de revendicare Tip {0}
@@ -5629,7 +5636,7 @@
 DocType: Hotel Room,Hotel Manager,Hotel Manager
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Set Regula fiscală pentru coșul de cumpărături
 DocType: Purchase Invoice,Taxes and Charges Added,Impozite și Taxe Added
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Rândul de amortizare {0}: Data următoarei amortizări nu poate fi înaintea datei disponibile pentru utilizare
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Rândul de amortizare {0}: Data următoarei amortizări nu poate fi înaintea datei disponibile pentru utilizare
 ,Sales Funnel,De vânzări pâlnie
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Abreviere este obligatorie
 DocType: Project,Task Progress,Progresul sarcină
@@ -5643,7 +5650,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Toate grupurile de clienți
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,lunar acumulat
 DocType: Attendance Request,On Duty,La datorie
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} este obligatoriu. Este posibil ca înregistrarea schimbului valutar nu este creată pentru {1} până la {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} este obligatoriu. Este posibil ca înregistrarea schimbului valutar nu este creată pentru {1} până la {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Planul de personal {0} există deja pentru desemnare {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Format de impozitare este obligatorie.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Contul {0}: cont părinte {1} nu există
@@ -5724,11 +5731,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Cel puţin un depozit este obligatoriu
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Configurați câmpurile de articole, cum ar fi UOM, Grupul de articole, Descrierea și numărul de ore."
 DocType: Certification Application,Certification Status,Starea certificării
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Piata de desfacere
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Piata de desfacere
 DocType: Travel Itinerary,Travel Advance Required,Advance Travel Required
 DocType: Subscriber,Subscriber Name,Numele Abonatului
 DocType: Serial No,Out of Warranty,Ieșit din garanție
-DocType: Cashier Closing,Cashier-closing-,Casier-closing-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Mapat tipul de date
 DocType: BOM Update Tool,Replace,Înlocuirea
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Nu găsiți produse.
@@ -5816,7 +5822,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Se creează șabloane fiscale predefinite pentru vânzări și achiziții.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Inregistrarea Rezultatului evaluării {0} există deja.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Exemplu: ABCD. #####. Dacă seria este setată și numărul lotului nu este menționat în tranzacții, atunci numărul lotului automat va fi creat pe baza acestei serii. Dacă doriți întotdeauna să menționați în mod explicit numărul lotului pentru acest articol, lăsați acest lucru necompletat. Notă: această setare va avea prioritate față de Prefixul Seriei de Nomenclatoare din Setările de stoc."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vă rugăm să configurați seria de numerotare pentru Participare prin Configurare&gt; Serie de numerotare
 DocType: BOM,Materials Required (Exploded),Materiale necesare (explodat)
 DocType: Contract,Party User,Utilizator de petreceri
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Filtru filtru de companie gol dacă grupul de grup este &quot;companie&quot;
@@ -6018,7 +6023,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,"Trebuie să fie setată atât data de începere a perioadei de încercare, cât și data de încheiere a perioadei de încercare"
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Rata medie
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Suma totală de plată în Planul de Plăți trebuie să fie egală cu Total / Rotunjit
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Suma totală de plată în Planul de Plăți trebuie să fie egală cu Total / Rotunjit
 DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Banca echilibru Declarație pe General Ledger
 DocType: Job Applicant,Applicant Name,Nume solicitant
@@ -6087,7 +6092,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Soap & Detergent
 DocType: BOM,Show Items,Afișare articole
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Din Timpul nu poate fi mai mare decât în timp.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Doriți să anunțați toți clienții prin e-mail?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Doriți să anunțați toți clienții prin e-mail?
 DocType: Subscription Plan,Billing Interval,Intervalul de facturare
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordonat
@@ -6096,9 +6101,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Rând {0}: {1} trebuie să fie mai mare de 0
 DocType: Assessment Criteria,Assessment Criteria Group,Grup de criterii de evaluare
 DocType: Healthcare Settings,Patient Name By,Nume pacient
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Înregistrarea jurnalelor de angajare pentru salariile de la {0} la {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Înregistrarea jurnalelor de angajare pentru salariile de la {0} la {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Activați venitul amânat
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Amortizarea de deschidere trebuie să fie mai mică Acumulate decât egală cu {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Amortizarea de deschidere trebuie să fie mai mică Acumulate decât egală cu {0}
 DocType: Warehouse,Warehouse Name,Denumire depozit
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Data de începere efectivă trebuie să fie mai mică decât data finală
 DocType: Naming Series,Select Transaction,Selectați Transaction
@@ -6250,7 +6255,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Angajații {0} ai clasei {1} nu au o politică de concediu implicită
 DocType: Salary Detail,Salary Detail,Detalii salariu
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Vă rugăm selectați 0} {întâi
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Au fost adăugați {0} utilizatori
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Au fost adăugați {0} utilizatori
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","În cazul unui program cu mai multe niveluri, Clienții vor fi automat alocați nivelului respectiv în funcție de cheltuielile efectuate"
 DocType: Appointment Type,Physician,Medic
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Lot {0} din {1} Postul a expirat.
@@ -6395,7 +6400,7 @@
 DocType: Asset,Custodian,Custode
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Punctul de vânzare profil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} ar trebui să fie o valoare cuprinsă între 0 și 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Plata pentru {0} de la {1} la {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Plata pentru {0} de la {1} la {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Creditele negarantate
 DocType: Cost Center,Cost Center Name,Nume Centrul de Cost
 DocType: Student,B+,B +
@@ -6427,6 +6432,7 @@
 DocType: Employee,Date of Issue,Data Problemei
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","În conformitate cu Setările de cumpărare, dacă este necesară achiziția == &#39;YES&#39;, atunci pentru a crea factura de cumpărare, utilizatorul trebuie să creeze primul chitanță pentru elementul {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Row # {0}: Set Furnizor de produs {1}
+DocType: Global Defaults,Default Distance Unit,Unitatea de distanță standard
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Rândul {0}: Valoarea ore trebuie să fie mai mare decât zero.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Site-ul Image {0} atașat la postul {1} nu poate fi găsit
 DocType: Issue,Content Type,Tip Conținut
@@ -6482,7 +6488,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Debit la contul trebuie să fie un cont de bilanț
 DocType: Asset,Naming Series,Naming Series
 DocType: Vital Signs,Coated,Acoperit
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Rând {0}: Valoarea așteptată după viața utilă trebuie să fie mai mică decât suma brută de achiziție
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Rând {0}: Valoarea așteptată după viața utilă trebuie să fie mai mică decât suma brută de achiziție
 DocType: GoCardless Settings,GoCardless Settings,Setări GoCardless
 DocType: Leave Block List,Leave Block List Name,Denumire Lista Concedii Blocate
 DocType: Certified Consultant,Certification Validity,Valabilitatea certificării
@@ -6551,6 +6557,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Antetul băncii
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Vizualizați testele de laborator
 DocType: Hub Users,Hub Users,Hub utilizatori
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clienți&gt; Teritoriu
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Data Mentenanta
 DocType: Purchase Invoice Item,Rejected Serial No,Respins de ordine
@@ -6566,7 +6573,7 @@
 DocType: SG Creation Tool Course,Max Strength,Putere max
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Instalarea presetărilor
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Nu este selectată nicio notificare de livrare pentru client {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Nu este selectată nicio notificare de livrare pentru client {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Angajatul {0} nu are o valoare maximă a beneficiului
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Selectați elementele bazate pe data livrării
 DocType: Grant Application,Has any past Grant Record,Are vreun dosar Grant trecut
@@ -6594,7 +6601,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Rezervarea camerelor hotelului
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Service Client
 DocType: BOM,Thumbnail,Miniatură
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Nu au fost găsite contacte cu ID-urile de e-mail.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Nu au fost găsite contacte cu ID-urile de e-mail.
 DocType: Item Customer Detail,Item Customer Detail,Detaliu Articol Client
 DocType: Notification Control,Prompt for Email on Submission of,Prompt de e-mail pe Depunerea
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Suma maximă a beneficiilor angajatului {0} depășește {1}
@@ -6853,7 +6860,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,Nu se poate sub acoperire la Grupul pentru că este selectată Tip cont.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} a fost modificat. Vă rugăm să reîmprospătați.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Opri utilizatorii de la a face aplicații concediu pentru următoarele zile.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Codul elementului&gt; Element Grup&gt; Brand
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Dacă expiră nelimitat pentru Punctele de loialitate, păstrați Durata de expirare goală sau 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Membrii echipei de întreținere
 DocType: Loyalty Point Entry,Purchase Amount,Suma cumpărată
@@ -6861,7 +6867,7 @@
 											to fullfill Sales Order {2}",Nu se poate livra numarul de serie {0} al articolului {1} asa cum este rezervat \ pentru a indeplini comanda de vanzari {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Furnizor de oferta {0} creat
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Sfârșitul anului nu poate fi înainte de Anul de început
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Sfârșitul anului nu poate fi înainte de Anul de început
 DocType: Employee Benefit Application,Employee Benefits,Beneficiile angajatului
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Cantitate ambalate trebuie să fie egală cantitate pentru postul {0} în rândul {1}
 DocType: Work Order,Manufactured Qty,Produs Cantitate
@@ -6877,6 +6883,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Selectați numerele lotului
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Pentru GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Facturi cu valoarea ridicată pentru clienți.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurați sistemul de numire a angajaților în Resurse umane&gt; Setări HR
 DocType: Healthcare Settings,Invoice Appointments Automatically,Facturare Numiri automat
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id-ul proiectului
 DocType: Salary Component,Variable Based On Taxable Salary,Variabilă pe salariu impozabil
@@ -6925,7 +6932,7 @@
 DocType: POS Profile,Account for Change Amount,Contul pentru Schimbare Sumă
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Conectarea la QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Total câștig / pierdere
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Compania nevalidă pentru factura intercompanie.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Compania nevalidă pentru factura intercompanie.
 DocType: Purchase Invoice,input service,serviciu de intrare
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rând {0}: Parte / conturi nu se potrivește cu {1} / {2} din {3} {4}
 DocType: Employee Promotion,Employee Promotion,Promovarea angajaților
@@ -7056,7 +7063,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Zonă preferată de cazare
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Google Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Coșul este gol
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Vă rugăm să configurați Sistemul de denumire a instructorului în Educație&gt; Setări educaționale
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Produsul {0} nu are un număr de serie Numai elementele seriale \ pot fi livrate pe baza numărului de serie
 DocType: Vehicle,Model,Model
@@ -7086,7 +7092,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Nimic de schimbat
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Vă rugăm să selectați un fișier csv
 DocType: Holiday List,Total Holidays,Total sărbători
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Șablonul de e-mail lipsă pentru expediere. Alegeți unul din Setările de livrare.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Șablonul de e-mail lipsă pentru expediere. Alegeți unul din Setările de livrare.
 DocType: Student Leave Application,Mark as Present,Marcați ca prezent
 DocType: Supplier Scorecard,Indicator Color,Indicator Culoare
 DocType: Purchase Order,To Receive and Bill,Pentru a primi și Bill
@@ -7095,7 +7101,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Selectați numărul serial
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Proiectant
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Termeni și condiții Format
-DocType: Serial No,Delivery Details,Detalii Livrare
+DocType: Delivery Trip,Delivery Details,Detalii Livrare
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Centrul de Cost este necesar pentru inregistrarea {0} din tabelul Taxe pentru tipul {1}
 DocType: Program,Program Code,Codul programului
 DocType: Terms and Conditions,Terms and Conditions Help,Termeni și Condiții Ajutor
@@ -7119,7 +7125,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Timpul in Zile Conducere
 DocType: Cash Flow Mapping,Is Income Tax Expense,Cheltuielile cu impozitul pe venit
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Comanda dvs. este livrată!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rând # {0}: Detașarea Data trebuie să fie aceeași ca dată de achiziție {1} din activ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rând # {0}: Detașarea Data trebuie să fie aceeași ca dată de achiziție {1} din activ {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Verificați dacă studentul este rezident la Hostelul Institutului.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Vă rugăm să introduceți comenzile de vânzări în tabelul de mai sus
 ,Stock Summary,Rezumat de stoc
diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv
index c3f0145..0f401e7 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Название периода
 DocType: Employee,Salary Mode,Режим Зарплата
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,регистр
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,регистр
 DocType: Patient,Divorced,Разведенный
 DocType: Support Settings,Post Route Key,Ключ почтового маршрута
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Разрешить добавлять продукт несколько раз в сделке
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Новый обменный курс
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Валюта необходима для Прейскурантом {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Будет рассчитана в сделке.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Поставщик&gt; Тип поставщика
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Контакты с клиентами
 DocType: Patient Appointment,Check availability,Проверить наличие свободных мест
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Показать открыт
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Серия Обновлено Успешно
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,"Проверять, выписываться"
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} в строке {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} в строке {1}
 DocType: Asset Finance Book,Depreciation Start Date,Дата начала амортизации
 DocType: Pricing Rule,Apply On,Применить на
 DocType: Item Price,Multiple Item prices.,Гибкая цена продукта
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Лабораторный рецепт
 ,Delay Days,Дни задержки
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Услуги Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Серийный номер: {0} уже указан в счете продаж: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Серийный номер: {0} уже указан в счете продаж: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Счет
 DocType: Purchase Invoice Item,Item Weight Details,Деталь Вес Подробности
 DocType: Asset Maintenance Log,Periodicity,Периодичность
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Бухгалтер
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Продажа прайс-листа
 DocType: Patient,Tobacco Current Use,Текущее потребление табака
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Дата начала и дата окончания совпадают с картой задания <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Стоимость продажи
 DocType: Cost Center,Stock User,Пользователь склада
 DocType: Soil Analysis,(Ca+Mg)/K,(Са + Mg) / К
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Связанный
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,"Дата Посещаемость не может быть меньше, чем присоединение даты работника"
 DocType: Grading Scale,Grading Scale Name,Градация шкалы Имя
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Добавить пользователей на рынок
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Добавить пользователей на рынок
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Это корень счета и не могут быть изменены.
 DocType: Sales Invoice,Company Address,Адрес компании
 DocType: BOM,Operations,Эксплуатация
@@ -322,7 +322,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Qty
 DocType: Production Plan,Material Request Detail,Подробности заявки на метериал
 DocType: Selling Settings,Default Quotation Validity Days,Дни по умолчанию для котировок
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item, налоги в строках должны быть также включены {1}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item, налоги в строках должны быть также включены {1}"
 DocType: SMS Center,SMS Center,СМС-центр
 DocType: Payroll Entry,Validate Attendance,Подтвердить посещаемость
 DocType: Sales Invoice,Change Amount,Изменение Сумма
@@ -441,7 +441,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Интервал между строками на сумму в словах
 DocType: Vehicle,Additional Details,дополнительные детали
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Не введено описание
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Поставщик&gt; Группа поставщиков
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Заявка на закупку.
 DocType: POS Closing Voucher Details,Collected Amount,Собранная сумма
 DocType: Lab Test,Submitted Date,Дата отправки
@@ -486,7 +485,7 @@
 DocType: Student Admission,Student Admission,приёму студентов
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Пункт {0} отменяется
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Строка амортизации {0}: Дата начала амортизации вводится как прошедшая дата
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Строка амортизации {0}: Дата начала амортизации вводится как прошедшая дата
 DocType: Contract Template,Fulfilment Terms and Conditions,Сроки и условия выполнения
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Запрос материала
 DocType: Bank Reconciliation,Update Clearance Date,Обновление просвет Дата
@@ -543,6 +542,7 @@
 DocType: Accounts Settings,Settings for Accounts,Настройки для счетов
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Поставщик Счет-фактура не существует в счете-фактуре {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Управление деревом менеджеров по продажам.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Невозможно обработать маршрут, поскольку настройки Карт Google отключены."
 DocType: Job Applicant,Cover Letter,Сопроводительное письмо
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,"Выдающиеся чеки и депозиты, чтобы очистить"
 DocType: Item,Synced With Hub,Синхронизированные со ступицей
@@ -602,7 +602,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Новая стоимость активов
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Курс по которому валюта Покупателя конвертируется в базовую валюту покупателя
 DocType: Course Scheduling Tool,Course Scheduling Tool,Курс планирования Инструмент
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Строка # {0}: Покупка Счет-фактура не может быть сделано в отношении существующего актива {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Строка # {0}: Покупка Счет-фактура не может быть сделано в отношении существующего актива {1}
 DocType: Crop Cycle,LInked Analysis,Анализ LInked
 DocType: POS Closing Voucher,POS Closing Voucher,Закрытый ваучер на POS
 DocType: Contract,Lapsed,Просроченные
@@ -637,6 +637,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} — {1} не зачислен в курс {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Имя ученика:
 DocType: POS Closing Voucher Details,Difference,разница
+DocType: Delivery Settings,Delay between Delivery Stops,Задержка между поставками
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Серийный номер {0} не принадлежит накладной {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Кажется, что проблема связана с конфигурацией Go900less сервера. Не беспокойтесь, в случае неудачи сумма будет возвращена на ваш счет."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -697,7 +698,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Количество и курс
 DocType: Delivery Note,% Installed,% Установлено
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Кабинеты / лаборатории и т.д., где лекции могут быть запланированы."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Валюты компаний обеих компаний должны соответствовать сделкам Inter Company.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Валюты компаний обеих компаний должны соответствовать сделкам Inter Company.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,"Пожалуйста, введите название компании сначала"
 DocType: Travel Itinerary,Non-Vegetarian,Не вегетарианский
 DocType: Purchase Invoice,Supplier Name,Наименование поставщика
@@ -784,7 +785,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Сдано с даты
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Достаточно части для сборки
 DocType: POS Profile User,POS Profile User,Пользователь профиля POS
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Строка {0}: требуется дата начала амортизации
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Строка {0}: требуется дата начала амортизации
 DocType: Purchase Invoice Item,Service Start Date,Дата начала службы
 DocType: Subscription Invoice,Subscription Invoice,Счет-фактура
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Прямая прибыль
@@ -853,7 +854,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Сокращение уже используется для другой компании
 DocType: Selling Settings,Default Customer Group,По умолчанию Группа клиентов
 DocType: Employee,IFSC Code,Код IFSC
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Дата начала и дата окончания совпадают с картой задания <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Если отключить, 'закругленными Всего' поле не будет виден в любой сделке"
 DocType: BOM,Operating Cost,Эксплуатационные затраты
 DocType: Crop,Produced Items,Производимые товары
@@ -905,7 +905,7 @@
 DocType: Supplier,Prevent RFQs,Предотвращение запросов
 DocType: Hub User,Hub User,Пользователь концентратора
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Создать накладную
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},"Зарплатный сальс, представленный на период от {0} до {1}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},"Зарплатный сальс, представленный на период от {0} до {1}"
 DocType: Project Task,Project Task,Задача проекта
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Погашенные очки
 ,Lead Id,ID лида
@@ -1037,7 +1037,7 @@
 DocType: Fee Validity,Max number of visit,Максимальное количество посещений
 ,Hotel Room Occupancy,Гостиничный номер
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Табель создан:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,зачислять
 DocType: GST Settings,GST Settings,Настройки GST
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},"Валюта должна быть такой же, как и прейскурант Валюта: {0}"
@@ -1092,7 +1092,7 @@
 DocType: Vehicle Log,Service Details,Сведения о службе
 DocType: Lab Test Template,Grouped,Сгруппировано
 DocType: Selling Settings,Delivery Note Required,Необходим Документы  Отгрузки
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Отправка зарплатных листов ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Отправка зарплатных листов ...
 DocType: Bank Guarantee,Bank Guarantee Number,Номер банковской гарантии
 DocType: Assessment Criteria,Assessment Criteria,Критерии оценки
 DocType: BOM Item,Basic Rate (Company Currency),Основная ставка (валюта компании)
@@ -1117,13 +1117,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Оплата запись уже создан
 DocType: Request for Quotation,Get Suppliers,Получить поставщиков
 DocType: Purchase Receipt Item Supplied,Current Stock,Наличие на складе
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Строка # {0}: Asset {1} не связан с п {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Строка # {0}: Asset {1} не связан с п {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Просмотр Зарплата скольжению
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Счёт {0} был введен несколько раз
 DocType: Account,Expenses Included In Valuation,"Затрат, включаемых в оценке"
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Вы можете продлить действие только в случае истечения срока действия вашего членства в течение 30 дней
 DocType: Shopping Cart Settings,Show Stock Availability,Доступность
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Установите {0} в категории активов {1} или компании {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Установите {0} в категории активов {1} или компании {2}
 DocType: Location,Longitude,долгота
 ,Absent Student Report,Отчёт об отсутствии студентов
 DocType: Crop,Crop Spacing UOM,Интервал между кадрами UOM
@@ -1196,7 +1196,7 @@
 DocType: Soil Texture,Sand,песок
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Энергоэффективность
 DocType: Opportunity,Opportunity From,Выявление из
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Строка {0}: {1} Необходимы серийные номера продукта {2}. Вы предоставили {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Строка {0}: {1} Необходимы серийные номера продукта {2}. Вы предоставили {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Выберите таблицу
 DocType: BOM,Website Specifications,Сайт характеристики
 DocType: Special Test Items,Particulars,Частности
@@ -1307,7 +1307,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Продукты с более высоким весом будут показаны выше
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Лабораторные тесты и жизненные знаки
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Подробности банковской сверки
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Строка # {0}: Актив {1} должен быть проведен
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Строка # {0}: Актив {1} должен быть проведен
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Сотрудник не найден
 DocType: Item,If subcontracted to a vendor,Если по субподряду поставщика
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Студенческая группа уже обновлена.
@@ -1362,7 +1362,6 @@
 DocType: Loyalty Program Collection,Tier Name,Название уровня
 DocType: HR Settings,Enter retirement age in years,Введите возраст выхода на пенсию в ближайшие годы
 DocType: Crop,Target Warehouse,Склад готовой продукции
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Пожалуйста, установите Naming Series для {0} через Setup&gt; Settings&gt; Naming Series"
 DocType: Payroll Employee Detail,Payroll Employee Detail,Сведения о сотрудниках по расчетам
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Выберите склад
 DocType: Cheque Print Template,Starting location from left edge,Начиная расположение от левого края
@@ -1452,7 +1451,7 @@
 DocType: Work Order,Plan material for sub-assemblies,План материал для Субсборки
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Партнеры по сбыту и территории
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,ВМ {0} должен быть активным
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Нет доступных продуктов для перемещения
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Нет доступных продуктов для перемещения
 DocType: Employee Boarding Activity,Activity Name,Название мероприятия
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Изменить дату выпуска
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Количество готового продукта <b>{0}</b> и для количества <b>{1}</b> не может быть разным
@@ -1682,6 +1681,7 @@
 DocType: Project,First Email,Первая электронная почта
 DocType: Company,Exception Budget Approver Role,Роль вспомогательного бюджета бюджета исключения
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date",После этого этот счет будет приостановлен до установленной даты
+DocType: Cashier Closing,POS-CLO-,POS-ClO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Зарезервировано Склад в заказ клиента / склад готовой продукции
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Продажа Сумма
 DocType: Repayment Schedule,Interest Amount,Проценты Сумма
@@ -1693,7 +1693,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Записи
 DocType: Asset,Scrapped,Уничтоженный
 DocType: Item,Item Defaults,Элементы по умолчанию
-DocType: Purchase Invoice,Returns,Возвращает
+DocType: Cashier Closing,Returns,Возвращает
 DocType: Job Card,WIP Warehouse,WIP Склад
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Серийный номер {0} находится под контрактом на техническое обслуживание ДО {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,Набор персонала
@@ -1707,7 +1707,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Тип передачи
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Расходы на продажи
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Группа клиентов&gt; Территория
 DocType: Diagnosis,Diagnosis,диагностика
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Стандартный Покупка
 DocType: Attendance Request,Explanation,объяснение
@@ -1720,7 +1719,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Элементы заказа на поставку просрочены
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Почтовый индекс
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Заказ клиента {0} {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Выберите процентный доход в кредите {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Выберите процентный доход в кредите {0}
 DocType: Opportunity,Contact Info,Контактная информация
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Создание складской проводки
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Невозможно продвинуть сотрудника со статусом Left
@@ -1732,7 +1731,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Счета не могут быть выставлены за нулевой расчетный час
 DocType: Company,Date of Commencement,Дата начала
 DocType: Sales Person,Select company name first.,Выберите название компании в первую очередь.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},E-mail отправлено на адрес {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},E-mail отправлено на адрес {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Котировки полученных от поставщиков.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Заменить спецификацию и обновить последнюю цену во всех спецификациях
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Для {0} | {1} {2}
@@ -1752,7 +1751,7 @@
 DocType: Asset Movement,From Employee,От работника
 DocType: Driver,Cellphone Number,номер мобильного телефона
 DocType: Project,Monitor Progress,Мониторинг готовности
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
 DocType: Journal Entry,Make Difference Entry,Сделать Разница запись
 DocType: Supplier Quotation,Auto Repeat Section,Секция автоматического повтора
 DocType: Upload Attendance,Attendance From Date,Начало учетного периода
@@ -1855,7 +1854,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ряд # {0}: Отклонено Кол-во не может быть введен в приобретении Вернуться
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Изменение группы клиентов для выбранного Клиента запрещено.
 ,Purchase Order Items To Be Billed,Покупка Заказ позиции быть выставлен счет
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Обновление предполагаемого времени прибытия.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Обновление предполагаемого времени прибытия.
 DocType: Program Enrollment Tool,Enrollment Details,Сведения о зачислении
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Невозможно установить несколько параметров по умолчанию для компании.
 DocType: Purchase Invoice Item,Net Rate,Нетто-ставка
@@ -1869,7 +1868,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Оставить Тип сумасшедший
 DocType: Support Settings,Close Issue After Days,Закрыть вопрос после дней
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Чтобы добавить пользователей в Marketplace, вы должны быть пользователем с диспетчерами System Manager и Item Manager."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Чтобы добавить пользователей в Marketplace, вы должны быть пользователем с диспетчерами System Manager и Item Manager."
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Оставьте пустым, если считать для всех отраслей"
 DocType: Job Opening,Staffing Plan,План кадрового обеспечения
 DocType: Bank Guarantee,Validity in Days,Срок действия в днях
@@ -1890,7 +1889,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Дубликат строка {0} с же {1}
 DocType: Marketplace Settings,Disable Marketplace,Отключить рынок
 ,Trial Balance,Пробный баланс
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Финансовый год {0} не найден
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Финансовый год {0} не найден
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Настройка сотрудников
 DocType: Hotel Room Reservation,Hotel Reservation User,Бронирование отеля
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,"Пожалуйста, выберите префикс первым"
@@ -1998,7 +1997,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Не удалось войти
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Объект {0} создан
 DocType: Special Test Items,Special Test Items,Специальные тестовые элементы
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Для регистрации на Marketplace вам необходимо быть пользователем с диспетчерами System Manager и Item Manager.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Для регистрации на Marketplace вам необходимо быть пользователем с диспетчерами System Manager и Item Manager.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Способ оплаты
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,В соответствии с вашей установленной структурой заработной платы вы не можете подать заявку на получение пособий
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Сайт изображение должно быть общественное файл или адрес веб-сайта
@@ -2010,7 +2009,7 @@
 DocType: Warehouse,Warehouse Contact Info,Контактная информация склада
 DocType: Payment Entry,Write Off Difference Amount,Списание разница в
 DocType: Volunteer,Volunteer Name,Имя волонтера
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Были найдены строки с повторяющимися датами в других строках: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Были найдены строки с повторяющимися датами в других строках: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: Адрес электронной почты сотрудника не найден, поэтому письмо не отправлено"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},"Нет структуры заработной платы, назначенной для сотрудника {0} в данную дату {1}"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Правило доставки не применяется для страны {0}
@@ -2101,6 +2100,7 @@
 DocType: Salary Component,Earning,Зарабатывание
 DocType: Supplier Scorecard,Scoring Criteria,Критерии оценки
 DocType: Purchase Invoice,Party Account Currency,Партия Валюта счета
+DocType: Delivery Trip,Total Estimated Distance,Общее расчетное расстояние
 ,BOM Browser,Браузер ВМ
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Обновите свой статус для этого учебного мероприятия
 DocType: Item Barcode,EAN,EAN
@@ -2139,7 +2139,7 @@
 DocType: Activity Cost,Projects,Проекты
 DocType: Payment Request,Transaction Currency,Валюта сделки
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},С {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Некоторые сообщения недействительны.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Некоторые сообщения недействительны.
 DocType: Work Order Operation,Operation Description,Операция Описание
 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.,Невозможно изменить финансовый год Дата начала и финансовый год Дата окончания сразу финансовый год будет сохранен.
 DocType: Quotation,Shopping Cart,Корзина
@@ -2163,7 +2163,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Чистое изменение в основных фондов
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Оставьте пустым, если рассматривать для всех обозначений"
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные 'в строке {0} не могут быть включены в пункт Оценить
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные 'в строке {0} не могут быть включены в пункт Оценить
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,С DateTime
 DocType: Shopify Settings,For Company,Для Компании
@@ -2177,7 +2177,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,"Были ошибки, связанные с расписанием курсов"
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Первый Подтвердитель расходов в списке будет установлен в качестве Утвердителя расходов по умолчанию.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,"не может быть больше, чем 100"
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Чтобы зарегистрироваться на Marketplace, вам необходимо быть другим пользователем, кроме Администратора, с ролями System Manager и Item Manager."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Чтобы зарегистрироваться на Marketplace, вам необходимо быть другим пользователем, кроме Администратора, с ролями System Manager и Item Manager."
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Продукта {0} нет на складе
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Незапланированный
@@ -2206,7 +2206,7 @@
 DocType: HR Settings,Employee Settings,Работники Настройки
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Загрузка платежной системы
 ,Batch-Wise Balance History,История баланса партий
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Строка # {0}: не может установить значение скорости, если сумма превышает сумму выставленного счета за элемент {1}."
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Строка # {0}: не может установить значение скорости, если сумма превышает сумму выставленного счета за элемент {1}."
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Настройки печати обновляется в соответствующем формате печати
 DocType: Package Code,Package Code,Код пакета
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Ученик
@@ -2440,7 +2440,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.","{0} вакансий и {1} бюджета для {2}, уже запланированного для дочерних компаний {3}. \ Вы можете планировать только {4} вакансии и бюджет {5} согласно кадровому плану {6} для материнской компании {3}."
 DocType: HR Settings,Stop Birthday Reminders,Стоп День рождения Напоминания
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},"Пожалуйста, установите по умолчанию Payroll расчётный счёт в компании {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},"Пожалуйста, установите по умолчанию Payroll расчётный счёт в компании {0}"
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Получите финансовую разбивку данных по налогам и сборам Amazon
 DocType: SMS Center,Receiver List,Список получателей
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Поиск продукта
@@ -2510,7 +2510,7 @@
 DocType: Vital Signs,Constipated,Запор
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Против поставщика счет-фактура {0} от {1}
 DocType: Customer,Default Price List,По умолчанию Прайс-лист
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,запись Движение активов {0} создано
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,запись Движение активов {0} создано
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Ничего не найдено.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Нельзя удалить {0} финансовый год. Финансовый год {0} установлен  основным в глобальных параметрах
 DocType: Share Transfer,Equity/Liability Account,Акционерный / Обязательный счет
@@ -2650,6 +2650,7 @@
 DocType: Blanket Order,Order Type,Тип заказа
 ,Item-wise Sales Register,Пункт мудрый Продажи Зарегистрироваться
 DocType: Asset,Gross Purchase Amount,Валовая сумма покупки
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код товара&gt; Группа товаров&gt; Марка
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Открытые балансы
 DocType: Asset,Depreciation Method,метод начисления износа
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Этот налог Входит ли в базовой ставки?
@@ -2733,7 +2734,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,"Действие, если годовой бюджет превысил PO"
 DocType: Student Leave Application,Student Leave Application,Заявление на отпуск обучаемого
 DocType: Item,Will also apply for variants,Также применять к модификациям
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Asset не может быть отменена, так как она уже {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Asset не может быть отменена, так как она уже {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Сотрудник {0} на полдня на {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},"Всего продолжительность рабочего времени не должна быть больше, чем максимальное рабочее время {0}"
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Вкл
@@ -2757,6 +2758,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Получение данных
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},"Максимальный отпуск, разрешенный в типе отпуска {0}, равен {1}"
 DocType: SMS Center,Create Receiver List,Создать список получателей
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Доступная для использования дата должна быть после даты покупки
 DocType: Vehicle,Wheels,Колеса
 DocType: Packing Slip,To Package No.,Номер пакета
 DocType: Patient Relation,Family,семья
@@ -2770,7 +2772,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Валюта платежа должна быть равна валюте валюты дефолта или валюте счета участника
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Указывает, что пакет является частью этой поставки (только проект)"
 DocType: Soil Texture,Loam,суглинок
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Строка {0}: дата выполнения не может быть до даты публикации
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Строка {0}: дата выполнения не может быть до даты публикации
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Произвести оплату запись
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Количество по пункту {0} должно быть меньше {1}
 ,Sales Invoice Trends,Расходная накладная тенденции
@@ -2843,7 +2845,7 @@
 DocType: Guardian,Guardian Interests,хранители Интересы
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Обновить имя учетной записи / номер
 DocType: Naming Series,Current Value,Текущее значение
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Несколько финансовых лет существуют на дату {0}. Пожалуйста, установите компанию в финансовый год"
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Несколько финансовых лет существуют на дату {0}. Пожалуйста, установите компанию в финансовый год"
 DocType: Education Settings,Instructor Records to be created by,Записи инструкторов должны быть созданы
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,Создано {0}
 DocType: GST Account,GST Account,Учетная запись GST
@@ -2861,7 +2863,7 @@
 DocType: Sales Person,Name and Employee ID,Имя и ID сотрудника
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,"Впритык не может быть, прежде чем отправлять Дата"
 DocType: Website Item Group,Website Item Group,Продуктовая группа на сайте
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Никакой оговорки о зарплате не было найдено для вышеуказанных выбранных критериев.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Никакой оговорки о зарплате не было найдено для вышеуказанных выбранных критериев.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Пошлины и налоги
 DocType: Projects Settings,Projects Settings,Настройки проектов
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
@@ -2870,7 +2872,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Поставляемое кол-во
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Позиция запроса материала
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Сначала отмените покупку {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Сначала отмените покупку {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Структура продуктовых групп
 DocType: Production Plan,Total Produced Qty,Общее количество произведенных
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можете обратиться номер строки, превышающую или равную текущему номеру строки для этого типа зарядки"
@@ -2981,6 +2983,7 @@
 ,Vehicle Expenses,Расходы транспортных средств
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Создать лабораторный тест (ы) в Справке по продажам
 DocType: Serial No,Invoice Details,Сведения о счете
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Включите параметры Карт Google для оценки и оптимизации маршрутов.
 DocType: Grant Application,Show on Website,Показать на сайте
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Начать
 DocType: Hub Tracked Item,Hub Category,Категория концентратора
@@ -3021,7 +3024,7 @@
 DocType: Inpatient Record,B Positive,В Позитивный
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Максимальная выгода сотрудника {0} превышает {1} на сумму {2} предыдущего заявленного \ суммы
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Строка # {0}: Кол-во должно быть 1, а элемент является фиксированным активом. Пожалуйста, используйте отдельную строку для нескольких Упак."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Строка # {0}: Кол-во должно быть 1, а элемент является фиксированным активом. Пожалуйста, используйте отдельную строку для нескольких Упак."
 DocType: Leave Block List Allow,Leave Block List Allow,Оставьте Черный список Разрешить
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Аббревиатура не может быть пустой или пробелом
 DocType: Patient Medical Record,Patient Medical Record,Медицинская запись пациента
@@ -3056,7 +3059,7 @@
 DocType: Workstation,Wages per hour,Заработная плата в час
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Для продукта {2} на складе {3} остатки запасов для партии {0} станут отрицательными {1}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Следующие запросы на материалы были созданы автоматически на основании минимального уровня запасов продукта
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Счёт {0} является недопустимым. Валюта счёта должна быть {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Счёт {0} является недопустимым. Валюта счёта должна быть {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},From Date {0} не может быть после освобождения сотрудника {Date} {1}
 DocType: Supplier,Is Internal Supplier,Внутренний поставщик
 DocType: Employee,Create User Permission,Создать разрешение пользователя
@@ -3202,7 +3205,7 @@
 DocType: Account,Fixed Asset,Основное средство
 DocType: Amazon MWS Settings,After Date,После даты
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Учет сериями
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Недопустимый {0} для счета Inter Company.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Недопустимый {0} для счета Inter Company.
 ,Department Analytics,Аналитика отделов
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Электронная почта не найдена в контакте по умолчанию
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Создать секрет
@@ -3215,7 +3218,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Программа в структуре вознаграждения и студенческой группе {0} отличается.
 DocType: Bank Statement Transaction Entry,Receivable Account,Счет Дебиторской задолженности
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Действительный с даты должен быть меньше Действительной даты.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Строка # {0}: Asset {1} уже {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Строка # {0}: Asset {1} уже {2}
 DocType: Quotation Item,Stock Balance,Баланс запасов
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Заказы к оплате
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,Исполнительный директор
@@ -3257,6 +3260,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Дебет требуется
 DocType: Clinical Procedure,Inpatient Record,Стационарная запись
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets поможет отслеживать время, стоимость и выставление счетов для Активности сделанной вашей команды"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Поставщик&gt; Тип поставщика
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Прайс-лист закупки
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Дата транзакции
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Шаблоны переменных показателей поставщика.
@@ -3300,7 +3304,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Обмен Прибыль / убыток
 DocType: Opportunity,Lost Reason,Забыли Причина
 DocType: Amazon MWS Settings,Enable Amazon,Включить Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Строка # {0}: Учетная запись {1} не принадлежит компании {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Строка # {0}: Учетная запись {1} не принадлежит компании {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Не удалось найти DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Новый адрес
 DocType: Quality Inspection,Sample Size,Размер образца
@@ -3412,7 +3416,7 @@
 DocType: Water Analysis,Origin,происхождения
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Этот документ находится над пределом {0} {1} для элемента {4}. Вы делаете другой {3} против того же {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,"Пожалуйста, установите повторяющиеся после сохранения"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Сумма счета Выберите изменения
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Сумма счета Выберите изменения
 DocType: Purchase Invoice,Price List Currency,Прайс-лист валют
 DocType: Naming Series,User must always select,Пользователь всегда должен выбирать
 DocType: Stock Settings,Allow Negative Stock,Разрешить отрицательный запас
@@ -3454,7 +3458,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Вы действительно хотите отменить эту встречу?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Пакет услуг для гостиничных номеров
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Воронка продаж
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},"Пожалуйста, установите учетную запись по умолчанию в компоненте Зарплатный {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},"Пожалуйста, установите учетную запись по умолчанию в компоненте Зарплатный {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Обязательно На
 DocType: Rename Tool,File to Rename,Файл Переименовать
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Выберите в строке {0} спецификацию для продукта
@@ -3475,7 +3479,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Стоимость поставленных продуктов
 DocType: Employee Separation,Employee Separation Template,Шаблон разделения сотрудников
 DocType: Selling Settings,Sales Order Required,Требования Заказа клиента
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Стать продавцом
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Стать продавцом
 DocType: Purchase Invoice,Credit To,Кредитная Для
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,"Активные лиды, клиенты"
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Оставьте пустым для использования стандартного формата Отчета доставки
@@ -3516,7 +3520,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Сделать шаблон налога
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Форум пользователей
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Сырьё не может быть пустым.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Строка # {0} (Таблица платежей): сумма должна быть отрицательной
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Строка # {0} (Таблица платежей): сумма должна быть отрицательной
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Не удалось обновить запас, счет-фактура содержит падение пункт доставки."
 DocType: Contract,Fulfilment Status,Статус выполнения
 DocType: Lab Test Sample,Lab Test Sample,Лабораторный пробный образец
@@ -3675,7 +3679,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Дата документа
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Создано записей платы - {0}
 DocType: Asset Category Account,Asset Category Account,Категория активов Счет
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Строка # {0} (Таблица платежей): сумма должна быть положительной
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Строка # {0} (Таблица платежей): сумма должна быть положительной
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},"Нельзя производить продукта {0} больше, чем в заказе на продажу ({1})"
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Выберите значения атрибута
 DocType: Purchase Invoice,Reason For Issuing document,Причина выдачи документа
@@ -3730,7 +3734,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Время получения материалов
 DocType: Products Settings,Products per Page,Продукты на страницу
 DocType: Stock Ledger Entry,Outgoing Rate,Исходящие Оценить
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,или
 DocType: Sales Order,Billing Status,Статус Биллинг
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Отправить вопрос
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Коммунальные расходы
@@ -3757,7 +3761,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Декларация об освобождении от налогов
 DocType: Payment Entry,Cheque/Reference Date,Чеками / Исходная дата
 DocType: Purchase Invoice,Total Taxes and Charges,Общие налоги и сборы
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Доступная для использования дата вводится как прошедшая дата
 DocType: Employee,Emergency Contact,Экстренная связь
 DocType: Bank Reconciliation Detail,Payment Entry,Запись оплаты
 ,sales-browser,продажи-браузер
@@ -3804,6 +3807,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Возврат (кредитная нота)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Начать работу
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Серийный номер не требуется для актива {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Пожалуйста, установите Naming Series для {0} через Setup&gt; Settings&gt; Naming Series"
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Шаблон для инвалидов не должно быть по умолчанию шаблон
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Для строки {0}: введите запланированное количество
 DocType: Account,Income Account,Счет Доходов
@@ -3817,6 +3821,7 @@
 DocType: Loyalty Program,Help Section,Раздел справки
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Предыдущая
 DocType: Appraisal Goal,Key Responsibility Area,Ключ Ответственность Площадь
+DocType: Delivery Trip,Distance UOM,Расстояние UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Студенческие Порции помогают отслеживать посещаемость, оценки и сборы для студентов"
 DocType: Payment Entry,Total Allocated Amount,Общая сумма Обозначенная
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Установить учетную запись по умолчанию для вечной инвентаризации
@@ -3858,7 +3863,7 @@
 DocType: Item Supplier,Item Supplier,Поставщик продукта
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,"Пожалуйста, введите Код товара, чтобы получить партию не"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Не выбраны продукты для перемещения
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Не выбраны продукты для перемещения
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Все адреса.
 DocType: Company,Stock Settings,Настройки Запасов
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Объединение возможно только, если следующие свойства такие же, как в отчетах. Есть группа, корневого типа, компания"
@@ -4156,7 +4161,7 @@
 DocType: Patient,Personal and Social History,Личная и социальная история
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Пользователь {0} создан
 DocType: Fee Schedule,Fee Breakup for each student,Расплата за каждого студента
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Всего аванс ({0}) против ордена {1} не может быть больше, чем общая сумма ({2})"
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Всего аванс ({0}) против ордена {1} не может быть больше, чем общая сумма ({2})"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,"Выберете Распределение по Месяцам, чтобы разбить цель"
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Изменить код
 DocType: Purchase Invoice Item,Valuation Rate,Оценка
@@ -4165,7 +4170,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Пользуется ITC Cess
 ,Student Monthly Attendance Sheet,Student Ежемесячная посещаемость Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Правило доставки применимо только для продажи
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Строка амортизации {0}: следующая дата амортизации не может быть до даты покупки
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Строка амортизации {0}: следующая дата амортизации не может быть до даты покупки
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Дата начала проекта
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,До
 DocType: Rename Tool,Rename Log,Переименовать Входить
@@ -4183,12 +4188,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Как часто необходимо обновлять проект и компанию на основе транзакций продаж.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Годен до
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Добавить студентов
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Удалите сотрудника <a href=""#Form/Employee/{0}"">{0}</a> \, чтобы отменить этот документ."
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},"Пожалуйста, выберите {0}"
 DocType: C-Form,C-Form No,C-образный Нет
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Дистанция
+DocType: Delivery Stop,Distance,Дистанция
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Перечислите свои продукты или услуги, которые вы покупаете или продаете."
 DocType: Water Analysis,Storage Temperature,Температура хранения
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4215,7 +4218,7 @@
 DocType: Homepage,Company Description for website homepage,Описание компании на главную страницу сайта
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Для удобства клиентов, эти коды могут быть использованы в печатных формах документов, таких как Счета и Документы  Отгрузки"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Название поставщика
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Не удалось получить информацию для {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Не удалось получить информацию для {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Журнал открытия журнала
 DocType: Contract,Fulfilment Terms,Условия выполнения
 DocType: Sales Invoice,Time Sheet List,Список времени лист
@@ -4398,7 +4401,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Выберите учащихся вручную для группы на основе действий
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Выберите учащихся вручную для группы на основе действий
 DocType: Journal Entry,User Remark,Примечание Пользователь
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Оптимизация маршрутов.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Оптимизация маршрутов.
 DocType: Travel Itinerary,Non Diary,Не дневник
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Невозможно создать бонус удерживания для левых сотрудников
 DocType: Lead,Market Segment,Сегмент рынка
@@ -4429,7 +4432,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Программа лояльности
 DocType: Student Guardian,Father,Отец
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Билеты на поддержку
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,"""Обновить запасы"" нельзя выбрать при продаже основных средств"
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,"""Обновить запасы"" нельзя выбрать при продаже основных средств"
 DocType: Bank Reconciliation,Bank Reconciliation,Банковская сверка
 DocType: Attendance,On Leave,в отпуске
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Получить обновления
@@ -4474,7 +4477,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Серийный номер и партия
 DocType: Warranty Claim,From Company,От компании
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Сумма десятков критериев оценки должно быть {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,"Пожалуйста, установите Количество отчислений на амортизацию бронирования"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,"Пожалуйста, установите Количество отчислений на амортизацию бронирования"
 DocType: Supplier Scorecard Period,Calculations,вычисления
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Значение или Кол-во
 DocType: Payment Terms Template,Payment Terms,Условия оплаты
@@ -4493,7 +4496,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Скидка (%) на цену Прейскурант с маржой
 DocType: Healthcare Service Unit Type,Rate / UOM,Скорость / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Все склады
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Нет {0} найдено для транзакций Inter Company.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Нет {0} найдено для транзакций Inter Company.
 DocType: Travel Itinerary,Rented Car,Прокат автомобилей
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,О вашей компании
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Кредит на счету должен быть баланс счета
@@ -4595,6 +4598,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Критерии анализа производства
 DocType: Cheque Print Template,Cheque Height,Cheque Высота
 DocType: Supplier,Supplier Details,Подробная информация о поставщике
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Пожалуйста, установите серию нумерации для участия через Setup&gt; Numbering Series"
 DocType: Setup Progress,Setup Progress,Установка готовности
 DocType: Expense Claim,Approval Status,Статус утверждения
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},"От значение должно быть меньше, чем значение в строке {0}"
@@ -4688,7 +4692,6 @@
 DocType: Travel Request,Fully Sponsored,Полностью спонсируемый
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Обратная запись журнала
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Клиент {0} создан.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Пожалуйста, настройте систему имен пользователей в человеческих ресурсах&gt; Настройки персонажа"
 DocType: Stock Settings,Limit Percent,Предельный процент
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Сейчас нет доступного запаса на складах
 ,Payment Period Based On Invoice Date,Оплата период на основе Накладная Дата
@@ -4747,7 +4750,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Источник Склад
 DocType: Installation Note,Installation Date,Дата установки
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Share Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Строка # {0}: Asset {1} не принадлежит компании {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Строка # {0}: Asset {1} не принадлежит компании {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Счет на продажу {0} создан
 DocType: Employee,Confirmation Date,Дата подтверждения
 DocType: Inpatient Occupancy,Check Out,Проверка
@@ -4767,6 +4770,7 @@
 DocType: Production Plan,Sales Orders Detail,Сведения о заказах на продажу
 DocType: Bin,Requested Quantity,Запрашиваемое количество
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Пожалуйста, настройте систему именования инструкторов в образовании&gt; Настройки образования"
 DocType: Patient,Marital Status,Семейное положение
 DocType: Stock Settings,Auto Material Request,Автоматический запрос материалов
 DocType: Woocommerce Settings,API consumer secret,Секрет потребителя API
@@ -4819,7 +4823,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Выберите дни
 DocType: Academic Term,Term Name,срок Имя
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Кредит ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Создание зарплатных листков...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Создание зарплатных листков...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Вы не можете редактировать корневой узел.
 DocType: Buying Settings,Purchase Order Required,"Покупка порядке, предусмотренном"
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,таймер
@@ -4857,7 +4861,7 @@
 DocType: Account,Rate at which this tax is applied,Курс по которому этот налог применяется
 DocType: Cash Flow Mapper,Section Name,Название раздела
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Изменить порядок Кол-во
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Строка амортизации {0}: ожидаемое значение после полезного срока службы должно быть больше или равно {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Строка амортизации {0}: ожидаемое значение после полезного срока службы должно быть больше или равно {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Текущие вакансии Вакансии
 DocType: Company,Stock Adjustment Account,Регулирование счета запасов
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Списать
@@ -4904,7 +4908,7 @@
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Из КУА
 DocType: Opportunity,Opportunity Amount,Количество возможностей
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Количество не Забронированный отчислений на амортизацию может быть больше, чем Общее количество отчислений на амортизацию"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Количество не Забронированный отчислений на амортизацию может быть больше, чем Общее количество отчислений на амортизацию"
 DocType: Purchase Order,Order Confirmation Date,Дата подтверждения заказа
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Сделать ОБСЛУЖИВАНИЕ Посетите
@@ -4945,7 +4949,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Batch:
 DocType: Volunteer,Afternoon,После полудня
 DocType: Loyalty Program,Loyalty Program Help,Помощь в программе лояльности
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' отключен
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' отключен
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Установить как Open
 DocType: Cheque Print Template,Scanned Cheque,Сканированные чеками
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Отправлять автоматические  электронные письма Контактам по проводимым операциям.
@@ -4958,7 +4962,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Продукт и гарантийные условия
 DocType: Chapter,Chapter Members,Члены группы
 DocType: Sales Team,Contribution (%),Вклад (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана, так как ""Наличные или Банковский счет"" не был указан"
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана, так как ""Наличные или Банковский счет"" не был указан"
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Проект {0} уже существует
 DocType: Clinical Procedure,Nursing User,Уход за больным
 DocType: Employee Benefit Application,Payroll Period,Период расчета заработной платы
@@ -4966,6 +4970,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Серийный номер {0} не принадлежит к пакету {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Обязанности
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Срок действия этой цитаты закончился.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Удалите сотрудника <a href=""#Form/Employee/{0}"">{0}</a> \, чтобы отменить этот документ."
 DocType: Expense Claim Account,Expense Claim Account,Счет Авансового Отчета
 DocType: Account,Capital Work in Progress,Капитальная работа в процессе
 DocType: Accounts Settings,Allow Stale Exchange Rates,Разрешить статичные обменные курсы
@@ -5046,7 +5052,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Запрос на материал
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Подключить Shopify с помощью ERPNext
 DocType: Material Request Item,For Warehouse,Для Склада
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Примечания к доставке {0} обновлены
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Примечания к доставке {0} обновлены
 DocType: Employee,Offer Date,Дата предложения
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Цитаты
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Вы находитесь в автономном режиме. Вы не сможете обновить без подключения к сети.
@@ -5097,7 +5103,7 @@
 DocType: Shipping Rule,Calculate Based On,Рассчитать на основе
 DocType: Contract,Unfulfilled,невыполненный
 DocType: Delivery Note Item,From Warehouse,От Склад
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Нет сотрудников по указанным критериям
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Нет сотрудников по указанным критериям
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Нет предметов с Биллом материалов не Manufacture
 DocType: Shopify Settings,Default Customer,Клиент по умолчанию
 DocType: Sales Stage,Stage Name,Сценический псевдоним
@@ -5140,7 +5146,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Сумма налога После скидка сумма
 DocType: Patient,Inpatient Status,Состояние стационара
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Ежедневные Настройки работы Резюме
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Выбранный прейскурант должен иметь поля для покупки и продажи.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Выбранный прейскурант должен иметь поля для покупки и продажи.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,"Пожалуйста, введите Reqd by Date"
 DocType: Payment Entry,Internal Transfer,Внутренний трансфер
 DocType: Asset Maintenance,Maintenance Tasks,Задачи обслуживания
@@ -5177,7 +5183,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Group By
 DocType: Guardian,Interests,интересы
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Включение / отключение валюты.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Не удалось подтвердить некоторые зарплатные листки
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Не удалось подтвердить некоторые зарплатные листки
 DocType: Exchange Rate Revaluation,Get Entries,Получить записи
 DocType: Production Plan,Get Material Request,Получить заявку на материал
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Почтовые расходы
@@ -5264,7 +5270,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
 DocType: BOM,Website Description,Описание
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Чистое изменение в капитале
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,"Пожалуйста, отменить счета покупки {0} первым"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,"Пожалуйста, отменить счета покупки {0} первым"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Не разрешено. Отключите тип устройства обслуживания
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Адрес электронной почты должен быть уникальным, уже существует для {0}"
 DocType: Serial No,AMC Expiry Date,Срок действия AMC
@@ -5304,7 +5310,7 @@
 DocType: Hotel Room,Hotel Room,Номер в отеле
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Счет {0} не принадлежит компании {1}
 DocType: Leave Type,Rounding,округление
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Серийные номера в строке {0} не совпадают с полем «Поставка»
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Серийные номера в строке {0} не совпадают с полем «Поставка»
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Распределенная сумма (про-рейтинг)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Затем Правила ценообразования отфильтровываются на основе Клиента, Группы клиентов, Территории, Поставщика, Группы поставщиков, Кампании, Партнера по продажам и т. Д."
 DocType: Student,Guardian Details,Подробнее Гардиан
@@ -5359,7 +5365,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Требуется Склад для Запаса {0}
 DocType: Leave Allocation,Unused leaves,Неиспользованные листья
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Сделать заявку на погашение
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Все отделы
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Все отделы
 DocType: Healthcare Service Unit,Vacant,вакантный
 DocType: Patient,Alcohol Past Use,Использование алкоголя в прошлом
 DocType: Fertilizer Content,Fertilizer Content,Содержание удобрений
@@ -5370,7 +5376,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Рабочий заказ {0} должен быть отменен до отмены этого заказа клиента
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Fetch разобранном BOM (в том числе узлов)
 DocType: Authorization Rule,Applicable To (Employee),Применимо к (Сотрудник)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Благодаря Дата является обязательным
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Благодаря Дата является обязательным
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Прирост за атрибут {0} не может быть 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Тип и сумма пособия
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Забронированные номера
@@ -5518,7 +5524,7 @@
 DocType: Purchase Invoice Item,Total Weight,Общий вес
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Комиссия по продажам
 DocType: Job Offer Term,Value / Description,Значение / Описание
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Строка # {0}: Актив {1} не может быть проведен, он уже {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Строка # {0}: Актив {1} не может быть проведен, он уже {2}"
 DocType: Tax Rule,Billing Country,Страна плательщика
 DocType: Purchase Order Item,Expected Delivery Date,Ожидаемая дата доставки
 DocType: Restaurant Order Entry,Restaurant Order Entry,Ввод заказа ресторана
@@ -5557,12 +5563,13 @@
 DocType: Maintenance Visit,Breakdown,Разбивка
 DocType: Travel Itinerary,Vegetarian,вегетарианец
 DocType: Patient Encounter,Encounter Date,Дата встречи
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Счет: {0} с валютой: {1} не может быть выбран
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Счет: {0} с валютой: {1} не может быть выбран
 DocType: Bank Statement Transaction Settings Item,Bank Data,Банковские данные
 DocType: Purchase Receipt Item,Sample Quantity,Количество образцов
 DocType: Bank Guarantee,Name of Beneficiary,Имя получателя
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Автоматически обновлять стоимость спецификации через Планировщик, исходя из последней оценки / курса прейскуранта / последней покупки сырья."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Поставщик&gt; Группа поставщиков
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Дата
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Счет {0}: Родитель счета {1} не принадлежит компании: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,"Успешно удален все сделки, связанные с этой компанией!"
@@ -5590,7 +5597,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Дочерние узлы могут быть созданы только в узлах типа &quot;Группа&quot;
 DocType: Attendance Request,Half Day Date,Полдня Дата
 DocType: Academic Year,Academic Year Name,Название учебного года
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} не разрешено совершать транзакции с {1}. Измените компанию.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} не разрешено совершать транзакции с {1}. Измените компанию.
 DocType: Sales Partner,Contact Desc,Связаться Описание изделия
 DocType: Email Digest,Send regular summary reports via Email.,Отправить регулярные сводные отчеты по электронной почте.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},"Пожалуйста, установите учетную запись по умолчанию для Типа Авансового Отчета {0}"
@@ -5623,7 +5630,7 @@
 DocType: Hotel Room,Hotel Manager,Менеджер отеля
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Установите Налоговый Правило корзине
 DocType: Purchase Invoice,Taxes and Charges Added,Налоги и сборы добавлены
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,"Строка амортизации {0}: следующая дата амортизации не может быть до даты, доступной для использования"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,"Строка амортизации {0}: следующая дата амортизации не может быть до даты, доступной для использования"
 ,Sales Funnel,Воронка продаж
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Сокращение является обязательным
 DocType: Project,Task Progress,Готовность задачи
@@ -5637,7 +5644,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Все группы клиентов
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,Накопленный в месяц
 DocType: Attendance Request,On Duty,На службе
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} является обязательным. Может быть, запись Обмен валюты не создана для {1} по {2}."
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} является обязательным. Может быть, запись Обмен валюты не создана для {1} по {2}."
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Кадровый план {0} уже существует для обозначения {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Налоговый шаблона является обязательным.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Счет {0}: Родитель счета {1} не существует
@@ -5718,11 +5725,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,"По крайней мере, один склад является обязательным"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Настройте поля элементов, такие как UOM, группа элементов, описание и количество часов."
 DocType: Certification Application,Certification Status,Статус сертификации
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,базарная площадь
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,базарная площадь
 DocType: Travel Itinerary,Travel Advance Required,Требуется командировка
 DocType: Subscriber,Subscriber Name,Имя подписчика
 DocType: Serial No,Out of Warranty,По истечении гарантийного срока
-DocType: Cashier Closing,Cashier-closing-,Кассир-closing-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Тип данных сопоставления
 DocType: BOM Update Tool,Replace,Заменить
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Не найдено продуктов.
@@ -5810,7 +5816,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Создаются шаблоны налогов по умолчанию для продаж и покупки.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Запись результатов оценки {0} уже существует.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Пример: ABCD. #####. Если серия задана, а в транзакциях не указано «Пакет №», то на основе этой серии будет создан автоматический номер партии. Если вы всегда хотите явно указать Batch No для этого элемента, оставьте это поле пустым. Примечание. Этот параметр будет иметь приоритет над префиксом серии имен в настройках запаса."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Пожалуйста, установите серию нумерации для участия через Setup&gt; Numbering Series"
 DocType: BOM,Materials Required (Exploded),Необходимые материалы (в разобранном)
 DocType: Contract,Party User,Пользователь Party
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Пожалуйста, установите фильтр компании blank, если Group By является «Company»"
@@ -6013,7 +6018,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Счетчик Opp
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,"Должны быть установлены как дата начала пробного периода, так и дата окончания пробного периода"
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Средняя оценка
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Общая сумма платежа в Графе платежей должна быть равна Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Общая сумма платежа в Графе платежей должна быть равна Grand / Rounded Total
 DocType: Subscription Plan Detail,Plan,План
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Банк балансовый отчет за Главную книгу
 DocType: Job Applicant,Applicant Name,Имя заявителя
@@ -6082,7 +6087,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Моющие средства
 DocType: BOM,Show Items,Показать продукты
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,От времени не может быть больше времени.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Вы хотите уведомить всех клиентов по электронной почте?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Вы хотите уведомить всех клиентов по электронной почте?
 DocType: Subscription Plan,Billing Interval,Интервал выставления счетов
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Кино- и видеостудия
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,В обработке
@@ -6091,9 +6096,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Строка {0}: {1} должна быть больше 0
 DocType: Assessment Criteria,Assessment Criteria Group,Критерии оценки Группа
 DocType: Healthcare Settings,Patient Name By,Имя пациента
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Запись журнала начислений для зарплат от {0} до {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Запись журнала начислений для зарплат от {0} до {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Включить отложенный доход
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Начальная Накопленная амортизация должна быть меньше или равна {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Начальная Накопленная амортизация должна быть меньше или равна {0}
 DocType: Warehouse,Warehouse Name,Название склада
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Фактическая дата начала должна быть меньше фактической даты окончания
 DocType: Naming Series,Select Transaction,Выберите операцию
@@ -6245,7 +6250,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Сотрудник {0} класса {1} не имеет политики отпуска по умолчанию
 DocType: Salary Detail,Salary Detail,Заработная плата: Подробности
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,"Пожалуйста, выберите {0} первый"
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Добавлены пользователи {0}
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Добавлены пользователи {0}
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",В случае многоуровневой программы Клиенты будут автоматически назначены соответствующему уровню в соответствии с затраченными
 DocType: Appointment Type,Physician,врач
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Партия {0} продукта {1} просрочена
@@ -6389,7 +6394,7 @@
 DocType: Asset,Custodian,попечитель
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Точка-в-продажи профиля
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} должно быть значением от 0 до 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Оплата {0} от {1} до {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Оплата {0} от {1} до {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Необеспеченных кредитов
 DocType: Cost Center,Cost Center Name,Название учетного отдела
 DocType: Student,B+,B+
@@ -6421,6 +6426,7 @@
 DocType: Employee,Date of Issue,Дата вопроса
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","В соответствии с настройками покупки, если требуется Приобретение покупки == «ДА», затем для создания счета-фактуры для покупки пользователю необходимо сначала создать покупку для элемента {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Ряд # {0}: Установить Поставщик по пункту {1}
+DocType: Global Defaults,Default Distance Unit,Единица измерения по умолчанию
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Строка {0}: значение часов должно быть больше нуля.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,"Изображение {0} на сайте, прикреплённое к продукту {1}, не найдено"
 DocType: Issue,Content Type,Тип контента
@@ -6476,7 +6482,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Дебету счета должны быть баланс счета
 DocType: Asset,Naming Series,Наименование серии
 DocType: Vital Signs,Coated,Покрытый
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Ряд {0}: ожидаемое значение после полезной жизни должно быть меньше валовой суммы покупки
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Ряд {0}: ожидаемое значение после полезной жизни должно быть меньше валовой суммы покупки
 DocType: GoCardless Settings,GoCardless Settings,Настройки бездорожья
 DocType: Leave Block List,Leave Block List Name,Оставьте Имя Блок-лист
 DocType: Certified Consultant,Certification Validity,Срок действия сертификации
@@ -6545,6 +6551,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Заголовок банка
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Просмотр лабораторных тестов
 DocType: Hub Users,Hub Users,Пользователи концентратора
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Группа клиентов&gt; Территория
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Дата технического обслуживания
 DocType: Purchase Invoice Item,Rejected Serial No,Отклонен Серийный номер
@@ -6560,7 +6567,7 @@
 DocType: SG Creation Tool Course,Max Strength,Максимальная прочность
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Установка пресетов
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Нет примечания о доставке для клиента {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Нет примечания о доставке для клиента {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Сотрудник {0} не имеет максимальной суммы пособия
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Выбрать продукты по дате поставки
 DocType: Grant Application,Has any past Grant Record,Имеет ли какая-либо прошлая грантовая запись
@@ -6588,7 +6595,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Бронирование номеров в гостинице
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Обслуживание Клиентов
 DocType: BOM,Thumbnail,Миниатюра
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Не найдено контактов с идентификаторами электронной почты.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Не найдено контактов с идентификаторами электронной почты.
 DocType: Item Customer Detail,Item Customer Detail,Пункт Детальное клиентов
 DocType: Notification Control,Prompt for Email on Submission of,Запрашивать Email по подаче
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Максимальная сумма вознаграждения сотрудника {0} превышает {1}
@@ -6848,7 +6855,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,"Не можете скрытой в группу, потому что выбран Тип аккаунта."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,"{0} {1} был изменен. Пожалуйста, обновите."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Остановить пользователям вносить Leave приложений на последующие дни.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код товара&gt; Группа товаров&gt; Марка
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Если неограниченное истечение срока действия для очков лояльности, держите продолжительность истечения срока действия пустым или 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Члены службы технической поддержки
 DocType: Loyalty Point Entry,Purchase Amount,Сумма покупки
@@ -6856,7 +6862,7 @@
 											to fullfill Sales Order {2}","Невозможно доставить Серийный № {0} пункта {1}, поскольку он зарезервирован \ для полного заполнения заказа клиента {2}"
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Ценовое предложение поставщика {0} создано
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Год окончания не может быть раньше начала года
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Год окончания не может быть раньше начала года
 DocType: Employee Benefit Application,Employee Benefits,Вознаграждения работникам
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Упакованное количество должно соответствовать количеству  продукта  {0} в строке {1}
 DocType: Work Order,Manufactured Qty,Изготовлено Кол-во
@@ -6872,6 +6878,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Выберите пакетные номера
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,К GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Платежи Заказчиков
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Пожалуйста, настройте систему имен пользователей в человеческих ресурсах&gt; Настройки персонажа"
 DocType: Healthcare Settings,Invoice Appointments Automatically,Назначение счетов-фактур автоматически
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Идентификатор проекта
 DocType: Salary Component,Variable Based On Taxable Salary,"Переменная, основанная на налогооблагаемой зарплате"
@@ -6920,7 +6927,7 @@
 DocType: POS Profile,Account for Change Amount,Счет для изменения высоты
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Подключение к QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Общая прибыль / убыток
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Недопустимая компания для счета компании Inter.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Недопустимая компания для счета компании Inter.
 DocType: Purchase Invoice,input service,услуга ввода
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ряд {0}: Партия / счета не соответствует {1} / {2} в {3} {4}
 DocType: Employee Promotion,Employee Promotion,Продвижение сотрудников
@@ -7051,7 +7058,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Предпочтительная зона для проживания
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Аналитика
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Корзина Пусто
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Пожалуйста, настройте систему именования инструкторов в образовании&gt; Настройки образования"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Пункт {0} не имеет серийного номера. Только сериализованные элементы \ могут иметь доставку на основе серийного номера
 DocType: Vehicle,Model,Модель
@@ -7081,7 +7087,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Нечего менять
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Выберите файл CSV
 DocType: Holiday List,Total Holidays,Всего праздников
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Отсутствует шаблон электронной почты для отправки. Установите его в настройках доставки.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Отсутствует шаблон электронной почты для отправки. Установите его в настройках доставки.
 DocType: Student Leave Application,Mark as Present,Отметить как Present
 DocType: Supplier Scorecard,Indicator Color,Цвет индикатора
 DocType: Purchase Order,To Receive and Bill,Для приема и Билл
@@ -7090,7 +7096,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Выберите серийный номер
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Дизайнер
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Условия шаблона
-DocType: Serial No,Delivery Details,Подробности доставки
+DocType: Delivery Trip,Delivery Details,Подробности доставки
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
 DocType: Program,Program Code,Программный код
 DocType: Terms and Conditions,Terms and Conditions Help,Правила и условия Помощь
@@ -7114,7 +7120,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Время выполнения
 DocType: Cash Flow Mapping,Is Income Tax Expense,Расходы на подоходный налог
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Ваш заказ для доставки!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"Строка # {0}: Дата размещения должна быть такой же, как даты покупки {1} актива {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"Строка # {0}: Дата размещения должна быть такой же, как даты покупки {1} актива {2}"
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Проверьте это, если Студент проживает в Хостеле Института."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Пожалуйста, введите Заказы в приведенной выше таблице"
 ,Stock Summary,Всего запасов
diff --git a/erpnext/translations/si.csv b/erpnext/translations/si.csv
index 102ab3c..53af6cb 100644
--- a/erpnext/translations/si.csv
+++ b/erpnext/translations/si.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,කාලය නම
 DocType: Employee,Salary Mode,වැටුප් ක්රමය
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,ලියාපදිංචි වන්න
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,ලියාපදිංචි වන්න
 DocType: Patient,Divorced,දික්කසාද
 DocType: Support Settings,Post Route Key,තැපැල් මාර්ගයේ යතුර
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,විෂය ගනුදෙනුවකින් කිහිපවතාවක් එකතු කිරීමට ඉඩ දෙන්න
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,නව විනිමය අනුපාතිකය
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},ව්යවහාර මුදල් මිල ලැයිස්තුව {0} සඳහා අවශ්ය
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ගනුදෙනුව ගණනය කරනු ඇත.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,සැපයුම්කරු&gt; සැපයුම් වර්ගය
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,පාරිභෝගික ඇමතුම්
 DocType: Patient Appointment,Check availability,ලබා ගන්න
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,විවෘත පෙන්වන්න
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,මාලාවක් සාර්ථකව යාවත්කාලීන කිරීම
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,පරීක්ෂාකාරී වන්න
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} පේළි {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} පේළි {1}
 DocType: Asset Finance Book,Depreciation Start Date,ක්ෂයවීම් ආරම්භක දිනය
 DocType: Pricing Rule,Apply On,දා යොමු කරන්න
 DocType: Item Price,Multiple Item prices.,බහු විෂය මිල.
@@ -118,7 +117,7 @@
 DocType: Lab Prescription,Lab Prescription,වෛද්ය නිර්දේශය
 ,Delay Days,ප්රමාද වූ දින
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,සේවා වියදම්
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},අනුක්රමික අංකය: {0} දැනටමත් විකුණුම් ඉන්වොයිසිය දී නමෙන්ම ඇත: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},අනුක්රමික අංකය: {0} දැනටමත් විකුණුම් ඉන්වොයිසිය දී නමෙන්ම ඇත: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,ඉන්වොයිසිය
 DocType: Purchase Invoice Item,Item Weight Details,අයිතම බර ප්රමාණය විස්තර
 DocType: Asset Maintenance Log,Periodicity,ආවර්තයක්
@@ -143,6 +142,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,ගණකාධිකාරී
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,විකුණුම් මිල ලැයිස්තුව
 DocType: Patient,Tobacco Current Use,දුම්කොළ භාවිතය
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","ආරම්භක දිනය සහ අවසන් දිනය කාර්යය කාඩ්පත සමඟ අතිශුද්ධව පවතී <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,විකුණුම් අනුපාතිකය
 DocType: Cost Center,Stock User,කොටස් පරිශීලක
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -162,7 +162,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,ආශ්රිත
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,පැමිණීම දිනය සේවක එක්වීමට දිනය ට වඩා අඩු විය නොහැක
 DocType: Grading Scale,Grading Scale Name,ශ්රේණිගත පරිමාණ නම
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,පරිශීලකයින්ට වෙළඳපොළට එක් කරන්න
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,පරිශීලකයින්ට වෙළඳපොළට එක් කරන්න
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,"මෙම root පරිශීලක සඳහා ගිණුමක් වන අතර, සංස්කරණය කළ නොහැක."
 DocType: Sales Invoice,Company Address,සමාගම ලිපිනය
 DocType: BOM,Operations,මෙහෙයුම්
@@ -320,7 +320,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Qty
 DocType: Production Plan,Material Request Detail,ද්රව්ය ඉල්ලීම් විස්තර
 DocType: Selling Settings,Default Quotation Validity Days,පෙරනිමි නිශ්කාෂණ වලංගු කාලය
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","බදු ඇතුළත් කිරීමට පේළියේ {0} අයිතමය අනුපාතය, පේළි {1} බදු ද ඇතුළත් විය යුතු අතර"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","බදු ඇතුළත් කිරීමට පේළියේ {0} අයිතමය අනුපාතය, පේළි {1} බදු ද ඇතුළත් විය යුතු අතර"
 DocType: SMS Center,SMS Center,කෙටි පණිවුඩ මධ්යස්ථානය
 DocType: Payroll Entry,Validate Attendance,වලංගු සහභාගිත්වය
 DocType: Sales Invoice,Change Amount,මුදල වෙනස්
@@ -439,7 +439,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,වචන මුදල සඳහා පේළි පරතරය
 DocType: Vehicle,Additional Details,අතිරේක විස්තර
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,විස්තර ලබා නැත
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,සැපයුම්කරු&gt; සැපයුම් කණ්ඩායම
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,මිලදී ගැනීම සඳහා ඉල්ලීම.
 DocType: POS Closing Voucher Details,Collected Amount,එකතු කළ මුදල
 DocType: Lab Test,Submitted Date,ඉදිරිපත් කළ දිනය
@@ -484,7 +483,7 @@
 DocType: Student Admission,Student Admission,ශිෂ්ය ඇතුළත් කිරීම
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,අයිතමය {0} අවලංගුයි
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,ක්ෂය කිරීම් පේළි {0}: ක්ෂයවීම් ආරම්භක දිනය අතීත දිනය ලෙස ඇතුළත් කර ඇත
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,ක්ෂය කිරීම් පේළි {0}: ක්ෂයවීම් ආරම්භක දිනය අතීත දිනය ලෙස ඇතුළත් කර ඇත
 DocType: Contract Template,Fulfilment Terms and Conditions,ඉටු කරන නියමයන් සහ කොන්දේසි
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,"ද්රව්ය, ඉල්ලීම්"
 DocType: Bank Reconciliation,Update Clearance Date,යාවත්කාලීන නිශ්කාශනෙය් දිනය
@@ -541,6 +540,7 @@
 DocType: Accounts Settings,Settings for Accounts,ගිණුම් සඳහා සැකසුම්
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},සැපයුම්කරු ගෙවීම් නොමැත ගැනුම් {0} පවතින
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,විකුණුම් පුද්ගලයෙක් රුක් කළමනාකරණය කරන්න.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.",ගූගල් සිතියම් සැකසීම් අක්රිය කර ඇති බැවින් මාර්ගය සකසා ගත නොහැක.
 DocType: Job Applicant,Cover Letter,ආවරණ ලිපිය
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,පැහැදිලි කිරීමට කැපී පෙනෙන චෙක්පත් සහ තැන්පතු
 DocType: Item,Synced With Hub,Hub සමඟ සමමුහුර්ත
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,නව වත්කම් අගය
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,පාරිභෝගික ව්යවහාර මුදල් පාරිභෝගික පදනම මුදල් බවට පරිවර්තනය වන අවස්ථාවේ අනුපාතය
 DocType: Course Scheduling Tool,Course Scheduling Tool,පාඨමාලා අවස මෙවලම
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ෙරෝ # {0}: ගැනුම් දැනට පවතින වත්කම් {1} එරෙහිව කළ නොහැකි
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ෙරෝ # {0}: ගැනුම් දැනට පවතින වත්කම් {1} එරෙහිව කළ නොහැකි
 DocType: Crop Cycle,LInked Analysis,ලින්ක්ඩ් විශ්ලේෂණය
 DocType: POS Closing Voucher,POS Closing Voucher,POS අවසාන වවුචරය
 DocType: Contract,Lapsed,ගතවූ කාලය
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} පාඨමාලා {2} ලියාපදිංචි වී නොමැති
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,ශිෂ්ය නම:
 DocType: POS Closing Voucher Details,Difference,වෙනස
+DocType: Delivery Settings,Delay between Delivery Stops,Delivery Stops අතර ප්රමාද වීම
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},අනු අංකය {0} සැපයුම් සටහන {1} අයත් නොවේ
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","සේවාදායකයේ GoCardless සැකසුම සමඟ ගැටළුවක් ඇති බව පෙනේ. අසාර්ථක වුවහොත්, ඔබේ ගිණුමට නැවත මුදල් ආපසු ලබා දෙනු ඇත."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -695,7 +696,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,ප්රමාණය හා වේගය
 DocType: Delivery Note,% Installed,% ප්රාප්ත
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,පන්ති කාමර / රසායනාගාර ආදිය දේශන නියමිත කළ හැකි.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,සමාගම් දෙකේම සමාගම් අන්තර් සමාගම් ගනුදෙනු සඳහා ගැලපේ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,සමාගම් දෙකේම සමාගම් අන්තර් සමාගම් ගනුදෙනු සඳහා ගැලපේ.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,සමාගමේ නම පළමු ඇතුලත් කරන්න
 DocType: Travel Itinerary,Non-Vegetarian,නිර්මාංශ නොවන
 DocType: Purchase Invoice,Supplier Name,සපයන්නාගේ නම
@@ -780,7 +781,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,දිනෙයන් ලබා ගන්නා ලදි
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,ගොඩනගනු කිරීමට තරම් අමතර කොටස්
 DocType: POS Profile User,POS Profile User,POS පැතිකඩ පරිශීලක
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,පේළිය {0}: ක්ෂයවීම් ආරම්භක දිනය අවශ්යය
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,පේළිය {0}: ක්ෂයවීම් ආරම්භක දිනය අවශ්යය
 DocType: Purchase Invoice Item,Service Start Date,සේවා ආරම්භක දිනය
 DocType: Subscription Invoice,Subscription Invoice,දායකත්ව ඉන්වොයිසිය
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,සෘජු ආදායම්
@@ -849,7 +850,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,තවත් සමාගමක් දැනටමත් යොදා කෙටි යෙදුම්
 DocType: Selling Settings,Default Customer Group,පෙරනිමි කස්ටමර් සමූහයේ
 DocType: Employee,IFSC Code,IFSC සංග්රහය
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","ආරම්භක දිනය සහ අවසන් දිනය කාර්යය කාඩ්පත සමඟ අතිශුද්ධව පවතී <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","ආබාධිත නම්, &#39;වුනාට මුළු&#39; ක්ෂේත්රය ඕනෑම ගනුදෙනුවක් තුළ දිස් නොවන"
 DocType: BOM,Operating Cost,මෙහෙයුම් පිරිවැය
 DocType: Crop,Produced Items,නිෂ්පාදිත අයිතම
@@ -901,7 +901,7 @@
 DocType: Supplier,Prevent RFQs,RFQs වැළැක්වීම
 DocType: Hub User,Hub User,Hub පරිශීලක
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,විකුණුම් සාමය කරන්න
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},කාල පරාසය තුළ {0} සිට {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},කාල පරාසය තුළ {0} සිට {1}
 DocType: Project Task,Project Task,ව්යාපෘති කාර්ය සාධක
 DocType: Loyalty Point Entry Redemption,Redeemed Points,මුදා හරින ලකුණු
 ,Lead Id,ඊයම් අංකය
@@ -1030,7 +1030,7 @@
 DocType: Fee Validity,Max number of visit,සංචාරය කරන ලද උපරිම සංඛ්යාව
 ,Hotel Room Occupancy,හෝටල් කාමරය
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet නිර්මාණය:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},ගෙවීම් ප්රකාරය {0} පැහැර මුදල් හෝ බැංකු ගිණුම් සකස් කරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},ගෙවීම් ප්රකාරය {0} පැහැර මුදල් හෝ බැංකු ගිණුම් සකස් කරන්න
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,ලියාපදිංචි
 DocType: GST Settings,GST Settings,GST සැකසුම්
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},ව්යවහාර මුදල් ලැයිස්තු ගත කළ යුත්තේ මිල ලැයිස්තුව: {0}
@@ -1085,7 +1085,7 @@
 DocType: Vehicle Log,Service Details,සේවා තොරතුරු
 DocType: Lab Test Template,Grouped,සමූහගත කර ඇත
 DocType: Selling Settings,Delivery Note Required,සැපයුම් සටහන අවශ්ය
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,වැටුප් ඉල්ලීම් ඉදිරිපත් කිරීම ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,වැටුප් ඉල්ලීම් ඉදිරිපත් කිරීම ...
 DocType: Bank Guarantee,Bank Guarantee Number,බැංකු ඇපකරයක් අංකය
 DocType: Bank Guarantee,Bank Guarantee Number,බැංකු ඇපකරයක් අංකය
 DocType: Assessment Criteria,Assessment Criteria,තක්සේරු නිර්ණායක
@@ -1111,7 +1111,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,ගෙවීම් සටහන් දැනටමත් නිර්මාණය
 DocType: Request for Quotation,Get Suppliers,සැපයුම්කරුවන් ලබා ගන්න
 DocType: Purchase Receipt Item Supplied,Current Stock,වත්මන් කොටස්
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},ෙරෝ # {0}: වත්කම් {1} අයිතමය {2} සම්බන්ධ නැහැ
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},ෙරෝ # {0}: වත්කම් {1} අයිතමය {2} සම්බන්ධ නැහැ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,පෙරදසුන වැටුප කුවිතාන්සියක්
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,ගිණුම {0} වාර කිහිපයක් ඇතුලත් කර ඇත
 DocType: Account,Expenses Included In Valuation,ඇතුලත් තක්සේරු දී වියදම්
@@ -1189,7 +1189,7 @@
 DocType: Soil Texture,Sand,වැලි
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,බලශක්ති
 DocType: Opportunity,Opportunity From,සිට අවස්ථාව
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,පේළිය {0}: {1} අයිතමය සඳහා අවශ්ය වන අනුක්රමික අංකයන් {2}. ඔබ සපයා ඇත්තේ {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,පේළිය {0}: {1} අයිතමය සඳහා අවශ්ය වන අනුක්රමික අංකයන් {2}. ඔබ සපයා ඇත්තේ {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,කරුණාකර වගුවක් තෝරන්න
 DocType: BOM,Website Specifications,වෙබ් අඩවිය පිරිවිතර
 DocType: Special Test Items,Particulars,විස්තර
@@ -1281,7 +1281,7 @@
 DocType: Item,Items with higher weightage will be shown higher,අයිතම ඉහළ weightage සමග ඉහළ පෙන්වනු ලැබේ
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,ලේසර් ටෙස්ට් හා වැදගත් සංඥා
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,බැංකු සැසඳුම් විස්තර
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,ෙරෝ # {0}: වත්කම් {1} ඉදිරිපත් කළ යුතුය
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,ෙරෝ # {0}: වත්කම් {1} ඉදිරිපත් කළ යුතුය
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,සොයා ගත් සේවකයෙකු කිසිදු
 DocType: Item,If subcontracted to a vendor,එය ඔබම කිරීමට උප කොන්ත්රාත්තු නම්
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,ශිෂ්ය කණ්ඩායම් මේ වන විටත් යාවත්කාලීන කෙරේ.
@@ -1336,7 +1336,6 @@
 DocType: Loyalty Program Collection,Tier Name,ස්ථර නාමය
 DocType: HR Settings,Enter retirement age in years,වසර විශ්රාම ගන්නා වයස අවුරුදු ඇතුලත් කරන්න
 DocType: Crop,Target Warehouse,ඉලක්ක ගබඩාව
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,කරුණාකර Setup&gt; Settings&gt; Naming Series මගින් {0} සඳහා නම් කිරීමේ මාලාවක් සකසන්න
 DocType: Payroll Employee Detail,Payroll Employee Detail,සේවක විස්තරය
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,කරුණාකර ගබඩා තෝරා
 DocType: Cheque Print Template,Starting location from left edge,ඉතිරි අද්දර සිට ස්ථානය ආරම්භ
@@ -1426,7 +1425,7 @@
 DocType: Work Order,Plan material for sub-assemblies,උප-එකලස්කිරීම් සඳහා සැලසුම් ද්රව්ය
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,විකුණුම් හවුල්කරුවන් සහ ප්රාට්රද්ීයය
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,ද්රව්ය ලේඛණය {0} ක්රියාකාරී විය යුතුය
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,ස්ථාන මාරු සඳහා අයිතම නොමැත
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,ස්ථාන මාරු සඳහා අයිතම නොමැත
 DocType: Employee Boarding Activity,Activity Name,ක්රියාකාරකම් නම
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,නිකුත් කරන දිනය වෙනස් කරන්න
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,නිමි භාණ්ඩයේ ප්රමාණය <b>{0}</b> සහ ප්රමාණය <b>{1}</b> වෙනස් විය නොහැක
@@ -1656,6 +1655,7 @@
 DocType: Project,First Email,පළමු විද්යුත් තැපෑල
 DocType: Company,Exception Budget Approver Role,ව්යතිරේක අයවැය අනුමත කාර්යභාරය
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","සැකසූ පසු, නියමිත දිනට තෙක් මෙම ඉන්වොයිසිය සුදානම් වේ"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,විකුණුම් න්යාය / නිමි භාණ්ඩ ගබඩා තුළ ඇවිරිනි ගබඩාව
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,මුදල විකිණීම
 DocType: Repayment Schedule,Interest Amount,පොලී මුදල
@@ -1667,7 +1667,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,වාර්තා
 DocType: Asset,Scrapped,කටුගා දමා
 DocType: Item,Item Defaults,අයිතම Defaults
-DocType: Purchase Invoice,Returns,ප්රතිලාභ
+DocType: Cashier Closing,Returns,ප්රතිලාභ
 DocType: Job Card,WIP Warehouse,WIP ගබඩාව
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},අනු අංකය {0} {1} දක්වා නඩත්තු ගිවිසුම් යටතේ ය
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,බඳවා ගැනීම
@@ -1681,7 +1681,6 @@
 DocType: Student,A-,ඒ-
 DocType: Share Transfer,Transfer Type,මාරු වර්ගය
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,විකුණුම් වියදම්
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ගණුදෙනුකරු&gt; පාරිභෝගික කණ්ඩායම්&gt; ප්රදේශය
 DocType: Diagnosis,Diagnosis,ඩයග්නේෂන්
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,සම්මත මිලට ගැනීම
 DocType: Attendance Request,Explanation,පැහැදිලි කිරීම
@@ -1694,7 +1693,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,භාණ්ඩ මිලදී ගැනීම් නියෝග කල් ඉකුත් වේ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,කලාප කේතය
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},විකුණුම් සාමය {0} වේ {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},පොලී ආදායම් ගිණුමක් තෝරන්න {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},පොලී ආදායම් ගිණුමක් තෝරන්න {0}
 DocType: Opportunity,Contact Info,සම්බන්ධ වීම
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,කොටස් අයැදුම්පත් කිරීම
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,සේවකයාගේ තත්වය වාමාංශය සමඟ ප්රවර්ධනය කළ නොහැක
@@ -1706,7 +1705,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,ශුන්ය බිල්පත් කිරීම සඳහා ඉන්වොයිසිය කළ නොහැක
 DocType: Company,Date of Commencement,ආරම්භක දිනය
 DocType: Sales Person,Select company name first.,පළමු සමාගම නම තෝරන්න.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},විද්යුත් තැපෑල {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},විද්යුත් තැපෑල {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,සැපයුම්කරුවන් ලැබෙන මිල ගණන්.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOM ආකෘති වෙනුවට නවීනතම අළුත් යාවත්කාලීන කිරීම
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},{0} වෙත | {1} {2}
@@ -1727,7 +1726,7 @@
 DocType: Asset Movement,From Employee,සේවක සිට
 DocType: Driver,Cellphone Number,ජංගම දුරකථන අංකය
 DocType: Project,Monitor Progress,ප්රගතිය අධීක්ෂණය කරන්න
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,අවවාදයයි: පද්ධතිය අයිතමය {0} සඳහා මුදල සිට overbilling පරීක්ෂා නැහැ {1} ශුන්ය වේ දී
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,අවවාදයයි: පද්ධතිය අයිතමය {0} සඳහා මුදල සිට overbilling පරීක්ෂා නැහැ {1} ශුන්ය වේ දී
 DocType: Journal Entry,Make Difference Entry,වෙනස සටහන් කරන්න
 DocType: Supplier Quotation,Auto Repeat Section,ස්වයංක්රියව නැවත කියවීම
 DocType: Upload Attendance,Attendance From Date,දිනය සිට පැමිණීම
@@ -1829,7 +1828,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,ෙරෝ # {0}: ප්රතික්ෂේප යවන ලද මිලදී ගැනීම ප්රතිලාභ ඇතුළත් කළ නොහැකි
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,තෝරාගත් ගනුදෙනුකරු සඳහා පාරිභෝගික කණ්ඩායම් වෙනස් කිරීම තහනම් කර ඇත.
 ,Purchase Order Items To Be Billed,මිලදී ගැනීමේ නියෝගයක් අයිතම බිල්පතක්
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,ඇස්තමේන්තුගත පැමිණීමේ කාලය යාවත්කාලීන කිරීම.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,ඇස්තමේන්තුගත පැමිණීමේ කාලය යාවත්කාලීන කිරීම.
 DocType: Program Enrollment Tool,Enrollment Details,ඇතුළත් කිරීම් විස්තර
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,සමාගමකට බහු අයිතම ආකෘති සැකසිය නොහැක.
 DocType: Purchase Invoice Item,Net Rate,ශුද්ධ ෙපොලී අනුපාතිකය
@@ -1843,7 +1842,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,නිවාඩු වර්ගය සාරවත් වේ
 DocType: Support Settings,Close Issue After Days,නිකුත් දින පසු සමීප
 ,Eway Bill,ඊවා බිල්
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,පරිශීලකයින් Marketplace වෙත එකතු කිරීම සඳහා ඔබට පද්ධති කළමණාකරු සහ අයිතම කළමනාකරුගේ භූමිකාවන් සමඟ භාවිතා කරන්නෙකු විය යුතුය.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,පරිශීලකයින් Marketplace වෙත එකතු කිරීම සඳහා ඔබට පද්ධති කළමණාකරු සහ අයිතම කළමනාකරුගේ භූමිකාවන් සමඟ භාවිතා කරන්නෙකු විය යුතුය.
 DocType: Leave Control Panel,Leave blank if considered for all branches,සියලු ශාඛා සඳහා සලකා නම් හිස්ව තබන්න
 DocType: Job Opening,Staffing Plan,කාර්ය මණ්ඩල සැලැස්ම
 DocType: Bank Guarantee,Validity in Days,දින තුළ වලංගු
@@ -1865,7 +1864,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},එම {1} සමග පේළිය {0} අනුපිටපත්
 DocType: Marketplace Settings,Disable Marketplace,වෙළඳපල අවලංගු කරන්න
 ,Trial Balance,මාසික බැංකු සැසඳුම්
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,මුදල් වර්ෂය {0} සොයාගත නොහැකි
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,මුදල් වර්ෂය {0} සොයාගත නොහැකි
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,සේවක සකස් කිරීම
 DocType: Hotel Room Reservation,Hotel Reservation User,හෝටල් වෙන් කිරීමේ පරිශීලක
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,කරුණාකර පළමු උපසර්ගය තෝරා
@@ -1973,7 +1972,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,පිවිසීම අසාර්ථකයි
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Asset {0} නිර්මාණය කරන ලදි
 DocType: Special Test Items,Special Test Items,විශේෂ පරීක්ෂණ අයිතම
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,ඔබ Marketplace හි ලියාපදිංචි වීමට System Manager සහ අයිතම කළමනාකරුගේ භූමිකාවන් සමඟ භාවිතා කරන්නෙකු විය යුතුය.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,ඔබ Marketplace හි ලියාපදිංචි වීමට System Manager සහ අයිතම කළමනාකරුගේ භූමිකාවන් සමඟ භාවිතා කරන්නෙකු විය යුතුය.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,ගෙවීම් ක්රමය
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,ඔබ ලබා දුන් වැටුප් ව්යුහය අනුව ඔබට ප්රතිලාභ සඳහා අයදුම් කළ නොහැකිය
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,වෙබ් අඩවිය රූප ප්රසිද්ධ ගොනුව හෝ වෙබ් අඩවි URL විය යුතුය
@@ -1985,7 +1984,7 @@
 DocType: Warehouse,Warehouse Contact Info,පොත් ගබඩාව සම්බන්ධ වීම
 DocType: Payment Entry,Write Off Difference Amount,වෙනස මුදල කපා
 DocType: Volunteer,Volunteer Name,ස්වේච්ඡා නම
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},අනෙකුත් පේළි අනුපිටපත් නියමිත දිනයන් සමඟ ඇති පේළි සොයා ගන්නා ලදී: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},අනෙකුත් පේළි අනුපිටපත් නියමිත දිනයන් සමඟ ඇති පේළි සොයා ගන්නා ලදී: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: සේවක ඊ-තැපැල් සොයාගත නොහැකි, ඒ නිසා ඊ-තැපැල් යවා නැත"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},යෝජිත දිනයක {0} සේවක සේවිකාවන් සඳහා වන වැටුප් ව්යුහය නොමැත {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},නැව්ගත කිරීමේ නීතිය රටට අදාළ නොවේ {0}
@@ -2076,6 +2075,7 @@
 DocType: Salary Component,Earning,උපයන
 DocType: Supplier Scorecard,Scoring Criteria,පිරික්සුම් නිර්ණායක
 DocType: Purchase Invoice,Party Account Currency,පක්ෂය ගිණුම ව්යවහාර මුදල්
+DocType: Delivery Trip,Total Estimated Distance,සම්පූර්ණ ඇස්තමේන්තුගත දුර ප්රමාණය
 ,BOM Browser,ද්රව්ය ලේඛණය බ්රව්සරය
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,මෙම පුහුණු වැඩසටහන සඳහා ඔබගේ තත්ත්වය යාවත්කාලීන කරන්න
 DocType: Item Barcode,EAN,EAN
@@ -2114,7 +2114,7 @@
 DocType: Activity Cost,Projects,ව්යාපෘති
 DocType: Payment Request,Transaction Currency,ගනුදෙනු ව්යවහාර මුදල්
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},{0} සිට | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,සමහර ඊමේල් වලංගු නොවේ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,සමහර ඊමේල් වලංගු නොවේ
 DocType: Work Order Operation,Operation Description,මෙහෙයුම විස්තරය
 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.,"මුදල් වර්ෂය සුරකින වරක් මුදල් වර්ෂය ආරම්භය දිනය හා රාජ්ය මූල්ය, වසර අවසාන දිනය වෙනස් කළ නොහැක."
 DocType: Quotation,Shopping Cart,සාප්පු ට්රොලිය
@@ -2138,7 +2138,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,ස්ථාවර වත්කම් ශුද්ධ වෙනස්
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,සියලු තනතුරු සඳහා සලකා නම් හිස්ව තබන්න
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,වර්ගය භාර &#39;සත&#39; පේළිය {0} අයිතමය ශ්රේණිගත ඇතුළත් කළ නොහැකි
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,වර්ගය භාර &#39;සත&#39; පේළිය {0} අයිතමය ශ්රේණිගත ඇතුළත් කළ නොහැකි
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},මැක්ස්: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,දිනයවේලාව සිට
 DocType: Shopify Settings,For Company,සමාගම වෙනුවෙන්
@@ -2152,7 +2152,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,පාඨමාලාවේ උපලේඛන නිර්මාණය කිරීමේ දෝෂ ඇත
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,ලැයිස්තුවේ පළමු වියදම් සහතිකය පෙරනිමි වියදම් සහතිකය ලෙස නියම කරනු ලැබේ.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,100 ට වඩා වැඩි විය නොහැක
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,ඔබ Marketplace හි ලියාපදිංචි වීම සඳහා පද්ධති කළමනාකරු සහ අයිතම කළමනාකරුගේ භූමිකාවන් සමඟ පරිපාලක හැර වෙනත් පරිශීලකයෙකු විය යුතුය.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,ඔබ Marketplace හි ලියාපදිංචි වීම සඳහා පද්ධති කළමනාකරු සහ අයිතම කළමනාකරුගේ භූමිකාවන් සමඟ පරිපාලක හැර වෙනත් පරිශීලකයෙකු විය යුතුය.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,අයිතමය {0} කොටස් අයිතමය නොවේ
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,කලින් නොදන්වා
@@ -2181,7 +2181,7 @@
 DocType: HR Settings,Employee Settings,සේවක සැකසුම්
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,ගෙවීම් පද්ධතියක් පැටවීම
 ,Batch-Wise Balance History,කණ්ඩායම ප්රාඥ ශේෂ ඉතිහාසය
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,පේළිය # {0}: අයිතමය {1} සඳහා බිල්පත් ප්රමාණයට වඩා වැඩි නම් අනුපාතය සැකසිය නොහැක.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,පේළිය # {0}: අයිතමය {1} සඳහා බිල්පත් ප්රමාණයට වඩා වැඩි නම් අනුපාතය සැකසිය නොහැක.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,මුද්රණය සැකසුම් අදාළ මුද්රිත ආකෘතිය යාවත්කාලීන
 DocType: Package Code,Package Code,පැකේජය සංග්රහයේ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,ආධුනිකත්ව
@@ -2413,7 +2413,7 @@
 DocType: Delivery Trip,Optimize Route,මාර්ගගත කරන්න
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,කල්තියා X දින සඳහා මෙහෙයුම් සැලසුම් උත්සාහ කරන්න.
 DocType: HR Settings,Stop Birthday Reminders,උපන්දින මතක් නතර
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},සමාගම {0} හි පෙරනිමි වැටුප් ගෙවිය යුතු ගිණුම් සකස් කරන්න
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},සමාගම {0} හි පෙරනිමි වැටුප් ගෙවිය යුතු ගිණුම් සකස් කරන්න
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,ඇමසන් විසින් බදු සහ ගාස්තු ගාස්තු මූල්ය බිඳවැටීම ලබා ගන්න
 DocType: SMS Center,Receiver List,ලබන්නා ලැයිස්තුව
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,සොයන්න අයිතමය
@@ -2483,7 +2483,7 @@
 DocType: Vital Signs,Constipated,සංවෘත
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},සැපයුම්කරු ඉන්වොයිසිය {0} එරෙහිව දිනැති {1}
 DocType: Customer,Default Price List,පෙරනිමි මිල ලැයිස්තුව
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,වත්කම් ව්යාපාරය වාර්තා {0} නිර්මාණය
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,වත්කම් ව්යාපාරය වාර්තා {0} නිර්මාණය
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,අයිතම හමු නොවිනි.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,ඔබ මුදල් වර්ෂය {0} මකා දැමිය නොහැකි. මුදල් වර්ෂය {0} ගෝලීය සැකසුම් සුපුරුදු ලෙස සකසා ඇත
 DocType: Share Transfer,Equity/Liability Account,කොටස් / වගකීම් ගිණුම
@@ -2622,6 +2622,7 @@
 DocType: Blanket Order,Order Type,සාමය වර්ගය
 ,Item-wise Sales Register,අයිතමය ප්රඥාවන්ත විකුණුම් රෙජිස්ටර්
 DocType: Asset,Gross Purchase Amount,දළ මිලදී ගැනීම මුදල
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,අයිතම කේතය&gt; අයිතමය කාණ්ඩ&gt; වෙළඳ නාමය
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,ආරම්භක ශේෂයන්
 DocType: Asset,Depreciation Method,ක්ෂය ක්රමය
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,මූලික අනුපාත ඇතුළත් මෙම බදු ද?
@@ -2705,7 +2706,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,තැ. ප
 DocType: Student Leave Application,Student Leave Application,ශිෂ්ය නිවාඩු ඉල්ලුම්
 DocType: Item,Will also apply for variants,ද ප්රභේද සඳහා අයදුම් කරනු ඇත
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","එය {0} දැනටමත් ලෙස වත්කම්, අවලංගු කල නොහැක"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","එය {0} දැනටමත් ලෙස වත්කම්, අවලංගු කල නොහැක"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},{1} මත සේවක {0} අඩක් දින
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},මුළු කම්කරු පැය වැඩ කරන පැය {0} උපරිම වඩා වැඩි විය යුතු නැහැ
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,මත
@@ -2729,6 +2730,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,දත්ත ලබාගන්න
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},නිවාඩු වර්ගයේ අවසර දී ඇති උපරිම නිවාඩු {0} යනු {1}
 DocType: SMS Center,Create Receiver List,Receiver ලැයිස්තුව නිර්මාණය
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,භාවිතයට ගත හැකි දිනය මිලදී ගැනීමෙන් පසුව විය යුතුය
 DocType: Vehicle,Wheels,රෝද
 DocType: Packing Slip,To Package No.,අංක ඇසිරීම සඳහා
 DocType: Patient Relation,Family,පවුලක්
@@ -2742,7 +2744,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,බිල්පත් මුදල් ගෙවීම් පැහැර හරින සමාගමක මුදලින් හෝ පාර්ශවීය ගිණුම් මුදලකට සමාන විය යුතුය
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"මෙම පැකේජය මෙම බෙදාහැරීමේ කොටසක් බව පෙන්නුම් කරයි (පමණක් කෙටුම්පත),"
 DocType: Soil Texture,Loam,ලෝම්
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,පේළිය {0}: කල් ඉකුත්වන දිනයට පෙර දින නියමිත විය නොහැක
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,පේළිය {0}: කල් ඉකුත්වන දිනයට පෙර දින නියමිත විය නොහැක
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,ගෙවීම් සටහන් කරන්න
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},විෂය {0} සඳහා ප්රමාණ {1} වඩා අඩු විය යුතුය
 ,Sales Invoice Trends,විකුණුම් ඉන්වොයිසිය ප්රවණතා
@@ -2815,7 +2817,7 @@
 DocType: Guardian,Guardian Interests,ගාඩියන් උනන්දුව දක්වන ක්ෂෙත්ර:
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,ගිණුමේ නම / අංකය යාවත්කාලීන කරන්න
 DocType: Naming Series,Current Value,වත්මන් වටිනාකම
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,දිනය {0} සඳහා බහු පිස්කල් අවුරුදු පවතී. රාජ්ය මූල්ය වර්ෂය තුළ දී සමාගමේ සකස් කරන්න
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,දිනය {0} සඳහා බහු පිස්කල් අවුරුදු පවතී. රාජ්ය මූල්ය වර්ෂය තුළ දී සමාගමේ සකස් කරන්න
 DocType: Education Settings,Instructor Records to be created by,විසින් නිර්මාණය කළ උපදේශක වාර්තා
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} නිර්මාණය
 DocType: GST Account,GST Account,GST ගිණුම
@@ -2832,7 +2834,7 @@
 DocType: Sales Person,Name and Employee ID,නම සහ සේවක හැඳුනුම්පත
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,"නියමිත දිනය දිනය ගිය තැන, ශ්රී ලංකා තැපෑල පෙර විය නොහැකි"
 DocType: Website Item Group,Website Item Group,වෙබ් අඩවිය අයිතමය සමූහ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ඉහත තෝරාගත් නිර්ණායකයන් සඳහා ඉදිරිපත් කළ වැටුප ස්ලැබ් හෝ දැනටමත් ඉදිරිපත් කර ඇති වැටුප් ස්ලිප්
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ඉහත තෝරාගත් නිර්ණායකයන් සඳහා ඉදිරිපත් කළ වැටුප ස්ලැබ් හෝ දැනටමත් ඉදිරිපත් කර ඇති වැටුප් ස්ලිප්
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,තීරු බදු හා බදු
 DocType: Projects Settings,Projects Settings,ව්යාපෘති සැකසීම්
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,විමර්ශන දිනය ඇතුලත් කරන්න
@@ -2841,7 +2843,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,සැපයූ යවන ලද
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYY-
 DocType: Purchase Order Item,Material Request Item,ද්රව්ය ඉල්ලීම් අයිතමය
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,කරුණාකර පළමුව ගෙවීම් රිසිට්පත {0} පළ කරන්න
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,කරුණාකර පළමුව ගෙවීම් රිසිට්පත {0} පළ කරන්න
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,විෂය කණ්ඩායම් රුක්.
 DocType: Production Plan,Total Produced Qty,මුළු නිෂ්පාදිත ප්රමාණය
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,මෙම ගාස්තු වර්ගය සඳහා විශාල හෝ වත්මන් පේළිය සංඛ්යාවට සමාන පේළිය අංකය යොමු නො හැකි
@@ -2952,6 +2954,7 @@
 ,Vehicle Expenses,වාහන වියදම්
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,විකුණුම් ඉන්වොයිසිය ඉදිරිපත් කිරීමට පරීක්ෂණාගාරය සාදන්න
 DocType: Serial No,Invoice Details,ඉන්වොයිසිය විස්තර
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,මාර්ග තක්සේරු කිරීමට සහ ප්රශස්තකරණය කිරීමට කරුණාකර Google සිතියම් සැකසීමට සක්රිය කරන්න
 DocType: Grant Application,Show on Website,වෙබ් අඩවියෙන් පෙන්වන්න
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,පටන් ගන්න
 DocType: Hub Tracked Item,Hub Category,ප්රවර්ග කේන්ද්රස්ථානය
@@ -2992,7 +2995,7 @@
 DocType: Inpatient Record,B Positive,B ධනාත්මකයි
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",{0} සේවකයාගේ උපරිම ප්රතිලාභ {{1} ඉක්මවා ඇති ප්රකාශිත ප්රමාණයෙන් {2} ට වඩා වැඩි වීම
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ෙරෝ # {0}: යවන ලද 1, අයිතමය ස්ථාවර වත්කම්වල පරිදි විය යුතුය. බහු යවන ලද සඳහා වෙනම පේළි භාවිතා කරන්න."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ෙරෝ # {0}: යවන ලද 1, අයිතමය ස්ථාවර වත්කම්වල පරිදි විය යුතුය. බහු යවන ලද සඳහා වෙනම පේළි භාවිතා කරන්න."
 DocType: Leave Block List Allow,Leave Block List Allow,වාරණ ලැයිස්තුව තබන්න ඉඩ දෙන්න
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr හිස් හෝ ඉඩක් බව අප වටහා ගත නො හැකි
 DocType: Patient Medical Record,Patient Medical Record,රෝගියා වෛද්ය වාර්තාව
@@ -3026,7 +3029,7 @@
 DocType: Workstation,Wages per hour,පැයට වැටුප්
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},කණ්ඩායම කොටස් ඉතිරි {0} ගබඩා {3} හි විෂය {2} සඳහා {1} සෘණ බවට පත් වනු
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,පහත සඳහන් ද්රව්ය ඉල්ලීම් අයිතමය යලි සඳහා මට්ටම මත පදනම්ව ස්වයංක්රීයව ඉහළ නංවා තිබෙනවා
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},ගිණුම {0} වලංගු නැත. ගිණුම ව්යවහාර මුදල් විය යුතුය {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},ගිණුම {0} වලංගු නැත. ගිණුම ව්යවහාර මුදල් විය යුතුය {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},දිනයෙන් {0} සේවකයාගේ දිනයෙන් පසුව {1}
 DocType: Supplier,Is Internal Supplier,අභ්යන්තර සැපයුම්කරු වේ
 DocType: Employee,Create User Permission,පරිශීලක අවසරය සාදන්න
@@ -3170,7 +3173,7 @@
 DocType: Account,Fixed Asset,ඉස්තාවර වත්කම්
 DocType: Amazon MWS Settings,After Date,දිනය පසුව
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Serialized බඩු තොග
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,අන්තර් සමාගම් ඉන්වොයිසිය සඳහා වලංගු නොවන {0}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,අන්තර් සමාගම් ඉන්වොයිසිය සඳහා වලංගු නොවන {0}.
 ,Department Analytics,දෙපාර්තමේන්තු විශ්ලේෂණ
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,පෙරනිමි සබඳතාවයේ ඊමේල් හමු නොවිනි
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,රහස් නිර්මාණය කරන්න
@@ -3183,7 +3186,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,ගාස්තු ව්යුහය හා ශිෂ්ය සමූහයෙහි වැඩසටහන {0} වෙනස් වේ.
 DocType: Bank Statement Transaction Entry,Receivable Account,ලැබිය යුතු ගිණුම්
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,වලංගු වන දිනයට වඩා දින සිට වලංගු විය යුතුය.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},ෙරෝ # {0}: වත්කම් {1} දැනටමත් {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},ෙරෝ # {0}: වත්කම් {1} දැනටමත් {2}
 DocType: Quotation Item,Stock Balance,කොටස් වෙළඳ ශේෂ
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,ගෙවීම විකුණුම් න්යාය
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,විධායක නිලධාරී
@@ -3225,6 +3228,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,ඩෙබිට් කිරීම අවශ්ය වේ
 DocType: Clinical Procedure,Inpatient Record,රෝගියාගේ වාර්තාව
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ඔබගේ කණ්ඩායම විසින් සිදු කළ කටයුතුවලදී සඳහා කාලය, පිරිවැය සහ බිල්පත් පිළිබඳ වාර්තාවක් තබා ගැනීමට උදව්"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,සැපයුම්කරු&gt; සැපයුම් වර්ගය
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,මිලදී ගැනීම මිල ලැයිස්තුව
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,ගනුදෙනුවේ දිනය
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,සැපයුම්කරුවන් ලකුණු දර්ශක විචල්යයන්හි තේමාවන්.
@@ -3267,7 +3271,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,විනිමය ලාභ / අඞු කිරීමට
 DocType: Opportunity,Lost Reason,අහිමි හේතුව
 DocType: Amazon MWS Settings,Enable Amazon,ඇමේසන් සක්රිය කරන්න
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},පේලිය # {0}: ගිණුම {1} සමාගමට අයත් නොවේ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},පේලිය # {0}: ගිණුම {1} සමාගමට අයත් නොවේ {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType සොයා ගැනීමට නොහැකි විය {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,නව ලිපිනය
 DocType: Quality Inspection,Sample Size,නියැදියේ ප්රමාණය
@@ -3378,7 +3382,7 @@
 DocType: Water Analysis,Origin,මූලාරම්භය
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,මෙම ලේඛනය අයිතමය {4} සඳහා {0} {1} විසින් සීමාව ඉක්මවා ඇත. ඔබ එකම {2} එරෙහිව තවත් {3} ගන්නවාද?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,ඉතිරි පසු නැවත නැවත සකස් කරන්න
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,වෙනස් මුදල ගිණුම තෝරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,වෙනස් මුදල ගිණුම තෝරන්න
 DocType: Purchase Invoice,Price List Currency,මිල ලැයිස්තුව ව්යවහාර මුදල්
 DocType: Naming Series,User must always select,පරිශීලක සෑම විටම තෝරාගත යුතුය
 DocType: Stock Settings,Allow Negative Stock,ඍණ කොටස් ඉඩ දෙන්න
@@ -3420,7 +3424,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,මෙම හමුවීම අවලංගු කිරීමට අවශ්ය බව ඔබට විශ්වාසද?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,හෝටල් කාමර මිල කිරීමේ පැකේජය
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,විකුණුම් නල
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},වැටුප සංරචක {0} පැහැර ගිණුමක් සකස් කරන්න
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},වැටුප සංරචක {0} පැහැර ගිණුමක් සකස් කරන්න
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,දා අවශ්ය
 DocType: Rename Tool,File to Rename,නැවත නම් කරන්න කිරීමට ගොනු
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},කරුණාකර ෙරෝ {0} තුළ අයිතමය සඳහා ද ෙව් තෝරා
@@ -3441,7 +3445,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,මිලදී ගත් අයිතම පිරිවැය
 DocType: Employee Separation,Employee Separation Template,සේවක වෙන් කිරීමේ ආකෘතිය
 DocType: Selling Settings,Sales Order Required,විකුණුම් සාමය අවශ්ය
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,විකිණුම්කරුවෙකු වන්න
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,විකිණුම්කරුවෙකු වන්න
 DocType: Purchase Invoice,Credit To,ක්රෙඩිට් කිරීම
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,ක්රියාකාරී ඇද්ද / ගනුදෙනුකරුවන්
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,සම්මත සැපයුම් සටහන ආකෘතිය භාවිතා කිරීමට හිස්ව තබන්න
@@ -3483,7 +3487,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,බදු ආකෘතියක් සාදන්න
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,පරිශීලක සංසදය
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,", අමු ද්රව්ය, හිස් විය නොහැක."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,පේළිය # {0} (ගෙවීම් වගුව): ප්රමාණය ඍණ විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,පේළිය # {0} (ගෙවීම් වගුව): ප්රමාණය ඍණ විය යුතුය
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.",", කොටස් යාවත්කාලීන නොවන ඉන්වොයිස් පහත නාවික අයිතමය අඩංගු විය."
 DocType: Contract,Fulfilment Status,සම්පූර්ණ තත්ත්වය
 DocType: Lab Test Sample,Lab Test Sample,පරීක්ෂණ පරීක්ෂණ නියැදිය
@@ -3623,7 +3627,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,ලේඛන දිනය
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},නිර්මාණය කරන ලද්දේ ගාස්තු වාර්තා - {0}
 DocType: Asset Category Account,Asset Category Account,වත්කම් ප්රවර්ගය ගිණුම්
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,පේළිය # {0} (ගෙවීම් වගුව): ප්රමාණය ධනාත්මක විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,පේළිය # {0} (ගෙවීම් වගුව): ප්රමාණය ධනාත්මක විය යුතුය
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},විකුණුම් සාමය ප්රමාණය {1} වඩා වැඩි අයිතමය {0} බිහි කිරීමට නොහැක
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Атрибут අගයන් තෝරන්න
 DocType: Purchase Invoice,Reason For Issuing document,ලියවිල්ල නිකුත් කිරීම සඳහා හේතුව
@@ -3678,7 +3682,7 @@
 DocType: Purchase Receipt,Time at which materials were received,කවෙර්ද ද්රව්ය ලැබුණු කාලය
 DocType: Products Settings,Products per Page,පිටුවකට භාණ්ඩ
 DocType: Stock Ledger Entry,Outgoing Rate,පිටතට යන අනුපාතය
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,හෝ
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,හෝ
 DocType: Sales Order,Billing Status,බිල්පත් තත්ත්වය
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ක නිකුත් වාර්තා
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,උපයෝගීතා වියදම්
@@ -3706,7 +3710,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,සේවක බදු නිදහස් කිරීමේ ප්රකාශය
 DocType: Payment Entry,Cheque/Reference Date,"එම ගාස්තුව මුදලින්, ෙචක්පතකින් / යොමුව දිනය"
 DocType: Purchase Invoice,Total Taxes and Charges,මුළු බදු හා ගාස්තු
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,පවත්නා-භාවිතා කරන දිනය අතීත දිනය ලෙස ඇතුළත් කර ඇත
 DocType: Employee,Emergency Contact,හදිසි ඇමතුම්
 DocType: Bank Reconciliation Detail,Payment Entry,ගෙවීම් සටහන්
 ,sales-browser,අලෙවි-බ්රවුසරය
@@ -3753,6 +3756,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),ප්රතිලාභ (ණය විස්තරය)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,යෝබ් ආරම්භ කරන්න
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},වත්කම සඳහා අනු අංකය නැත {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,කරුණාකර Setup&gt; Settings&gt; Naming Series මගින් {0} සඳහා නම් කිරීමේ මාලාවක් සකසන්න
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,ආබාධිත සැකිල්ල පෙරනිමි සැකිලි නොවිය යුතුයි
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,පේළි {0} සඳහා: සැලසුම්ගත qty ඇතුල් කරන්න
 DocType: Account,Income Account,ආදායම් ගිණුම
@@ -3766,6 +3770,7 @@
 DocType: Loyalty Program,Help Section,උපකාරක අංශය
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,පෙර
 DocType: Appraisal Goal,Key Responsibility Area,ප්රධාන වගකීම් ප්රදේශය
+DocType: Delivery Trip,Distance UOM,දුරස්ථ UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","ශිෂ්ය කාණ්ඩ ඔබ සිසුන් සඳහා පැමිණීම, ඇගයීම හා ගාස්තු නිරීක්ෂණය උදව්"
 DocType: Payment Entry,Total Allocated Amount,මුළු වෙන් කළ මුදල
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,භාණ්ඩ තොගය සඳහා සකසන්න පෙරනිමි බඩු තොග ගිණුමක්
@@ -3805,7 +3810,7 @@
 DocType: Item Supplier,Item Supplier,අයිතමය සැපයුම්කරු
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,කිසිදු කණ්ඩායම ලබා ගැනීමට අයිතමය සංග්රහයේ ඇතුලත් කරන්න
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},කරුණාකර {0} සඳහා අගය තෝරා quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,ස්ථාන මාරු සඳහා තෝරා නොගත් අයිතම
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,ස්ථාන මාරු සඳහා තෝරා නොගත් අයිතම
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,සියළු ලිපිනයන්.
 DocType: Company,Stock Settings,කොටස් සැකසුම්
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","පහත සඳහන් ලක්ෂණ වාර්තා දෙකම එකම නම් යනවාත් පමණි. සමූහය, රූට් වර්ගය, සමාගම,"
@@ -4091,7 +4096,7 @@
 DocType: Patient,Personal and Social History,පෞද්ගලික සහ සමාජ ඉතිහාසය
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,පරිශීලකයා {0} නිර්මාණය කරන ලදි
 DocType: Fee Schedule,Fee Breakup for each student,එක් සිසුවෙකු සඳහා ගාස්තු වෙන් කිරීම
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),සාමය එරෙහිව මුළු අත්තිකාරම් ({0}) {1} ග්රෑන්ඩ් මුළු වඩා වැඩි ({2}) විය නොහැකි
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),සාමය එරෙහිව මුළු අත්තිකාරම් ({0}) {1} ග්රෑන්ඩ් මුළු වඩා වැඩි ({2}) විය නොහැකි
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,අසාමාන ෙලස මාස හරහා ඉලක්ක බෙදා හැරීමට මාසික බෙදාහැරීම් තෝරන්න.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,කේතය වෙනස් කරන්න
 DocType: Purchase Invoice Item,Valuation Rate,තක්සේරු අනුපාත
@@ -4100,7 +4105,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,ITC සෙස් සඳහා උපකාරී විය
 ,Student Monthly Attendance Sheet,ශිෂ්ය මාසික පැමිණීම පත්රය
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,නැව්ගත කිරීමේ නීතිය විකිණීම සඳහා පමණි
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,ක්ෂය කිරීම් පේළි {0}: ඉදිරි ක්ෂය කිරීම් දිනය මිලදී ගැනීමේ දිනයට පෙර නොවිය හැක
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,ක්ෂය කිරීම් පේළි {0}: ඉදිරි ක්ෂය කිරීම් දිනය මිලදී ගැනීමේ දිනයට පෙර නොවිය හැක
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,ව්යාපෘති ආරම්භක දිනය
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,තුරු
 DocType: Rename Tool,Rename Log,ඇතුළුවන්න නැවත නම් කරන්න
@@ -4118,12 +4123,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,විකුණුම් ගනුදෙනු මත පදනම් ව ාපෘතියක් සහ සමාගමක් යාවත්කාලීන කළ යුතුද යන්න කොපමණ වේද?
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,දින අවසන් වීමට නියමිතය
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,සිසුන් එක් කරන්න
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","කරුණාකර මෙම ලේඛනය අවලංගු කිරීම සඳහා සේවකයා <a href=""#Form/Employee/{0}"">{0}</a> \ මකා දමන්න"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},කරුණාකර {0} තෝරා
 DocType: C-Form,C-Form No,C-අයදුම්පත් නොමැත
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,දුර
+DocType: Delivery Stop,Distance,දුර
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,ඔබ මිලදී ගන්නා හෝ විකිණෙන ඔබේ භාණ්ඩ හෝ සේවාවන් ලැයිස්තුගත කරන්න.
 DocType: Water Analysis,Storage Temperature,ගබඩා උෂ්ණත්වය
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4150,7 +4153,7 @@
 DocType: Homepage,Company Description for website homepage,වෙබ් අඩවිය මුල්පිටුව සඳහා සමාගම විස්තරය
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ගනුදෙනුකරුවන්ගේ පහසුව සඳහා, මෙම කේත ඉන්වොයිසි හා සැපයුම් සටහන් වැනි මුද්රිත ආකෘති භාවිතා කළ හැක"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier නම
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,{0} සඳහා තොරතුරු ලබාගත නොහැක.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,{0} සඳහා තොරතුරු ලබාගත නොහැක.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,විවෘත වීමේ ජර්නලය
 DocType: Contract,Fulfilment Terms,ඉටු කරන නියමයන්
 DocType: Sales Invoice,Time Sheet List,කාලය පත්රය ලැයිස්තුව
@@ -4333,7 +4336,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,සිසුන් ක්රියාකාරකම් පදනම් කණ්ඩායම සඳහා තෝරා
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,සිසුන් ක්රියාකාරකම් පදනම් කණ්ඩායම සඳහා තෝරා
 DocType: Journal Entry,User Remark,පරිශීලක අදහස් දැක්වීම්
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,මාර්ග සුසර කිරීම.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,මාර්ග සුසර කිරීම.
 DocType: Travel Itinerary,Non Diary,දිනපොත
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,වමේ සේවකයින් සඳහා රඳවා ගැනීමේ බෝනස් සෑදිය නොහැක
 DocType: Lead,Market Segment,වෙළෙඳපොළ
@@ -4364,7 +4367,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,පක්ෂපාතිත්වය වැඩසටහන
 DocType: Student Guardian,Father,පියා
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,ටිකට් පත්
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;යාවත්කාලීන කොටස්&#39; ස්ථාවර වත්කම් විකිණීමට සඳහා දැන්වීම් පරීක්ෂා කළ නොහැකි
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;යාවත්කාලීන කොටස්&#39; ස්ථාවර වත්කම් විකිණීමට සඳහා දැන්වීම් පරීක්ෂා කළ නොහැකි
 DocType: Bank Reconciliation,Bank Reconciliation,බැංකු සැසඳුම්
 DocType: Attendance,On Leave,නිවාඩු මත
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,යාවත්කාලීන ලබා ගන්න
@@ -4409,7 +4412,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,අනු අංකය හා කණ්ඩායම
 DocType: Warranty Claim,From Company,සමාගම වෙතින්
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,තක්සේරු නිර්ණායකයන් ලකුණු මුදලක් {0} විය යුතුය.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,වෙන් කරවා අගය පහත සංඛ්යාව සකස් කරන්න
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,වෙන් කරවා අගය පහත සංඛ්යාව සකස් කරන්න
 DocType: Supplier Scorecard Period,Calculations,ගණනය කිරීම්
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,හෝ වටිනාකම යවන ලද
 DocType: Payment Terms Template,Payment Terms,ගෙවීම් කොන්දේසි
@@ -4429,7 +4432,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,ආන්තිකය සමග වට්ටමක් (%) මිල ලැයිස්තුව අනුපාත මත
 DocType: Healthcare Service Unit Type,Rate / UOM,අනුපාතය / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,සියලු බඞු ගබඞාව
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,අන්තර් සමාගම් ගනුදෙනු සඳහා {0} සොයාගත නොහැකි විය.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,අන්තර් සමාගම් ගනුදෙනු සඳහා {0} සොයාගත නොහැකි විය.
 DocType: Travel Itinerary,Rented Car,කුලී කාර්
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,ඔබේ සමාගම ගැන
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,ගිණුමක් සඳහා ක්රෙඩිට් ශේෂ පත්රය ගිණුමක් විය යුතුය
@@ -4531,6 +4534,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,ශාක විශ්ලේෂක නිර්නායක
 DocType: Cheque Print Template,Cheque Height,"එම ගාස්තුව මුදලින්, ෙචක්පතකින් උස"
 DocType: Supplier,Supplier Details,සැපයුම්කරු විස්තර
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,කරුණාකර Setup&gt; Numbering Series හරහා පැමිණීමේදී සංඛ්යාලේඛන මාලාවක් සකසන්න
 DocType: Setup Progress,Setup Progress,ප්රගතිය සැකසීම
 DocType: Expense Claim,Approval Status,පතේ තත්වය
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},වටිනාකම පේළිය {0} අගය කිරීමට වඩා අඩු විය යුතුය
@@ -4624,7 +4628,6 @@
 DocType: Travel Request,Fully Sponsored,පූර්ණ අනුග්රහය
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,ප්රතිලෝම ජර්නල් ප්රවේශය
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,පාරිභෝගිකයා {0} නිර්මාණය වේ.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,කරුණාකර මානව සම්පත්&gt; HR සැකසුම් තුළ සේවක නාමකරණය කිරීමේ පද්ධතිය සැකසීම කරන්න
 DocType: Stock Settings,Limit Percent,සියයට සීමා
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,දැනට කිසිදු ගබඩාවක් නොමැත
 ,Payment Period Based On Invoice Date,ගෙවීම් කාලය ඉන්වොයිසිය දිනය පදනම්
@@ -4683,7 +4686,7 @@
 DocType: BOM Explosion Item,Source Warehouse,මූලාශ්රය ගබඩාව
 DocType: Installation Note,Installation Date,ස්ථාපනය දිනය
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Share ලෙජරය
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},ෙරෝ # {0}: වත්කම් {1} සමාගම අයිති නැත {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},ෙරෝ # {0}: වත්කම් {1} සමාගම අයිති නැත {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,විකුණුම් ඉන්වොයිසිය {0} සෑදී ඇත
 DocType: Employee,Confirmation Date,ස්ථිර කිරීම දිනය
 DocType: Inpatient Occupancy,Check Out,පරීක්ෂාකාරී වන්න
@@ -4703,6 +4706,7 @@
 DocType: Production Plan,Sales Orders Detail,විකුණුම් නියෝග detail
 DocType: Bin,Requested Quantity,ඉල්ලන ප්රමාණය
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,කරුණාකර අධ්යාපනය&gt; අධ්යාපන සැකසීම් තුළ උපදේශක නාමකරණයක් සැකසීම
 DocType: Patient,Marital Status,විවාහක අවිවාහක බව
 DocType: Stock Settings,Auto Material Request,වාහන ද්රව්ය ඉල්ලීම්
 DocType: Woocommerce Settings,API consumer secret,API පාරිභෝගික රහස
@@ -4755,7 +4759,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,දින තෝරන්න
 DocType: Academic Term,Term Name,කාලීන නම
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),ක්රෙඩිට් ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,වැටුප් වර්ධක නිර්මාණය කිරීම ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,වැටුප් වර්ධක නිර්මාණය කිරීම ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,ඔබට root node සංස්කරණය කළ නොහැක.
 DocType: Buying Settings,Purchase Order Required,මිලදී අවශ්ය න්යාය
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,ටයිමර්
@@ -4793,7 +4797,7 @@
 DocType: Account,Rate at which this tax is applied,මෙම බදු අයදුම් වන අවස්ථාවේ අනුපාතය
 DocType: Cash Flow Mapper,Section Name,කොටස නම
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,සීරුමාරු කිරීමේ යවන ලද
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},ක්ෂය කිරීම් පේළි {0}: ප්රයෝජනවත් ආයුෂ පසු බලාපොරොත්තු වූ අගය {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},ක්ෂය කිරීම් පේළි {0}: ප්රයෝජනවත් ආයුෂ පසු බලාපොරොත්තු වූ අගය {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,වත්මන් රැකියා අවස්ථා
 DocType: Company,Stock Adjustment Account,කොටස් ගැලපුම් ගිණුම
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ලියා හරින්න
@@ -4840,7 +4844,7 @@
 DocType: Program Enrollment,School House,ස්කූල් හවුස්
 DocType: Serial No,Out of AMC,විදේශ මුදල් හුවමාරු කරන්නන් අතරින්
 DocType: Opportunity,Opportunity Amount,අවස්ථා ප්රමාණය
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,වෙන් කරවා අගය පහත සංඛ්යාව අගය පහත සමස්ත සංඛ්යාව ට වඩා වැඩි විය නොහැක
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,වෙන් කරවා අගය පහත සංඛ්යාව අගය පහත සමස්ත සංඛ්යාව ට වඩා වැඩි විය නොහැක
 DocType: Purchase Order,Order Confirmation Date,ඇණවුම් කිරීමේ දිනය
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,නඩත්තු සංචාරය කරන්න
@@ -4881,7 +4885,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,කණ්ඩායම:
 DocType: Volunteer,Afternoon,දහවල්
 DocType: Loyalty Program,Loyalty Program Help,ලෝයල්ටි වැඩසටහන වැඩසටහන
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} &#39;{1}&#39; අක්රීය
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} &#39;{1}&#39; අක්රීය
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,විවෘත ලෙස සකසන්න
 DocType: Cheque Print Template,Scanned Cheque,ස්කෑන් චෙක්පත්
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ගනුදෙනු ඉදිරිපත් මත සම්බන්ධතා වෙත ස්වයංක්රීය ඊමේල් යවන්න.
@@ -4894,7 +4898,7 @@
 DocType: Warranty Claim,Item and Warranty Details,භාණ්ඩය හා Warranty විස්තර
 DocType: Chapter,Chapter Members,සාමාජිකයින්ගේ පරිච්ඡේදය
 DocType: Sales Team,Contribution (%),දායකත්වය (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,සටහන: &#39;මුදල් හෝ බැංකු ගිණුම්&#39; දක්වන නොවීම නිසා ගෙවීම් සටහන් නිර්මාණය කළ නොහැකි වනු ඇත
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,සටහන: &#39;මුදල් හෝ බැංකු ගිණුම්&#39; දක්වන නොවීම නිසා ගෙවීම් සටහන් නිර්මාණය කළ නොහැකි වනු ඇත
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,ව්යාපෘතිය {0} දැනටමත් පවතී
 DocType: Clinical Procedure,Nursing User,හෙද පරිශීලකයා
 DocType: Employee Benefit Application,Payroll Period,වැටුප් කාලපරිච්ෙඡ්දය
@@ -4902,6 +4906,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},අනු අංකය අංක {0} කණ්ඩායමට අයත් නොවේ {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,වගකීම්
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,මෙම උපලේඛනයේ වලංගු කාලය අවසන් වී ඇත.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","කරුණාකර මෙම ලේඛනය අවලංගු කිරීම සඳහා සේවකයා <a href=""#Form/Employee/{0}"">{0}</a> \ මකා දමන්න"
 DocType: Expense Claim Account,Expense Claim Account,වියදම් හිමිකම් ගිණුම
 DocType: Account,Capital Work in Progress,ප්රාග්ධන කාර්යය ප්රගතිය
 DocType: Accounts Settings,Allow Stale Exchange Rates,ස්ට්රේල් විනිමය අනුපාතිකයන්ට ඉඩ දෙන්න
@@ -4983,7 +4989,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,නිකුත් ද්රව්ය
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,ERPNext සමඟ වෙළඳාම් කරන්න
 DocType: Material Request Item,For Warehouse,ගබඩා සඳහා
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,බෙදාහදා ගැනීම සටහන් {0} යාවත්කාලීන කරන ලදි
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,බෙදාහදා ගැනීම සටහන් {0} යාවත්කාලීන කරන ලදි
 DocType: Employee,Offer Date,ඉල්ලුමට දිනය
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,උපුටා දැක්වීම්
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,ඔබ නොබැඳිව වේ. ඔබ ජාලයක් තියෙනවා තෙක් ඔබට රීලෝඩ් කිරීමට නොහැකි වනු ඇත.
@@ -5034,7 +5040,7 @@
 DocType: Shipping Rule,Calculate Based On,පදනම් කරගත් දින ගණනය
 DocType: Contract,Unfulfilled,අසම්පූර්ණයි
 DocType: Delivery Note Item,From Warehouse,ගබඩාව සිට
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,ඉහත නිර්ණායකයන් සඳහා සේවකයින් නොමැත
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,ඉහත නිර්ණායකයන් සඳහා සේවකයින් නොමැත
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,නිෂ්පාදනය කිරීමට ද්රව්ය පනත් ෙකටුම්පත අයිතම කිසිදු
 DocType: Shopify Settings,Default Customer,පාරිබෝගිකයා
 DocType: Sales Stage,Stage Name,ස්ථානයේ නම
@@ -5077,7 +5083,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,බදු මුදල වට්ටම් මුදල පසු
 DocType: Patient,Inpatient Status,රෝගියාගේ තත්වය
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,ඩේලි වැඩ සාරාංශය සැකසුම්
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,තෝරාගත් මිල ලැයිස්තු පරීක්ෂාවට ලක් කර ඇති ක්ෂේත්ර මිලදී ගැනීම සහ විකිණීම කළ යුතුය.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,තෝරාගත් මිල ලැයිස්තු පරීක්ෂාවට ලක් කර ඇති ක්ෂේත්ර මිලදී ගැනීම සහ විකිණීම කළ යුතුය.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,කරුණාකර Date by Reqd ඇතුලත් කරන්න
 DocType: Payment Entry,Internal Transfer,අභ තර ස්ථ
 DocType: Asset Maintenance,Maintenance Tasks,නඩත්තු කාර්යයන්
@@ -5114,7 +5120,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,පිරිසක් විසින්
 DocType: Guardian,Interests,උනන්දුව දක්වන ක්ෂෙත්ර:
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,මුදල් සක්රිය කරන්න / අක්රිය කරන්න.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,සමහර වැටුප් පත්රිකා ඉදිරිපත් කළ නොහැක
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,සමහර වැටුප් පත්රිකා ඉදිරිපත් කළ නොහැක
 DocType: Exchange Rate Revaluation,Get Entries,ප්රවේශය ලබා ගන්න
 DocType: Production Plan,Get Material Request,"ද්රව්ය, ඉල්ලීම් ලබා ගන්න"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,තැපැල් වියදම්
@@ -5200,7 +5206,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},වියදම් ගිණුම අයිතමය {0} සඳහා අනිවාර්ය වේ
 DocType: BOM,Website Description,වෙබ් අඩවිය විස්තරය
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,කොටස් ශුද්ධ වෙනස්
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,මිලදී ගැනීම ඉන්වොයිසිය {0} පළමු අවලංගු කරන්න
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,මිලදී ගැනීම ඉන්වොයිසිය {0} පළමු අවලංගු කරන්න
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,අවසර නොදේ. කරුණාකර සේවා ඒකක වර්ගය අක්රීය කරන්න
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","විද්යුත් තැපැල් ලිපිනය අනන්ය විය යුතුය, දැනටමත් {0} සඳහා පවතී"
 DocType: Serial No,AMC Expiry Date,"විදේශ මුදල් හුවමාරු කරන්නන්, කල් ඉකුත්වන දිනය,"
@@ -5240,7 +5246,7 @@
 DocType: Hotel Room,Hotel Room,හෝටල් කාමරය
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},ගිණුම {0} සමාගම {1} අයත් නොවේ
 DocType: Leave Type,Rounding,වටරවුම
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,පිට පිට අනු ගණන් {0} සැපයුම් සටහන සමග නොගැලපේ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,පිට පිට අනු ගණන් {0} සැපයුම් සටහන සමග නොගැලපේ
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),විසර්ජන ප්රමාණයේ (Pro-rated)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","පාරිභෝගික මිල දී ගැනීම්, පාරිභෝගික සමූහය, ප්රදේශය, සැපයුම්කරු, සැපයුම්කාර කණ්ඩායම, ව්යාපාර කටයුතු, විකුණුම් හවුල්කරු ආදිය පදනම්ව මිල නියම කිරීමේ නීති රීති සකස් කර ගනී."
 DocType: Student,Guardian Details,ගාඩියන් විස්තර
@@ -5295,7 +5301,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},කොටස් අයිතමය {0} සඳහා අවශ්ය පොත් ගබඩාව
 DocType: Leave Allocation,Unused leaves,භාවිතයට නොගත් කොළ
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,ආපසු ගෙවීමේ පිවිසුම කරන්න
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,සියලුම දෙපාර්තමේන්තු
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,සියලුම දෙපාර්තමේන්තු
 DocType: Healthcare Service Unit,Vacant,පුරප්පාඩු
 DocType: Patient,Alcohol Past Use,මත්පැන් අතීත භාවිතය
 DocType: Fertilizer Content,Fertilizer Content,පොහොර අන්තර්ගතය
@@ -5306,7 +5312,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,මෙම වැඩ පිළිවෙල අවලංගු කිරීමට පෙර වැඩ පිළිවෙළ {0} අවලංගු කළ යුතුය
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),(උප-එකලස්කිරීම් ඇතුළුව) පුපුරා ද්රව්ය ලේඛණය බෝගයන්ගේ
 DocType: Authorization Rule,Applicable To (Employee),(සේවක) කිරීම සඳහා අදාළ
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,නියමිත දිනය අනිවාර්ය වේ
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,නියමිත දිනය අනිවාර්ය වේ
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Attribute {0} 0 වෙන්න බෑ සඳහා වර්ධකය
 DocType: Employee Benefit Claim,Benefit Type and Amount,ප්රතිලාභ වර්ගය සහ ප්රමාණය
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,කාමර වෙන් කර ඇත
@@ -5455,7 +5461,7 @@
 DocType: Purchase Invoice Item,Total Weight,සම්පූර්ණ බර
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,විකුණුම් මත කොමිසම
 DocType: Job Offer Term,Value / Description,අගය / විස්තරය
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ෙරෝ # {0}: වත්කම් {1} ඉදිරිපත් කළ නොහැකි, එය දැනටමත් {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ෙරෝ # {0}: වත්කම් {1} ඉදිරිපත් කළ නොහැකි, එය දැනටමත් {2}"
 DocType: Tax Rule,Billing Country,බිල්පත් රට
 DocType: Purchase Order Item,Expected Delivery Date,අපේක්ෂිත භාර දීම දිනය
 DocType: Restaurant Order Entry,Restaurant Order Entry,ආපන ශාලා ප්රවේශය
@@ -5494,12 +5500,13 @@
 DocType: Maintenance Visit,Breakdown,බිඳ වැටීම
 DocType: Travel Itinerary,Vegetarian,නිර්මාංශ
 DocType: Patient Encounter,Encounter Date,රැස්වීම් දිනය
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,ගිණුම: {0} මුදල් සමග: {1} තෝරා ගත නොහැකි
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,ගිණුම: {0} මුදල් සමග: {1} තෝරා ගත නොහැකි
 DocType: Bank Statement Transaction Settings Item,Bank Data,බැංකු දත්ත
 DocType: Purchase Receipt Item,Sample Quantity,සාම්පල ප්රමාණය
 DocType: Bank Guarantee,Name of Beneficiary,ප්රතිලාභියාගේ නම
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",නවතම තක්සේරු අනුපාතය / මිල ලැයිස්තුවේ අනුපාතය / අමු ද්රව්යයේ අවසන් මිලදී ගැනීමේ අනුපාතය මත පදනම්ව Scheduler හරහා ස්වයංක්රීයව BOM පිරිවැය යාවත්කාලීන කරන්න.
 DocType: Supplier,SUP-.YYYY.-,SUP-YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,සැපයුම්කරු&gt; සැපයුම් කණ්ඩායම
 DocType: Bank Reconciliation Detail,Cheque Date,"එම ගාස්තුව මුදලින්, ෙචක්පතකින් දිනය"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},ගිණුම {0}: මාපිය ගිණුමක් {1} සමාගම අයිති නැත: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,මෙම සමාගම අදාළ සියලු ගනුදෙනු සාර්ථකව මකා!
@@ -5559,7 +5566,7 @@
 DocType: Hotel Room,Hotel Manager,හෝටල් කළමනාකරු
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,කරත්තයක් සඳහා බදු පාලනය සකසන්න
 DocType: Purchase Invoice,Taxes and Charges Added,බදු හා බදු ගාස්තු එකතු
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,ක්ෂය කිරීම් පේළි {0}: ඉදිරි ක්ෂය කිරීම් දිනය ලබා ගත හැකි දිනය සඳහා භාවිතා කල නොහැක
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,ක්ෂය කිරීම් පේළි {0}: ඉදිරි ක්ෂය කිරීම් දිනය ලබා ගත හැකි දිනය සඳහා භාවිතා කල නොහැක
 ,Sales Funnel,විකුණුම් පොම්ප
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,කෙටි යෙදුම් අනිවාර්ය වේ
 DocType: Project,Task Progress,කාර්ය සාධක ප්රගති
@@ -5573,7 +5580,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,සියලු පාරිභෝගික කණ්ඩායම්
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,මාසික සමුච්චිත
 DocType: Attendance Request,On Duty,රාජකාරිය මත
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} අනිවාර්ය වේ. සමහර විට විනිමය හුවමාරු වාර්තා {1} {2} සඳහා නිර්මාණය කර නැත.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} අනිවාර්ය වේ. සමහර විට විනිමය හුවමාරු වාර්තා {1} {2} සඳහා නිර්මාණය කර නැත.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},කාර්ය මණ්ඩලය සැලැස්ම {0} දැනටමත් පවතී {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,බදු සැකිල්ල අනිවාර්ය වේ.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,ගිණුම {0}: මාපිය ගිණුමක් {1} නොපවතියි
@@ -5653,11 +5660,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,හිතුව එක තේ ගබඩාවක් අනිවාර්ය වේ
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","UOM, අයිතම සමූහය, විස්තරය සහ වේලාවන් වැනි අයිතමයන් වින්යාස කරන්න."
 DocType: Certification Application,Certification Status,සහතික කිරීමේ තත්වය
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,වෙළඳපල
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,වෙළඳපල
 DocType: Travel Itinerary,Travel Advance Required,ගමන් අත්තිකාරම් අවශ්යයි
 DocType: Subscriber,Subscriber Name,අනුසන්කරු නම
 DocType: Serial No,Out of Warranty,Warranty න්
-DocType: Cashier Closing,Cashier-closing-,මුදල් අයකැමි-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,සිතියම දත්ත වර්ගය
 DocType: BOM Update Tool,Replace,ආදේශ
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,නිෂ්පාදන සොයාගත්තේ නැත.
@@ -5745,7 +5751,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,විකිණුම් සහ මිලදී ගැනීම සඳහා පෙරනිමි බදු ආකෘති නිර්මාණය කර ඇත.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,තක්සේරු ප්රතිඵල ප්රතිඵලය {0} දැනටමත් පවතී.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","උදාහරණය: ABCD. #####. කාණ්ඩ මාලාවක් සකසා ඇත්නම් සහ කාණ්ඩ අංක සඳහන් නොකරනු ලැබේ. පසුව මෙම ශ්රේණිය පදනම් කර ගත් ස්වයංක්රීය කාණ්ඩය වේ. මෙම අයිතමය සඳහා යාවත්කාලීන කිරීම සඳහා ඔබ සැමවිටම අවශ්ය නම්, මෙය හිස්ව තබන්න. සටහන: මෙම සැකසුම නාමකරණ අනුප්රාප්තිකය තුළ ඇති සැකසීම් වලදී ප්රමුඛතාව හිමිවනු ඇත."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,කරුණාකර Setup&gt; Numbering Series හරහා පැමිණීමේදී සංඛ්යාලේඛන මාලාවක් සකසන්න
 DocType: BOM,Materials Required (Exploded),අවශ්ය ද්රව්ය (පුපුරා)
 DocType: Contract,Party User,පක්ෂ පරිශීලක
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',පිරිසක් විසින් &#39;සමාගම&#39; නම් හිස් පෙරීමට සමාගම සකස් කරන්න
@@ -5948,7 +5953,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,විපක්ෂ ගණන්
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Trial Period ආරම්භක දිනය සහ පරීක්ෂණ කාලය අවසන් දිනය නියම කළ යුතුය
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,සාමාන්ය අනුපාතය
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ගෙවීම් කිරීමේ උපලේඛනයේ මුළු මුදල / ග්රෑන්ඩ් / වටලා ඇති මුළු එකතුව සමාන විය යුතුය
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ගෙවීම් කිරීමේ උපලේඛනයේ මුළු මුදල / ග්රෑන්ඩ් / වටලා ඇති මුළු එකතුව සමාන විය යුතුය
 DocType: Subscription Plan Detail,Plan,සැලැස්ම
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,පොදු ලෙජරය අනුව බැංකු ප්රකාශය ඉතිරි
 DocType: Job Applicant,Applicant Name,අයදුම්කරු නම
@@ -6017,7 +6022,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,සබන් සහ ඩිටර්ජන්ට්
 DocType: BOM,Show Items,අයිතම පෙන්වන්න
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,වරින් වර ට වඩා වැඩි විය නොහැක.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,ඊ-මේල් මගින් පාරිභෝගිකයින්ට දැනුම් දීමට ඔබට අවශ්යද?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,ඊ-මේල් මගින් පාරිභෝගිකයින්ට දැනුම් දීමට ඔබට අවශ්යද?
 DocType: Subscription Plan,Billing Interval,බිල්ගත කිරීමේ කාලය
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,චලන පින්තූර සහ වීඩියෝ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,නියෝග
@@ -6026,9 +6031,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,පේළිය {0}: {1} 0 ට වඩා වැඩි විය යුතුය
 DocType: Assessment Criteria,Assessment Criteria Group,තක්සේරු නිර්ණායක සමූහ
 DocType: Healthcare Settings,Patient Name By,රෝගියාගේ නම
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},උපචිත සඟරාව {0} සිට {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},උපචිත සඟරාව {0} සිට {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,විෙමෝචිත ආදායම් සබල කරන්න
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},සමුච්චිත ක්ෂය විවෘත {0} සමාන වඩා අඩු විය යුතුය
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},සමුච්චිත ක්ෂය විවෘත {0} සමාන වඩා අඩු විය යුතුය
 DocType: Warehouse,Warehouse Name,පොත් ගබඩාව නම
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,සැබෑ ආරම්භක දිනය සැබෑ අවසානයට වඩා අඩු විය යුතුය
 DocType: Naming Series,Select Transaction,ගනුදෙනු තෝරන්න
@@ -6180,7 +6185,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,ශ්රේණියේ {1} ශ්රේණියේ සේවක {1} වල පෙරනිමි නිවාඩු ප්රතිපත්තිය නොමැත
 DocType: Salary Detail,Salary Detail,වැටුප් විස්තර
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,කරුණාකර පළමු {0} තෝරා
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,{0} පරිශීලකයන් එකතු කරන ලදි
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,{0} පරිශීලකයන් එකතු කරන ලදි
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","බහු ස්ථරයේ වැඩසටහනක දී, පාරිභෝගිකයින් විසින් වැය කරනු ලබන පරිදි පාරිභෝගිකයින්ට අදාල ස්ථානයට ස්වයංක්රීයව පවරනු ලැබේ"
 DocType: Appointment Type,Physician,වෛද්යවරයෙක්
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,කණ්ඩායම {0} අයිතමය ක {1} කල් ඉකුත් වී ඇත.
@@ -6325,7 +6330,7 @@
 DocType: Asset,Custodian,භාරකරු
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,පේදුරු-of-Sale විකිණීමට නරඹන්න
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} 0 සිට 100 අතර අගයක් විය යුතුය
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},{0} සිට {1} දක්වා {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},{0} සිට {1} දක්වා {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,අනාරක්ෂිත ණය
 DocType: Cost Center,Cost Center Name,වියදම මධ්යස්ථානය නම
 DocType: Student,B+,B +
@@ -6357,6 +6362,7 @@
 DocType: Employee,Date of Issue,නිකුත් කරන දිනය
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","අර Buy සැකසුම් අනුව මිලදී ගැනීම Reciept අවශ්ය == &#39;ඔව්&#39; නම් ගැනුම් නිර්මාණය කිරීම සඳහා, පරිශීලක අයිතමය {0} සඳහා පළමු මිලදී ගැනීම රිසිට්පත නිර්මාණය කිරීමට අවශ්ය නම්"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},ෙරෝ # {0}: අයිතමය සඳහා සැපයුම්කරු සකසන්න {1}
+DocType: Global Defaults,Default Distance Unit,පෙරනිමි දුරස්ථ ඒකකය
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,ෙරෝ {0}: පැය අගය බිංදුවට වඩා වැඩි විය යුතුය.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,වෙබ් අඩවිය රූප {0} අයිතමය අනුයුක්ත {1} සොයාගත නොහැකි
 DocType: Issue,Content Type,අන්තර්ගතයේ වර්ගය
@@ -6412,7 +6418,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,ගිණුමක් සඳහා ඩෙබිට් වූ ශේෂ පත්රය ගිණුමක් විය යුතුය
 DocType: Asset,Naming Series,ශ්රේණි අනුප්රාප්තිකයා නම් කිරීම
 DocType: Vital Signs,Coated,ආෙල්පිත
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,පේළිය {0}: අපේක්ෂිත වටිනාකමින් පසු ප්රයෝජනවත් ආයු කාලය පසු දළ වශයෙන් මිලදී ගැනීමේ ප්රමාණයට වඩා අඩු විය යුතුය
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,පේළිය {0}: අපේක්ෂිත වටිනාකමින් පසු ප්රයෝජනවත් ආයු කාලය පසු දළ වශයෙන් මිලදී ගැනීමේ ප්රමාණයට වඩා අඩු විය යුතුය
 DocType: GoCardless Settings,GoCardless Settings,GoCardless සැකසුම්
 DocType: Leave Block List,Leave Block List Name,"අවසරය, වාරණ ලැයිස්තුව නම"
 DocType: Certified Consultant,Certification Validity,සහතික කිරීමේ වලංගු භාවය
@@ -6481,6 +6487,7 @@
 DocType: Bank Statement Settings Item,Bank Header,බැංකු ශීර්ෂය
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Lab Tests බලන්න
 DocType: Hub Users,Hub Users,Hub පරිශීලකයන්
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ගණුදෙනුකරු&gt; පාරිභෝගික කණ්ඩායම්&gt; ප්රදේශය
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,නඩත්තු දිනය
 DocType: Purchase Invoice Item,Rejected Serial No,ප්රතික්ෂේප අනු අංකය
@@ -6495,7 +6502,7 @@
 DocType: SG Creation Tool Course,Max Strength,මැක්ස් ශක්තිය
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,පෙරසැකසුම් ස්ථාපනය කිරීම
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},ගනුදෙනුකරු සඳහා තෝරා ගන්නා ලද සටහන {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},ගනුදෙනුකරු සඳහා තෝරා ගන්නා ලද සටහන {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,සේවක {0} උපරිම ප්රතිලාභයක් නොමැත
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Delivery Date මත පදනම් අයිතම තෝරන්න
 DocType: Grant Application,Has any past Grant Record,කිසිදු අතීත ප්රදාන වාර්තාවක් තිබේ
@@ -6523,7 +6530,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,හෝටල් කාමර වෙන් කිරීම
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,පාරිභෝගික සේවය
 DocType: BOM,Thumbnail,සිඟිති-රූපය
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,ඊමේල් හැඳුනුම් පත් සමඟ සම්බන්ධතා නොමැත.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,ඊමේල් හැඳුනුම් පත් සමඟ සම්බන්ධතා නොමැත.
 DocType: Item Customer Detail,Item Customer Detail,අයිතමය පාරිභෝගික විස්තර
 DocType: Notification Control,Prompt for Email on Submission of,ඉදිරිපත් කිරීම මත විද්යුත් සඳහා කඩිනම්
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},සේවකයාගේ උපරිම ප්රතිලාභය {0} ඉක්මවයි {1}
@@ -6783,13 +6790,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,ගිණුම් වර්ගය තෝරා නිසා සමූහ සමාගම සැරසේ නොහැක.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} වෙනස් කර ඇත. නැවුම් කරන්න.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,පහත සඳහන් දිනවල නිවාඩු ඉල්ලුම් කිරීමෙන් පරිශීලකයන් එක නතර කරන්න.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,අයිතම කේතය&gt; අයිතමය කාණ්ඩ&gt; වෙළඳ නාමය
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","පක්ෂපාතීත්ව ලකුණු සඳහා අසීමිත ඉකුත්වීමක් නම්, කල් ඉකුත්වීමේ කාලය හිස්ව තබන්න, නැතහොත් 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,නඩත්තු කණ්ඩායම් සාමාජිකයින්
 DocType: Loyalty Point Entry,Purchase Amount,මිලදී ගැනීම මුදල
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,සැපයුම්කරු උද්ධෘත {0} නිර්මාණය
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,අවසන් වසර ආරම්භය අවුරුද්දට පෙර විය නොහැකි
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,අවසන් වසර ආරම්භය අවුරුද්දට පෙර විය නොහැකි
 DocType: Employee Benefit Application,Employee Benefits,සේවක ප්රතිලාභ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},හැකිළු ප්රමාණය පේළිය {1} තුළ අයිතමය {0} සඳහා ප්රමාණය සමාන විය යුතුය
 DocType: Work Order,Manufactured Qty,නිෂ්පාදනය යවන ලද
@@ -6805,6 +6811,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,තේරීම් කණ්ඩායම අංක
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,GSTIN සඳහා
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ගනුදෙනුකරුවන් වෙත මතු බිල්පත්.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,කරුණාකර මානව සම්පත්&gt; HR සැකසුම් තුළ සේවක නාමකරණය කිරීමේ පද්ධතිය සැකසීම කරන්න
 DocType: Healthcare Settings,Invoice Appointments Automatically,ඉන්වොයිස් පත් කිරීම් ස්වයංක්රීයව
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ව්යාපෘති අංකය
 DocType: Salary Component,Variable Based On Taxable Salary,ආදායම් මත පදනම් විචල්ය මත පදනම් වේ
@@ -6853,7 +6860,7 @@
 DocType: POS Profile,Account for Change Amount,වෙනස් මුදල ගිණුම්
 DocType: QuickBooks Migrator,Connecting to QuickBooks,QuickBooks සම්බන්ධ කිරීම
 DocType: Exchange Rate Revaluation,Total Gain/Loss,සමස්ත ලාභය / අලාභය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,අන්තර් සමාගම් ඉන්වොයිසිය සඳහා වලංගු නොවන සමාගමකි.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,අන්තර් සමාගම් ඉන්වොයිසිය සඳහා වලංගු නොවන සමාගමකි.
 DocType: Purchase Invoice,input service,ආදාන සේවා
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ෙරෝ {0}: පක්ෂය / ගිණුම් {3} {4} තුළ {1} / {2} සමග නොගැලපේ
 DocType: Employee Promotion,Employee Promotion,සේවක ප්රවර්ධන
@@ -6984,7 +6991,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,නවාතැන් පහසුකම් සඳහා කැමති පෙදෙස
 apps/erpnext/erpnext/config/selling.py +184,Analytics,විශ්ලේෂණ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,කරත්ත හිස් වේ
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,කරුණාකර අධ්යාපනය&gt; අධ්යාපන සැකසීම් තුළ උපදේශක නාමකරණයක් සැකසීම
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",අයිතමය {0} සතුව නැත. අනුපිළිවෙලට පමණක් සේයනය කළ අයිතමයන් \ serial number මත පදනම්ව බෙදා හැරීම කළ හැක
 DocType: Vehicle,Model,ආදර්ශ
@@ -7014,7 +7020,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,වෙනස් කිරීමට කිසිවක් නැත
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,කරුණාකර CSV ගොනුවක් තෝරා
 DocType: Holiday List,Total Holidays,සමස්ථ නිවාඩු දිනයන්
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,යැවීම සඳහා නොලැබෙන ඊමේල් අච්චුව. කරුණාකර සැපයුම් සැකසුම් තුළ එකක් සකසන්න.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,යැවීම සඳහා නොලැබෙන ඊමේල් අච්චුව. කරුණාකර සැපයුම් සැකසුම් තුළ එකක් සකසන්න.
 DocType: Student Leave Application,Mark as Present,වර්තමාන ලෙස ලකුණ
 DocType: Supplier Scorecard,Indicator Color,දර්ශක වර්ණය
 DocType: Purchase Order,To Receive and Bill,පිළිගන්න සහ පනත් කෙටුම්පත
@@ -7023,7 +7029,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,අනුක්රමික අංකය තෝරන්න
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,නිර්මාණකරුවා
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,නියමයන් හා කොන්දේසි සැකිල්ල
-DocType: Serial No,Delivery Details,සැපයුම් විස්තර
+DocType: Delivery Trip,Delivery Details,සැපයුම් විස්තර
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},වර්ගය {1} සඳහා බදු පේළියක {0} පිරිවැය මධ්යස්ථානය අවශ්ය වේ
 DocType: Program,Program Code,වැඩසටහන සංග්රහයේ
 DocType: Terms and Conditions,Terms and Conditions Help,නියමයන් හා කොන්දේසි උදවු
@@ -7047,7 +7053,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ඉදිරියට ඇති කාලය දින
 DocType: Cash Flow Mapping,Is Income Tax Expense,ආදායම් බදු වියදම
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,ඔබේ ඇණවුම භාර දීම සඳහා පිටත් වේ!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"ෙරෝ # {0}: ගිය තැන, ශ්රී ලංකා තැපෑල දිනය මිලදී දිනය ලෙස සමාන විය යුතුය {1} වත්කම් {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"ෙරෝ # {0}: ගිය තැන, ශ්රී ලංකා තැපෑල දිනය මිලදී දිනය ලෙස සමාන විය යුතුය {1} වත්කම් {2}"
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"ශිෂ්ය ආයතනයේ නේවාසිකාගාරය පදිංචි, නම් මෙම පරීක්ෂා කරන්න."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,ඉහත වගුවේ විකුණුම් නියෝග ඇතුලත් කරන්න
 ,Stock Summary,කොටස් සාරාංශය
diff --git a/erpnext/translations/sk.csv b/erpnext/translations/sk.csv
index 1fb7687..7328143 100644
--- a/erpnext/translations/sk.csv
+++ b/erpnext/translations/sk.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Názov obdobia
 DocType: Employee,Salary Mode,Mode Plat
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Registrovať
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Registrovať
 DocType: Patient,Divorced,Rozvedený
 DocType: Support Settings,Post Route Key,Pridať kľúč trasy
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Povoliť položky, ktoré sa pridávajú viackrát v transakcii"
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Nový kurz
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Mena je vyžadovaná pre Cenník {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bude vypočítané v transakcii.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Dodávateľ&gt; Typ dodávateľa
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Zákaznícky kontakt
 DocType: Patient Appointment,Check availability,Skontrolovať dostupnosť
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,ukázať otvorené
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Řada Aktualizováno Úspěšně
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Odhlásiť sa
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} v riadku {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} v riadku {1}
 DocType: Asset Finance Book,Depreciation Start Date,Dátum začiatku odpisovania
 DocType: Pricing Rule,Apply On,Aplikujte na
 DocType: Item Price,Multiple Item prices.,Více ceny položku.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Lab Prescription
 ,Delay Days,Oneskorené dni
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,service Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Sériové číslo: {0} už je uvedené vo faktúre predaja: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Sériové číslo: {0} už je uvedené vo faktúre predaja: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Faktúra
 DocType: Purchase Invoice Item,Item Weight Details,Podrobnosti o položke hmotnosti
 DocType: Asset Maintenance Log,Periodicity,Periodicita
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Účtovník
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Cenník predaja
 DocType: Patient,Tobacco Current Use,Súčasné používanie tabaku
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Dátum začiatku a dátum ukončenia sa prekrýva s pracovnou kartou <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Predajná sadzba
 DocType: Cost Center,Stock User,Používateľ skladu
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,príbuzný
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Dátum návštevnosť nemôže byť nižšia ako spojovacie dáta zamestnanca
 DocType: Grading Scale,Grading Scale Name,Stupnica Name
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Pridajte používateľov na trh
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Pridajte používateľov na trh
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,To je kořen účtu a nelze upravovat.
 DocType: Sales Invoice,Company Address,Adresa spoločnosti
 DocType: BOM,Operations,Operace
@@ -322,7 +322,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Rozdielové množstvo
 DocType: Production Plan,Material Request Detail,Podrobnosti o vyžiadaní materiálu
 DocType: Selling Settings,Default Quotation Validity Days,Predvolené dni platnosti cenovej ponuky
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
 DocType: SMS Center,SMS Center,SMS centrum
 DocType: Payroll Entry,Validate Attendance,Overenie účasti
 DocType: Sales Invoice,Change Amount,zmena Suma
@@ -441,7 +441,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,riadkovanie za čiastku v slovách
 DocType: Vehicle,Additional Details,Ďalšie podrobnosti
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Bez popisu
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Dodávateľ&gt; Skupina dodávateľov
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Žádost o koupi.
 DocType: POS Closing Voucher Details,Collected Amount,Zozbieraná suma
 DocType: Lab Test,Submitted Date,Dátum odoslania
@@ -486,7 +485,7 @@
 DocType: Student Admission,Student Admission,študent Vstupné
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Položka {0} je zrušená
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Odpisový riadok {0}: Dátum začiatku odpisovania sa zadáva ako posledný dátum
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Odpisový riadok {0}: Dátum začiatku odpisovania sa zadáva ako posledný dátum
 DocType: Contract Template,Fulfilment Terms and Conditions,Zmluvné podmienky plnenia
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Požiadavka na materiál
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizace Výprodej Datum
@@ -543,6 +542,7 @@
 DocType: Accounts Settings,Settings for Accounts,Nastavenie Účtovníctva
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Dodávateľské faktúry No existuje vo faktúre {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Správa obchodník strom.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Trasu nie je možné spracovať, pretože nastavenia služby Mapy Google sú zakázané."
 DocType: Job Applicant,Cover Letter,Sprievodný list
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Vynikajúci Šeky a vklady s jasnými
 DocType: Item,Synced With Hub,Synchronizovány Hub
@@ -602,7 +602,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Nová hodnota majetku
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Sazba, za kterou je zákazník měny převeden na zákazníka základní měny"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Samozrejme Plánovanie Tool
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Riadok # {0}: faktúry nemožno vykonať voči existujúcemu aktívu {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Riadok # {0}: faktúry nemožno vykonať voči existujúcemu aktívu {1}
 DocType: Crop Cycle,LInked Analysis,Llnked Analysis
 DocType: POS Closing Voucher,POS Closing Voucher,Uzávierka POS uzávierky
 DocType: Contract,Lapsed,odpadlý
@@ -637,6 +637,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} nie je zapísaný do kurzu {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Meno študenta:
 DocType: POS Closing Voucher Details,Difference,Rozdiel
+DocType: Delivery Settings,Delay between Delivery Stops,Oneskorenie medzi doručením
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Pořadové číslo {0} není součástí dodávky Poznámka: {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Zdá sa, že je problém s konfiguráciou servera GoCardless. Nebojte sa, v prípade zlyhania bude suma vrátená do vášho účtu."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -697,7 +698,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Množstvo a Sadzba
 DocType: Delivery Note,% Installed,% Inštalovaných
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Učebne / etc laboratória, kde môžu byť naplánované prednášky."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Spoločné meny oboch spoločností by mali zodpovedať transakciám medzi spoločnosťami.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Spoločné meny oboch spoločností by mali zodpovedať transakciám medzi spoločnosťami.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,"Prosím, zadajte najprv názov spoločnosti"
 DocType: Travel Itinerary,Non-Vegetarian,Non-vegetariánska
 DocType: Purchase Invoice,Supplier Name,Názov dodávateľa
@@ -707,7 +708,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Temporarily on Hold,Dočasne pozastavené
 DocType: Account,Is Group,Is Group
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +324,Credit Note {0} has been created automatically,Kreditná poznámka {0} bola vytvorená automaticky
-DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automaticky nastaviť sériových čísel na základe FIFO
+DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automaticky nastaviť sériové čísla na základe FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,"Skontrolujte, či dodávateľské faktúry Počet Jedinečnosť"
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +34,Primary Address Details,Údaje o primárnej adrese
 DocType: Vehicle Service,Oil Change,výmena oleja
@@ -784,7 +785,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Prenajaté od dátumu
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Dosť Časti vybudovať
 DocType: POS Profile User,POS Profile User,Používateľ profilu POS
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Riadok {0}: Vyžaduje sa dátum začiatku odpisovania
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Riadok {0}: Vyžaduje sa dátum začiatku odpisovania
 DocType: Purchase Invoice Item,Service Start Date,Dátum začiatku služby
 DocType: Subscription Invoice,Subscription Invoice,Faktúra odberu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Priame príjmy
@@ -853,7 +854,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Skratka už použitý pre inú spoločnosť
 DocType: Selling Settings,Default Customer Group,Výchozí Customer Group
 DocType: Employee,IFSC Code,Kód IFSC
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Dátum začiatku a dátum ukončenia sa prekrýva s pracovnou kartou <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Je-li zakázat, ""zaokrouhlí celková"" pole nebude viditelný v jakékoli transakce"
 DocType: BOM,Operating Cost,Provozní náklady
 DocType: Crop,Produced Items,Vyrobené položky
@@ -905,7 +905,7 @@
 DocType: Supplier,Prevent RFQs,Zabráňte RFQ
 DocType: Hub User,Hub User,Používateľ Hubu
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Vytvoriť prijatú objednávku
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Zápis platu bol odoslaný na obdobie od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Zápis platu bol odoslaný na obdobie od {0} do {1}
 DocType: Project Task,Project Task,Úloha Project
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Vymožené body
 ,Lead Id,Id Obchodnej iniciatívy
@@ -935,7 +935,7 @@
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Otvorenie nástroja na tvorbu faktúr
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +906,Sales Return,Sales Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +110,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Poznámka: Celkový počet alokovaných listy {0} by nemala byť menšia ako ktoré už boli schválené listy {1} pre obdobie
-DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Nastavte počet v transakciách na základe sériového č. Vstupu
+DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Voliť množstvo v transakciách na základe vybratého sériového čísla
 ,Total Stock Summary,Súhrnné zhrnutie zásob
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +68,"You can only plan for upto {0} vacancies and budget {1} \
 				for {2} as per staffing plan {3} for parent company {4}.",Môžete plánovať až {0} voľné pracovné miesta a rozpočet {1} \ pre {2} podľa personálneho plánu {3} pre materskú spoločnosť {4}.
@@ -1037,7 +1037,7 @@
 DocType: Fee Validity,Max number of visit,Maximálny počet návštev
 ,Hotel Room Occupancy,Hotel Occupancy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Pracovný výkaz vytvorený:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,zapísať
 DocType: GST Settings,GST Settings,Nastavenia GST
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Mena by mala byť rovnaká ako mena cenníka: {0}
@@ -1092,7 +1092,7 @@
 DocType: Vehicle Log,Service Details,Podrobnosti o službe
 DocType: Lab Test Template,Grouped,zoskupené
 DocType: Selling Settings,Delivery Note Required,Dodací list povinný
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Odoslanie platových kariet ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Odoslanie platových kariet ...
 DocType: Bank Guarantee,Bank Guarantee Number,Číslo bankovej záruky
 DocType: Bank Guarantee,Bank Guarantee Number,Číslo bankovej záruky
 DocType: Assessment Criteria,Assessment Criteria,Kritériá hodnotenia
@@ -1118,13 +1118,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Vstup Platba je už vytvorili
 DocType: Request for Quotation,Get Suppliers,Získajte dodávateľov
 DocType: Purchase Receipt Item Supplied,Current Stock,Current skladem
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Riadok # {0}: Asset {1} nie je spojená s item {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Riadok # {0}: Asset {1} nie je spojená s item {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Preview výplatnej páske
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Účet {0} bol zadaný viackrát
 DocType: Account,Expenses Included In Valuation,Náklady ceně oceňování
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,"Môžete obnoviť iba vtedy, ak vaše členstvo uplynie do 30 dní"
 DocType: Shopping Cart Settings,Show Stock Availability,Zobraziť dostupnosť zásob
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Nastavte {0} v kategórii majetku {1} alebo v spoločnosti {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Nastavte {0} v kategórii majetku {1} alebo v spoločnosti {2}
 DocType: Location,Longitude,zemepisná dĺžka
 ,Absent Student Report,Absent Študent Report
 DocType: Crop,Crop Spacing UOM,Rozmiestnenie medzných plôch
@@ -1196,7 +1196,7 @@
 DocType: Soil Texture,Sand,piesok
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Příležitost Z
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Riadok {0}: {1} Sériové čísla vyžadované pre položku {2}. Poskytli ste {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Riadok {0}: {1} Sériové čísla vyžadované pre položku {2}. Poskytli ste {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vyberte tabuľku
 DocType: BOM,Website Specifications,Webových stránek Specifikace
 DocType: Special Test Items,Particulars,podrobnosti
@@ -1307,7 +1307,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Položky s vyšším weightage budú zobrazené vyššie
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Laboratórne testy a vitálne znaky
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detail bankového odsúhlasenia
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Riadok # {0}: {1} Asset musia byť predložené
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Riadok # {0}: {1} Asset musia byť predložené
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nenájdený žiadny zamestnanec
 DocType: Item,If subcontracted to a vendor,Ak sa subdodávky na dodávateľa
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Skupina študentov je už aktualizovaná.
@@ -1362,7 +1362,6 @@
 DocType: Loyalty Program Collection,Tier Name,Názov úrovne
 DocType: HR Settings,Enter retirement age in years,Zadajte vek odchodu do dôchodku v rokoch
 DocType: Crop,Target Warehouse,Target Warehouse
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte pomenovanie série {0} cez Nastavenie&gt; Nastavenia&gt; Pomenovanie série
 DocType: Payroll Employee Detail,Payroll Employee Detail,Mzdový detail zamestnancov
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Vyberte si sklad
 DocType: Cheque Print Template,Starting location from left edge,Počnúc umiestnenie od ľavého okraja
@@ -1452,7 +1451,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Plán materiál pro podsestavy
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Obchodní partneri a teritória
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} musí být aktivní
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Pre prenos nie sú k dispozícii žiadne položky
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Pre prenos nie sú k dispozícii žiadne položky
 DocType: Employee Boarding Activity,Activity Name,Názov aktivity
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Zmeniť dátum vydania
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Množstvo hotového produktu <b>{0}</b> a Množstvo <b>{1}</b> sa nemôžu líšiť
@@ -1663,7 +1662,7 @@
 DocType: Sales Invoice Item,Rate With Margin,Sadzba s maržou
 DocType: Purchase Invoice,Is Return (Debit Note),Je Return (Debit Note)
 DocType: Workstation,Wages,Mzdy
-DocType: Asset Maintenance,Maintenance Manager Name,Názov správcu údržby
+DocType: Asset Maintenance,Maintenance Manager Name,Meno správcu údržby
 DocType: Agriculture Task,Urgent,Naléhavý
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +187,Please specify a valid Row ID for row {0} in table {1},Zadajte platný riadok ID riadku tabuľky {0} {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,Nepodarilo sa nájsť premennú:
@@ -1681,6 +1680,7 @@
 DocType: Project,First Email,Prvý e-mail
 DocType: Company,Exception Budget Approver Role,Role prístupu k výnimke rozpočtu
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date",Po nastavení bude táto faktúra pozastavená až do stanoveného dátumu
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Vyhrazeno Warehouse v prodejní objednávky / hotových výrobků Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Predajná čiastka
 DocType: Repayment Schedule,Interest Amount,záujem Suma
@@ -1692,7 +1692,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Záznamy
 DocType: Asset,Scrapped,zošrotovaný
 DocType: Item,Item Defaults,Predvolené položky
-DocType: Purchase Invoice,Returns,výnos
+DocType: Cashier Closing,Returns,výnos
 DocType: Job Card,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Pořadové číslo {0} je na základě smlouvy o údržbě aľ {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,nábor
@@ -1702,11 +1702,10 @@
 DocType: Tax Rule,Shipping State,Prepravné State
 ,Projected Quantity as Source,Množstvo projekciou as Zdroj
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Položka musí být přidány pomocí ""získat předměty z kupní příjmy"" tlačítkem"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +911,Delivery Trip,Výlet z dodávky
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +911,Delivery Trip,Rozvoz tovaru
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Typ prenosu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Predajné náklady
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Zákaznícka skupina&gt; Územie
 DocType: Diagnosis,Diagnosis,diagnóza
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Štandardný nákup
 DocType: Attendance Request,Explanation,vysvetlenie
@@ -1719,7 +1718,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Položky nákupných objednávok Po splatnosti
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,PSČ
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Predajné objednávky {0} {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Vyberte účet úrokového príjmu v úvere {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Vyberte účet úrokového príjmu v úvere {0}
 DocType: Opportunity,Contact Info,Kontaktné informácie
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Tvorba prírastkov zásob
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Nemožno povýšiť zamestnanca so statusom odídený
@@ -1731,7 +1730,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Faktúru nemožno vykonať za nulovú fakturačnú hodinu
 DocType: Company,Date of Commencement,Dátum začiatku
 DocType: Sales Person,Select company name first.,"Prosím, vyberte najprv názov spoločnosti"
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},Email odoslaný na {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},Email odoslaný na {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ponuky od Dodávateľov.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Nahraďte kusovník a aktualizujte najnovšiu cenu vo všetkých kusovníkoch
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Chcete-li {0} | {1} {2}
@@ -1753,7 +1752,7 @@
 DocType: Asset Movement,From Employee,Od Zaměstnance
 DocType: Driver,Cellphone Number,Mobilné číslo
 DocType: Project,Monitor Progress,Monitorovanie pokroku
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Upozornění: Systém nebude kontrolovat nadfakturace, protože částka za položku na {1} je nula {0}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Upozornění: Systém nebude kontrolovat nadfakturace, protože částka za položku na {1} je nula {0}"
 DocType: Journal Entry,Make Difference Entry,Učinit vstup Rozdíl
 DocType: Supplier Quotation,Auto Repeat Section,Sekcia Auto Repeat
 DocType: Upload Attendance,Attendance From Date,Účast Datum od
@@ -1856,7 +1855,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Riadok # {0}: zamietnutie Množstvo nemôže byť zapísaný do kúpnej Návrat
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Zmena zákazníckej skupiny pre vybraného zákazníka nie je povolená.
 ,Purchase Order Items To Be Billed,Položky vydané objednávky k fakturaci
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Aktualizácia predpokladaných časov príchodu.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Aktualizácia predpokladaných časov príchodu.
 DocType: Program Enrollment Tool,Enrollment Details,Podrobnosti o registrácii
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Nie je možné nastaviť viaceré predvolené položky pre spoločnosť.
 DocType: Purchase Invoice Item,Net Rate,Čistá miera
@@ -1870,7 +1869,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Druh dovolenky je panikavý
 DocType: Support Settings,Close Issue After Days,Close Issue po niekoľkých dňoch
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Musíte byť používateľom s funkciami Správca systémov a Správca položiek, pomocou ktorých môžete používateľov pridávať do služby Marketplace."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Musíte byť používateľom s funkciami Správca systémov a Správca položiek, pomocou ktorých môžete používateľov pridávať do služby Marketplace."
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Ponechte prázdné, pokud se to považuje za všechny obory"
 DocType: Job Opening,Staffing Plan,Personálny plán
 DocType: Bank Guarantee,Validity in Days,Platnosť v dňoch
@@ -1892,7 +1891,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Duplicitný riadok {0} s rovnakým {1}
 DocType: Marketplace Settings,Disable Marketplace,Zakázať trhovisko
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Fiškálny rok {0} nebol nájdený
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Fiškálny rok {0} nebol nájdený
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Nastavenia pre modul Zamestnanci
 DocType: Hotel Room Reservation,Hotel Reservation User,Používateľ rezervácie hotelov
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,"Prosím, vyberte první prefix"
@@ -2000,7 +1999,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Nepodarilo sa prihlásiť
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Bol vytvorený majetok {0}
 DocType: Special Test Items,Special Test Items,Špeciálne testovacie položky
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Musíte byť používateľom s funkciami Správca systému a Správca položiek na registráciu na trhu.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Musíte byť používateľom s funkciami Správca systému a Správca položiek na registráciu na trhu.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Způsob platby
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Podľa vašej pridelenej štruktúry platov nemôžete požiadať o výhody
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Webové stránky Image by mala byť verejná súboru alebo webovej stránky URL
@@ -2012,7 +2011,7 @@
 DocType: Warehouse,Warehouse Contact Info,Sklad Kontaktní informace
 DocType: Payment Entry,Write Off Difference Amount,Odpísať Difference Suma
 DocType: Volunteer,Volunteer Name,Názov dobrovoľníka
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},V iných riadkoch boli nájdené riadky s duplicitnými termínmi: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},V iných riadkoch boli nájdené riadky s duplicitnými termínmi: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: e-mail zamestnanec nebol nájdený, a preto je pošta neposlal"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Žiadna platová štruktúra priradená zamestnancovi {0} v daný deň {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Prepravné pravidlo sa nevzťahuje na krajinu {0}
@@ -2103,6 +2102,7 @@
 DocType: Salary Component,Earning,Príjem
 DocType: Supplier Scorecard,Scoring Criteria,Kritériá hodnotenia
 DocType: Purchase Invoice,Party Account Currency,Party Mena účtu
+DocType: Delivery Trip,Total Estimated Distance,Celková odhadovaná vzdialenosť
 ,BOM Browser,BOM Browser
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Aktualizujte svoj stav tejto tréningovej udalosti
 DocType: Item Barcode,EAN,EAN
@@ -2141,7 +2141,7 @@
 DocType: Activity Cost,Projects,Projekty
 DocType: Payment Request,Transaction Currency,transakčné mena
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Od {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Niektoré e-maily sú neplatné
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Niektoré e-maily sú neplatné
 DocType: Work Order Operation,Operation Description,Operace Popis
 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.,"Nelze měnit Fiskální rok Datum zahájení a fiskální rok datum ukončení, jakmile fiskální rok se uloží."
 DocType: Quotation,Shopping Cart,Nákupný košík
@@ -2165,7 +2165,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Čistá zmena v stálych aktív
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Požad
 DocType: Leave Control Panel,Leave blank if considered for all designations,Nechajte prázdne ak má platiť pre všetky zadelenia
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od datetime
 DocType: Shopify Settings,For Company,Pre spoločnosť
@@ -2179,7 +2179,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Pri vytváraní kurzov sa vyskytli chyby
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Prvý odhadovač výdavkov v zozname bude nastavený ako predvolený odhadovač nákladov.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,nemôže byť väčšie ako 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Aby ste sa mohli zaregistrovať na trhu, musíte byť iným používateľom než správcom s roly Správcu systémov a Správca položiek."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Aby ste sa mohli zaregistrovať na trhu, musíte byť iným používateľom než správcom s roly Správcu systémov a Správca položiek."
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Položka {0} není skladem
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Neplánovaná
@@ -2208,7 +2208,7 @@
 DocType: HR Settings,Employee Settings,Nastavení zaměstnanců
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Načítanie platobného systému
 ,Batch-Wise Balance History,Batch-Wise Balance History
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Riadok # {0}: Nie je možné nastaviť sadzbu, ak je suma vyššia ako čiastka fakturácie pre položku {1}."
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Riadok # {0}: Nie je možné nastaviť sadzbu, ak je suma vyššia ako čiastka fakturácie pre položku {1}."
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Nastavenie tlače aktualizované v príslušnom formáte tlači
 DocType: Package Code,Package Code,Kód zásielky
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Učeň
@@ -2443,7 +2443,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} voľných pracovných miest a {1} rozpočet pre {2} už naplánované pre dcérske spoločnosti {3}. \ Môžete plánovať až {4} voľné pracovné miesta a rozpočet {5} podľa personálneho plánu {6} pre materskú spoločnosť {3}.
 DocType: HR Settings,Stop Birthday Reminders,Zastaviť pripomenutie narodenín
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},"Prosím nastaviť predvolený účet mzdy, splatnú v spoločnosti {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},"Prosím nastaviť predvolený účet mzdy, splatnú v spoločnosti {0}"
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Získajte finančné rozdelenie údajov o daniach a poplatkoch od spoločnosti Amazon
 DocType: SMS Center,Receiver List,Zoznam príjemcov
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,hľadanie položky
@@ -2513,7 +2513,7 @@
 DocType: Vital Signs,Constipated,zápchu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Proti faktuře dodavatele {0} ze dne {1}
 DocType: Customer,Default Price List,Predvolený cenník
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Záznam Asset Pohyb {0} vytvoril
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Záznam Asset Pohyb {0} vytvoril
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Nenašli sa žiadne položky.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nemožno odstrániť fiškálny rok {0}. Fiškálny rok {0} je nastavený ako predvolený v globálnom nastavení
 DocType: Share Transfer,Equity/Liability Account,Účet vlastného imania / zodpovednosti
@@ -2653,6 +2653,7 @@
 DocType: Blanket Order,Order Type,Typ objednávky
 ,Item-wise Sales Register,Item-moudrý Sales Register
 DocType: Asset,Gross Purchase Amount,Gross Suma nákupu
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položiek&gt; Značka
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Otváracie zostatky
 DocType: Asset,Depreciation Method,odpisy Metóda
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je to poplatek v ceně základní sazbě?
@@ -2736,7 +2737,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,"Opatrenie, ak bol prekročený ročný rozpočet na PO"
 DocType: Student Leave Application,Student Leave Application,Študent nechať aplikáciu
 DocType: Item,Will also apply for variants,Bude platiť aj pre varianty
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Asset nemožno zrušiť, pretože je už {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Asset nemožno zrušiť, pretože je už {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Zamestnancov {0} o pol dňa na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Celkom pracovná doba by nemala byť väčšia ako maximálna pracovnej doby {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Kdy
@@ -2760,6 +2761,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Načítať údaje
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Maximálna povolená dovolenka v type dovolenky {0} je {1}
 DocType: SMS Center,Create Receiver List,Vytvoriť zoznam príjemcov
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Dátum dostupný na použitie by mal byť po dátume nákupu
 DocType: Vehicle,Wheels,kolesá
 DocType: Packing Slip,To Package No.,Balit No.
 DocType: Patient Relation,Family,Rodina
@@ -2773,7 +2775,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Mena fakturácie sa musí rovnať mene menovej jednotky alebo účtovnej parity
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Označuje, že balíček je součástí této dodávky (Pouze návrhu)"
 DocType: Soil Texture,Loam,hlina
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Riadok {0}: dátum splatnosti nemôže byť pred dátumom odoslania
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Riadok {0}: dátum splatnosti nemôže byť pred dátumom odoslania
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Učinit vstup platby
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Množství k bodu {0} musí být menší než {1}
 ,Sales Invoice Trends,Prodejní faktury Trendy
@@ -2846,7 +2848,7 @@
 DocType: Guardian,Guardian Interests,Guardian záujmy
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Aktualizovať názov / číslo účtu
 DocType: Naming Series,Current Value,Current Value
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Niekoľko fiškálnych rokov existujú pre dáta {0}. Prosím nastavte spoločnosť vo fiškálnom roku
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Niekoľko fiškálnych rokov existujú pre dáta {0}. Prosím nastavte spoločnosť vo fiškálnom roku
 DocType: Education Settings,Instructor Records to be created by,"Záznamy inštruktorov, ktoré vytvorí"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} vytvoril
 DocType: GST Account,GST Account,Účet GST
@@ -2864,7 +2866,7 @@
 DocType: Sales Person,Name and Employee ID,Meno a ID zamestnanca
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
 DocType: Website Item Group,Website Item Group,Website Item Group
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Žiadna schéma platu sa nepodarilo predložiť na vyššie uvedené kritériá ALEBO platový výkaz už bol predložený
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Žiadna schéma platu sa nepodarilo predložiť na vyššie uvedené kritériá ALEBO platový výkaz už bol predložený
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Odvody a dane
 DocType: Projects Settings,Projects Settings,Nastavenia projektov
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,"Prosím, zadejte Referenční den"
@@ -2873,7 +2875,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Dodávané Množstvo
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Materiál Žádost o bod
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Najprv zrušte nákupnú knižku {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Najprv zrušte nákupnú knižku {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Strom skupiny položek.
 DocType: Production Plan,Total Produced Qty,Celkový vyrobený počet
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Nelze odkazovat číslo řádku větší nebo rovnou aktuální číslo řádku pro tento typ Charge
@@ -2984,6 +2986,7 @@
 ,Vehicle Expenses,Náklady pre autá
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Vytvorte laboratórne testy na odoslanie faktúry predaja
 DocType: Serial No,Invoice Details,Podrobnosti faktúry
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,"Ak chcete odhadnúť a optimalizovať trasy, povoľte nastavenie Máp Google"
 DocType: Grant Application,Show on Website,Zobraziť na webovej stránke
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Začnite zapnuté
 DocType: Hub Tracked Item,Hub Category,Kategória Hubu
@@ -3024,7 +3027,7 @@
 DocType: Inpatient Record,B Positive,B Pozitívne
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Maximálny prínos zamestnanca {0} presahuje {1} sumou {2} predchádzajúcej nárokovanej sumy
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Riadok # {0}: Množstvo musí byť 1, keď je položka investičného majetku. Prosím použiť samostatný riadok pre viacnásobné Mn."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Riadok # {0}: Množstvo musí byť 1, keď je položka investičného majetku. Prosím použiť samostatný riadok pre viacnásobné Mn."
 DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Skrátená nemôže byť prázdne alebo priestor
 DocType: Patient Medical Record,Patient Medical Record,Záznam pacienta
@@ -3059,7 +3062,7 @@
 DocType: Workstation,Wages per hour,Mzda za hodinu
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Sklad bilance v dávce {0} se zhorší {1} k bodu {2} ve skladu {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Nasledujúci materiál žiadosti boli automaticky zvýšená na základe úrovni re-poradie položky
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatná. Mena účtu musí byť {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatná. Mena účtu musí byť {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Od dátumu {0} nemôže byť po uvoľnení zamestnanca Dátum {1}
 DocType: Supplier,Is Internal Supplier,Je interný dodávateľ
 DocType: Employee,Create User Permission,Vytvoriť povolenie používateľa
@@ -3205,7 +3208,7 @@
 DocType: Account,Fixed Asset,Základní Jmění
 DocType: Amazon MWS Settings,After Date,Po dátume
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Serialized Zásoby
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Neplatná {0} pre faktúru spoločnosti Inter.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Neplatná {0} pre faktúru spoločnosti Inter.
 ,Department Analytics,Analýza oddelenia
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-mail sa v predvolenom kontakte nenachádza
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generovať tajomstvo
@@ -3218,7 +3221,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Program v štruktúre poplatkov a študentskej skupine {0} je odlišný.
 DocType: Bank Statement Transaction Entry,Receivable Account,Účet pohľadávok
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Platná od dátumu musí byť menšia ako platná do dátumu.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Riadok # {0}: Asset {1} je už {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Riadok # {0}: Asset {1} je už {2}
 DocType: Quotation Item,Stock Balance,Stav zásob
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Predajné objednávky na platby
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,CEO
@@ -3260,6 +3263,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Debetné K je vyžadované
 DocType: Clinical Procedure,Inpatient Record,Liečebný záznam
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomôže udržať prehľad o času, nákladov a účtovania pre aktivít hotový svojho tímu"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Dodávateľ&gt; Typ dodávateľa
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Nákupní Ceník
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Dátum transakcie
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Šablóny premenných ukazovateľa skóre dodávateľa.
@@ -3303,7 +3307,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Exchange zisk / strata
 DocType: Opportunity,Lost Reason,Ztracené Důvod
 DocType: Amazon MWS Settings,Enable Amazon,Povoliť Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Riadok # {0}: Účet {1} nepatrí spoločnosti {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Riadok # {0}: Účet {1} nepatrí spoločnosti {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Nepodarilo sa nájsť DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Nová adresa
 DocType: Quality Inspection,Sample Size,Veľkosť vzorky
@@ -3415,10 +3419,10 @@
 DocType: Water Analysis,Origin,pôvod
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tento dokument je nad hranicou {0} {1} pre položku {4}. Robíte si iný {3} proti rovnakej {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Prosím nastavte opakovanie po uložení
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Vybrať zmena výšky účet
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Vybrať zmena výšky účet
 DocType: Purchase Invoice,Price List Currency,Mena cenníka
 DocType: Naming Series,User must always select,Uživatel musí vždy vybrat
-DocType: Stock Settings,Allow Negative Stock,Povolit Negativní Sklad
+DocType: Stock Settings,Allow Negative Stock,Povoliť mínusové zásoby
 DocType: Installation Note,Installation Note,Poznámka k instalaci
 DocType: Soil Texture,Clay,hlina
 DocType: Topic,Topic,téma
@@ -3457,7 +3461,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Naozaj chcete zrušiť túto schôdzku?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Balík ceny izieb v hoteli
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,predajné Pipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Prosím nastaviť predvolený účet platu Component {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Prosím nastaviť predvolený účet platu Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Povinné On
 DocType: Rename Tool,File to Rename,Súbor premenovať
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Prosím, vyberte BOM pre položku v riadku {0}"
@@ -3478,7 +3482,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Náklady na zakúpené položky
 DocType: Employee Separation,Employee Separation Template,Šablóna oddelenia zamestnancov
 DocType: Selling Settings,Sales Order Required,Je potrebná predajná objednávka
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Staňte sa predajcom
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Staňte sa predajcom
 DocType: Purchase Invoice,Credit To,Kredit:
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Aktívne Iniciatívy / Zákazníci
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,"Nechajte prázdne, ak chcete použiť štandardný formát dodacieho listu"
@@ -3520,7 +3524,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Vytvoriť daňovú šablónu
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,user Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Riadok # {0} (Platobný stôl): Suma musí byť záporná
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Riadok # {0} (Platobný stôl): Suma musí byť záporná
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Nie je možné aktualizovať zásob, faktúra obsahuje pokles lodnej dopravy tovaru."
 DocType: Contract,Fulfilment Status,Stav plnenia
 DocType: Lab Test Sample,Lab Test Sample,Laboratórna vzorka
@@ -3680,7 +3684,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Dátum dokumentu
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Fee Records Vytvoril - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategórie Account
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Riadok # {0} (Platobný stôl): Suma musí byť pozitívna
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Riadok # {0} (Platobný stôl): Suma musí byť pozitívna
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Nie je možné vyrobiť viac Položiek {0} ako je množstvo na predajnej objednávke {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Vyberte hodnoty atribútov
 DocType: Purchase Invoice,Reason For Issuing document,Dôvod pre vydanie dokumentu
@@ -3735,7 +3739,7 @@
 DocType: Purchase Receipt,Time at which materials were received,"Čas, kdy bylo přijato materiály"
 DocType: Products Settings,Products per Page,Produkty na stránku
 DocType: Stock Ledger Entry,Outgoing Rate,Odchádzajúce Rate
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,alebo
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,alebo
 DocType: Sales Order,Billing Status,Stav fakturácie
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Nahlásiť problém
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Utility Náklady
@@ -3763,7 +3767,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Vyhlásenie o oslobodení od dane z príjmu zamestnancov
 DocType: Payment Entry,Cheque/Reference Date,Šek / Referenčný dátum
 DocType: Purchase Invoice,Total Taxes and Charges,Celkem Daně a poplatky
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,"Dátum, ktorý je k dispozícii na použitie, je zadaný ako dátum posledného dátumu"
 DocType: Employee,Emergency Contact,Kontakt v nouzi
 DocType: Bank Reconciliation Detail,Payment Entry,platba Entry
 ,sales-browser,Predajná-browser
@@ -3809,6 +3812,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Je návrat (kreditná poznámka)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Začať úlohu
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Sériové číslo sa požaduje pre majetok {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte pomenovanie série {0} cez Nastavenie&gt; Nastavenia&gt; Pomenovanie série
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Bezbariérový šablóna nesmie byť predvolenú šablónu
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Pre riadok {0}: Zadajte naplánované množstvo
 DocType: Account,Income Account,Účet příjmů
@@ -3822,6 +3826,7 @@
 DocType: Loyalty Program,Help Section,Sekcia pomocníka
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Predchádzajúce
 DocType: Appraisal Goal,Key Responsibility Area,Key Odpovědnost Area
+DocType: Delivery Trip,Distance UOM,Vzdialenosť UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Študent Šarže pomôže sledovať dochádzku, hodnotenia a poplatky pre študentov"
 DocType: Payment Entry,Total Allocated Amount,Celková alokovaná suma
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Nastavte predvolený inventárny účet pre trvalý inventár
@@ -3863,7 +3868,7 @@
 DocType: Item Supplier,Item Supplier,Položka Dodavatel
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,"Prosím, zadejte kód položky se dostat dávku no"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Nie sú vybraté žiadne položky na prenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Nie sú vybraté žiadne položky na prenos
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Všetky adresy
 DocType: Company,Stock Settings,Nastavenie Skladu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spojenie je možné len vtedy, ak tieto vlastnosti sú rovnaké v oboch záznamoch. Je Group, Root Type, Company"
@@ -4077,7 +4082,7 @@
 DocType: Journal Entry Account,Party Balance,Balance Party
 DocType: Cash Flow Mapper,Section Subtotal,Oddiel Medzisúčet
 apps/erpnext/erpnext/accounts/page/pos/pos.js +500,Please select Apply Discount On,"Prosím, vyberte Použiť Zľava na"
-DocType: Stock Settings,Sample Retention Warehouse,Záznam uchovávania vzoriek
+DocType: Stock Settings,Sample Retention Warehouse,Sklad pre uchovávanie vzoriek
 DocType: Company,Default Receivable Account,Výchozí pohledávek účtu
 DocType: Purchase Invoice,Deemed Export,Považovaný export
 DocType: Stock Entry,Material Transfer for Manufacture,Materiál Přenos: Výroba
@@ -4161,7 +4166,7 @@
 DocType: Patient,Personal and Social History,Osobná a sociálna história
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Používateľ {0} bol vytvorený
 DocType: Fee Schedule,Fee Breakup for each student,Poplatok za každý študent
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Celkové zálohy ({0}) na objednávku {1} nemôže byť väčšia ako Celkom ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Celkové zálohy ({0}) na objednávku {1} nemôže byť väčšia ako Celkom ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vyberte měsíční výplatou na nerovnoměrně distribuovat cílů napříč měsíců.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Zmeniť kód
 DocType: Purchase Invoice Item,Valuation Rate,Ocenění Rate
@@ -4170,7 +4175,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Využil ITC Cess
 ,Student Monthly Attendance Sheet,Študent mesačná návštevnosť Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Pravidlo platia iba pre predaj
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Odpisový riadok {0}: Nasledujúci Dátum odpisovania nemôže byť pred dátumom nákupu
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Odpisový riadok {0}: Nasledujúci Dátum odpisovania nemôže byť pred dátumom nákupu
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum zahájení projektu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Dokud
 DocType: Rename Tool,Rename Log,Premenovať Log
@@ -4188,12 +4193,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Ako často by sa projekt a spoločnosť mali aktualizovať na základe predajných transakcií.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Vyprší
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Pridajte študentov
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Odstráňte zamestnanca <a href=""#Form/Employee/{0}"">{0}</a> \ tento dokument zrušíte"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},"Prosím, vyberte {0}"
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,vzdialenosť
+DocType: Delivery Stop,Distance,vzdialenosť
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Uveďte zoznam svojich produktov alebo služieb, ktoré kupujete alebo predávate."
 DocType: Water Analysis,Storage Temperature,Teplota skladovania
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4220,7 +4223,7 @@
 DocType: Homepage,Company Description for website homepage,Spoločnosť Popis pre webové stránky domovskú stránku
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pro pohodlí zákazníků, tyto kódy mohou být použity v tiskových formátech, jako na fakturách a dodacích listech"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Meno suplier
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Nepodarilo sa získať informácie pre {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Nepodarilo sa získať informácie pre {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Otvorenie denníka vstupu
 DocType: Contract,Fulfilment Terms,Podmienky plnenia
 DocType: Sales Invoice,Time Sheet List,Zoznam časových rozvrhov
@@ -4403,7 +4406,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Vyberte manuálne študentov pre skupinu založenú na aktivitách
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Vyberte manuálne študentov pre skupinu založenú na aktivitách
 DocType: Journal Entry,User Remark,Uživatel Poznámka
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Optimalizácia trasy.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Optimalizácia trasy.
 DocType: Travel Itinerary,Non Diary,Bez deníku
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Nemožno vytvoriť retenčný bonus pre odídených zamestnancov
 DocType: Lead,Market Segment,Segment trhu
@@ -4434,7 +4437,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Vernostný program
 DocType: Student Guardian,Father,otec
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Podporné vstupenky
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&quot;Aktualizácia Sklad&quot; nemôžu byť kontrolované na pevnú predaji majetku
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&quot;Aktualizácia Sklad&quot; nemôžu byť kontrolované na pevnú predaji majetku
 DocType: Bank Reconciliation,Bank Reconciliation,Bankové odsúhlasenie
 DocType: Attendance,On Leave,Na odchode
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Získať aktualizácie
@@ -4479,7 +4482,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Sériové číslo a Dávka
 DocType: Warranty Claim,From Company,Od Společnosti
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Súčet skóre hodnotiacich kritérií musí byť {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Prosím nastavte Počet Odpisy rezervované
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Prosím nastavte Počet Odpisy rezervované
 DocType: Supplier Scorecard Period,Calculations,Výpočty
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Hodnota nebo Množství
 DocType: Payment Terms Template,Payment Terms,Platobné podmienky
@@ -4499,7 +4502,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Zľava (%) na sadzbe cien s maržou
 DocType: Healthcare Service Unit Type,Rate / UOM,Sadzba / MJ
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,všetky Sklady
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Nie je {0} zistené pre transakcie medzi spoločnosťami.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Nie je {0} zistené pre transakcie medzi spoločnosťami.
 DocType: Travel Itinerary,Rented Car,Nájomné auto
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,O vašej spoločnosti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Pripísať na účet musí byť účtu Súvaha
@@ -4601,6 +4604,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Kritériá analýzy rastlín
 DocType: Cheque Print Template,Cheque Height,šek Výška
 DocType: Supplier,Supplier Details,Detaily dodávateľa
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosím, nastavte číselnú sériu pre účasť v programe Setup&gt; Numbering Series"
 DocType: Setup Progress,Setup Progress,Pokročilé nastavenie
 DocType: Expense Claim,Approval Status,Stav schválení
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Z hodnota musí být menší než hodnota v řadě {0}
@@ -4694,7 +4698,6 @@
 DocType: Travel Request,Fully Sponsored,Plne sponzorované
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Zadanie reverzného denníka
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Zákazník {0} je vytvorený.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosím, nastavte systém pomenovania zamestnancov v oblasti ľudských zdrojov&gt; Nastavenia personálu"
 DocType: Stock Settings,Limit Percent,limit Percento
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Momentálne niesu k dispozícii položky v žiadnom sklade
 ,Payment Period Based On Invoice Date,Platební období na základě data vystavení faktury
@@ -4753,7 +4756,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Zdroj Warehouse
 DocType: Installation Note,Installation Date,Datum instalace
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Zdieľať knihu
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Riadok # {0}: {1} Asset nepatrí do spoločnosti {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Riadok # {0}: {1} Asset nepatrí do spoločnosti {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Faktúra predaja {0} bola vytvorená
 DocType: Employee,Confirmation Date,Dátum potvrdenia
 DocType: Inpatient Occupancy,Check Out,Odhlásiť sa
@@ -4773,6 +4776,7 @@
 DocType: Production Plan,Sales Orders Detail,Podrobné obchodné pokyny
 DocType: Bin,Requested Quantity,požadované množstvo
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Prosím, nastavte názov inštruktora systému vo vzdelávaní&gt; Nastavenia vzdelávania"
 DocType: Patient,Marital Status,Rodinný stav
 DocType: Stock Settings,Auto Material Request,Auto materiálu Poptávka
 DocType: Woocommerce Settings,API consumer secret,API spotrebiteľské tajomstvo
@@ -4805,7 +4809,7 @@
 DocType: Program Enrollment,Walking,chôdza
 DocType: Student Guardian,Student Guardian,študent Guardian
 DocType: Member,Member Name,Meno člena
-DocType: Stock Settings,Use Naming Series,Použite pomenovanie série
+DocType: Stock Settings,Use Naming Series,Použiť pomenovacie série
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +231,Valuation type charges can not marked as Inclusive,Poplatky typu ocenenie môže nie je označený ako Inclusive
 DocType: POS Profile,Update Stock,Aktualizace skladem
 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.,"Různé UOM položky povede k nesprávné (celkem) Čistá hmotnost hodnoty. Ujistěte se, že čistá hmotnost každé položky je ve stejném nerozpuštěných."
@@ -4825,7 +4829,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Vyberte dni
 DocType: Academic Term,Term Name,termín Name
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Úver ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Vytváranie platových taríf ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Vytváranie platových taríf ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Nemôžete upraviť koreňový uzol.
 DocType: Buying Settings,Purchase Order Required,Vydaná objednávka je vyžadována
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,časomerač
@@ -4863,7 +4867,7 @@
 DocType: Account,Rate at which this tax is applied,"Sadzba, pri ktorej sa použije táto daň"
 DocType: Cash Flow Mapper,Section Name,Názov sekcie
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Změna pořadí Množství
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Riadok odpisov {0}: Očakávaná hodnota po uplynutí životnosti musí byť väčšia alebo rovná {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Riadok odpisov {0}: Očakávaná hodnota po uplynutí životnosti musí byť väčšia alebo rovná {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Aktuálne pracovné príležitosti
 DocType: Company,Stock Adjustment Account,Reklamní Nastavení účtu
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Odpísať
@@ -4910,7 +4914,7 @@
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
 DocType: Opportunity,Opportunity Amount,Príležitostná suma
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Počet Odpisy rezervované nemôže byť väčšia ako celkový počet Odpisy
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Počet Odpisy rezervované nemôže byť väčšia ako celkový počet Odpisy
 DocType: Purchase Order,Order Confirmation Date,Dátum potvrdenia objednávky
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Proveďte návštěv údržby
@@ -4951,7 +4955,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,šarže:
 DocType: Volunteer,Afternoon,Popoludnie
 DocType: Loyalty Program,Loyalty Program Help,Nápoveda vernostného programu
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' je vypnuté
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' je vypnuté
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastaviť ako Otvorené
 DocType: Cheque Print Template,Scanned Cheque,skenovaných Šek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Posílat automatické e-maily na Kontakty na předložení transakcí.
@@ -4964,7 +4968,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Položka a Záruka Podrobnosti
 DocType: Chapter,Chapter Members,Členovia kapitoly
 DocType: Sales Team,Contribution (%),Príspevok (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Poznámka: Položka Platba nebude vytvořili, protože ""v hotovosti nebo bankovním účtu"" nebyl zadán"
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Poznámka: Položka Platba nebude vytvořili, protože ""v hotovosti nebo bankovním účtu"" nebyl zadán"
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Projekt {0} už existuje
 DocType: Clinical Procedure,Nursing User,Ošetrujúci používateľ
 DocType: Employee Benefit Application,Payroll Period,Mzdové obdobie
@@ -4972,6 +4976,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Sériové číslo {0} nepatrí do dávky {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Zodpovednosť
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Platnosť tejto ponuky sa skončila.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Odstráňte zamestnanca <a href=""#Form/Employee/{0}"">{0}</a> \ tento dokument zrušíte"
 DocType: Expense Claim Account,Expense Claim Account,Náklady na poistné Account
 DocType: Account,Capital Work in Progress,Kapitál Rozrobenosť
 DocType: Accounts Settings,Allow Stale Exchange Rates,Povoliť stale kurzy výmeny
@@ -5053,7 +5059,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Vydání Material
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Pripojte službu Shopify s nástrojom ERPNext
 DocType: Material Request Item,For Warehouse,Pro Sklad
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Poznámky o doručení {0} boli aktualizované
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Poznámky o doručení {0} boli aktualizované
 DocType: Employee,Offer Date,Dátum Ponuky
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Ponuky
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,"Ste v režime offline. Nebudete môcť znovu, kým nebudete mať sieť."
@@ -5104,7 +5110,7 @@
 DocType: Shipping Rule,Calculate Based On,Vypočítať na základe
 DocType: Contract,Unfulfilled,nesplnený
 DocType: Delivery Note Item,From Warehouse,Zo skladu
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Žiadni zamestnanci pre uvedené kritériá
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Žiadni zamestnanci pre uvedené kritériá
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Žiadne položky s Bill of Materials Výroba
 DocType: Shopify Settings,Default Customer,Predvolený zákazník
 DocType: Sales Stage,Stage Name,Pseudonym
@@ -5147,7 +5153,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Částka daně po slevě Částka
 DocType: Patient,Inpatient Status,Stav lôžka
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Každodennú prácu Súhrnné Nastavenie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Vybraný cenník by mal kontrolovať pole nákupu a predaja.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Vybraný cenník by mal kontrolovať pole nákupu a predaja.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Zadajte Reqd podľa dátumu
 DocType: Payment Entry,Internal Transfer,vnútorné Prevod
 DocType: Asset Maintenance,Maintenance Tasks,Úlohy údržby
@@ -5184,7 +5190,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Seskupit podle
 DocType: Guardian,Interests,záujmy
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Povolit / zakázat měny.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Nepodarilo sa odoslať niektoré platobné pásky
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Nepodarilo sa odoslať niektoré platobné pásky
 DocType: Exchange Rate Revaluation,Get Entries,Získajte záznamy
 DocType: Production Plan,Get Material Request,Získať Materiál Request
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Poštovní náklady
@@ -5271,7 +5277,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
 DocType: BOM,Website Description,Popis webu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Čistá zmena vo vlastnom imaní
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Zrušte faktúre {0} prvý
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Zrušte faktúre {0} prvý
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Nepovolené. Zakážte typ servisnej jednotky
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailová adresa musí byť jedinečná, už existuje pre {0}"
 DocType: Serial No,AMC Expiry Date,AMC Datum vypršení platnosti
@@ -5311,7 +5317,7 @@
 DocType: Hotel Room,Hotel Room,Hotelová izba
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Účet {0} nie je patria spoločnosti {1}
 DocType: Leave Type,Rounding,zaokrúhľovania
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Sériové čísla v riadku {0} sa nezhodujú s dodacím listom
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Sériové čísla v riadku {0} sa nezhodujú s dodacím listom
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Vyčlenená čiastka (premenná)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Následne sa cenové pravidlá odfilcujú na základe zákazníka, skupiny zákazníkov, územia, dodávateľa, skupiny dodávateľov, kampane, obchodného partnera atď."
 DocType: Student,Guardian Details,Guardian Podrobnosti
@@ -5366,7 +5372,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
 DocType: Leave Allocation,Unused leaves,Nepoužité listy
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Vykonajte splatenie položky
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Všetky oddelenia
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Všetky oddelenia
 DocType: Healthcare Service Unit,Vacant,prázdny
 DocType: Patient,Alcohol Past Use,Použitie alkoholu v minulosti
 DocType: Fertilizer Content,Fertilizer Content,Obsah hnojiva
@@ -5377,7 +5383,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Pred zrušením tejto objednávky musí byť pracovná objednávka {0} zrušená
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
 DocType: Authorization Rule,Applicable To (Employee),Vztahující se na (Employee)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Dátum splatnosti je povinný
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Dátum splatnosti je povinný
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Prírastok pre atribút {0} nemôže byť 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Druh dávky a výška dávky
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Izby boli rezervované
@@ -5525,7 +5531,7 @@
 DocType: Purchase Invoice Item,Total Weight,Celková váha
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Provizia z prodeja
 DocType: Job Offer Term,Value / Description,Hodnota / Popis
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Riadok # {0}: Asset {1} nemôže byť predložený, je už {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Riadok # {0}: Asset {1} nemôže byť predložený, je už {2}"
 DocType: Tax Rule,Billing Country,Fakturačná krajina
 DocType: Purchase Order Item,Expected Delivery Date,Očekávané datum dodání
 DocType: Restaurant Order Entry,Restaurant Order Entry,Vstup do objednávky reštaurácie
@@ -5564,12 +5570,13 @@
 DocType: Maintenance Visit,Breakdown,Rozbor
 DocType: Travel Itinerary,Vegetarian,vegetarián
 DocType: Patient Encounter,Encounter Date,Dátum stretnutia
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Účet: {0} s menou: {1} nemožno vybrať
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Účet: {0} s menou: {1} nemožno vybrať
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bankové údaje
 DocType: Purchase Receipt Item,Sample Quantity,Množstvo vzoriek
 DocType: Bank Guarantee,Name of Beneficiary,Názov príjemcu
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",Aktualizujte náklady na BOM automaticky prostredníctvom Plánovača na základe najnovšej sadzby ocenenia / cien / posledného nákupu surovín.
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Dodávateľ&gt; Skupina dodávateľov
 DocType: Bank Reconciliation Detail,Cheque Date,Šek Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Účet {0}: Nadřazený účet {1} nepatří ke společnosti: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Úspešne vypúšťa všetky transakcie súvisiace s týmto spoločnosti!
@@ -5597,7 +5604,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Podriadené uzly môžu byť vytvorené len na základe typu uzly &quot;skupina&quot;
 DocType: Attendance Request,Half Day Date,Half Day Date
 DocType: Academic Year,Academic Year Name,Akademický rok Meno
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} nesmie transakcie s {1}. Zmeňte spoločnosť.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} nesmie transakcie s {1}. Zmeňte spoločnosť.
 DocType: Sales Partner,Contact Desc,Opis kontaktu
 DocType: Email Digest,Send regular summary reports via Email.,Zasílat pravidelné souhrnné zprávy e-mailem.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Prosím nastaviť predvolený účet v Expense reklamačný typu {0}
@@ -5630,7 +5637,7 @@
 DocType: Hotel Room,Hotel Manager,Hotelový manažér
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Sada Daňové Pravidlo pre nákupného košíka
 DocType: Purchase Invoice,Taxes and Charges Added,Daně a poplatky přidané
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Odpisový riadok {0}: Nasledujúci dátum odpisovania nemôže byť pred dátumom k dispozícii na použitie
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Odpisový riadok {0}: Nasledujúci dátum odpisovania nemôže byť pred dátumom k dispozícii na použitie
 ,Sales Funnel,Predajný lievik
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Skratka je povinná
 DocType: Project,Task Progress,pokrok úloha
@@ -5639,12 +5646,12 @@
 DocType: Staffing Plan,Total Estimated Budget,Celkový odhadovaný rozpočet
 ,Qty to Transfer,Množství pro přenos
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Ponuka z Obchodnej Iniciatívy alebo pre Zákazníka
-DocType: Stock Settings,Role Allowed to edit frozen stock,Role povoleno upravovat zmrazené zásoby
+DocType: Stock Settings,Role Allowed to edit frozen stock,"Rola, ktorá má oprávnenie upravovať zmrazené zásoby"
 ,Territory Target Variance Item Group-Wise,Území Cílová Odchylka Item Group-Wise
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Všechny skupiny zákazníků
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,nahromadené za mesiac
 DocType: Attendance Request,On Duty,V službe
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možno nie je vytvorený záznam Zmeny meny pre {1} až {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možno nie je vytvorený záznam Zmeny meny pre {1} až {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Personálny plán {0} už existuje pre označenie {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Daňová šablóna je povinné.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Účet {0}: Nadřazený účet {1} neexistuje
@@ -5725,11 +5732,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Alespoň jeden sklad je povinný
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Konfigurácia polí položiek ako UOM, skupina položiek, popis a počet hodín."
 DocType: Certification Application,Certification Status,Stav certifikácie
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Marketplace
 DocType: Travel Itinerary,Travel Advance Required,Cestovanie Advance Povinné
 DocType: Subscriber,Subscriber Name,Názov účastníka
 DocType: Serial No,Out of Warranty,Out of záruky
-DocType: Cashier Closing,Cashier-closing-,Pokladničné-closing-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Mapovaný typ údajov
 DocType: BOM Update Tool,Replace,Vyměnit
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Nenašli sa žiadne produkty.
@@ -5817,7 +5823,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Predvolené daňové šablóny pre predaj a nákup sú vytvorené.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Hodnotenie výsledkov {0} už existuje.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Príklad: ABCD. #####. Ak je nastavená séria a v transakciách sa neuvádza dávka, potom sa na základe tejto série vytvorí automatické číslo dávky. Ak chcete vždy výslovne uviesť číslo dávky pre túto položku, ponechajte prázdne. Poznámka: Toto nastavenie bude mať prednosť pred prefixom série Naming v nastaveniach zásob."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosím, nastavte číselnú sériu pre účasť v programe Setup&gt; Numbering Series"
 DocType: BOM,Materials Required (Exploded),Potřebný materiál (Rozložený)
 DocType: Contract,Party User,Používateľ strany
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Filtrovanie spoločnosti nastavte prázdne, ak je položka Skupina pod skupinou &quot;Spoločnosť&quot;"
@@ -6020,7 +6025,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Musí sa nastaviť dátum spustenia skúšobného obdobia a dátum ukončenia skúšobného obdobia
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Priemerná hodnota
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Celková čiastka platby v pláne platieb sa musí rovnať veľkému / zaokrúhlenému súčtu
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Celková čiastka platby v pláne platieb sa musí rovnať veľkému / zaokrúhlenému súčtu
 DocType: Subscription Plan Detail,Plan,plán
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bankový zostatok podľa hlavnej knihy
 DocType: Job Applicant,Applicant Name,Meno žiadateľa
@@ -6089,7 +6094,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Soap & Detergent
 DocType: BOM,Show Items,Zobraziť položky
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Od doby nemôže byť väčšia ako na čas.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Chcete upozorniť všetkých zákazníkov e-mailom?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Chcete upozorniť všetkých zákazníkov e-mailom?
 DocType: Subscription Plan,Billing Interval,Fakturačný interval
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Objednáno
@@ -6098,9 +6103,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Riadok {0}: {1} musí byť väčší ako 0
 DocType: Assessment Criteria,Assessment Criteria Group,Hodnotiace kritériá Group
 DocType: Healthcare Settings,Patient Name By,Názov pacienta
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Záznam o účtovaní časového rozlíšenia pre platy od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Záznam o účtovaní časového rozlíšenia pre platy od {0} do {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Povoliť odložené výnosy
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Otvorenie Oprávky musí byť menšia ako rovná {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Otvorenie Oprávky musí byť menšia ako rovná {0}
 DocType: Warehouse,Warehouse Name,Názov skladu
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Skutočný dátum začiatku musí byť nižší ako skutočný dátum ukončenia
 DocType: Naming Series,Select Transaction,Vybrat Transaction
@@ -6157,7 +6162,7 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +90,Task weight cannot be negative,Hmotnosť úlohy nemôže byť negatívna
 DocType: Sales Invoice Item,Sales Order Item,Položka predajnej objednávky
 DocType: Salary Slip,Payment Days,Platební dny
-DocType: Stock Settings,Convert Item Description to Clean HTML,Konverzia položky Popis na čistenie HTML
+DocType: Stock Settings,Convert Item Description to Clean HTML,Konvertovať popis položky na HTML
 DocType: Patient,Dormant,spiace
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,Odpočítajte daň za nevyžiadané zamestnanecké výhody
 DocType: Salary Slip,Total Interest Amount,Celková výška úroku
@@ -6252,7 +6257,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Zamestnanec {0} v platovej triede {1} nemá žiadne predvolené pravidlá pre dovolenku
 DocType: Salary Detail,Salary Detail,Detail platu
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,"Prosím, najprv vyberte {0}"
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Pridali sme {0} používateľov
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Pridali sme {0} používateľov
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",V prípade viacvrstvového programu budú zákazníci automaticky priradení príslušnému vrstvu podľa ich vynaložených prostriedkov
 DocType: Appointment Type,Physician,lekár
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Batch {0} z {1} bodu vypršala.
@@ -6397,7 +6402,7 @@
 DocType: Asset,Custodian,strážca
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Point-of-Sale Profil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} by mala byť hodnota medzi 0 a 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Platba {0} od {1} do {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Platba {0} od {1} do {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Nezajištěných úvěrů
 DocType: Cost Center,Cost Center Name,Meno nákladového strediska
 DocType: Student,B+,B +
@@ -6429,6 +6434,7 @@
 DocType: Employee,Date of Issue,Datum vydání
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Podľa Nákupných nastavení, ak je potrebná nákupná požiadavka == &#39;ÁNO&#39;, potom pre vytvorenie nákupnej faktúry musí používateľ najskôr vytvoriť potvrdenie nákupu pre položku {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Riadok # {0}: Nastavte Dodávateľ pre položku {1}
+DocType: Global Defaults,Default Distance Unit,Predvolená vzdialenosť jednotky
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Riadok {0}: doba hodnota musí byť väčšia ako nula.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Webové stránky Image {0} pripája k bodu {1} nemožno nájsť
 DocType: Issue,Content Type,Typ obsahu
@@ -6484,7 +6490,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Debetné Na účet musí byť účtu Súvaha
 DocType: Asset,Naming Series,Číselné rady
 DocType: Vital Signs,Coated,obalený
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Riadok {0}: Očakávaná hodnota po skončení životnosti musí byť nižšia ako čiastka hrubého nákupu
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Riadok {0}: Očakávaná hodnota po skončení životnosti musí byť nižšia ako čiastka hrubého nákupu
 DocType: GoCardless Settings,GoCardless Settings,Nastavenia GoCardless
 DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
 DocType: Certified Consultant,Certification Validity,Platnosť certifikátu
@@ -6553,6 +6559,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Záhlavie banky
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Zobraziť laboratórne testy
 DocType: Hub Users,Hub Users,Používatelia Hubu
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Zákaznícka skupina&gt; Územie
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Datum údržby
 DocType: Purchase Invoice Item,Rejected Serial No,Zamítnuto Serial No
@@ -6568,7 +6575,7 @@
 DocType: SG Creation Tool Course,Max Strength,Max Sila
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Inštalácia predvolieb
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Pre zákazníka nie je vybratá žiadna dodacia poznámka {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Pre zákazníka nie je vybratá žiadna dodacia poznámka {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Zamestnanec {0} nemá maximálnu výšku dávok
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Vyberte položku podľa dátumu doručenia
 DocType: Grant Application,Has any past Grant Record,Má nejaký predchádzajúci grantový záznam
@@ -6596,7 +6603,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Rezervácia izieb v hoteli
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Služby zákazníkom
 DocType: BOM,Thumbnail,Thumbnail
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Neboli nájdené žiadne kontakty s e-mailovými ID.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Neboli nájdené žiadne kontakty s e-mailovými ID.
 DocType: Item Customer Detail,Item Customer Detail,Položka Detail Zákazník
 DocType: Notification Control,Prompt for Email on Submission of,Výzva pro e-mail na předkládání
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Maximálna výška dávky zamestnanca {0} presahuje {1}
@@ -6856,7 +6863,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,"Nelze skryté do skupiny, protože je požadovaný typ účtu."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} bol zmenený. Prosím aktualizujte.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Přestaňte uživatelům provádět Nechat aplikací v následujících dnech.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položiek&gt; Značka
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","V prípade neobmedzeného uplynutia platnosti Vernostných bodov, ponechajte dobu trvania expirácie prázdnu alebo 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Členovia tímu údržby
 DocType: Loyalty Point Entry,Purchase Amount,suma nákupu
@@ -6864,7 +6870,7 @@
 											to fullfill Sales Order {2}","Nie je možné dodať sériové číslo {0} položky {1}, pretože je rezervované \ na plnenie zákazky odberateľa {2}"
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Dodávateľ Cien {0} vytvoril
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Koniec roka nemôže byť pred uvedením do prevádzky roku
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Koniec roka nemôže byť pred uvedením do prevádzky roku
 DocType: Employee Benefit Application,Employee Benefits,Zamestnanecké benefity
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Balené množstvo se musí rovnať množstvu pre položku {0} v riadku {1}
 DocType: Work Order,Manufactured Qty,Vyrobeno Množství
@@ -6880,6 +6886,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Vyberte dávkové čísla
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Na GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Faktúry zákazníkom
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosím, nastavte systém pomenovania zamestnancov v oblasti ľudských zdrojov&gt; Nastavenia personálu"
 DocType: Healthcare Settings,Invoice Appointments Automatically,Automatické zadanie faktúr
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID projektu
 DocType: Salary Component,Variable Based On Taxable Salary,Premenná založená na zdaniteľnom platu
@@ -6928,7 +6935,7 @@
 DocType: POS Profile,Account for Change Amount,Účet pre zmenu Suma
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Pripojenie k aplikácii QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Celkový zisk / strata
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Neplatná spoločnosť pre faktúru medzi spoločnosťami.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Neplatná spoločnosť pre faktúru medzi spoločnosťami.
 DocType: Purchase Invoice,input service,vstupná služba
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Riadok {0}: Party / Account nezhoduje s {1} / {2} do {3} {4}
 DocType: Employee Promotion,Employee Promotion,Podpora zamestnancov
@@ -7058,7 +7065,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Preferovaná oblasť ubytovania
 apps/erpnext/erpnext/config/selling.py +184,Analytics,analytika
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Košík je prázdny
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Prosím, nastavte názov inštruktora systému vo vzdelávaní&gt; Nastavenia vzdelávania"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Položka {0} neobsahuje žiadne sériové číslo. Serializované položky \ môžu mať dodávku na základe poradového čísla
 DocType: Vehicle,Model,Modelka
@@ -7088,7 +7094,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Nič sa nemenia
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Vyberte soubor csv
 DocType: Holiday List,Total Holidays,Celkové prázdniny
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Chýba šablóna e-mailu na odoslanie. Prosím nastavte jednu z možností Delivery Settings.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Chýba šablóna e-mailu na odoslanie. Prosím nastavte jednu z možností Delivery Settings.
 DocType: Student Leave Application,Mark as Present,Označiť ako prítomný
 DocType: Supplier Scorecard,Indicator Color,Farba indikátora
 DocType: Purchase Order,To Receive and Bill,Prijímať a Bill
@@ -7097,7 +7103,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Vyberte položku Sériové číslo
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Návrhár
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Podmínky Template
-DocType: Serial No,Delivery Details,Detaily dodania
+DocType: Delivery Trip,Delivery Details,Detaily dodania
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
 DocType: Program,Program Code,kód programu
 DocType: Terms and Conditions,Terms and Conditions Help,podmienky nápovedy
@@ -7121,7 +7127,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Vek Obchodnej iniciatívy v dňoch
 DocType: Cash Flow Mapping,Is Income Tax Expense,Daň z príjmov
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Vaša objednávka je k dispozícii!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Riadok # {0}: Vysielanie dátum musí byť rovnaké ako dátum nákupu {1} aktíva {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Riadok # {0}: Vysielanie dátum musí byť rovnaké ako dátum nákupu {1} aktíva {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Skontrolujte, či študent býva v hosteli inštitútu."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Prosím, zadajte Predajné objednávky v tabuľke vyššie"
 ,Stock Summary,Sumár zásob
diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv
index f0b0c6d..a43ca4f 100644
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Ime obdobja
 DocType: Employee,Salary Mode,Način plače
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Registriraj se
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Registriraj se
 DocType: Patient,Divorced,Ločen
 DocType: Support Settings,Post Route Key,Ključ objave posta
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Dovoli da se artikel večkrat  doda v transakciji.
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Nov tečaj
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Valuta je potrebna za tečajnico {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bo izračunano v transakciji.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Dobavitelj&gt; Dobavitelj tip
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-YYYY-
 DocType: Purchase Order,Customer Contact,Stranka Kontakt
 DocType: Patient Appointment,Check availability,Preveri razpoložljivost
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Prikaži odprte
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Zaporedje uspešno posodobljeno
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Naročilo
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} v vrstici {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} v vrstici {1}
 DocType: Asset Finance Book,Depreciation Start Date,Začetni datum amortizacije
 DocType: Pricing Rule,Apply On,Nanesite na
 DocType: Item Price,Multiple Item prices.,Več cene postavko.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Laboratorijski recept
 ,Delay Days,Dnevi zamude
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Service Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijska številka: {0} že naveden v prodajne fakture: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijska številka: {0} že naveden v prodajne fakture: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Račun
 DocType: Purchase Invoice Item,Item Weight Details,Element Teža Podrobnosti
 DocType: Asset Maintenance Log,Periodicity,Periodičnost
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Računovodja
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Prodajni cenik
 DocType: Patient,Tobacco Current Use,Trenutna uporaba tobaka
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Začetni datum in končni datum se prekrivata z delovno kartico <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Prodajna cena
 DocType: Cost Center,Stock User,Stock Uporabnik
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca+Mg)/K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Podobni
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Datum udeležba ne sme biti manjša od povezuje datumu zaposlenega
 DocType: Grading Scale,Grading Scale Name,Ocenjevalna lestvica Ime
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Dodaj uporabnike v Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Dodaj uporabnike v Marketplace
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,To je račun root in jih ni mogoče urejati.
 DocType: Sales Invoice,Company Address,Naslov podjetja
 DocType: BOM,Operations,Operacije
@@ -322,7 +322,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Količina
 DocType: Production Plan,Material Request Detail,Materialna zahteva Podrobnosti
 DocType: Selling Settings,Default Quotation Validity Days,Privzeti dnevi veljavnosti ponudbe
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Da vključujejo davek v vrstici {0} v stopnji Element, davki v vrsticah {1} je treba vključiti tudi"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Da vključujejo davek v vrstici {0} v stopnji Element, davki v vrsticah {1} je treba vključiti tudi"
 DocType: SMS Center,SMS Center,SMS center
 DocType: Payroll Entry,Validate Attendance,Potrjevanje prisotnosti
 DocType: Sales Invoice,Change Amount,Znesek spremembe
@@ -441,7 +441,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Razmik med vrsticami za znesek z besedami
 DocType: Vehicle,Additional Details,Dodatne podrobnosti
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Opis ni dana
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Dobavitelj&gt; Skupina dobaviteljev
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Zaprosi za nakup.
 DocType: POS Closing Voucher Details,Collected Amount,Zbrani znesek
 DocType: Lab Test,Submitted Date,Datum predložitve
@@ -486,7 +485,7 @@
 DocType: Student Admission,Student Admission,študent Sprejem
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Postavka {0} je odpovedan
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Amortizacijski vrstici {0}: začetni datum amortizacije se vnese kot pretekli datum
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Amortizacijski vrstici {0}: začetni datum amortizacije se vnese kot pretekli datum
 DocType: Contract Template,Fulfilment Terms and Conditions,Izpolnjevanje pogojev
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Zahteva za material
 DocType: Bank Reconciliation,Update Clearance Date,Posodobitev Potrditev Datum
@@ -543,6 +542,7 @@
 DocType: Accounts Settings,Settings for Accounts,Nastavitve za račune
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Dobavitelj računa ni v računu o nakupu obstaja {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Upravljanje drevesa prodajalca.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Te poti ni mogoče obdelati, ker so nastavitve Google Zemljevidov onemogočene."
 DocType: Job Applicant,Cover Letter,Cover Letter
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Neporavnani čeki in depoziti želite počistiti
 DocType: Item,Synced With Hub,Sinhronizirano Z Hub
@@ -602,7 +602,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Nova vrednost sredstev
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Stopnjo, po kateri je naročnik Valuta pretvori v osnovni valuti kupca"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Seveda razporejanje orodje
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Nakup računa ni mogoče sklepati na podlagi obstoječega sredstva {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Nakup računa ni mogoče sklepati na podlagi obstoječega sredstva {1}
 DocType: Crop Cycle,LInked Analysis,LInked analiza
 DocType: POS Closing Voucher,POS Closing Voucher,POS zaključni bon
 DocType: Contract,Lapsed,Neodločeno
@@ -637,6 +637,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} ni vpisan v smer {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Študentsko ime:
 DocType: POS Closing Voucher Details,Difference,Razlika
+DocType: Delivery Settings,Delay between Delivery Stops,Zakasnitev med stopnjami dostave
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serijska št {0} ne pripada dobavnica {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Zdi se, da obstaja težava s strežniško GoCardless konfiguracijo. V primeru neuspeha ne skrbite, znesek bo povrnjen na vaš račun."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -697,7 +698,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Količina in stopnja
 DocType: Delivery Note,% Installed,% nameščeno
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Učilnice / Laboratories itd, kjer se lahko načrtovana predavanja."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Valutne družbe obeh družb se morajo ujemati s transakcijami Inter Company.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Valutne družbe obeh družb se morajo ujemati s transakcijami Inter Company.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,"Prosimo, da najprej vpišete ime podjetja"
 DocType: Travel Itinerary,Non-Vegetarian,Ne-vegetarijanska
 DocType: Purchase Invoice,Supplier Name,Dobavitelj Name
@@ -784,7 +785,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Najem od datuma
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Dovolj deli za izgradnjo
 DocType: POS Profile User,POS Profile User,POS profil uporabnika
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Vrstica {0}: začetni datum amortizacije je obvezen
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Vrstica {0}: začetni datum amortizacije je obvezen
 DocType: Purchase Invoice Item,Service Start Date,Datum začetka storitve
 DocType: Subscription Invoice,Subscription Invoice,Naročniški račun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Neposredne dohodkovne
@@ -852,7 +853,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Kratica že uporabljena za druge družbe
 DocType: Selling Settings,Default Customer Group,Privzeta skupina kupcev
 DocType: Employee,IFSC Code,Kodeks IFSC
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Začetni datum in končni datum se prekrivata z delovno kartico <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Če onemogočiti, polje &quot;zaokrožena Skupaj &#39;ne bo viden v vsakem poslu"
 DocType: BOM,Operating Cost,Obratovalni stroški
 DocType: Crop,Produced Items,Proizvedeni elementi
@@ -904,7 +904,7 @@
 DocType: Supplier,Prevent RFQs,Preprečite RFQ-je
 DocType: Hub User,Hub User,Uporabnik Hub
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Naredite Sales Order
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Plačilo za plačilo je oddano za obdobje od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Plačilo za plačilo je oddano za obdobje od {0} do {1}
 DocType: Project Task,Project Task,Project Task
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Uveljavljene točke
 ,Lead Id,ID Ponudbe
@@ -1036,7 +1036,7 @@
 DocType: Fee Validity,Max number of visit,Največje število obiska
 ,Hotel Room Occupancy,Hotelske sobe
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet ustvaril:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},"Prosim, nastavite privzeto gotovinski ali bančni račun v načinu plačevanja {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},"Prosim, nastavite privzeto gotovinski ali bančni račun v načinu plačevanja {0}"
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,včlanite se
 DocType: GST Settings,GST Settings,GST Nastavitve
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Valuta mora biti enaka ceni valute: {0}
@@ -1091,7 +1091,7 @@
 DocType: Vehicle Log,Service Details,storitev Podrobnosti
 DocType: Lab Test Template,Grouped,Združeno
 DocType: Selling Settings,Delivery Note Required,Dostava Opomba Obvezno
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Predložitev plakatov ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Predložitev plakatov ...
 DocType: Bank Guarantee,Bank Guarantee Number,Bančna garancija Število
 DocType: Bank Guarantee,Bank Guarantee Number,Bančna garancija Število
 DocType: Assessment Criteria,Assessment Criteria,Merila ocenjevanja
@@ -1117,13 +1117,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Začetek Plačilo je že ustvarjena
 DocType: Request for Quotation,Get Suppliers,Pridobite dobavitelje
 DocType: Purchase Receipt Item Supplied,Current Stock,Trenutna zaloga
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ni povezana s postavko {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ni povezana s postavko {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Predogled Plača listek
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Račun {0} je bil vpisan večkrat
 DocType: Account,Expenses Included In Valuation,Stroški Vključeno v vrednotenju
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,"Obnovite lahko le, če vaše članstvo poteče v 30 dneh"
 DocType: Shopping Cart Settings,Show Stock Availability,Prihranite sedaj null%!
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Nastavite {0} v kategoriji sredstev {1} ali podjetje {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Nastavite {0} v kategoriji sredstev {1} ali podjetje {2}
 DocType: Location,Longitude,Dolžina
 ,Absent Student Report,Odsoten Student Report
 DocType: Crop,Crop Spacing UOM,UOM razmika rastlin
@@ -1196,7 +1196,7 @@
 DocType: Soil Texture,Sand,Pesek
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energy
 DocType: Opportunity,Opportunity From,Priložnost Od
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,"Vrstica {0}: {1} Serijske številke, potrebne za postavko {2}. Dali ste {3}."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,"Vrstica {0}: {1} Serijske številke, potrebne za postavko {2}. Dali ste {3}."
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Izberite tabelo
 DocType: BOM,Website Specifications,Spletna Specifikacije
 DocType: Special Test Items,Particulars,Podrobnosti
@@ -1288,7 +1288,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Postavke z višjo weightage bo prikazan višje
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Laboratorijski testi in vitalni znaki
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Sprava Detail
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} je treba predložiti
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} je treba predložiti
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Najdenih ni delavec
 DocType: Item,If subcontracted to a vendor,Če podizvajanje prodajalca
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Študent Skupina je že posodobljen.
@@ -1343,7 +1343,6 @@
 DocType: Loyalty Program Collection,Tier Name,Ime razreda
 DocType: HR Settings,Enter retirement age in years,Vnesite upokojitveno starost v letih
 DocType: Crop,Target Warehouse,Ciljna Skladišče
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Prosimo, nastavite imena serije za {0} prek Setup&gt; Settings&gt; Series Naming"
 DocType: Payroll Employee Detail,Payroll Employee Detail,Detajl zaposlenih zaposlenih
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Izberite skladišče
 DocType: Cheque Print Template,Starting location from left edge,Izhajajoč lokacijo od levega roba
@@ -1433,7 +1432,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Plan material za sklope
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Prodajni partnerji in ozemelj
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} mora biti aktiven
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Ni razpoložljivih elementov za prenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Ni razpoložljivih elementov za prenos
 DocType: Employee Boarding Activity,Activity Name,Ime dejavnosti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Sprememba datuma izdaje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Končana količina izdelka <b>{0}</b> in Za količino <b>{1}</b> ne moreta biti drugačna
@@ -1662,6 +1661,7 @@
 DocType: Project,First Email,Prva e-pošta
 DocType: Company,Exception Budget Approver Role,Izvršilna vloga za odobritev proračuna
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Ko je nastavljen, bo ta račun zadržan do določenega datuma"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervirano Warehouse v Sales Order / dokončanih proizvodov Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Prodajni Znesek
 DocType: Repayment Schedule,Interest Amount,Obresti Znesek
@@ -1673,7 +1673,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Zapisi
 DocType: Asset,Scrapped,izločeni
 DocType: Item,Item Defaults,Privzeta postavka
-DocType: Purchase Invoice,Returns,Vračila
+DocType: Cashier Closing,Returns,Vračila
 DocType: Job Card,WIP Warehouse,WIP Skladišče
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serijska št {0} je pod vzdrževalne pogodbe stanuje {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,zaposlovanje
@@ -1687,7 +1687,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Vrsta prenosa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Prodajna Stroški
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina strank&gt; Teritorija
 DocType: Diagnosis,Diagnosis,Diagnoza
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standardna nabavna
 DocType: Attendance Request,Explanation,Pojasnilo
@@ -1700,7 +1699,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Postavke nakupnih naročil so prepozne
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Poštna številka
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Naročilo {0} je {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Izberite račun obrestnih prihodkov v posojilu {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Izberite račun obrestnih prihodkov v posojilu {0}
 DocType: Opportunity,Contact Info,Kontaktni podatki
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Izdelava Zaloga Entries
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Zaposlenca s statusom Levo ni mogoče spodbujati
@@ -1712,7 +1711,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Račun ni mogoče naročiti za ničelno uro zaračunavanja
 DocType: Company,Date of Commencement,Datum začetka
 DocType: Sales Person,Select company name first.,Izberite ime podjetja prvič.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},E-pošta je poslana na {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},E-pošta je poslana na {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Prejete ponudbe
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Zamenjajte BOM in posodobite najnovejšo ceno v vseh BOM
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Za {0} | {1} {2}
@@ -1733,7 +1732,7 @@
 DocType: Asset Movement,From Employee,Od zaposlenega
 DocType: Driver,Cellphone Number,številka mobilnega telefona
 DocType: Project,Monitor Progress,Spremljajte napredek
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Opozorilo: Sistem ne bo preveril previsokih saj znesek za postavko {0} v {1} je nič
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Opozorilo: Sistem ne bo preveril previsokih saj znesek za postavko {0} v {1} je nič
 DocType: Journal Entry,Make Difference Entry,Naredite Razlika Entry
 DocType: Supplier Quotation,Auto Repeat Section,Samodejni del ponovitve
 DocType: Upload Attendance,Attendance From Date,Udeležba Od datuma
@@ -1836,7 +1835,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Vrstica # {0}: Zavrnjena Kol ne more biti vpisana v Nabava Nazaj
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Spreminjanje skupine strank za izbrano stranko ni dovoljeno.
 ,Purchase Order Items To Be Billed,Naročilnica Postavke placevali
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Posodabljanje predvidenih časov prihoda.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Posodabljanje predvidenih časov prihoda.
 DocType: Program Enrollment Tool,Enrollment Details,Podrobnosti o vpisu
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Ne morete nastaviti več privzetih postavk za podjetje.
 DocType: Purchase Invoice Item,Net Rate,Net Rate
@@ -1850,7 +1849,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Leave Type je premišljen
 DocType: Support Settings,Close Issue After Days,Zapri Težava Po dnevih
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Če želite dodati uporabnike v Marketplace, morate biti uporabnik z vlogami upravitelja sistema in upravitelja elementov."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Če želite dodati uporabnike v Marketplace, morate biti uporabnik z vlogami upravitelja sistema in upravitelja elementov."
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Pustite prazno, če velja za vse veje"
 DocType: Job Opening,Staffing Plan,Načrt zaposlovanja
 DocType: Bank Guarantee,Validity in Days,Veljavnost v dnevih
@@ -1872,7 +1871,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Dvojnik vrstica {0} z enako {1}
 DocType: Marketplace Settings,Disable Marketplace,Onemogoči trg
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Poslovno leto {0} ni bilo mogoče najti
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Poslovno leto {0} ni bilo mogoče najti
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Postavitev Zaposleni
 DocType: Hotel Room Reservation,Hotel Reservation User,Uporabnik rezervacije hotela
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,"Prosimo, izberite predpono najprej"
@@ -1980,7 +1979,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Prijava ni uspel
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Sredstvo {0} je ustvarjeno
 DocType: Special Test Items,Special Test Items,Posebni testni elementi
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Za registracijo v Marketplace morate biti uporabnik z vlogami upravitelja sistemov in upravitelja elementov.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Za registracijo v Marketplace morate biti uporabnik z vlogami upravitelja sistemov in upravitelja elementov.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Način plačila
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Glede na dodeljeno strukturo plače ne morete zaprositi za ugodnosti
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Spletna stran Slika bi morala biti javna datoteka ali spletna stran URL
@@ -1992,7 +1991,7 @@
 DocType: Warehouse,Warehouse Contact Info,Skladišče Kontakt Info
 DocType: Payment Entry,Write Off Difference Amount,Napišite Off Razlika Znesek
 DocType: Volunteer,Volunteer Name,Ime prostovoljca
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Vrstice s podvojenimi datumi v drugih vrsticah so bile najdene: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Vrstice s podvojenimi datumi v drugih vrsticah so bile najdene: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: email zaposlenega ni mogoče najti, zato e-poštno sporočilo ni bilo poslano"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Struktura plač ni dodeljena zaposlenemu {0} na določenem datumu {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Pravilo o pošiljanju ni veljavno za državo {0}
@@ -2083,6 +2082,7 @@
 DocType: Salary Component,Earning,Služenje
 DocType: Supplier Scorecard,Scoring Criteria,Kriteriji točkovanja
 DocType: Purchase Invoice,Party Account Currency,Party Valuta računa
+DocType: Delivery Trip,Total Estimated Distance,Skupna ocenjena razdalja
 ,BOM Browser,BOM Browser
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,"Prosimo, posodobite svoj status za ta trening dogodek"
 DocType: Item Barcode,EAN,EAN
@@ -2121,7 +2121,7 @@
 DocType: Activity Cost,Projects,Projekti
 DocType: Payment Request,Transaction Currency,transakcija Valuta
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Od {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Nekaj e-poštnih sporočil je neveljavno
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Nekaj e-poštnih sporočil je neveljavno
 DocType: Work Order Operation,Operation Description,Operacija Opis
 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.,"Ne more spremeniti poslovno leto začetni datum in fiskalnem letu End Datum, ko je poslovno leto shranjen."
 DocType: Quotation,Shopping Cart,Nakupovalni voziček
@@ -2145,7 +2145,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Neto sprememba v osnovno sredstvo
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Pustite prazno, če velja za vse označb"
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Naboj tip &quot;Dejanski&quot; v vrstici {0} ni mogoče vključiti v postavko Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Naboj tip &quot;Dejanski&quot; v vrstici {0} ni mogoče vključiti v postavko Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od datetime
 DocType: Shopify Settings,For Company,Za podjetje
@@ -2159,7 +2159,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Prišlo je do napak pri urejanju tečaja tečaja
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Prvi odobritev Expenses na seznamu bo nastavljen kot privzeti odobritev Expense.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,ne more biti večja kot 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Če se želite registrirati v Marketplace, morate biti uporabnik, ki ni administrator, z vlogo Upravitelja sistema in Upravitelja elementov."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Če se želite registrirati v Marketplace, morate biti uporabnik, ki ni administrator, z vlogo Upravitelja sistema in Upravitelja elementov."
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Postavka {0} ni zaloge Item
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.LLLL.-
 DocType: Maintenance Visit,Unscheduled,Nenačrtovana
@@ -2188,7 +2188,7 @@
 DocType: HR Settings,Employee Settings,Nastavitve zaposlenih
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Nalaganje plačilnega sistema
 ,Batch-Wise Balance History,Serija-Wise Balance Zgodovina
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Vrstica # {0}: Ne morem nastaviti stopnje, če je znesek večji od zaračunanega zneska za predmet {1}."
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Vrstica # {0}: Ne morem nastaviti stopnje, če je znesek večji od zaračunanega zneska za predmet {1}."
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,nastavitve tiskanja posodabljajo v ustrezni obliki za tiskanje
 DocType: Package Code,Package Code,paket koda
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Vajenec
@@ -2420,7 +2420,7 @@
 DocType: Delivery Trip,Optimize Route,Optimizirajte pot
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Poskusite načrtovanju operacij za X dni vnaprej.
 DocType: HR Settings,Stop Birthday Reminders,Stop Birthday opomniki
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},"Prosimo, nastavite privzetega izplačane plače je treba plačati račun v družbi {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},"Prosimo, nastavite privzetega izplačane plače je treba plačati račun v družbi {0}"
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,"Get finančno razčlenitev davkov in zaračunavanje podatkov, ki jih Amazon"
 DocType: SMS Center,Receiver List,Sprejemnik Seznam
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Iskanje Item
@@ -2490,7 +2490,7 @@
 DocType: Vital Signs,Constipated,Zaprta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Zoper dobavitelja Račun {0} dne {1}
 DocType: Customer,Default Price List,Privzeto Cenik
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,zapis Gibanje sredstvo {0} ustvaril
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,zapis Gibanje sredstvo {0} ustvaril
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Ni elementov.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,"Ne, ne moreš brisati poslovnega leta {0}. Poslovno leto {0} je privzet v globalnih nastavitvah"
 DocType: Share Transfer,Equity/Liability Account,Račun kapitala / obveznost
@@ -2630,6 +2630,7 @@
 DocType: Blanket Order,Order Type,Sklep Type
 ,Item-wise Sales Register,Element-pametno Sales Registriraj se
 DocType: Asset,Gross Purchase Amount,Bruto znesek nakupa
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Koda postavke&gt; Skupina izdelkov&gt; Blagovna znamka
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Začetne stave
 DocType: Asset,Depreciation Method,Metoda amortiziranja
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je to DDV vključen v osnovni stopnji?
@@ -2713,7 +2714,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,"Ukrep, če je letni proračun presegel PO"
 DocType: Student Leave Application,Student Leave Application,Študent Zapusti Uporaba
 DocType: Item,Will also apply for variants,Bo veljalo tudi za variante
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Sredstvo ni mogoče preklicati, saj je že {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Sredstvo ni mogoče preklicati, saj je že {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Zaposlenih {0} v pol dneva na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Skupaj delovni čas ne sme biti večja od max delovnih ur {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,na
@@ -2737,6 +2738,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Pridobi podatke
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Največji dovoljeni dopust v tipu dopusta {0} je {1}
 DocType: SMS Center,Create Receiver List,Ustvarite sprejemnik seznam
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,"Datum, ki je na voljo za uporabo, mora biti po datumu nakupa"
 DocType: Vehicle,Wheels,kolesa
 DocType: Packing Slip,To Package No.,Če želite Paket No.
 DocType: Patient Relation,Family,Družina
@@ -2750,7 +2752,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Valuta za obračun mora biti enaka valuti podjetja ali valuti stranke
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Kaže, da je paket del tega dostave (samo osnutka)"
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Vrstica {0}: Datum roka ne more biti pred datumom objavljanja
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Vrstica {0}: Datum roka ne more biti pred datumom objavljanja
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Naredite Entry plačila
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Količina za postavko {0} sme biti manjša od {1}
 ,Sales Invoice Trends,Prodajni fakturi Trendi
@@ -2823,7 +2825,7 @@
 DocType: Guardian,Guardian Interests,Guardian Zanima
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Posodobi ime računa / številka
 DocType: Naming Series,Current Value,Trenutna vrednost
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"obstaja več proračunskih let za datum {0}. Prosim, nastavite podjetje v poslovnem letu"
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"obstaja več proračunskih let za datum {0}. Prosim, nastavite podjetje v poslovnem letu"
 DocType: Education Settings,Instructor Records to be created by,"Zapise za inštruktorje, ki jih bo ustvaril"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} ustvaril
 DocType: GST Account,GST Account,GST račun
@@ -2840,7 +2842,7 @@
 DocType: Sales Person,Name and Employee ID,Ime in zaposlenih ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Rok ne more biti pred datumom knjiženja
 DocType: Website Item Group,Website Item Group,Spletna stran Element Group
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"Za zgoraj navedena izbrana merila ILI plačilni list, ki je že bil predložen, ni bilo mogoče najti nobene plačilne liste"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"Za zgoraj navedena izbrana merila ILI plačilni list, ki je že bil predložen, ni bilo mogoče najti nobene plačilne liste"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Dajatve in davki
 DocType: Projects Settings,Projects Settings,Nastavitve projektov
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Vnesite Referenčni datum
@@ -2849,7 +2851,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Priložena Kol
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.GGGG.-
 DocType: Purchase Order Item,Material Request Item,Material Zahteva Postavka
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Najprej prekličite potrdilo o nakupu {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Najprej prekličite potrdilo o nakupu {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Drevo skupin artiklov.
 DocType: Production Plan,Total Produced Qty,Skupno število proizvedenih količin
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Ne more sklicevati številko vrstice večja ali enaka do trenutne številke vrstice za to vrsto Charge
@@ -2959,6 +2961,7 @@
 ,Vehicle Expenses,Stroški vozil
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Ustvari laboratorijske teste na računu za prodajo
 DocType: Serial No,Invoice Details,Podrobnosti na računu
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Omogočite nastavitve Google Zemljevidov za ocenjevanje in optimiziranje poti
 DocType: Grant Application,Show on Website,Prikaži na spletni strani
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Začni
 DocType: Hub Tracked Item,Hub Category,Kategorija vozlišča
@@ -2999,7 +3002,7 @@
 DocType: Inpatient Record,B Positive,B Pozitivni
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Najvišja korist zaposlenega {0} presega {1} za vsoto {2} prejšnje zahtevane količine
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Kol mora biti 1, kot točka je osnovno sredstvo. Prosimo, uporabite ločeno vrstico za večkratno Kol."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Kol mora biti 1, kot točka je osnovno sredstvo. Prosimo, uporabite ločeno vrstico za večkratno Kol."
 DocType: Leave Block List Allow,Leave Block List Allow,Pustite Block List Dovoli
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr ne more biti prazna ali presledek
 DocType: Patient Medical Record,Patient Medical Record,Zdravniški zapis bolnika
@@ -3034,7 +3037,7 @@
 DocType: Workstation,Wages per hour,Plače na uro
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock ravnotežje Serija {0} bo postal negativen {1} za postavko {2} v skladišču {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Po Material Zahteve so bile samodejno dvigne temelji na ravni re-naročilnico elementa
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Račun {0} ni veljaven. Valuta računa mora biti {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Račun {0} ni veljaven. Valuta računa mora biti {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Od datuma {0} ne more biti po razrešitvi delavca Datum {1}
 DocType: Supplier,Is Internal Supplier,Je notranji dobavitelj
 DocType: Employee,Create User Permission,Ustvarite dovoljenje za uporabnika
@@ -3180,7 +3183,7 @@
 DocType: Account,Fixed Asset,Osnovno sredstvo
 DocType: Amazon MWS Settings,After Date,Po datumu
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Zaporednimi Inventory
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Neveljaven {0} za Inter Company račun.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Neveljaven {0} za Inter Company račun.
 ,Department Analytics,Oddelek Analytics
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,V privzetem stiku ni mogoče najti e-pošte
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Ustvari skrivnost
@@ -3193,7 +3196,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Program v strukturi pristojbin in študentski skupini {0} je drugačen.
 DocType: Bank Statement Transaction Entry,Receivable Account,Terjatev račun
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Velja od datuma mora biti manjši od veljavnega datuma uveljavitve.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} je že {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} je že {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Sales Order do plačila
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,direktor
@@ -3235,6 +3238,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Bremenitev je potrebno
 DocType: Clinical Procedure,Inpatient Record,Hišni bolezen
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomaga slediti časa, stroškov in zaračunavanje za aktivnostmi s svojo ekipo, podpisan"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Dobavitelj&gt; Dobavitelj tip
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Nakup Cenik
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Datum transakcije
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Predloge spremenljivk rezultatov dobaviteljev.
@@ -3278,7 +3282,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Exchange dobiček / izguba
 DocType: Opportunity,Lost Reason,Lost Razlog
 DocType: Amazon MWS Settings,Enable Amazon,Omogoči Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Vrstica # {0}: Račun {1} ne pripada podjetju {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Vrstica # {0}: Račun {1} ne pripada podjetju {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Datoteke DocType {0} ni mogoče najti
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,New Naslov
 DocType: Quality Inspection,Sample Size,Velikost vzorca
@@ -3390,7 +3394,7 @@
 DocType: Water Analysis,Origin,Izvor
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,"Ta dokument je nad mejo, ki jo {0} {1} za postavko {4}. Delaš drugo {3} zoper isto {2}?"
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,"Prosim, nastavite ponavljajočih se po shranjevanju"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,znesek računa Izberite sprememba
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,znesek računa Izberite sprememba
 DocType: Purchase Invoice,Price List Currency,Cenik Valuta
 DocType: Naming Series,User must always select,Uporabnik mora vedno izbrati
 DocType: Stock Settings,Allow Negative Stock,Dovoli Negative Stock
@@ -3432,7 +3436,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,"Ali ste prepričani, da želite preklicati ta sestanek?"
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Paket hotelskih cen
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,prodaja Pipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},"Prosim, nastavite privzetega računa v plač komponento {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},"Prosim, nastavite privzetega računa v plač komponento {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Zahtevani Na
 DocType: Rename Tool,File to Rename,Datoteka za preimenovanje
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Izberite BOM za postavko v vrstici {0}
@@ -3453,7 +3457,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Vrednost kupljenih artiklov
 DocType: Employee Separation,Employee Separation Template,Predloga za ločevanje zaposlenih
 DocType: Selling Settings,Sales Order Required,Zahtevano je naročilo
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Postanite prodajalec
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Postanite prodajalec
 DocType: Purchase Invoice,Credit To,Kredit
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Aktivne ponudbe / Stranke
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,"Pustite prazno, da uporabite standardno obliko zapisa za dostavo"
@@ -3495,7 +3499,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Naredi davčno predlogo
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Uporabniški forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Surovine ne more biti prazno.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Vrstica # {0} (Tabela plačil): znesek mora biti negativen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Vrstica # {0} (Tabela plačil): znesek mora biti negativen
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Ni mogel posodobiti vozni park, faktura vsebuje padec element ladijskega prometa."
 DocType: Contract,Fulfilment Status,Status izpolnjevanja
 DocType: Lab Test Sample,Lab Test Sample,Vzorec laboratorijskega testa
@@ -3635,7 +3639,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Doc Datum
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Fee Records Created - {0}
 DocType: Asset Category Account,Asset Category Account,Sredstvo Kategorija račun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Vrstica # {0} (Tabela plačil): znesek mora biti pozitiven
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Vrstica # {0} (Tabela plačil): znesek mora biti pozitiven
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Ne more proizvajati več item {0} od prodaje kol {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Izberite vrednosti atributa
 DocType: Purchase Invoice,Reason For Issuing document,Razlog za izdajo dokumenta
@@ -3690,7 +3694,7 @@
 DocType: Purchase Receipt,Time at which materials were received,"Čas, v katerem so bile prejete materiale"
 DocType: Products Settings,Products per Page,Izdelki na stran
 DocType: Stock Ledger Entry,Outgoing Rate,Odhodni Rate
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,ali
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,ali
 DocType: Sales Order,Billing Status,Status zaračunavanje
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Prijavi težavo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Pomožni Stroški
@@ -3718,7 +3722,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Izjava o davčni oprostitvi za zaposlene
 DocType: Payment Entry,Cheque/Reference Date,Ček / Referenčni datum
 DocType: Purchase Invoice,Total Taxes and Charges,Skupaj davki in dajatve
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,"Datum, ki je na voljo za uporabo, se vpiše kot pretekli datum"
 DocType: Employee,Emergency Contact,Zasilna Kontakt
 DocType: Bank Reconciliation Detail,Payment Entry,Začetek plačilo
 ,sales-browser,prodaja brskalnik
@@ -3765,6 +3768,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Je donos (kreditna opomba)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Začni opravilo
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Serijsko št. Se zahteva za sredstvo {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Prosimo, nastavite imena serije za {0} prek Setup&gt; Settings&gt; Series Naming"
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Onemogočeno predloga ne sme biti kot privzeto
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Za vrstico {0}: vnesite načrtovani qty
 DocType: Account,Income Account,Prihodki račun
@@ -3778,6 +3782,7 @@
 DocType: Loyalty Program,Help Section,Oddelek za pomoč
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,prejšnja
 DocType: Appraisal Goal,Key Responsibility Area,Key Odgovornost Area
+DocType: Delivery Trip,Distance UOM,Razdalja UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Študentski Paketi vam pomaga slediti sejnin, ocene in pristojbine za študente"
 DocType: Payment Entry,Total Allocated Amount,Skupaj Dodeljena Znesek
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Privzeta nastavitev popis račun za stalne inventarizacije
@@ -3819,7 +3824,7 @@
 DocType: Item Supplier,Item Supplier,Postavka Dobavitelj
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Vnesite Koda dobiti serijo no
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},"Prosimo, izberite vrednost za {0} quotation_to {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Ni izbranih elementov za prenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Ni izbranih elementov za prenos
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Vsi naslovi.
 DocType: Company,Stock Settings,Nastavitve Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je mogoče le, če so naslednje lastnosti enaka v obeh evidencah. Je skupina, Root Type, Company"
@@ -4105,7 +4110,7 @@
 DocType: Patient,Personal and Social History,Osebna in socialna zgodovina
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Uporabnik {0} je ustvaril
 DocType: Fee Schedule,Fee Breakup for each student,Povračilo stroškov za vsakega študenta
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Skupaj predplačilo ({0}) proti odredbi {1} ne more biti večja od Grand Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Skupaj predplačilo ({0}) proti odredbi {1} ne more biti večja od Grand Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Izberite mesečnim izplačilom neenakomerno distribucijo ciljev po mesecih.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Spremeni kodo
 DocType: Purchase Invoice Item,Valuation Rate,Oceni Vrednotenje
@@ -4114,7 +4119,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Uporabil ITC Cess
 ,Student Monthly Attendance Sheet,Študent Mesečni Udeležba Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Pravilo o dostavi velja samo za prodajo
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Amortizacijski vrstici {0}: Naslednji amortizacijski datum ne more biti pred datumom nakupa
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Amortizacijski vrstici {0}: Naslednji amortizacijski datum ne more biti pred datumom nakupa
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt Start Date
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Do
 DocType: Rename Tool,Rename Log,Preimenovanje Prijava
@@ -4132,12 +4137,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Kako pogosto je treba posodobiti projekt in podjetje na podlagi prodajnih transakcij.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Poteče
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Dodaj Študenti
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Če želite preklicati ta dokument, izbrišite zaposlenega <a href=""#Form/Employee/{0}"">{0}</a> \"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},"Prosimo, izberite {0}"
 DocType: C-Form,C-Form No,C-forma
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Razdalja
+DocType: Delivery Stop,Distance,Razdalja
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Navedite svoje izdelke ali storitve, ki jih kupite ali prodajate."
 DocType: Water Analysis,Storage Temperature,Temperatura shranjevanja
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4164,7 +4167,7 @@
 DocType: Homepage,Company Description for website homepage,Podjetje Opis za domačo stran spletnega mesta
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Za udobje kupcev lahko te kode se uporabljajo v tiskanih oblikah, kot so na računih in dobavnicah"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Ime suplier
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Podatkov za {0} ni bilo mogoče pridobiti.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Podatkov za {0} ni bilo mogoče pridobiti.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Otvoritveni dnevnik
 DocType: Contract,Fulfilment Terms,Izpolnjevanje pogojev
 DocType: Sales Invoice,Time Sheet List,Časovnica
@@ -4346,7 +4349,7 @@
 DocType: Serial No,Warranty / AMC Details,Garancija / AMC Podrobnosti
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,"Izberite študentov ročno za skupine dejavnosti, ki temelji"
 DocType: Journal Entry,User Remark,Uporabnik Pripomba
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Optimiziranje poti.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Optimiziranje poti.
 DocType: Travel Itinerary,Non Diary,Ne Dnevnik
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Ne morete ustvariti zadrževalnega bonusa za leve zaposlene
 DocType: Lead,Market Segment,Tržni segment
@@ -4376,7 +4379,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Program zvestobe
 DocType: Student Guardian,Father,oče
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Podporne vstopnice
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,"&quot;Update Stock&quot;, ni mogoče preveriti za prodajo osnovnih sredstev"
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,"&quot;Update Stock&quot;, ni mogoče preveriti za prodajo osnovnih sredstev"
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Sprava
 DocType: Attendance,On Leave,Na dopustu
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Dobite posodobitve
@@ -4421,7 +4424,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serijska številka in serije
 DocType: Warranty Claim,From Company,Od družbe
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Vsota ocen ocenjevalnih meril mora biti {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,"Prosim, nastavite Število amortizacije Rezervirano"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,"Prosim, nastavite Število amortizacije Rezervirano"
 DocType: Supplier Scorecard Period,Calculations,Izračuni
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Vrednost ali Kol
 DocType: Payment Terms Template,Payment Terms,Plačilni pogoji
@@ -4441,7 +4444,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Popust (%) na Cena iz cenika Oceni z mejo
 DocType: Healthcare Service Unit Type,Rate / UOM,Oceni / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Vse Skladišča
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Št. {0} je bil najden za transakcije podjetja Inter.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Št. {0} je bil najden za transakcije podjetja Inter.
 DocType: Travel Itinerary,Rented Car,Najem avtomobila
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,O vaši družbi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Credit Za računu mora biti bilanca računa
@@ -4542,6 +4545,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Kriteriji za analizo rastlin
 DocType: Cheque Print Template,Cheque Height,Ček Višina
 DocType: Supplier,Supplier Details,Dobavitelj Podrobnosti
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosimo, nastavite številske serije za udeležbo preko Setup&gt; Series Numbering"
 DocType: Setup Progress,Setup Progress,Napredek nastavitve
 DocType: Expense Claim,Approval Status,Stanje odobritve
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Iz mora biti vrednost manj kot na vrednosti v vrstici {0}
@@ -4635,7 +4639,6 @@
 DocType: Travel Request,Fully Sponsored,Popolnoma sponzorirani
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Stranka {0} je ustvarjena.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosimo, nastavite sistem imenovanja zaposlenih v kadri&gt; HR Settings"
 DocType: Stock Settings,Limit Percent,omejitev Odstotek
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Trenutno ni na zalogi
 ,Payment Period Based On Invoice Date,Plačilo obdobju na podlagi računa Datum
@@ -4694,7 +4697,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Vir Skladišče
 DocType: Installation Note,Installation Date,Datum vgradnje
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Delež knjige
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne pripada družbi {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne pripada družbi {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Ustvarjen je račun za prodajo {0}
 DocType: Employee,Confirmation Date,Datum potrditve
 DocType: Inpatient Occupancy,Check Out,Preveri
@@ -4714,6 +4717,7 @@
 DocType: Production Plan,Sales Orders Detail,Prodajna naročila Podrobnosti
 DocType: Bin,Requested Quantity,Zahtevana količina
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Prosimo, nastavite sistem imenovanja inštruktorja v izobraževanju&gt; Nastavitve izobraževanja"
 DocType: Patient,Marital Status,Zakonski stan
 DocType: Stock Settings,Auto Material Request,Auto Material Zahteva
 DocType: Woocommerce Settings,API consumer secret,API potrošnikov skrivnost
@@ -4766,7 +4770,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Izberite Dnevi
 DocType: Academic Term,Term Name,izraz Ime
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Kredit ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Ustvarjanje plačnih lističev ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Ustvarjanje plačnih lističev ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Rootnega vozlišča ne morete urejati.
 DocType: Buying Settings,Purchase Order Required,Naročilnica obvezno
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Časovnik
@@ -4804,7 +4808,7 @@
 DocType: Account,Rate at which this tax is applied,"Hitrost, s katero se ta davek"
 DocType: Cash Flow Mapper,Section Name,Ime oddelka
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Preureditev Kol
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Vrednost amortizacije {0}: pričakovana vrednost po življenjski dobi mora biti večja ali enaka {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Vrednost amortizacije {0}: pričakovana vrednost po življenjski dobi mora biti večja ali enaka {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Razpisana delovna
 DocType: Company,Stock Adjustment Account,Račun prilagoditev zaloge
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Odpisati
@@ -4851,7 +4855,7 @@
 DocType: Program Enrollment,School House,šola House
 DocType: Serial No,Out of AMC,Od AMC
 DocType: Opportunity,Opportunity Amount,Znesek priložnosti
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Število amortizacije naročene ne sme biti večja od skupnega št amortizacije
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Število amortizacije naročene ne sme biti večja od skupnega št amortizacije
 DocType: Purchase Order,Order Confirmation Date,Datum potrditve naročila
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Naredite Maintenance obisk
@@ -4892,7 +4896,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Serija:
 DocType: Volunteer,Afternoon,Popoldne
 DocType: Loyalty Program,Loyalty Program Help,Pomoč programa zvestobe
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} {1} &quot;je onemogočena
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} {1} &quot;je onemogočena
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastavi kot Odpri
 DocType: Cheque Print Template,Scanned Cheque,skeniranih Ček
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Pošlji samodejne elektronske pošte v Contacts o posredovanju transakcij.
@@ -4905,7 +4909,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Točka in Garancija Podrobnosti
 DocType: Chapter,Chapter Members,Članice poglavja
 DocType: Sales Team,Contribution (%),Prispevek (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Opomba: Začetek Plačilo se ne bodo ustvarili, saj &quot;gotovinski ali bančni račun&quot; ni bil podan"
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Opomba: Začetek Plačilo se ne bodo ustvarili, saj &quot;gotovinski ali bančni račun&quot; ni bil podan"
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Projekt {0} že obstaja
 DocType: Clinical Procedure,Nursing User,Uporabnik zdravstvene nege
 DocType: Employee Benefit Application,Payroll Period,Obdobje plačevanja
@@ -4913,6 +4917,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Serijska številka {0} ne sodi v paket {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Odgovornosti
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Obdobje veljavnosti te ponudbe se je končalo.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Če želite preklicati ta dokument, izbrišite zaposlenega <a href=""#Form/Employee/{0}"">{0}</a> \"
 DocType: Expense Claim Account,Expense Claim Account,Expense Zahtevek računa
 DocType: Account,Capital Work in Progress,Kapitalsko delo v teku
 DocType: Accounts Settings,Allow Stale Exchange Rates,Dovoli tečajne menjalne tečaje
@@ -4994,7 +5000,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Vprašanje Material
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Poveži Shopify z ERPNext
 DocType: Material Request Item,For Warehouse,Za Skladišče
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Opombe o dostavi {0} posodobljeni
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Opombe o dostavi {0} posodobljeni
 DocType: Employee,Offer Date,Ponudba Datum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Ponudbe
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,"Ste v načinu brez povezave. Ne boste mogli naložiti, dokler imate omrežje."
@@ -5045,7 +5051,7 @@
 DocType: Shipping Rule,Calculate Based On,Izračun temelji na
 DocType: Contract,Unfulfilled,Neizpolnjeno
 DocType: Delivery Note Item,From Warehouse,Iz skladišča
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Za omenjena merila ni zaposlenih
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Za omenjena merila ni zaposlenih
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Ni Postavke z Bill materialov za Izdelava
 DocType: Shopify Settings,Default Customer,Privzeta stranka
 DocType: Sales Stage,Stage Name,Ime stadiona
@@ -5088,7 +5094,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Davčna Znesek Po Popust Znesek
 DocType: Patient,Inpatient Status,Bolnišnično stanje
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Dnevni Nastavitve Delo Povzetek
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Izbrani cenik bi moral imeti preverjena polja nakupa in prodaje.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Izbrani cenik bi moral imeti preverjena polja nakupa in prodaje.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Vnesite Reqd po datumu
 DocType: Payment Entry,Internal Transfer,Interni prenos
 DocType: Asset Maintenance,Maintenance Tasks,Vzdrževalna opravila
@@ -5125,7 +5131,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Skupina S
 DocType: Guardian,Interests,Zanima
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Omogoči / onemogoči valute.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Ne morem poslati nekaterih plačnih lističev
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Ne morem poslati nekaterih plačnih lističev
 DocType: Exchange Rate Revaluation,Get Entries,Get Entries
 DocType: Production Plan,Get Material Request,Get Zahteva material
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Poštni stroški
@@ -5211,7 +5217,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Expense račun je obvezna za postavko {0}
 DocType: BOM,Website Description,Spletna stran Opis
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Neto sprememba v kapitalu
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Prosim za prekinitev računu o nakupu {0} najprej
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Prosim za prekinitev računu o nakupu {0} najprej
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,"Ni dovoljeno. Prosimo, onemogočite vrsto servisne enote"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-poštni naslov mora biti edinstven, že obstaja za {0}"
 DocType: Serial No,AMC Expiry Date,AMC preteka Datum
@@ -5251,7 +5257,7 @@
 DocType: Hotel Room,Hotel Room,Hotelska soba
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Račun {0} ne pripada podjetju {1}
 DocType: Leave Type,Rounding,Zaokroževanje
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Številke v vrstici {0} se ne ujema z dobavnice
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Številke v vrstici {0} se ne ujema z dobavnice
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Razdeljeni znesek (Pro-rated)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Nato se pravila o ceni filtrirajo na podlagi stranke, skupine strank, ozemlja, dobavitelja, skupine dobaviteljev, oglaševalske akcije, prodajnega partnerja itd."
 DocType: Student,Guardian Details,Guardian Podrobnosti
@@ -5306,7 +5312,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Skladišče je potrebna za borzo postavki {0}
 DocType: Leave Allocation,Unused leaves,Neizkoriščene listi
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Vnos vračila
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Vsi oddelki
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Vsi oddelki
 DocType: Healthcare Service Unit,Vacant,Prazen
 DocType: Patient,Alcohol Past Use,Pretekla uporaba alkohola
 DocType: Fertilizer Content,Fertilizer Content,Vsebina gnojil
@@ -5317,7 +5323,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Delovni nalog {0} morate preklicati pred preklicem tega prodajnega naloga
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Fetch eksplodiral BOM (vključno podsklopov)
 DocType: Authorization Rule,Applicable To (Employee),Ki se uporabljajo za (zaposlenih)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Datum zapadlosti je obvezno
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Datum zapadlosti je obvezno
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Prirastek za Attribute {0} ne more biti 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Vrsta in znesek ugodnosti
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Sobe Rezervirano
@@ -5466,7 +5472,7 @@
 DocType: Purchase Invoice Item,Total Weight,Totalna teža
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Komisija za prodajo
 DocType: Job Offer Term,Value / Description,Vrednost / Opis
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ni mogoče predložiti, je že {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ni mogoče predložiti, je že {2}"
 DocType: Tax Rule,Billing Country,Zaračunavanje Država
 DocType: Purchase Order Item,Expected Delivery Date,Pričakuje Dostava Datum
 DocType: Restaurant Order Entry,Restaurant Order Entry,Vnos naročila restavracij
@@ -5505,12 +5511,13 @@
 DocType: Maintenance Visit,Breakdown,Zlomiti se
 DocType: Travel Itinerary,Vegetarian,Vegetarijansko
 DocType: Patient Encounter,Encounter Date,Datum srečanja
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Račun: {0} z valuti: ne more biti izbran {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Račun: {0} z valuti: ne more biti izbran {1}
 DocType: Bank Statement Transaction Settings Item,Bank Data,Podatki banke
 DocType: Purchase Receipt Item,Sample Quantity,Količina vzorca
 DocType: Bank Guarantee,Name of Beneficiary,Ime upravičenca
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",Na podlagi najnovejšega razmerja cene / cene cenika / zadnje stopnje nakupa surovin samodejno posodobite stroške BOM prek načrtovalca.
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Dobavitelj&gt; Skupina dobaviteljev
 DocType: Bank Reconciliation Detail,Cheque Date,Ček Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Račun {0}: Matični račun {1} ne pripada podjetju: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Uspešno izbrisana vse transakcije v zvezi s to družbo!
@@ -5538,7 +5545,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Otroški vozlišča lahko ustvari samo na podlagi tipa vozlišča &quot;skupina&quot;
 DocType: Attendance Request,Half Day Date,Poldnevni datum
 DocType: Academic Year,Academic Year Name,Ime študijsko leto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,"{0} ni dovoljeno posredovati z {1}. Prosimo, spremenite družbo."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,"{0} ni dovoljeno posredovati z {1}. Prosimo, spremenite družbo."
 DocType: Sales Partner,Contact Desc,Kontakt opis izdelka
 DocType: Email Digest,Send regular summary reports via Email.,Pošlji redna zbirna poročila preko e-maila.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},"Prosim, nastavite privzetega računa v Tip Expense Terjatve {0}"
@@ -5571,7 +5578,7 @@
 DocType: Hotel Room,Hotel Manager,Hotel Manager
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Nastavite Davčna pravilo za nakupovalno košarico
 DocType: Purchase Invoice,Taxes and Charges Added,Davki in dajatve Dodano
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,"Amortizacijski vrstici {0}: Naslednji Amortizacijski datum ne sme biti pred datumom, ki je na voljo za uporabo"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,"Amortizacijski vrstici {0}: Naslednji Amortizacijski datum ne sme biti pred datumom, ki je na voljo za uporabo"
 ,Sales Funnel,Prodaja toka
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Kratica je obvezna
 DocType: Project,Task Progress,naloga Progress
@@ -5585,7 +5592,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Vse skupine strank
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,Bilančni Mesečni
 DocType: Attendance Request,On Duty,Na dolžnosti
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obvezen. Mogoče zapis Menjalnega tečaja ni ustvarjen za {1} v {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obvezen. Mogoče zapis Menjalnega tečaja ni ustvarjen za {1} v {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Kadrovski načrt {0} že obstaja za oznako {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Davčna Predloga je obvezna.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Račun {0}: Matični račun {1} ne obstaja
@@ -5665,11 +5672,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Atleast eno skladišče je obvezna
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Konfigurirajte polja polj, na primer UOM, skupino elementov, opis in število ur."
 DocType: Certification Application,Certification Status,Certifikacijski status
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Tržnica
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Tržnica
 DocType: Travel Itinerary,Travel Advance Required,Zahtevano potovanje
 DocType: Subscriber,Subscriber Name,Ime naročnika
 DocType: Serial No,Out of Warranty,Iz garancije
-DocType: Cashier Closing,Cashier-closing-,"Blagajne,"
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Podatki tipa Mapped
 DocType: BOM Update Tool,Replace,Zamenjaj
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Ni izdelkov.
@@ -5757,7 +5763,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Ustvari so privzete davčne predloge za prodajo in nakup.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Ocenjevanje Rezultat zapisa {0} že obstaja.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Primer: ABCD. #####. Če je serija nastavljena in številka paketa ni navedena v transakcijah, bo na podlagi te serije izdelana avtomatična serijska številka. Če za to postavko vedno želite izrecno omeniti Lot št., Pustite to prazno. Opomba: ta nastavitev bo imela prednost pred imeniku serije Prefix v nastavitvah zalog."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosimo, nastavite številske serije za udeležbo preko Setup&gt; Series Numbering"
 DocType: BOM,Materials Required (Exploded),Potreben materiali (eksplodirala)
 DocType: Contract,Party User,Stranski uporabnik
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Nastavite Podjetje filtriranje prazno, če skupina Z je &quot;Podjetje&quot;"
@@ -5960,7 +5965,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Štetje
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Določiti je treba začetni datum preizkusnega obdobja in datum konca poskusnega obdobja
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Povprečna hitrost
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Skupni znesek plačila v urniku plačil mora biti enak znesku zaokroženo / zaokroženo
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Skupni znesek plačila v urniku plačil mora biti enak znesku zaokroženo / zaokroženo
 DocType: Subscription Plan Detail,Plan,Načrt
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Banka Izjava ravnotežje kot na glavno knjigo
 DocType: Job Applicant,Applicant Name,Predlagatelj Ime
@@ -6029,7 +6034,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Soap &amp; Detergent
 DocType: BOM,Show Items,prikaži Točke
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Od časa ne sme biti večja od do časa.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Ali želite obvestiti vse stranke po elektronski pošti?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Ali želite obvestiti vse stranke po elektronski pošti?
 DocType: Subscription Plan,Billing Interval,Interval zaračunavanja
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naročeno
@@ -6038,9 +6043,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Vrstica {0}: {1} mora biti večja od 0
 DocType: Assessment Criteria,Assessment Criteria Group,Skupina Merila ocenjevanja
 DocType: Healthcare Settings,Patient Name By,Ime bolnika z
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Vpis v časopisni razgovor za plače od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Vpis v časopisni razgovor za plače od {0} do {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Omogočite odloženi prihodek
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Odpiranje nabrano amortizacijo sme biti manjša od enako {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Odpiranje nabrano amortizacijo sme biti manjša od enako {0}
 DocType: Warehouse,Warehouse Name,Skladišče Name
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Dejanski začetni datum mora biti manjši od dejanskega končnega datuma
 DocType: Naming Series,Select Transaction,Izberite Transaction
@@ -6192,7 +6197,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Zaposleni {0} razreda {1} nimajo pravilnika o privzetem dopustu
 DocType: Salary Detail,Salary Detail,plača Podrobnosti
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,"Prosimo, izberite {0} najprej"
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Dodal {0} uporabnike
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Dodal {0} uporabnike
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",V primeru večstopenjskega programa bodo stranke samodejno dodeljene zadevni stopnji glede na porabljene
 DocType: Appointment Type,Physician,Zdravnik
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Serija {0} od Postavka {1} je potekla.
@@ -6337,7 +6342,7 @@
 DocType: Asset,Custodian,Skrbnik
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Point-of-Sale profila
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} mora biti vrednost med 0 in 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Plačilo {0} od {1} do {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Plačilo {0} od {1} do {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Nezavarovana posojila
 DocType: Cost Center,Cost Center Name,Stalo Ime Center
 DocType: Student,B+,B +
@@ -6369,6 +6374,7 @@
 DocType: Employee,Date of Issue,Datum izdaje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Kot je na Nastavitve Nakup če Nakup Reciept Zahtevano == &quot;DA&quot;, nato pa za ustvarjanje računu o nakupu, uporabnik potreba ustvariti Nakup listek najprej za postavko {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Vrstica # {0}: Nastavite Dobavitelj za postavko {1}
+DocType: Global Defaults,Default Distance Unit,Privzeta enota za razdaljo
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Vrstica {0}: Ure vrednost mora biti večja od nič.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Spletna stran slike {0} pritrjena na postavki {1} ni mogoče najti
 DocType: Issue,Content Type,Vrsta vsebine
@@ -6424,7 +6430,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Bremenitev računa mora biti bilanca računa
 DocType: Asset,Naming Series,Poimenovanje zaporedja
 DocType: Vital Signs,Coated,Prevlečen
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Vrstica {0}: Pričakovana vrednost po uporabnem življenjskem obdobju mora biti manjša od bruto zneska nakupa
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Vrstica {0}: Pričakovana vrednost po uporabnem življenjskem obdobju mora biti manjša od bruto zneska nakupa
 DocType: GoCardless Settings,GoCardless Settings,GoCardless nastavitve
 DocType: Leave Block List,Leave Block List Name,Pustite Ime Block List
 DocType: Certified Consultant,Certification Validity,Veljavnost certifikata
@@ -6493,6 +6499,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Glava banke
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Oglejte si laboratorijske preiskave
 DocType: Hub Users,Hub Users,Uporabniki vozlišča
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina strank&gt; Teritorija
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Vzdrževanje Datum
 DocType: Purchase Invoice Item,Rejected Serial No,Zavrnjeno Zaporedna številka
@@ -6507,7 +6514,7 @@
 DocType: SG Creation Tool Course,Max Strength,Max moč
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Namestitev prednastavitev
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Za kupca ni izbranega obvestila o dostavi {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Za kupca ni izbranega obvestila o dostavi {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Zaposleni {0} nima največjega zneska nadomestila
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Izberite elemente glede na datum dostave
 DocType: Grant Application,Has any past Grant Record,Ima dodeljen zapis
@@ -6535,7 +6542,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Rezervacija hotelske sobe
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Storitev za stranke
 DocType: BOM,Thumbnail,Thumbnail
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Ni najdenih stikov z e-poštnimi ID-ji.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Ni najdenih stikov z e-poštnimi ID-ji.
 DocType: Item Customer Detail,Item Customer Detail,Postavka Detail Stranka
 DocType: Notification Control,Prompt for Email on Submission of,Vprašal za e-poštni ob predložitvi
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Najvišji znesek zaslužka zaposlenega {0} presega {1}
@@ -6794,7 +6801,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,"Ne more prikrite skupini, saj je izbrana vrsta računa."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} je bila spremenjena. Osvežite.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop uporabnike iz česar dopusta aplikacij na naslednjih dneh.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Koda postavke&gt; Skupina izdelkov&gt; Blagovna znamka
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Če je za točke zvestobe neomejen rok trajanja, sledite praznim časom trajanja ali 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Člani vzdrževalne ekipe
 DocType: Loyalty Point Entry,Purchase Amount,Znesek nakupa
@@ -6802,7 +6808,7 @@
 											to fullfill Sales Order {2}","Ne more dostaviti zaporednega št. {0} elementa {1}, ker je rezerviran \ za polnjenje prodajnega naročila {2}"
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-YYYY-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Dobavitelj za predračun {0} ustvaril
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Konec leta ne more biti pred začetkom leta
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Konec leta ne more biti pred začetkom leta
 DocType: Employee Benefit Application,Employee Benefits,Zaslužki zaposlencev
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti enaka količini za postavko {0} v vrstici {1}
 DocType: Work Order,Manufactured Qty,Izdelano Kol
@@ -6818,6 +6824,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Izberite številke Serija
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Za GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Računi zbrana strankam.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosimo, nastavite sistem imenovanja zaposlenih v kadri&gt; HR Settings"
 DocType: Healthcare Settings,Invoice Appointments Automatically,Samodejni izstavki računov
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID Projekta
 DocType: Salary Component,Variable Based On Taxable Salary,Spremenljivka na podlagi obdavčljive plače
@@ -6866,7 +6873,7 @@
 DocType: POS Profile,Account for Change Amount,Račun za znesek spremembe
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Povezava na QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Skupni dobiček / izguba
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Neveljavna družba za račun družbe.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Neveljavna družba za račun družbe.
 DocType: Purchase Invoice,input service,vnosna storitev
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Vrstica {0}: Party / račun se ne ujema z {1} / {2} v {3} {4}
 DocType: Employee Promotion,Employee Promotion,Promocija zaposlenih
@@ -6997,7 +7004,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Prednostno območje za vložitev
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Košarica je Prazna
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Prosimo, nastavite sistem imenovanja inštruktorja v izobraževanju&gt; Nastavitve izobraževanja"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Element {0} nima serijske številke. Samo serilializirani predmeti \ lahko imajo dostavo na podlagi serijske št
 DocType: Vehicle,Model,Model
@@ -7027,7 +7033,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Ničesar se ne spremeni
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Izberite csv datoteko
 DocType: Holiday List,Total Holidays,Skupaj prazniki
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Manjka e-poštna predloga za odpošiljanje. Nastavite ga v nastavitvah za dostavo.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Manjka e-poštna predloga za odpošiljanje. Nastavite ga v nastavitvah za dostavo.
 DocType: Student Leave Application,Mark as Present,Označi kot Present
 DocType: Supplier Scorecard,Indicator Color,Barva indikatorja
 DocType: Purchase Order,To Receive and Bill,Za prejemanje in Bill
@@ -7036,7 +7042,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Izberite serijsko št
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Oblikovalec
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Pogoji Template
-DocType: Serial No,Delivery Details,Dostava Podrobnosti
+DocType: Delivery Trip,Delivery Details,Dostava Podrobnosti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},"Stroškov Center, je potrebno v vrstici {0} v Davki miza za tip {1}"
 DocType: Program,Program Code,Program Code
 DocType: Terms and Conditions,Terms and Conditions Help,Pogoji Pomoč
@@ -7060,7 +7066,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Dobavni rok dni
 DocType: Cash Flow Mapping,Is Income Tax Expense,Ali je prihodek od davka na dohodek
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Vaše naročilo je brezplačno!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Napotitev Datum mora biti enak datumu nakupa {1} od sredstva {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Napotitev Datum mora biti enak datumu nakupa {1} od sredstva {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Označite to, če je študent s stalnim prebivališčem v Hostel inštituta."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Vnesite Prodajne nalogov v zgornji tabeli
 ,Stock Summary,Stock Povzetek
diff --git a/erpnext/translations/sq.csv b/erpnext/translations/sq.csv
index 768714b..fb1fb1d 100644
--- a/erpnext/translations/sq.csv
+++ b/erpnext/translations/sq.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Emri Periudha
 DocType: Employee,Salary Mode,Mode paga
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Regjistrohu
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Regjistrohu
 DocType: Patient,Divorced,I divorcuar
 DocType: Support Settings,Post Route Key,Çështja e rrugës së postës
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Lejoni Pika për të shtuar disa herë në një transaksion
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Norma e re e këmbimit
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Valuta është e nevojshme për Lista Çmimi {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Do të llogaritet në transaksion.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Furnizuesi&gt; Lloji i Furnizuesit
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Customer Contact
 DocType: Patient Appointment,Check availability,Kontrolloni disponueshmërinë
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Trego të hapur
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Seria Përditësuar sukses
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,arkë
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} në rresht {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} në rresht {1}
 DocType: Asset Finance Book,Depreciation Start Date,Data e fillimit të zhvlerësimit
 DocType: Pricing Rule,Apply On,Apliko On
 DocType: Item Price,Multiple Item prices.,Çmimet shumta artikull.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Kërkimi i laboratorit
 ,Delay Days,Vonesa Ditët
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,shpenzimeve të shërbimit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Numri Serial: {0} është referuar tashmë në shitje Faturë: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Numri Serial: {0} është referuar tashmë në shitje Faturë: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Faturë
 DocType: Purchase Invoice Item,Item Weight Details,Pesha Detajet e artikullit
 DocType: Asset Maintenance Log,Periodicity,Periodicitet
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Llogaritar
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Lista e Çmimeve të Shitjes
 DocType: Patient,Tobacco Current Use,Përdorimi aktual i duhanit
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Data e fillimit dhe e mbarimit mbivendosen me kartën e punës <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Shitja e normës
 DocType: Cost Center,Stock User,Stock User
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,i lidhur
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,date Pjesëmarrja nuk mund të jetë më pak se data bashkuar punëmarrësit
 DocType: Grading Scale,Grading Scale Name,Nota Scale Emri
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Shto përdoruesit në treg
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Shto përdoruesit në treg
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Kjo është një llogari rrënjë dhe nuk mund të redaktohen.
 DocType: Sales Invoice,Company Address,adresa e kompanise
 DocType: BOM,Operations,Operacionet
@@ -322,7 +322,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Qty
 DocType: Production Plan,Material Request Detail,Detaji i Kërkesës Materiale
 DocType: Selling Settings,Default Quotation Validity Days,Ditët e vlefshmërisë së çmimeve të çmimeve
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Të përfshijnë tatimin në rresht {0} në shkallën Item, taksat në rreshtat {1} duhet të përfshihen edhe"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Të përfshijnë tatimin në rresht {0} në shkallën Item, taksat në rreshtat {1} duhet të përfshihen edhe"
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Payroll Entry,Validate Attendance,Vërtetoni pjesëmarrjen
 DocType: Sales Invoice,Change Amount,Ndryshimi Shuma
@@ -441,7 +441,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Hapësira Line për shumën në fjalë
 DocType: Vehicle,Additional Details,Detaje shtesë
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Nuk ka përshkrim dhënë
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Furnizuesi&gt; Grupi Furnizues
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Kërkesë për blerje.
 DocType: POS Closing Voucher Details,Collected Amount,Shuma e mbledhur
 DocType: Lab Test,Submitted Date,Data e Dërguar
@@ -486,7 +485,7 @@
 DocType: Student Admission,Student Admission,Pranimi Student
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Item {0} është anuluar
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Rënia e zhvlerësimit {0}: Data e Fillimit të Zhvlerësimit futet si data e fundit
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Rënia e zhvlerësimit {0}: Data e Fillimit të Zhvlerësimit futet si data e fundit
 DocType: Contract Template,Fulfilment Terms and Conditions,Kushtet dhe Përmbushja e Kushteve
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Kërkesë materiale
 DocType: Bank Reconciliation,Update Clearance Date,Update Pastrimi Data
@@ -543,6 +542,7 @@
 DocType: Accounts Settings,Settings for Accounts,Cilësimet për Llogaritë
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Furnizuesi Fatura Nuk ekziston në Blerje Faturë {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Manage shitjes person Tree.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Nuk mund të përpunohet rruga, pasi cilësimet e Hartave të Google janë çaktivizuar."
 DocType: Job Applicant,Cover Letter,Cover Letter
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Çeqet e papaguara dhe Depozitat për të pastruar
 DocType: Item,Synced With Hub,Synced Me Hub
@@ -602,7 +602,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Vlera e re e aseteve
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Shkalla në të cilën Valuta Customer është konvertuar në bazë monedhën klientit
 DocType: Course Scheduling Tool,Course Scheduling Tool,Sigurisht caktimin Tool
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Blerje Fatura nuk mund të bëhet kundër një aktiv ekzistues {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Blerje Fatura nuk mund të bëhet kundër një aktiv ekzistues {1}
 DocType: Crop Cycle,LInked Analysis,LInked Analiza
 DocType: POS Closing Voucher,POS Closing Voucher,Vlera e Mbylljes POS
 DocType: Contract,Lapsed,skaduar
@@ -637,6 +637,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} nuk është i regjistruar në lëndës {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Emri i studentit:
 DocType: POS Closing Voucher Details,Difference,ndryshim
+DocType: Delivery Settings,Delay between Delivery Stops,Vonesa në mes të ndalimeve të dorëzimit
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial Asnjë {0} nuk i përket dorëzimit Shënim {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Duket të ketë një problem me konfigurimin GoCardless të serverit. Mos u shqetësoni, në rast të dështimit, shuma do të kthehet në llogarinë tuaj."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -697,7 +698,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Sasia dhe Rate
 DocType: Delivery Note,% Installed,% Installed
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Klasat / laboratore etj, ku mësimi mund të jenë të planifikuara."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Monedhat e kompanisë të të dy kompanive duhet të përputhen me Transaksionet e Ndërmarrjeve Ndër.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Monedhat e kompanisë të të dy kompanive duhet të përputhen me Transaksionet e Ndërmarrjeve Ndër.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Ju lutem shkruani emrin e kompanisë e parë
 DocType: Travel Itinerary,Non-Vegetarian,Non-Vegetarian
 DocType: Purchase Invoice,Supplier Name,Furnizuesi Emri
@@ -784,7 +785,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Me qera nga data
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Pjesë mjaftueshme për të ndërtuar
 DocType: POS Profile User,POS Profile User,Profili i POS-ut
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Rreshti {0}: Data e Fillimit të Zhvlerësimit kërkohet
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Rreshti {0}: Data e Fillimit të Zhvlerësimit kërkohet
 DocType: Purchase Invoice Item,Service Start Date,Data e Fillimit të Shërbimit
 DocType: Subscription Invoice,Subscription Invoice,Fatura e abonimit
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Të ardhurat direkte
@@ -853,7 +854,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Shkurtesa e përdorur tashmë për një kompani tjetër
 DocType: Selling Settings,Default Customer Group,Gabim Grupi Klientit
 DocType: Employee,IFSC Code,Kodi IFSC
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Data e fillimit dhe e mbarimit mbivendosen me kartën e punës <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Nëse disable, fushë &quot;rrumbullakosura Totali i &#39;nuk do të jenë të dukshme në çdo transaksion"
 DocType: BOM,Operating Cost,Kosto Operative
 DocType: Crop,Produced Items,Artikujt e prodhuar
@@ -905,7 +905,7 @@
 DocType: Supplier,Prevent RFQs,Parandalimi i RFQ-ve
 DocType: Hub User,Hub User,Përdoruesi Hub
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Bëni Sales Order
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Lëshimi i pagës i paraqitur për periudhën nga {0} në {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Lëshimi i pagës i paraqitur për periudhën nga {0} në {1}
 DocType: Project Task,Project Task,Projekti Task
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Pikët e reduktuara
 ,Lead Id,Lead Id
@@ -1034,7 +1034,7 @@
 DocType: Fee Validity,Max number of visit,Numri maksimal i vizitës
 ,Hotel Room Occupancy,Perdorimi i dhomes se hotelit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Pasqyrë e mungesave krijuar:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Ju lutemi të vendosur Cash parazgjedhur apo llogari bankare në mënyra e pagesës {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Ju lutemi të vendosur Cash parazgjedhur apo llogari bankare në mënyra e pagesës {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,regjistroj
 DocType: GST Settings,GST Settings,GST Settings
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Monedha duhet të jetë e njëjtë si Valuta e Çmimeve: {0}
@@ -1089,7 +1089,7 @@
 DocType: Vehicle Log,Service Details,Details shërbimit
 DocType: Lab Test Template,Grouped,grupuar
 DocType: Selling Settings,Delivery Note Required,Ofrimit Shënim kërkuar
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Dorëzimi i rrogave të pagave ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Dorëzimi i rrogave të pagave ...
 DocType: Bank Guarantee,Bank Guarantee Number,Bank Numri Guarantee
 DocType: Bank Guarantee,Bank Guarantee Number,Bank Numri Guarantee
 DocType: Assessment Criteria,Assessment Criteria,Kriteret e vlerësimit
@@ -1115,13 +1115,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Pagesa Hyrja është krijuar tashmë
 DocType: Request for Quotation,Get Suppliers,Merrni Furnizuesit
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock tanishme
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} nuk lidhet me pikën {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} nuk lidhet me pikën {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Preview Paga Shqip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Llogaria {0} ka hyrë disa herë
 DocType: Account,Expenses Included In Valuation,Shpenzimet e përfshira në Vlerësimit
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Ju mund të rinovoni vetëm nëse anëtarësimi juaj mbaron brenda 30 ditëve
 DocType: Shopping Cart Settings,Show Stock Availability,Trego disponueshmërinë e aksioneve
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Set {0} në kategorinë e aseteve {1} ose kompani {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Set {0} në kategorinë e aseteve {1} ose kompani {2}
 DocType: Location,Longitude,gjatësi
 ,Absent Student Report,Mungon Raporti Student
 DocType: Crop,Crop Spacing UOM,Spastrimi i drithrave UOM
@@ -1193,7 +1193,7 @@
 DocType: Soil Texture,Sand,rërë
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energji
 DocType: Opportunity,Opportunity From,Opportunity Nga
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rreshti {0}: {1} Numrat serialë të kërkuar për artikullin {2}. Ju keni dhënë {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rreshti {0}: {1} Numrat serialë të kërkuar për artikullin {2}. Ju keni dhënë {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Zgjidh një tabelë
 DocType: BOM,Website Specifications,Specifikimet Website
 DocType: Special Test Items,Particulars,Të dhënat
@@ -1285,7 +1285,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Gjërat me weightage më të lartë do të tregohet më e lartë
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Testet Lab dhe Shenjat Vital
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detail Banka Pajtimit
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} duhet të dorëzohet
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} duhet të dorëzohet
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Asnjë punonjës gjetur
 DocType: Item,If subcontracted to a vendor,Në qoftë se nënkontraktuar për një shitës
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Grupi Student është përditësuar tashmë.
@@ -1339,7 +1339,6 @@
 DocType: Loyalty Program Collection,Tier Name,Emri i grupit
 DocType: HR Settings,Enter retirement age in years,Shkruani moshën e pensionit në vitet
 DocType: Crop,Target Warehouse,Target Magazina
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vendosni Serinë Naming për {0} nëpërmjet Setup&gt; Settings&gt; Naming Series
 DocType: Payroll Employee Detail,Payroll Employee Detail,Detajet e punonjësve të pagave
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,"Ju lutem, përzgjidhni një depo"
 DocType: Cheque Print Template,Starting location from left edge,Duke filluar vend nga buzë e majtë
@@ -1429,7 +1428,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Materiali plan për nën-kuvendet
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Sales Partners dhe Territori
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} duhet të jetë aktiv
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Asnjë artikull në dispozicion për transferim
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Asnjë artikull në dispozicion për transferim
 DocType: Employee Boarding Activity,Activity Name,Emri i aktivitetit
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Ndrysho datën e lëshimit
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Sasia e përfunduar e produktit <b>{0}</b> dhe Për sasinë <b>{1}</b> nuk mund të jenë të ndryshme
@@ -1659,6 +1658,7 @@
 DocType: Project,First Email,Emaili i Parë
 DocType: Company,Exception Budget Approver Role,Përjashtim nga Roli i Aprovimit të Buxhetit
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Pasi të jetë caktuar, kjo faturë do të jetë në pritje deri në datën e caktuar"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervuar Magazina në Sales Order / Finished mallrave Magazina
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Shuma Shitja
 DocType: Repayment Schedule,Interest Amount,Shuma e interesit
@@ -1670,7 +1670,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,të dhëna
 DocType: Asset,Scrapped,braktiset
 DocType: Item,Item Defaults,Përcaktimet e objektit
-DocType: Purchase Invoice,Returns,Kthim
+DocType: Cashier Closing,Returns,Kthim
 DocType: Job Card,WIP Warehouse,WIP Magazina
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serial Asnjë {0} është nën kontratë të mirëmbajtjes upto {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,rekrutim
@@ -1684,7 +1684,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Lloji i transferimit
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Shitjet Shpenzimet
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klienti&gt; Grupi i Konsumatorëve&gt; Territori
 DocType: Diagnosis,Diagnosis,diagnozë
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Blerja Standard
 DocType: Attendance Request,Explanation,Shpjegim
@@ -1697,7 +1696,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Artikujt e porosive të blerjes janë vonuar
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Kodi Postal
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Sales Order {0} është {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Zgjidh llogarinë e të ardhurave nga interesi në kredi {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Zgjidh llogarinë e të ardhurave nga interesi në kredi {0}
 DocType: Opportunity,Contact Info,Informacionet Kontakt
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Marrja e aksioneve Entries
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Nuk mund të promovojë punonjës me statusin e majtë
@@ -1709,7 +1708,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Faturë nuk mund të bëhet për zero orë faturimi
 DocType: Company,Date of Commencement,Data e fillimit
 DocType: Sales Person,Select company name first.,Përzgjidh kompani emri i parë.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},Email dërguar për {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},Email dërguar për {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Kuotimet e marra nga furnizuesit.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Replace BOM dhe update çmimin e fundit në të gjitha BOMs
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Për {0} | {1} {2}
@@ -1731,7 +1730,7 @@
 DocType: Asset Movement,From Employee,Nga punonjësi
 DocType: Driver,Cellphone Number,Numri i celularit
 DocType: Project,Monitor Progress,Monitorimi i progresit
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Kujdes: Sistemi nuk do të kontrollojë overbilling që shuma për Item {0} në {1} është zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Kujdes: Sistemi nuk do të kontrollojë overbilling që shuma për Item {0} në {1} është zero
 DocType: Journal Entry,Make Difference Entry,Bëni Diferenca Hyrja
 DocType: Supplier Quotation,Auto Repeat Section,Seksioni i përsëritjes automatike
 DocType: Upload Attendance,Attendance From Date,Pjesëmarrja Nga Data
@@ -1834,7 +1833,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Refuzuar Qty nuk mund të futen në Blerje Kthim
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Ndryshimi i Grupit të Klientit për Klientin e përzgjedhur nuk është i lejuar.
 ,Purchase Order Items To Be Billed,Items Rendit Blerje Për të faturohet
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Përditësimi i afatit të mbërritjes.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Përditësimi i afatit të mbërritjes.
 DocType: Program Enrollment Tool,Enrollment Details,Detajet e Regjistrimit
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Nuk mund të caktojë shuma të caktuara të objekteve për një kompani.
 DocType: Purchase Invoice Item,Net Rate,Net Rate
@@ -1848,7 +1847,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Lini Lloji është madatory
 DocType: Support Settings,Close Issue After Days,Mbylle Issue pas ditë
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Duhet të jesh një përdorues me rolet e Menaxhimit të Sistemit dhe Menaxhimit të Arteve për t&#39;i shtuar përdoruesit në Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Duhet të jesh një përdorues me rolet e Menaxhimit të Sistemit dhe Menaxhimit të Arteve për t&#39;i shtuar përdoruesit në Marketplace.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Lini bosh nëse konsiderohet për të gjitha degët
 DocType: Job Opening,Staffing Plan,Plani i stafit
 DocType: Bank Guarantee,Validity in Days,Vlefshmëria në Ditët
@@ -1870,7 +1869,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Duplicate rresht {0} me të njëjtën {1}
 DocType: Marketplace Settings,Disable Marketplace,Çaktivizo tregun
 ,Trial Balance,Bilanci gjyqi
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Viti Fiskal {0} nuk u gjet
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Viti Fiskal {0} nuk u gjet
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Ngritja Punonjësit
 DocType: Hotel Room Reservation,Hotel Reservation User,Përdoruesi i Rezervimit të Hoteleve
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,"Ju lutem, përzgjidhni prefiks parë"
@@ -1978,7 +1977,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Dështoi të identifikohej
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Aseti {0} krijoi
 DocType: Special Test Items,Special Test Items,Artikujt e veçantë të testimit
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Duhet të jeni përdorues me role të Menaxhmentit të Sistemit dhe Menaxhimit të Arteve për t&#39;u regjistruar në Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Duhet të jeni përdorues me role të Menaxhmentit të Sistemit dhe Menaxhimit të Arteve për t&#39;u regjistruar në Marketplace.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Mënyra e pagesës
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Sipas Strukturës së Paga tuaj të caktuar ju nuk mund të aplikoni për përfitime
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Faqja Image duhet të jetë një file publik ose URL website
@@ -1990,7 +1989,7 @@
 DocType: Warehouse,Warehouse Contact Info,Magazina Kontaktimit
 DocType: Payment Entry,Write Off Difference Amount,Shkruaj Off Diferenca Shuma
 DocType: Volunteer,Volunteer Name,Emri Vullnetar
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Rreshtat me datat e dyfishta të gjetjeve në rreshta të tjerë u gjetën: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Rreshtat me datat e dyfishta të gjetjeve në rreshta të tjerë u gjetën: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: email Punonjësi nuk gjendet, kështu nuk email dërguar"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Asnjë Strukturë Paga e caktuar për Punonjësin {0} në datën e dhënë {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Rregullimi i transportit nuk zbatohet për vendin {0}
@@ -2081,6 +2080,7 @@
 DocType: Salary Component,Earning,Fituar
 DocType: Supplier Scorecard,Scoring Criteria,Kriteret e shënimit
 DocType: Purchase Invoice,Party Account Currency,Llogaria parti Valuta
+DocType: Delivery Trip,Total Estimated Distance,Distanca totale e vlerësuar
 ,BOM Browser,Bom Browser
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Ju lutemi update statusin tuaj për këtë ngjarje trajnimi
 DocType: Item Barcode,EAN,EAN
@@ -2119,7 +2119,7 @@
 DocType: Activity Cost,Projects,Projektet
 DocType: Payment Request,Transaction Currency,Transaction Valuta
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Nga {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Disa email janë të pavlefshme
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Disa email janë të pavlefshme
 DocType: Work Order Operation,Operation Description,Operacioni Përshkrim
 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.,Nuk mund të ndryshojë fiskale Viti Fillimit Data dhe viti fiskal End Date herë Viti fiskal është ruajtur.
 DocType: Quotation,Shopping Cart,Karrocat
@@ -2143,7 +2143,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Ndryshimi neto në aseteve fikse
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lini bosh nëse konsiderohet për të gjitha përcaktimeve
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Ngarkesa e tipit &#39;aktuale&#39; në rresht {0} nuk mund të përfshihen në Item Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Ngarkesa e tipit &#39;aktuale&#39; në rresht {0} nuk mund të përfshihen në Item Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Nga datetime
 DocType: Shopify Settings,For Company,Për Kompaninë
@@ -2157,7 +2157,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Kishte gabime në krijimin e orarit të lëndëve
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Miratuesi i parë i shpenzimeve në listë do të vendoset si menaxher i parave të shpenzimeve.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,nuk mund të jetë më i madh se 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Duhet të jesh një përdorues i ndryshëm nga Administratori me rolin e Menaxhuesit të Sistemit dhe të Menaxhmentit të Arteve për t&#39;u regjistruar në Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Duhet të jesh një përdorues i ndryshëm nga Administratori me rolin e Menaxhuesit të Sistemit dhe të Menaxhmentit të Arteve për t&#39;u regjistruar në Marketplace.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Item {0} nuk është një gjendje Item
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Paplanifikuar
@@ -2186,7 +2186,7 @@
 DocType: HR Settings,Employee Settings,Cilësimet e punonjësve
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Duke ngarkuar sistemin e pagesave
 ,Batch-Wise Balance History,Batch-urti Historia Bilanci
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Rresht # {0}: Nuk mund të caktohet Rate nëse shuma është më e madhe se shuma e faturuar për Item {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Rresht # {0}: Nuk mund të caktohet Rate nëse shuma është më e madhe se shuma e faturuar për Item {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,cilësimet e printimit përditësuar në format përkatëse të shtypura
 DocType: Package Code,Package Code,Kodi paketë
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Nxënës
@@ -2418,7 +2418,7 @@
 DocType: Delivery Trip,Optimize Route,Optimizo rrugën
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Provoni planifikimin e operacioneve për ditë X paraprakisht.
 DocType: HR Settings,Stop Birthday Reminders,Stop Ditëlindja Harroni
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Ju lutemi të vendosur Default Payroll Llogaria e pagueshme në Kompaninë {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Ju lutemi të vendosur Default Payroll Llogaria e pagueshme në Kompaninë {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Merrni shpërbërjen financiare të të dhënave nga taksat dhe tarifat nga Amazon
 DocType: SMS Center,Receiver List,Marresit Lista
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Kërko Item
@@ -2488,7 +2488,7 @@
 DocType: Vital Signs,Constipated,kaps
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Kundër Furnizuesin Fatura {0} datë {1}
 DocType: Customer,Default Price List,E albumit Lista e Çmimeve
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Rekord Lëvizja Asset {0} krijuar
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Rekord Lëvizja Asset {0} krijuar
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Asnjë artikull nuk u gjet.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ju nuk mund të fshini Viti Fiskal {0}. Viti Fiskal {0} është vendosur si default në Settings Global
 DocType: Share Transfer,Equity/Liability Account,Llogaria e ekuitetit / përgjegjësisë
@@ -2628,6 +2628,7 @@
 DocType: Blanket Order,Order Type,Rendit Type
 ,Item-wise Sales Register,Pika-mençur Sales Regjistrohu
 DocType: Asset,Gross Purchase Amount,Shuma Blerje Gross
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kodi i artikullit&gt; Grupi i artikullit&gt; Markë
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Hapjet e hapjes
 DocType: Asset,Depreciation Method,Metoda e amortizimit
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,A është kjo Tatimore të përfshira në normën bazë?
@@ -2710,7 +2711,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Veprimi në qoftë se buxheti vjetor tejkalon PO
 DocType: Student Leave Application,Student Leave Application,Student Leave Aplikimi
 DocType: Item,Will also apply for variants,Gjithashtu do të aplikojë për variantet
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Asset nuk mund të anulohet, pasi ajo tashmë është {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Asset nuk mund të anulohet, pasi ajo tashmë është {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},I punësuar {0} në gjysmë ditë në {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Orët totale të punës nuk duhet të jetë më e madhe se sa orë pune max {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Në
@@ -2734,6 +2735,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Fetch Data
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Leja maksimale e lejueshme në llojin e pushimit {0} është {1}
 DocType: SMS Center,Create Receiver List,Krijo Marresit Lista
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Data e disponueshme për përdorim duhet të jetë pas datës së blerjes
 DocType: Vehicle,Wheels,rrota
 DocType: Packing Slip,To Package No.,Për paketën Nr
 DocType: Patient Relation,Family,familje
@@ -2747,7 +2749,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Monedha e faturimit duhet të jetë e barabartë me monedhën e parave të kompanisë ose monedhën e llogarisë së partisë
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Tregon se paketa është pjesë e këtij ofrimit (Vetëm draft)
 DocType: Soil Texture,Loam,tokë pjellore
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Rreshti {0}: Data e duhur nuk mund të jetë para datës së postimit
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Rreshti {0}: Data e duhur nuk mund të jetë para datës së postimit
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Kryej pagesa Hyrja
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Sasia e artikullit {0} duhet të jetë më pak se {1}
 ,Sales Invoice Trends,Shitjet Trendet faturave
@@ -2820,7 +2822,7 @@
 DocType: Guardian,Guardian Interests,Guardian Interesat
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Përditëso emrin / numrin e llogarisë
 DocType: Naming Series,Current Value,Vlera e tanishme
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,vite të shumta fiskale ekzistojnë për datën {0}. Ju lutemi të vënë kompaninë në vitin fiskal
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,vite të shumta fiskale ekzistojnë për datën {0}. Ju lutemi të vënë kompaninë në vitin fiskal
 DocType: Education Settings,Instructor Records to be created by,Regjistruesi i instruktorit të krijohet nga
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} krijuar
 DocType: GST Account,GST Account,Llogari GST
@@ -2837,7 +2839,7 @@
 DocType: Sales Person,Name and Employee ID,Emri dhe punonjës ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Për shkak Data nuk mund të jetë para se të postimi Data
 DocType: Website Item Group,Website Item Group,Faqja kryesore Item Grupi
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Asnjë pagë pagese nuk është paraqitur për kriteret e përzgjedhura më lartë OSE paga e pagës tashmë e dorëzuar
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Asnjë pagë pagese nuk është paraqitur për kriteret e përzgjedhura më lartë OSE paga e pagës tashmë e dorëzuar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Detyrat dhe Taksat
 DocType: Projects Settings,Projects Settings,Projekte Cilësimet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Ju lutem shkruani datën Reference
@@ -2846,7 +2848,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Furnizuar Qty
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,FDH-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Materiali Kërkesë Item
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Ju lutemi të anulloni fillimisht blerjen {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Ju lutemi të anulloni fillimisht blerjen {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Pema e sendit grupeve.
 DocType: Production Plan,Total Produced Qty,Totali i Prodhimit
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,"Nuk mund t&#39;i referohet numrit rresht më të madhe se, ose të barabartë me numrin e tanishëm rresht për këtë lloj Ngarkesa"
@@ -2957,6 +2959,7 @@
 ,Vehicle Expenses,Shpenzimet automjeteve
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Krijo Test Lab (s) në Sales Fatura Submit
 DocType: Serial No,Invoice Details,detajet e faturës
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Aktivizo cilësimet e Google Maps për të vlerësuar dhe optimizuar rrugët
 DocType: Grant Application,Show on Website,Trego në Website
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Filloni
 DocType: Hub Tracked Item,Hub Category,Kategoria Hub
@@ -2997,7 +3000,7 @@
 DocType: Inpatient Record,B Positive,B Pozitiv
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Përfitimi maksimal i punonjësit {0} tejkalon {1} nga shuma {2} e shumës së kërkuar më parë
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty duhet të jetë 1, pasi pika është një pasuri fikse. Ju lutem përdorni rresht të veçantë për Qty shumëfishtë."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty duhet të jetë 1, pasi pika është një pasuri fikse. Ju lutem përdorni rresht të veçantë për Qty shumëfishtë."
 DocType: Leave Block List Allow,Leave Block List Allow,Dërgo Block Lista Lejoni
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr nuk mund të jetë bosh ose hapësirë
 DocType: Patient Medical Record,Patient Medical Record,Regjistrimi mjekësor pacient
@@ -3031,7 +3034,7 @@
 DocType: Workstation,Wages per hour,Rrogat në orë
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Bilanci aksioneve në Serisë {0} do të bëhet negative {1} për Item {2} në {3} Magazina
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Pas kërkesave materiale janë ngritur automatikisht bazuar në nivelin e ri të rendit zërit
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Llogari {0} është i pavlefshëm. Llogaria Valuta duhet të jetë {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Llogari {0} është i pavlefshëm. Llogaria Valuta duhet të jetë {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Nga Data {0} nuk mund të jetë pas heqjes së punonjësit Data {1}
 DocType: Supplier,Is Internal Supplier,Është furnizuesi i brendshëm
 DocType: Employee,Create User Permission,Krijo lejen e përdoruesit
@@ -3177,7 +3180,7 @@
 DocType: Account,Fixed Asset,Aseteve fikse
 DocType: Amazon MWS Settings,After Date,Pas datës
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Inventar serialized
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Invalid {0} për Inter Company Fature.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Invalid {0} për Inter Company Fature.
 ,Department Analytics,Departamenti i Analizës
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Emailja nuk gjendet në kontaktin e parazgjedhur
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Gjeni sekret
@@ -3190,7 +3193,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Programi në Strukturën e Tarifave dhe Grupi Studentor {0} janë të ndryshme.
 DocType: Bank Statement Transaction Entry,Receivable Account,Llogaria e arkëtueshme
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Data e vlefshme nga data duhet të jetë më e vogël se Valid Upto Date.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} është tashmë {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} është tashmë {2}
 DocType: Quotation Item,Stock Balance,Stock Bilanci
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Rendit Shitjet për Pagesa
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,CEO
@@ -3232,6 +3235,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Debi Për të është e nevojshme
 DocType: Clinical Procedure,Inpatient Record,Regjistri ambulator
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ndihmojë për të mbajtur gjurmët e kohës, kostos dhe faturimit për Aktivitetet e kryera nga ekipi juaj"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Furnizuesi&gt; Lloji i Furnizuesit
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Blerje Lista e Çmimeve
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Data e transaksionit
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Modelet e variablave të rezultateve të rezultateve të furnizuesit.
@@ -3275,7 +3279,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Exchange Gain / Humbje
 DocType: Opportunity,Lost Reason,Humbur Arsyeja
 DocType: Amazon MWS Settings,Enable Amazon,Aktivizo Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Rreshti # {0}: Llogaria {1} nuk i përket kompanisë {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Rreshti # {0}: Llogaria {1} nuk i përket kompanisë {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},E pamundur për të gjetur DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Adresa e re
 DocType: Quality Inspection,Sample Size,Shembull Madhësi
@@ -3387,7 +3391,7 @@
 DocType: Water Analysis,Origin,origjinë
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ky dokument është mbi kufirin nga {0} {1} për pika {4}. A jeni duke bërë një tjetër {3} kundër të njëjtit {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Ju lutemi të vendosur përsëritur pas kursimit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Llogaria Shuma Zgjidh ndryshim
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Llogaria Shuma Zgjidh ndryshim
 DocType: Purchase Invoice,Price List Currency,Lista e Çmimeve Valuta
 DocType: Naming Series,User must always select,Përdoruesi duhet të zgjidhni gjithmonë
 DocType: Stock Settings,Allow Negative Stock,Lejo Negativ Stock
@@ -3429,7 +3433,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Je i sigurt që dëshiron ta anulosh këtë takim?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Paketa e Çmimeve të Dhomës së Hotelit
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Sales tubacionit
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Ju lutemi të vendosur llogarinë e paracaktuar në Paga Komponentin {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Ju lutemi të vendosur llogarinë e paracaktuar në Paga Komponentin {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Kerkohet Në
 DocType: Rename Tool,File to Rename,Paraqesë për Rename
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Ju lutem, përzgjidhni bom për Item në rresht {0}"
@@ -3450,7 +3454,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostoja e artikujve të blerë
 DocType: Employee Separation,Employee Separation Template,Modeli i ndarjes së punonjësve
 DocType: Selling Settings,Sales Order Required,Sales Rendit kërkuar
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Bëhuni shitës
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Bëhuni shitës
 DocType: Purchase Invoice,Credit To,Kredia për
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Kryeson Active / Konsumatorët
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Lëreni bosh për të përdorur formatin standard të Shënimit të Dorëzimit
@@ -3492,7 +3496,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Bëni modelin e taksave
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forumi User
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Lëndëve të para nuk mund të jetë bosh.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Rreshti # {0} (Tabela e Pagesës): Shuma duhet të jetë negative
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Rreshti # {0} (Tabela e Pagesës): Shuma duhet të jetë negative
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Nuk mund të rinovuar aksioneve, fatura përmban anijeve rënie artikull."
 DocType: Contract,Fulfilment Status,Statusi i Përmbushjes
 DocType: Lab Test Sample,Lab Test Sample,Shembulli i testit të laboratorit
@@ -3632,7 +3636,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Data e Dokumentit
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Records tarifë Krijuar - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategoria Llogaria
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Rreshti # {0} (Tabela e Pagesës): Shuma duhet të jetë pozitive
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Rreshti # {0} (Tabela e Pagesës): Shuma duhet të jetë pozitive
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Nuk mund të prodhojë më shumë Item {0} se sasia Sales Rendit {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Zgjidhni vlerat e atributeve
 DocType: Purchase Invoice,Reason For Issuing document,Arsyeja për lëshimin e dokumentit
@@ -3687,7 +3691,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Koha në të cilën janë pranuar materialet e
 DocType: Products Settings,Products per Page,Produktet per
 DocType: Stock Ledger Entry,Outgoing Rate,Largohet Rate
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,ose
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,ose
 DocType: Sales Order,Billing Status,Faturimi Statusi
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Raportoni një çështje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Shpenzimet komunale
@@ -3715,7 +3719,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Deklarata e Përjashtimit të Taksave të Punonjësve
 DocType: Payment Entry,Cheque/Reference Date,Çek / Reference Data
 DocType: Purchase Invoice,Total Taxes and Charges,Totali Taksat dhe Tarifat
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Data e disponueshme për përdorim është futur si data e kaluar
 DocType: Employee,Emergency Contact,Urgjencës Kontaktoni
 DocType: Bank Reconciliation Detail,Payment Entry,pagesa Hyrja
 ,sales-browser,Shitjet-browser
@@ -3762,6 +3765,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Është Kthimi (Shënimi i Kredisë)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Filloni punën
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Serial no nuk kërkohet për aktivin {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vendosni Serinë Naming për {0} nëpërmjet Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,template me aftësi të kufizuara nuk duhet të jetë template parazgjedhur
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Për rresht {0}: Shkruani Qty planifikuar
 DocType: Account,Income Account,Llogaria ardhurat
@@ -3775,6 +3779,7 @@
 DocType: Loyalty Program,Help Section,Seksioni i Ndihmës
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,Key Zona Përgjegjësia
+DocType: Delivery Trip,Distance UOM,Largësia UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Mallrat e studentëve të ju ndihmojë të gjetur frekuentimit, vlerësimet dhe tarifat për studentët"
 DocType: Payment Entry,Total Allocated Amount,Shuma totale e alokuar
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Bëje llogari inventarit parazgjedhur për inventarit të përhershëm
@@ -3814,7 +3819,7 @@
 DocType: Item Supplier,Item Supplier,Item Furnizuesi
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Ju lutemi shkruani Kodin artikull për të marrë grumbull asnjë
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},"Ju lutem, përzgjidhni një vlerë për {0} quotation_to {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Asnjë artikull i përzgjedhur për transferim
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Asnjë artikull i përzgjedhur për transferim
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Të gjitha adresat.
 DocType: Company,Stock Settings,Stock Cilësimet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Shkrirja është e mundur vetëm nëse prona e mëposhtme janë të njëjta në të dy regjistrat. Është Grupi, Root Type, Kompania"
@@ -4100,7 +4105,7 @@
 DocType: Patient,Personal and Social History,Historia personale dhe sociale
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Përdoruesi {0} krijoi
 DocType: Fee Schedule,Fee Breakup for each student,Shkëputja e taksës për secilin nxënës
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Gjithsej paraprakisht ({0}) kundër Rendit {1} nuk mund të jetë më e madhe se Grand Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Gjithsej paraprakisht ({0}) kundër Rendit {1} nuk mund të jetë më e madhe se Grand Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Zgjidh Shpërndarja mujore të pabarabartë shpërndarë objektiva të gjithë muajve.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Ndrysho kodin
 DocType: Purchase Invoice Item,Valuation Rate,Vlerësimi Rate
@@ -4109,7 +4114,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Availed ITC Cess
 ,Student Monthly Attendance Sheet,Student Pjesëmarrja mujore Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Rregullat e transportit të aplikueshme vetëm për shitjen
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Rënia e amortizimit {0}: Data e zhvlerësimit tjetër nuk mund të jetë para datës së blerjes
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Rënia e amortizimit {0}: Data e zhvlerësimit tjetër nuk mund të jetë para datës së blerjes
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekti Data e Fillimit
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Deri
 DocType: Rename Tool,Rename Log,Rename Kyçu
@@ -4127,12 +4132,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Sa shpesh duhet të përditësohet projekti dhe kompania në bazë të Transaksioneve të Shitjes.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Skadon ne
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Shto Studentët
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Ju lutemi fshini punonjësin <a href=""#Form/Employee/{0}"">{0}</a> \ për ta anuluar këtë dokument"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},"Ju lutem, përzgjidhni {0}"
 DocType: C-Form,C-Form No,C-Forma Nuk ka
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,distancë
+DocType: Delivery Stop,Distance,distancë
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Listoni produktet ose shërbimet që bleni ose sillni.
 DocType: Water Analysis,Storage Temperature,Temperatura e magazinimit
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-Ord-.YYYY.-
@@ -4159,7 +4162,7 @@
 DocType: Homepage,Company Description for website homepage,Përshkrimi i kompanisë për faqen e internetit
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Për komoditetin e klientëve, këto kode mund të përdoren në formate të shtypura si faturat dhe ofrimit të shënimeve"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Emri suplier
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Nuk mundi të gjente informacion për {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Nuk mundi të gjente informacion për {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Hapja e Ditarit të Hyrjes
 DocType: Contract,Fulfilment Terms,Kushtet e Përmbushjes
 DocType: Sales Invoice,Time Sheet List,Ora Lista Sheet
@@ -4342,7 +4345,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Zgjidh studentët me dorë për aktivitetin bazuar Grupit
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Zgjidh studentët me dorë për aktivitetin bazuar Grupit
 DocType: Journal Entry,User Remark,Përdoruesi Vërejtje
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Optimizimi i rrugëve.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Optimizimi i rrugëve.
 DocType: Travel Itinerary,Non Diary,Jo Ditari
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Nuk mund të krijohen bonuse të mbajtjes për të punësuarit e majtë
 DocType: Lead,Market Segment,Segmenti i Tregut
@@ -4372,7 +4375,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Programi i besnikërisë
 DocType: Student Guardian,Father,Atë
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Biletat Mbështetëse
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; nuk mund të kontrollohet për shitjen e aseteve fikse
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; nuk mund të kontrollohet për shitjen e aseteve fikse
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Pajtimit
 DocType: Attendance,On Leave,Në ikje
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Get Updates
@@ -4417,7 +4420,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Pa serial dhe Batch
 DocType: Warranty Claim,From Company,Nga kompanisë
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Shuma e pikëve të kritereve të vlerësimit të nevojave të jetë {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Ju lutemi të vendosur Numri i nënçmime rezervuar
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Ju lutemi të vendosur Numri i nënçmime rezervuar
 DocType: Supplier Scorecard Period,Calculations,llogaritjet
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Vlera ose Qty
 DocType: Payment Terms Template,Payment Terms,Kushtet e pagesës
@@ -4437,7 +4440,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Discount (%) në listën e çmimeve të votuarat vetëm me Margjina
 DocType: Healthcare Service Unit Type,Rate / UOM,Rate / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Të gjitha Depot
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Jo {0} u gjet për Transaksionet e Ndërmarrjeve Ndër.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Jo {0} u gjet për Transaksionet e Ndërmarrjeve Ndër.
 DocType: Travel Itinerary,Rented Car,Makinë me qera
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Për kompaninë tuaj
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Kredi në llogarinë duhet të jetë një llogari Bilanci i Gjendjes
@@ -4539,6 +4542,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Kriteret e analizës së bimëve
 DocType: Cheque Print Template,Cheque Height,Çek Lartësia
 DocType: Supplier,Supplier Details,Detajet Furnizuesi
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ju lutem vendosni numrat e numrave për Pjesëmarrjen përmes Setup&gt; Seritë e Numërimit
 DocType: Setup Progress,Setup Progress,Progresi i konfigurimit
 DocType: Expense Claim,Approval Status,Miratimi Statusi
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Nga Vlera duhet të jetë më pak se të vlerës në rresht {0}
@@ -4632,7 +4636,6 @@
 DocType: Travel Request,Fully Sponsored,Plotësisht e sponsorizuar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Hyrja Reverse Journal
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Klienti {0} është krijuar.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ju lutem vendosni Sistemin e Emërimit të Punonjësve në Burimet Njerëzore&gt; Cilësimet e HR
 DocType: Stock Settings,Limit Percent,Limit Percent
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Aktualisht nuk ka të aksioneve në dispozicion në ndonjë depo
 ,Payment Period Based On Invoice Date,Periudha e pagesës bazuar në datën Faturë
@@ -4691,7 +4694,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Burimi Magazina
 DocType: Installation Note,Installation Date,Instalimi Data
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Libri i aksioneve
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} nuk i përkasin kompanisë {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} nuk i përkasin kompanisë {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Fatura Sales {0} krijuar
 DocType: Employee,Confirmation Date,Konfirmimi Data
 DocType: Inpatient Occupancy,Check Out,Kontrolloni
@@ -4711,6 +4714,7 @@
 DocType: Production Plan,Sales Orders Detail,Detajet e porosive të shitjeve
 DocType: Bin,Requested Quantity,kërkohet Sasia
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Ju lutemi vendosni Sistemin e Emërimit të Instruktorit në Arsim&gt; Cilësimet e Arsimit
 DocType: Patient,Marital Status,Statusi martesor
 DocType: Stock Settings,Auto Material Request,Auto materiale Kërkesë
 DocType: Woocommerce Settings,API consumer secret,Sekreti i konsumatorit API
@@ -4763,7 +4767,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Zgjidhni Ditët
 DocType: Academic Term,Term Name,Term Emri
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Kredia ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Krijimi i rreshjeve të pagave ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Krijimi i rreshjeve të pagave ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Nuk mund të ndryshosh nyjen e rrënjës.
 DocType: Buying Settings,Purchase Order Required,Blerje urdhër që nevojitet
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,kohëmatës
@@ -4801,7 +4805,7 @@
 DocType: Account,Rate at which this tax is applied,Shkalla në të cilën kjo taksë aplikohet
 DocType: Cash Flow Mapper,Section Name,Emri i seksionit
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Reorder Qty
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Rënia e amortizimit {0}: Vlera e pritshme pas jetës së dobishme duhet të jetë më e madhe ose e barabartë me {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Rënia e amortizimit {0}: Vlera e pritshme pas jetës së dobishme duhet të jetë më e madhe ose e barabartë me {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Hapje e tanishme e punës
 DocType: Company,Stock Adjustment Account,Llogaria aksioneve Rregullimit
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Shkruani Off
@@ -4848,7 +4852,7 @@
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Nga AMC
 DocType: Opportunity,Opportunity Amount,Shuma e Mundësive
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numri i nënçmime rezervuar nuk mund të jetë më e madhe se Total Numri i nënçmime
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numri i nënçmime rezervuar nuk mund të jetë më e madhe se Total Numri i nënçmime
 DocType: Purchase Order,Order Confirmation Date,Data e konfirmimit të rendit
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Bëni Mirëmbajtja vizitë
@@ -4889,7 +4893,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Batch:
 DocType: Volunteer,Afternoon,pasdite
 DocType: Loyalty Program,Loyalty Program Help,Ndihmë për programin e besnikërisë
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} &#39;{1}&#39; është me aftësi të kufizuara
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} &#39;{1}&#39; është me aftësi të kufizuara
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Bëje si Open
 DocType: Cheque Print Template,Scanned Cheque,skanuar çek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Dërgo email automatike në Kontaktet për transaksionet Dorëzimi.
@@ -4902,7 +4906,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Pika dhe Garanci Details
 DocType: Chapter,Chapter Members,Anëtarët e Kapitullit
 DocType: Sales Team,Contribution (%),Kontributi (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Shënim: Pagesa Hyrja nuk do të jetë krijuar që nga &#39;Cash ose Llogarisë Bankare &quot;nuk ishte specifikuar
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Shënim: Pagesa Hyrja nuk do të jetë krijuar që nga &#39;Cash ose Llogarisë Bankare &quot;nuk ishte specifikuar
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Projekti {0} tashmë ekziston
 DocType: Clinical Procedure,Nursing User,Përdorues i Infermierisë
 DocType: Employee Benefit Application,Payroll Period,Periudha e pagave
@@ -4910,6 +4914,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Serial No {0} nuk i përket Grumbullit {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Përgjegjësitë
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Periudha e vlefshmërisë së këtij citati ka përfunduar.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Ju lutemi fshini punonjësin <a href=""#Form/Employee/{0}"">{0}</a> \ për ta anuluar këtë dokument"
 DocType: Expense Claim Account,Expense Claim Account,Llogaria Expense Kërkesa
 DocType: Account,Capital Work in Progress,Puna në zhvillim e sipër
 DocType: Accounts Settings,Allow Stale Exchange Rates,Lejoni shkëmbimin e stale të këmbimit
@@ -4990,7 +4996,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Materiali çështje
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Lidhu Shopify me ERPNext
 DocType: Material Request Item,For Warehouse,Për Magazina
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Shënimet e Dorëzimit {0} janë përditësuar
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Shënimet e Dorëzimit {0} janë përditësuar
 DocType: Employee,Offer Date,Oferta Data
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Citate
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Ju jeni në offline mode. Ju nuk do të jetë në gjendje për të rifreskoni deri sa të ketë rrjet.
@@ -5040,7 +5046,7 @@
 DocType: Shipping Rule,Calculate Based On,Llogaritur bazuar në
 DocType: Contract,Unfulfilled,i paplotësuar
 DocType: Delivery Note Item,From Warehouse,Nga Magazina
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Asnjë punonjës për kriteret e përmendura
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Asnjë punonjës për kriteret e përmendura
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Nuk Items me faturën e materialeve të Prodhimi
 DocType: Shopify Settings,Default Customer,Customer Default
 DocType: Sales Stage,Stage Name,Emri i fazës
@@ -5082,7 +5088,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Shuma e taksave Pas Shuma ulje
 DocType: Patient,Inpatient Status,Statusi i spitalit
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Daily Settings Përmbledhje Work
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Lista e Çmimeve të Zgjedhura duhet të ketë fushat e blerjes dhe shitjes së kontrolluar.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Lista e Çmimeve të Zgjedhura duhet të ketë fushat e blerjes dhe shitjes së kontrolluar.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Ju lutemi shkruani Reqd by Date
 DocType: Payment Entry,Internal Transfer,Transfer të brendshme
 DocType: Asset Maintenance,Maintenance Tasks,Detyrat e Mirmbajtjes
@@ -5118,7 +5124,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Grupi Nga
 DocType: Guardian,Interests,interesat
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Enable / disable monedhave.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Nuk mund të dërgonte disa rreshta pagash
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Nuk mund të dërgonte disa rreshta pagash
 DocType: Exchange Rate Revaluation,Get Entries,Merr hyrjet
 DocType: Production Plan,Get Material Request,Get materiale Kërkesë
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Shpenzimet postare
@@ -5202,7 +5208,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Llogari shpenzim është i detyrueshëm për pikën {0}
 DocType: BOM,Website Description,Website Përshkrim
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Ndryshimi neto në ekuitetit
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Ju lutemi anuloni Blerje Faturën {0} parë
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Ju lutemi anuloni Blerje Faturën {0} parë
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Nuk lejohet. Çaktivizoni llojin e njësisë së shërbimit
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adresa Email duhet të jetë unike, tashmë ekziston për {0}"
 DocType: Serial No,AMC Expiry Date,AMC Data e Mbarimit
@@ -5242,7 +5248,7 @@
 DocType: Hotel Room,Hotel Room,Dhome hoteli
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Llogaria {0} nuk i takon kompanisë {1}
 DocType: Leave Type,Rounding,Llogaritja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Numrat serial në rresht {0} nuk përputhet me shpërndarjen Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Numrat serial në rresht {0} nuk përputhet me shpërndarjen Note
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Shuma e dhënë (Pro-rated)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Pastaj Rregullat e Çmimeve filtrohen në bazë të Konsumatorit, Grupit të Konsumatorëve, Territorit, Furnizuesit, Grupit të Furnizuesit, Fushatës, Partnerit të Shitjes etj."
 DocType: Student,Guardian Details,Guardian Details
@@ -5297,7 +5303,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Magazina e nevojshme për aksioneve Item {0}
 DocType: Leave Allocation,Unused leaves,Gjethet e papërdorura
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Bëni hyrjen e ripagimit
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Të gjitha Departamentet
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Të gjitha Departamentet
 DocType: Healthcare Service Unit,Vacant,vakant
 DocType: Patient,Alcohol Past Use,Përdorimi i mëparshëm i alkoolit
 DocType: Fertilizer Content,Fertilizer Content,Përmbajtja e plehut
@@ -5308,7 +5314,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Urdhri i Punës {0} duhet të anulohet para se të anulohet ky Urdhër Shitje
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Fetch bom shpërtheu (përfshirë nën-kuvendet)
 DocType: Authorization Rule,Applicable To (Employee),Për të zbatueshme (punonjës)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Për shkak Data është e detyrueshme
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Për shkak Data është e detyrueshme
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Rritja për Atributit {0} nuk mund të jetë 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Lloji i përfitimit dhe shuma
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Dhomat e rezervuara
@@ -5453,7 +5459,7 @@
 DocType: Purchase Invoice Item,Total Weight,Pesha Totale
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Komisioni për Shitje
 DocType: Job Offer Term,Value / Description,Vlera / Përshkrim
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} nuk mund të paraqitet, ajo është tashmë {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} nuk mund të paraqitet, ajo është tashmë {2}"
 DocType: Tax Rule,Billing Country,Faturimi Vendi
 DocType: Purchase Order Item,Expected Delivery Date,Pritet Data e dorëzimit
 DocType: Restaurant Order Entry,Restaurant Order Entry,Regjistrimi i Restorantit
@@ -5492,12 +5498,13 @@
 DocType: Maintenance Visit,Breakdown,Avari
 DocType: Travel Itinerary,Vegetarian,Vegjetarian
 DocType: Patient Encounter,Encounter Date,Data e takimit
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Llogaria: {0} me monedhën: {1} nuk mund të zgjidhen
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Llogaria: {0} me monedhën: {1} nuk mund të zgjidhen
 DocType: Bank Statement Transaction Settings Item,Bank Data,Të dhënat bankare
 DocType: Purchase Receipt Item,Sample Quantity,Sasia e mostrës
 DocType: Bank Guarantee,Name of Beneficiary,Emri i Përfituesit
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Përditësimi i çmimit BOM automatikisht nëpërmjet Planifikuesit, bazuar në normën e fundit të vlerësimit / normën e çmimeve / normën e fundit të blerjes së lëndëve të para."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Furnizuesi&gt; Grupi Furnizues
 DocType: Bank Reconciliation Detail,Cheque Date,Çek Data
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Llogaria {0}: llogari Parent {1} nuk i përkasin kompanisë: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Sukses të fshihen të gjitha transaksionet që lidhen me këtë kompani!
@@ -5525,7 +5532,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,nyjet e fëmijëve mund të krijohen vetëm me nyje të tipit &#39;Grupit&#39;
 DocType: Attendance Request,Half Day Date,Half Day Date
 DocType: Academic Year,Academic Year Name,Emri akademik Year
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} nuk lejohet të blej me {1}. Ju lutemi ndryshoni Kompaninë.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} nuk lejohet të blej me {1}. Ju lutemi ndryshoni Kompaninë.
 DocType: Sales Partner,Contact Desc,Kontakt Përshkrimi
 DocType: Email Digest,Send regular summary reports via Email.,Dërgo raporte të rregullta përmbledhje nëpërmjet Email.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Ju lutemi të vendosur llogarinë e paracaktuar në Expense kërkesën Lloji {0}
@@ -5558,7 +5565,7 @@
 DocType: Hotel Room,Hotel Manager,Menaxheri i Hotelit
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Set Rregulla Taksa për shopping cart
 DocType: Purchase Invoice,Taxes and Charges Added,Taksat dhe Tarifat Shtuar
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Rënia e zhvlerësimit {0}: Data e zhvlerësimit tjetër nuk mund të jetë para datës së disponueshme për përdorim
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Rënia e zhvlerësimit {0}: Data e zhvlerësimit tjetër nuk mund të jetë para datës së disponueshme për përdorim
 ,Sales Funnel,Gyp Sales
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Shkurtim është i detyrueshëm
 DocType: Project,Task Progress,Task Progress
@@ -5572,7 +5579,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Të gjitha grupet e konsumatorëve
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,akumuluar mujore
 DocType: Attendance Request,On Duty,Ne detyre
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} është i detyrueshëm. Ndoshta rekord Currency Exchange nuk është krijuar për {1} të {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} është i detyrueshëm. Ndoshta rekord Currency Exchange nuk është krijuar për {1} të {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Plani i stafit {0} ekziston tashmë për përcaktimin {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Template tatimi është i detyrueshëm.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Llogaria {0}: llogari Parent {1} nuk ekziston
@@ -5651,11 +5658,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Atleast një depo është e detyrueshme
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Konfiguro fushat e artikullit si UOM, Grupi i artikullit, Përshkrimi dhe Nr i orëve."
 DocType: Certification Application,Certification Status,Statusi i Certifikimit
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Marketplace
 DocType: Travel Itinerary,Travel Advance Required,Kërkohet Avansimi i Udhëtimit
 DocType: Subscriber,Subscriber Name,Emri i pajtimtarit
 DocType: Serial No,Out of Warranty,Nga Garanci
-DocType: Cashier Closing,Cashier-closing-,Turp-closing-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Lloji i të dhënave të përcaktuar
 DocType: BOM Update Tool,Replace,Zëvendësoj
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Nuk ka produkte gjet.
@@ -5742,7 +5748,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Modelet e taksave të parazgjedhur për shitje dhe blerje krijohen.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Regjistrimi i rezultatit të rezultatit {0} tashmë ekziston.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Shembull: ABCD. #####. Nëse seria është vendosur dhe No Batch nuk është përmendur në transaksionet, atëherë numri i batch automatik do të krijohet bazuar në këtë seri. Nëse gjithmonë doni të përmendni në mënyrë eksplicite Jo Serisë për këtë artikull, lini këtë bosh. Shënim: Ky vendosje do të ketë prioritet mbi Prefixin e Serisë së Emërtimit në Rregullimet e Stock."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ju lutem vendosni numrat e numrave për Pjesëmarrjen përmes Setup&gt; Seritë e Numërimit
 DocType: BOM,Materials Required (Exploded),Materialet e nevojshme (Shpërtheu)
 DocType: Contract,Party User,Përdoruesi i Partisë
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Ju lutemi të vendosur Company filtër bosh nëse Group By është &#39;Company&#39;
@@ -5943,7 +5948,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Duhet të përcaktohet si data e fillimit të periudhës së gjykimit dhe data e përfundimit të periudhës së gjykimit
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Norma mesatare
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Shuma totale e pagesës në orarin e pagesës duhet të jetë e barabartë me grandin / totalin e rrumbullakët
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Shuma totale e pagesës në orarin e pagesës duhet të jetë e barabartë me grandin / totalin e rrumbullakët
 DocType: Subscription Plan Detail,Plan,plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Balanca Deklarata Banka sipas Librit Kryesor
 DocType: Job Applicant,Applicant Name,Emri i aplikantit
@@ -6012,7 +6017,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sapun dhe detergjent
 DocType: BOM,Show Items,Shfaq Items
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Nga koha nuk mund të jetë më i madh se në kohë.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,A doni të njoftoni të gjithë klientët me email?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,A doni të njoftoni të gjithë klientët me email?
 DocType: Subscription Plan,Billing Interval,Intervali i faturimit
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Urdhërohet
@@ -6021,9 +6026,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Rreshti {0}: {1} duhet të jetë më i madh se 0
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteret e vlerësimit Group
 DocType: Healthcare Settings,Patient Name By,Emri i pacientit nga
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Hyrja në Regjistrimin Përgjegjës për pagat nga {0} në {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Hyrja në Regjistrimin Përgjegjës për pagat nga {0} në {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Aktivizo të ardhurat e shtyra
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Hapja amortizimi i akumuluar duhet të jetë më pak se e barabartë me {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Hapja amortizimi i akumuluar duhet të jetë më pak se e barabartë me {0}
 DocType: Warehouse,Warehouse Name,Magazina Emri
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Data aktuale e fillimit duhet të jetë më pak se data përfundimtare
 DocType: Naming Series,Select Transaction,Përzgjedhjen e transaksioneve
@@ -6174,7 +6179,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Punonjësi {0} i klasës {1} nuk ka politikë pushimi default
 DocType: Salary Detail,Salary Detail,Paga Detail
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,"Ju lutem, përzgjidhni {0} parë"
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Shtoi {0} përdorues
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Shtoi {0} përdorues
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","Në rastin e programit multi-shtresor, Konsumatorët do të caktohen automatikisht në nivelin përkatës sipas shpenzimeve të tyre"
 DocType: Appointment Type,Physician,mjek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Batch {0} i artikullit {1} ka skaduar.
@@ -6318,7 +6323,7 @@
 DocType: Asset,Custodian,kujdestar
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Point-of-Sale Profilin
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} duhet të jetë një vlerë midis 0 dhe 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Pagesa e {0} nga {1} deri {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Pagesa e {0} nga {1} deri {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Kredi pasiguruar
 DocType: Cost Center,Cost Center Name,Kosto Emri Qendra
 DocType: Student,B+,B +
@@ -6350,6 +6355,7 @@
 DocType: Employee,Date of Issue,Data e lëshimit
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Sipas Settings Blerja nëse blerja Reciept Required == &#39;PO&#39;, pastaj për krijimin Blerje Faturën, përdoruesi duhet të krijoni Marrjes blerjen e parë për pikën {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Row # {0}: Furnizuesi Set për pika {1}
+DocType: Global Defaults,Default Distance Unit,Njësia e distancës së parave
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Row {0}: Hours Vlera duhet të jetë më e madhe se zero.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Faqja Image {0} bashkangjitur në pikën {1} nuk mund të gjendet
 DocType: Issue,Content Type,Përmbajtja Type
@@ -6405,7 +6411,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Debi Për shkak duhet të jetë një llogari Bilanci i Gjendjes
 DocType: Asset,Naming Series,Emërtimi Series
 DocType: Vital Signs,Coated,i mbuluar
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Rresht {0}: Vlera e pritshme pas Jetës së dobishme duhet të jetë më e vogël se Shuma e Blerjes Bruto
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Rresht {0}: Vlera e pritshme pas Jetës së dobishme duhet të jetë më e vogël se Shuma e Blerjes Bruto
 DocType: GoCardless Settings,GoCardless Settings,Cilësimet GoCardless
 DocType: Leave Block List,Leave Block List Name,Dërgo Block Lista Emri
 DocType: Certified Consultant,Certification Validity,Vlefshmëria e Certifikimit
@@ -6474,6 +6480,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Banka Header
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Shiko testet laboratorike
 DocType: Hub Users,Hub Users,Përdoruesit Hub
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klienti&gt; Grupi i Konsumatorëve&gt; Territori
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Mirëmbajtja Data
 DocType: Purchase Invoice Item,Rejected Serial No,Refuzuar Nuk Serial
@@ -6488,7 +6495,7 @@
 DocType: SG Creation Tool Course,Max Strength,Max Forca
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Instalimi i paravendosjeve
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Nuk ka Shënim për Dorëzim të zgjedhur për Klientin {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Nuk ka Shënim për Dorëzim të zgjedhur për Klientin {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Punonjësi {0} nuk ka shumën maksimale të përfitimit
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Zgjedhni artikujt bazuar në Datën e Dorëzimit
 DocType: Grant Application,Has any past Grant Record,Ka ndonjë të kaluar Grant Record
@@ -6516,7 +6523,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Rezervimi i dhomës së hotelit
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Shërbimi ndaj klientit
 DocType: BOM,Thumbnail,Thumbnail
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Nuk u gjet asnjë kontakt me ID-të e emailit.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Nuk u gjet asnjë kontakt me ID-të e emailit.
 DocType: Item Customer Detail,Item Customer Detail,Item Detail Klientit
 DocType: Notification Control,Prompt for Email on Submission of,Prompt për Dërgoje në dorëzimin e
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Shuma maksimale e përfitimit të punonjësit {0} tejkalon {1}
@@ -6774,7 +6781,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,Nuk mund të fshehta të grupit për shkak Tipi Llogarisë është zgjedhur.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} është modifikuar. Ju lutem refresh.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop përdoruesit nga bërja Dërgo Aplikacione në ditët në vijim.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kodi i artikullit&gt; Grupi i artikullit&gt; Markë
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Nëse skadimi i pakufizuar për Pikat e Besnikërisë, mbajeni Kohëzgjatjen e Skadimit bosh ose 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Anëtarët e ekipit të mirëmbajtjes
 DocType: Loyalty Point Entry,Purchase Amount,Shuma Blerje
@@ -6782,7 +6788,7 @@
 											to fullfill Sales Order {2}",Nuk mund të dorëzojë Serial No {0} të artikullit {1} pasi është e rezervuar për të plotësuar Urdhrin e Shitjes {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Furnizuesi Citat {0} krijuar
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Fundi Viti nuk mund të jetë para se të fillojë Vitit
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Fundi Viti nuk mund të jetë para se të fillojë Vitit
 DocType: Employee Benefit Application,Employee Benefits,Përfitimet e Punonjësve
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Sasia e mbushur duhet të barabartë sasi për Item {0} në rresht {1}
 DocType: Work Order,Manufactured Qty,Prodhuar Qty
@@ -6798,6 +6804,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Zgjidh Batch Numbers
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Për GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Faturat e ngritura për të Konsumatorëve.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ju lutem vendosni Sistemin e Emërimit të Punonjësve në Burimet Njerëzore&gt; Cilësimet e HR
 DocType: Healthcare Settings,Invoice Appointments Automatically,Emërimet e faturës automatikisht
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekti Id
 DocType: Salary Component,Variable Based On Taxable Salary,Ndryshore bazuar në pagën e tatueshme
@@ -6846,7 +6853,7 @@
 DocType: POS Profile,Account for Change Amount,Llogaria për Ndryshim Shuma
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Lidhja me QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Totali i Fitimit / Humbjes
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Kompania e pavlefshme për faturën e kompanisë Inter.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Kompania e pavlefshme për faturën e kompanisë Inter.
 DocType: Purchase Invoice,input service,shërbimi i hyrjes
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partia / Llogaria nuk përputhet me {1} / {2} në {3} {4}
 DocType: Employee Promotion,Employee Promotion,Promovimi i Punonjësve
@@ -6977,7 +6984,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Zona e parapëlqyer për strehim
 apps/erpnext/erpnext/config/selling.py +184,Analytics,analitikë
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Shporta është bosh
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Ju lutemi vendosni Sistemin e Emërimit të Instruktorit në Arsim&gt; Cilësimet e Arsimit
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Artikulli {0} nuk ka Serial No. Vetëm artikujt e serilializuar \ mund të kenë shpërndarje bazuar në Serial No
 DocType: Vehicle,Model,Model
@@ -7007,7 +7013,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Asgjë për të ndryshuar
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,"Ju lutem, përzgjidhni një skedar CSV"
 DocType: Holiday List,Total Holidays,Pushimet Totale
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Modeli i emailit që mungon për dërgimin. Vendosni një në Parametrat e Dorëzimit.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Modeli i emailit që mungon për dërgimin. Vendosni një në Parametrat e Dorëzimit.
 DocType: Student Leave Application,Mark as Present,Mark si pranishëm
 DocType: Supplier Scorecard,Indicator Color,Treguesi Ngjyra
 DocType: Purchase Order,To Receive and Bill,Për të marrë dhe Bill
@@ -7016,7 +7022,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Zgjidh Serial No
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Projektues
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Termat dhe Kushtet Template
-DocType: Serial No,Delivery Details,Detajet e ofrimit të
+DocType: Delivery Trip,Delivery Details,Detajet e ofrimit të
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Qendra Kosto është e nevojshme në rresht {0} në Tatimet tryezë për llojin {1}
 DocType: Program,Program Code,Kodi program
 DocType: Terms and Conditions,Terms and Conditions Help,Termat dhe Kushtet Ndihmë
@@ -7040,7 +7046,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead ditësh
 DocType: Cash Flow Mapping,Is Income Tax Expense,Është shpenzimi i tatimit mbi të ardhurat
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Porosia jote është jashtë për dorëzim!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Posting Data duhet të jetë i njëjtë si data e blerjes {1} e aseteve {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Posting Data duhet të jetë i njëjtë si data e blerjes {1} e aseteve {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Kontrolloni këtë nëse studenti banon në Hostel e Institutit.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Ju lutem shkruani urdhëron Sales në tabelën e mësipërme
 ,Stock Summary,Stock Përmbledhje
diff --git a/erpnext/translations/sr-SP.csv b/erpnext/translations/sr-SP.csv
index 133be91..9e905d8 100644
--- a/erpnext/translations/sr-SP.csv
+++ b/erpnext/translations/sr-SP.csv
@@ -373,7 +373,7 @@
 DocType: Sales Invoice Item,Available Qty at Warehouse,Dostupna količina na skladištu
 DocType: Item,Foreign Trade Details,Spoljnotrgovinski detalji
 DocType: Item,Minimum Order Qty,Minimalna količina za poručivanje
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Za traženi kriterijum nema Zaposlenih
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Za traženi kriterijum nema Zaposlenih
 DocType: Budget,Fiscal Year,Fiskalna godina
 DocType: Stock Entry,Repack,Prepakovati
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Izaberite skladište
@@ -388,7 +388,7 @@
 DocType: Journal Entry Account,Employee Advance,Napredak Zaposlenog
 DocType: Purchase Order Item,Warehouse and Reference,Skladište i veza
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Nalog {2} je neaktivan
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađena
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađena
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +121,No Remarks,Nema napomene
 DocType: Notification Control,Purchase Receipt Message,Poruka u Prijemu robe
 DocType: Purchase Invoice,Taxes and Charges Deducted,Umanjeni porezi i naknade
@@ -837,7 +837,7 @@
 DocType: GL Entry,Voucher Type,Vrsta dokumenta
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +222,Serial No {0} has already been received,Serijski broj {0} je već primljen
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Uvoz i izvoz podataka
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Ukupan avns({0}) na porudžbini {1} ne može biti veći od Ukupnog iznosa ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Ukupan avns({0}) na porudžbini {1} ne može biti veći od Ukupnog iznosa ({2})
 DocType: Material Request,% Ordered,%  Poručenog
 apps/erpnext/erpnext/stock/get_item_details.py +523,Price List not selected,Cjenovnik nije odabran
 DocType: POS Profile,Apply Discount On,Primijeni popust na
@@ -862,9 +862,9 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Ovo je zasnovano na transkcijama ovog dobavljača. Pogledajte vremensku liniju ispod za dodatne informacije
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Iznad 90 dana
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Већ сте оценили за критеријум оцењивања {}.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Serijski broj na poziciji {0} se ne poklapa sa otpremnicom
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Serijski broj na poziciji {0} se ne poklapa sa otpremnicom
 apps/erpnext/erpnext/public/js/templates/contact_list.html +37,New Contact,Novi kontakt
-DocType: Purchase Invoice,Returns,Povraćaj
+DocType: Cashier Closing,Returns,Povraćaj
 DocType: Delivery Note,Delivery To,Isporuka za
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Vrijednost Projekta
 DocType: Warehouse,Parent Warehouse,Nadređeno skladište
@@ -932,7 +932,7 @@
 DocType: Lead,Mobile No.,Mobilni br.
 DocType: Item,Has Variants,Ima varijante
 DocType: Price List Country,Price List Country,Zemlja cjenovnika
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Datum dospijeća je obavezan
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Datum dospijeća je obavezan
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Korpa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Promjene na zalihama prije {0} su zamrznute
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +52,Employee {0} is not active or does not exist,Zaposleni {0} nije aktivan ili ne postoji
@@ -941,7 +941,7 @@
 DocType: Sales Invoice,Product Bundle Help,Sastavnica Pomoć
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py +384,Total {0} ({1}),Ukupno bez PDV-a {0} ({1})
 DocType: Sales Partner,Address & Contacts,Adresa i kontakti
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,ili
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,ili
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Zahtjev za ponudu
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardna prodaja
 DocType: Department,Expense Approver,Odobravatalj troškova
diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv
index cc87ad5..11b9e5f 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Име периода
 DocType: Employee,Salary Mode,Плата режим
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Регистровати
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Регистровати
 DocType: Patient,Divorced,Разведен
 DocType: Support Settings,Post Route Key,Пост Роуте Кеи
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Дозволите тачка треба додати више пута у трансакцији
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Нова девизна стопа
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Валута је потребан за ценовнику {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Биће обрачунато у овој трансакцији.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Супплиер&gt; Тип добављача
 DocType: Delivery Trip,MAT-DT-.YYYY.-,МАТ-ДТ-ИИИИ.-
 DocType: Purchase Order,Customer Contact,Кориснички Контакт
 DocType: Patient Appointment,Check availability,Провери доступност
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,схов отворен
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Серия Обновлено Успешно
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Провери
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} у реду {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} у реду {1}
 DocType: Asset Finance Book,Depreciation Start Date,Датум почетка амортизације
 DocType: Pricing Rule,Apply On,Нанесите на
 DocType: Item Price,Multiple Item prices.,Више цене аукцији .
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Лаб рецепт
 ,Delay Days,Дани одлагања
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,сервис Трошкови
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Серијски број: {0} је већ наведено у продаји фактуре: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Серијски број: {0} је већ наведено у продаји фактуре: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Фактура
 DocType: Purchase Invoice Item,Item Weight Details,Детаљна тежина артикла
 DocType: Asset Maintenance Log,Periodicity,Периодичност
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,рачуновођа
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Продајна цена
 DocType: Patient,Tobacco Current Use,Употреба дувана
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Датум почетка и завршетка се преклапа са картом посла <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Продајна стопа
 DocType: Cost Center,Stock User,Сток Корисник
 DocType: Soil Analysis,(Ca+Mg)/K,(Ца + Мг) / К
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,повезан
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Датум Присуство не може бити мањи од уласку датума запосленог
 DocType: Grading Scale,Grading Scale Name,Скала оцењивања Име
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Додајте кориснике у Маркетплаце
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Додајте кориснике у Маркетплаце
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,То јекорен рачун и не може се мењати .
 DocType: Sales Invoice,Company Address,Адреса предузећа
 DocType: BOM,Operations,Операције
@@ -322,7 +322,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Дифф Количина
 DocType: Production Plan,Material Request Detail,Захтев за материјал за материјал
 DocType: Selling Settings,Default Quotation Validity Days,Подразумевани дани валуте квотирања
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item , налоги в строках должны быть также включены {1}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item , налоги в строках должны быть также включены {1}"
 DocType: SMS Center,SMS Center,СМС центар
 DocType: Payroll Entry,Validate Attendance,Потврдите присуство
 DocType: Sales Invoice,Change Amount,Промена Износ
@@ -441,7 +441,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Проред за износ у речима
 DocType: Vehicle,Additional Details,Додатни детаљи
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Не введено описание
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Добављач&gt; Група добављача
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Захтев за куповину.
 DocType: POS Closing Voucher Details,Collected Amount,Прикупљени износ
 DocType: Lab Test,Submitted Date,Датум подношења
@@ -486,7 +485,7 @@
 DocType: Student Admission,Student Admission,студент Улаз
 ,Terretory,Терретори
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Пункт {0} отменяется
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Редослед амортизације {0}: Почетни датум амортизације уписан је као прошли датум
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Редослед амортизације {0}: Почетни датум амортизације уписан је као прошли датум
 DocType: Contract Template,Fulfilment Terms and Conditions,Услови испуњавања услова
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Материјал Захтев
 DocType: Bank Reconciliation,Update Clearance Date,Упдате Дате клиренс
@@ -543,6 +542,7 @@
 DocType: Accounts Settings,Settings for Accounts,Подешавања за рачуне
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Добављач Фактура Не постоји у фактури {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Управление менеджера по продажам дерево .
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Не можете обрађити руту, пошто су подешавања Гоогле мапа онемогућена."
 DocType: Job Applicant,Cover Letter,Пропратно писмо
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Изузетне чекова и депозити до знања
 DocType: Item,Synced With Hub,Синхронизују са Хуб
@@ -602,7 +602,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Нова вредност имовине
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Стопа по којој Купац Валута се претварају у основне валуте купца
 DocType: Course Scheduling Tool,Course Scheduling Tool,Наравно Распоред Алат
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ред # {0}: фактури не може се против постојеће имовине {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ред # {0}: фактури не може се против постојеће имовине {1}
 DocType: Crop Cycle,LInked Analysis,ЛИнкед Аналисис
 DocType: POS Closing Voucher,POS Closing Voucher,ПОС затворени ваучер
 DocType: Contract,Lapsed,Протекло
@@ -637,6 +637,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} није уписано у току {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Име студента:
 DocType: POS Closing Voucher Details,Difference,Разлика
+DocType: Delivery Settings,Delay between Delivery Stops,Кашњење између прекида испоруке
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Серийный номер {0} не принадлежит накладной {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Изгледа да постоји проблем са конфигурацијом ГоЦардлесс сервера. Не брините, у случају неуспеха, износ ће вам бити враћен на ваш рачун."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ЕРПНект демо
@@ -697,7 +698,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Количина и Оцените
 DocType: Delivery Note,% Installed,Инсталирано %
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Учионице / Лабораторије итд, где може да се планира предавања."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Компанијске валуте обе компаније треба да се подударају за трансакције Интер предузећа.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Компанијске валуте обе компаније треба да се подударају за трансакције Интер предузећа.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Молимо унесите прво име компаније
 DocType: Travel Itinerary,Non-Vegetarian,Не вегетаријанац
 DocType: Purchase Invoice,Supplier Name,Снабдевач Име
@@ -783,7 +784,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Изнајмљен од датума
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Довољно Делови за изградњу
 DocType: POS Profile User,POS Profile User,ПОС Профил корисника
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Ред {0}: датум почетка амортизације је потребан
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Ред {0}: датум почетка амортизације је потребан
 DocType: Purchase Invoice Item,Service Start Date,Датум почетка услуге
 DocType: Subscription Invoice,Subscription Invoice,Рачун за претплату
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Прямая прибыль
@@ -852,7 +853,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Скраћеница већ користи за другу компанију
 DocType: Selling Settings,Default Customer Group,Уобичајено групу потрошача
 DocType: Employee,IFSC Code,ИФСЦ код
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Датум почетка и завршетка се преклапа са картом посла <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ако онемогућите, &quot;заобљени&quot; Тотал поље неће бити видљив у свакој трансакцији"
 DocType: BOM,Operating Cost,Оперативни трошкови
 DocType: Crop,Produced Items,Произведене ставке
@@ -904,7 +904,7 @@
 DocType: Supplier,Prevent RFQs,Спречите РФКс
 DocType: Hub User,Hub User,Корисник Хуб
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Маке Продаја Наручите
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Износ плата за период од {0} до {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Износ плата за период од {0} до {1}
 DocType: Project Task,Project Task,Пројектни задатак
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Искоришћене тачке
 ,Lead Id,Олово Ид
@@ -1035,7 +1035,7 @@
 DocType: Fee Validity,Max number of visit,Максималан број посета
 ,Hotel Room Occupancy,Хотелске собе
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Тимесхеет цреатед:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,уписати
 DocType: GST Settings,GST Settings,ПДВ подешавања
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Валута мора бити иста као ценовник Валута: {0}
@@ -1090,7 +1090,7 @@
 DocType: Vehicle Log,Service Details,Сервице Детаљи
 DocType: Lab Test Template,Grouped,Груписано
 DocType: Selling Settings,Delivery Note Required,Испорука Напомена Обавезно
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Подношење плата ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Подношење плата ...
 DocType: Bank Guarantee,Bank Guarantee Number,Банкарска гаранција Број
 DocType: Bank Guarantee,Bank Guarantee Number,Банкарска гаранција Број
 DocType: Assessment Criteria,Assessment Criteria,Критеријум за процену
@@ -1116,13 +1116,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Плаћање Ступање је већ направљена
 DocType: Request for Quotation,Get Suppliers,Узмите добављача
 DocType: Purchase Receipt Item Supplied,Current Stock,Тренутне залихе
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Ред # {0}: имовине {1} не повезано са тачком {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Ред # {0}: имовине {1} не повезано са тачком {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Преглед плата Слип
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Рачун {0} је ушла више пута
 DocType: Account,Expenses Included In Valuation,Трошкови укључени у процене
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Можете обновити само ако ваше чланство истекне у року од 30 дана
 DocType: Shopping Cart Settings,Show Stock Availability,Схов Стоцк Аваилабилити
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Поставите {0} у категорији активе {1} или компанију {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Поставите {0} у категорији активе {1} или компанију {2}
 DocType: Location,Longitude,Дужина
 ,Absent Student Report,Абсент Студентски Извештај
 DocType: Crop,Crop Spacing UOM,Цроп Спацинг УОМ
@@ -1195,7 +1195,7 @@
 DocType: Soil Texture,Sand,Песак
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,енергија
 DocType: Opportunity,Opportunity From,Прилика Од
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ред {0}: {1} Серијски бројеви потребни за ставку {2}. Дали сте {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Ред {0}: {1} Серијски бројеви потребни за ставку {2}. Дали сте {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Изаберите табелу
 DocType: BOM,Website Specifications,Сајт Спецификације
 DocType: Special Test Items,Particulars,Спецулатионс
@@ -1306,7 +1306,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Предмети са вишим веигхтаге ће бити приказано више
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Лабораторијски тестови и витални знаци
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банка помирење Детаљ
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Ред # {0}: имовине {1} мора да се поднесе
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Ред # {0}: имовине {1} мора да се поднесе
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Не работник не найдено
 DocType: Item,If subcontracted to a vendor,Ако подизвођење на продавца
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Студент Група је већ ажуриран.
@@ -1361,7 +1361,6 @@
 DocType: Loyalty Program Collection,Tier Name,Тиер Наме
 DocType: HR Settings,Enter retirement age in years,Унесите старосну границу за пензионисање у годинама
 DocType: Crop,Target Warehouse,Циљна Магацин
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Поставите називе серије за {0} преко Сетуп&gt; Сеттингс&gt; Сериес Наминг
 DocType: Payroll Employee Detail,Payroll Employee Detail,Детаљи о запосленима
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Изаберите складиште
 DocType: Cheque Print Template,Starting location from left edge,Почетна локација од леве ивице
@@ -1451,7 +1450,7 @@
 DocType: Work Order,Plan material for sub-assemblies,План материјал за подсклопови
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Продајних партнера и Регија
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,БОМ {0} мора бити активна
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Нема ставки за пренос
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Нема ставки за пренос
 DocType: Employee Boarding Activity,Activity Name,Назив активности
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Промени датум издања
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Завршена количина производа <b>{0}</b> и За количину <b>{1}</b> не могу бити различита
@@ -1681,6 +1680,7 @@
 DocType: Project,First Email,Прва е-пошта
 DocType: Company,Exception Budget Approver Role,Улога одобравања буџета изузетака
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Једном подешен, овај рачун ће бити на чекању до одређеног датума"
+DocType: Cashier Closing,POS-CLO-,ПОС-ЦЛО-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Резервисано Магацин у Продаја Наручите / складиште готове робе
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Продаја Износ
 DocType: Repayment Schedule,Interest Amount,Износ камате
@@ -1692,7 +1692,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Записи
 DocType: Asset,Scrapped,одбачен
 DocType: Item,Item Defaults,Подразумевана ставка
-DocType: Purchase Invoice,Returns,повраћај
+DocType: Cashier Closing,Returns,повраћај
 DocType: Job Card,WIP Warehouse,ВИП Магацин
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Серийный номер {0} находится под контрактом на техническое обслуживание ДО {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,регрутовање
@@ -1706,7 +1706,6 @@
 DocType: Student,A-,А-
 DocType: Share Transfer,Transfer Type,Тип преноса
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Коммерческие расходы
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Корисник&gt; Корисничка група&gt; Територија
 DocType: Diagnosis,Diagnosis,Дијагноза
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Стандардна Куповина
 DocType: Attendance Request,Explanation,Објашњење
@@ -1719,7 +1718,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Налози за куповину наруџбине
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Поштански број
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Салес Ордер {0} је {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Изаберите каматни приход у кредиту {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Изаберите каматни приход у кредиту {0}
 DocType: Opportunity,Contact Info,Контакт Инфо
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Макинг Стоцк записи
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Не могу промовирати запосленика са статусом лево
@@ -1731,7 +1730,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Фактура не може бити направљена за време нултог фактурисања
 DocType: Company,Date of Commencement,Датум почетка
 DocType: Sales Person,Select company name first.,Изаберите прво име компаније.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},E-mail отправлено на адрес {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},E-mail отправлено на адрес {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Цитати од добављача.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Замените БОМ и ажурирајте најновију цену у свим БОМ
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Да {0} | {1} {2}
@@ -1753,7 +1752,7 @@
 DocType: Asset Movement,From Employee,Од запосленог
 DocType: Driver,Cellphone Number,број мобилног
 DocType: Project,Monitor Progress,Напредак монитора
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
 DocType: Journal Entry,Make Difference Entry,Направите унос Дифференце
 DocType: Supplier Quotation,Auto Repeat Section,Ауто Репеат Одељак
 DocType: Upload Attendance,Attendance From Date,Гледалаца Од датума
@@ -1856,7 +1855,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Одбијен количина не може се уписати у откупу Повратак
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Промена клијентске групе за изабраног клијента није дозвољена.
 ,Purchase Order Items To Be Billed,Налог за куповину артикала буду наплаћени
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Ажурирање процењених времена доласка.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Ажурирање процењених времена доласка.
 DocType: Program Enrollment Tool,Enrollment Details,Детаљи уписа
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Не може се подесити више поставки поставки за предузеће.
 DocType: Purchase Invoice Item,Net Rate,Нето курс
@@ -1870,7 +1869,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Леаве Типе је лијеван
 DocType: Support Settings,Close Issue After Days,Близу Издање Након неколико дана
 ,Eway Bill,Еваи Билл
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Морате бити корисник са улогама Систем Манагер и Итем Манагер да бисте додали кориснике у Маркетплаце.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Морате бити корисник са улогама Систем Манагер и Итем Манагер да бисте додали кориснике у Маркетплаце.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Оставите празно ако се сматра за све гране
 DocType: Job Opening,Staffing Plan,План запошљавања
 DocType: Bank Guarantee,Validity in Days,Ваљаност у данима
@@ -1892,7 +1891,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Дубликат строка {0} с же {1}
 DocType: Marketplace Settings,Disable Marketplace,Онемогући тржиште
 ,Trial Balance,Пробни биланс
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Фискална година {0} није пронађен
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Фискална година {0} није пронађен
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Подешавање Запослени
 DocType: Hotel Room Reservation,Hotel Reservation User,Резервација корисника хотела
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,"Пожалуйста, выберите префикс первым"
@@ -2000,7 +1999,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Није успела да се пријавите
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Имовина {0} креирана
 DocType: Special Test Items,Special Test Items,Специјалне тестне тачке
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Морате бити корисник са улогама Систем Манагер и Итем Манагер за пријављивање на Маркетплаце.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Морате бити корисник са улогама Систем Манагер и Итем Манагер за пријављивање на Маркетплаце.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Начин плаћања
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Према вашој додељеној структури зарада не можете се пријавити за накнаде
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Сајт Слика треба да буде јавни фајл или УРЛ веб-сајта
@@ -2012,7 +2011,7 @@
 DocType: Warehouse,Warehouse Contact Info,Магацин Контакт Инфо
 DocType: Payment Entry,Write Off Difference Amount,Отпис Дифференце Износ
 DocType: Volunteer,Volunteer Name,Име волонтера
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Редови са дуплицираним датумима у другим редовима су пронађени: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Редови са дуплицираним датумима у другим редовима су пронађени: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: е запослених није пронађен, стога емаил није послата"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Структура плате није додељена запосленом {0} на датом датуму {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Правило о испоруци не важи за земљу {0}
@@ -2102,6 +2101,7 @@
 DocType: Salary Component,Earning,Стицање
 DocType: Supplier Scorecard,Scoring Criteria,Критеријуми бодовања
 DocType: Purchase Invoice,Party Account Currency,Странка Рачун Валута
+DocType: Delivery Trip,Total Estimated Distance,Укупна процењена растојања
 ,BOM Browser,БОМ Бровсер
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Молимо да ажурирате свој статус за овај тренинг догађај
 DocType: Item Barcode,EAN,ЕАН
@@ -2140,7 +2140,7 @@
 DocType: Activity Cost,Projects,Пројекти
 DocType: Payment Request,Transaction Currency,трансакција Валута
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Од {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Неки е-маилови су неважећи
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Неки е-маилови су неважећи
 DocType: Work Order Operation,Operation Description,Операција Опис
 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.,Не можете променити фискалну годину и датум почетка фискалне године Датум завршетка једном Фискална година је сачувана.
 DocType: Quotation,Shopping Cart,Корпа
@@ -2164,7 +2164,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Нето промена у основном средству
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Рекд Кти
 DocType: Leave Control Panel,Leave blank if considered for all designations,Оставите празно ако се сматра за све ознакама
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные ' в строке {0} не могут быть включены в пункт Оценить
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные ' в строке {0} не могут быть включены в пункт Оценить
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Мак: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Од датетиме
 DocType: Shopify Settings,For Company,За компаније
@@ -2178,7 +2178,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Дошло је до грешака приликом креирања курса
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Први Екпенс Аппровер на листи биће постављен као подразумевани Екпенс Аппровер.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,не може бити већи од 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Потребно је да будете други корисник осим Администратора са улогама Систем Манагер и Манагер за регистрацију на Маркетплаце.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Потребно је да будете други корисник осим Администратора са улогама Систем Манагер и Манагер за регистрацију на Маркетплаце.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Packing Slip,MAT-PAC-.YYYY.-,МАТ-ПАЦ-ИИИИ.-
 DocType: Maintenance Visit,Unscheduled,Неплански
@@ -2207,7 +2207,7 @@
 DocType: HR Settings,Employee Settings,Подешавања запослених
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Учитавање платног система
 ,Batch-Wise Balance History,Групно-Висе Стање Историја
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Ред # {0}: Не може се подесити Рате ако је износ већи од фактурисане количине за ставку {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Ред # {0}: Не може се подесити Рате ако је износ већи од фактурисане количине за ставку {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,поставке за штампање ажуриран у одговарајућем формату за штампање
 DocType: Package Code,Package Code,пакет код
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,шегрт
@@ -2442,7 +2442,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} слободна места и {1} буџет за {2} већ планиран за подружнице предузећа {3}. \ Можете планирати само за {4} слободна радна места и буџет {5} по плану особља {6} за матичну компанију {3}.
 DocType: HR Settings,Stop Birthday Reminders,Стани Рођендан Подсетници
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Молимо поставите Дефаулт Паиролл Паиабле рачун у компанији {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Молимо поставите Дефаулт Паиролл Паиабле рачун у компанији {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Узми финансијски распад података о порезима и наплаћује Амазон
 DocType: SMS Center,Receiver List,Пријемник Листа
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Тражи артикла
@@ -2512,7 +2512,7 @@
 DocType: Vital Signs,Constipated,Запремљен
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Против добављача Фактура {0} {1} од
 DocType: Customer,Default Price List,Уобичајено Ценовник
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Кретање средство запис {0} је направљена
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Кретање средство запис {0} је направљена
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Нема пронађених предмета.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ви не можете брисати Фискална година {0}. Фискална {0} Година је постављен као подразумевани у глобалним поставкама
 DocType: Share Transfer,Equity/Liability Account,Рачун капитала / обавеза
@@ -2651,6 +2651,7 @@
 DocType: Blanket Order,Order Type,Врста поруџбине
 ,Item-wise Sales Register,Предмет продаје-мудре Регистрација
 DocType: Asset,Gross Purchase Amount,Бруто Куповина Количина
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Шифра производа&gt; Група производа&gt; Бренд
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Почетни баланси
 DocType: Asset,Depreciation Method,Амортизација Метод
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Да ли је то такса у Основном Рате?
@@ -2734,7 +2735,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Акција ако је годишњи буџет прешао на ПО
 DocType: Student Leave Application,Student Leave Application,Студент одсуство примене
 DocType: Item,Will also apply for variants,Ће конкурисати и за варијанте
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Средство не може бити поништена, као што је већ {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Средство не може бити поништена, као што је већ {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Запослени {0} на пола дана на {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Укупно радно време не би требало да буде већи од мак радних сати {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,На
@@ -2758,6 +2759,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Извадите податке
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Максимални дозвољени одмор у типу одласка {0} је {1}
 DocType: SMS Center,Create Receiver List,Направите листу пријемника
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Датум доступан за коришћење треба да буде након датума куповине
 DocType: Vehicle,Wheels,Точкови
 DocType: Packing Slip,To Package No.,За Пакет број
 DocType: Patient Relation,Family,Породица
@@ -2771,7 +2773,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Валута за обрачун мора бити једнака валути валуте компаније или валуте партијског рачуна
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Указује на то да пакет је део ове испоруке (само нацрт)
 DocType: Soil Texture,Loam,Лоам
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Ред {0}: Дуе Дате не може бити пре датума објављивања
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Ред {0}: Дуе Дате не може бити пре датума објављивања
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Уплатите Ентри
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Количество по пункту {0} должно быть меньше {1}
 ,Sales Invoice Trends,Продаје Фактура трендови
@@ -2844,7 +2846,7 @@
 DocType: Guardian,Guardian Interests,Гуардиан Интереси
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Ажурирајте име / број рачуна
 DocType: Naming Series,Current Value,Тренутна вредност
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Више фискалне године постоје за датум {0}. Молимо поставите компаније у фискалној години
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Више фискалне године постоје за датум {0}. Молимо поставите компаније у фискалној години
 DocType: Education Settings,Instructor Records to be created by,Инструкторске записе које креира
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} создан
 DocType: GST Account,GST Account,ГСТ налог
@@ -2861,7 +2863,7 @@
 DocType: Sales Person,Name and Employee ID,Име и број запослених
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,"Впритык не может быть , прежде чем отправлять Дата"
 DocType: Website Item Group,Website Item Group,Сајт тачка Група
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Ниједан образовни лист који је достављен за горе наведене критеријуме ИЛИ већ достављен
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Ниједан образовни лист који је достављен за горе наведене критеријуме ИЛИ већ достављен
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Пошлины и налоги
 DocType: Projects Settings,Projects Settings,Подешавања пројеката
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
@@ -2870,7 +2872,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Додатна количина
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,ХЛЦ-ЦПР-ИИИИ.-
 DocType: Purchase Order Item,Material Request Item,Материјал Захтев шифра
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Молим поништите прво куповну потврду {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Молим поништите прво куповну потврду {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Дерево товарные группы .
 DocType: Production Plan,Total Produced Qty,Укупно произведени количина
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можете обратиться номер строки , превышающую или равную текущему номеру строки для этого типа зарядки"
@@ -2981,6 +2983,7 @@
 ,Vehicle Expenses,Трошкови возила
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Направите лабораторијске тестове на рачуну за продају
 DocType: Serial No,Invoice Details,Детаљи рачуна
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Омогућите подешавања Гоогле мапа да бисте процијенили и оптимизирали руте
 DocType: Grant Application,Show on Website,Схов он Вебсите
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Почиње
 DocType: Hub Tracked Item,Hub Category,Главна категорија
@@ -3021,7 +3024,7 @@
 DocType: Inpatient Record,B Positive,Б Позитивно
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Максимална корист запосленог {0} премашује {1} за суму {2} претходног захтеваног \ износа
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ред # {0}: Кол-во мора бити 1, као тачка је основна средства. Молимо вас да користите посебан ред за вишеструко Кол."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ред # {0}: Кол-во мора бити 1, као тачка је основна средства. Молимо вас да користите посебан ред за вишеструко Кол."
 DocType: Leave Block List Allow,Leave Block List Allow,Оставите листу блокираних Аллов
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Аббр не може бити празно или простор
 DocType: Patient Medical Record,Patient Medical Record,Пацијент медицински запис
@@ -3056,7 +3059,7 @@
 DocType: Workstation,Wages per hour,Сатнице
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Сток стање у батцх {0} ће постати негативна {1} за {2} тачком у складишту {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Следећи материјал захтеви су аутоматски подигнута на основу нивоа поновног реда ставке
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Рачун {0} је неважећа. Рачун валута мора да буде {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Рачун {0} је неважећа. Рачун валута мора да буде {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Од Датум {0} не може бити након отпуштања запосленог Датум {1}
 DocType: Supplier,Is Internal Supplier,Је унутрашњи добављач
 DocType: Employee,Create User Permission,Креирајте дозволу корисника
@@ -3202,7 +3205,7 @@
 DocType: Account,Fixed Asset,Исправлена активами
 DocType: Amazon MWS Settings,After Date,Након датума
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Серијализоване Инвентар
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Неважеће {0} за Интер Цомпани рачун.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Неважеће {0} за Интер Цомпани рачун.
 ,Department Analytics,Одељење аналитике
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Е-пошта није пронађена у подразумеваном контакту
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Генерирај тајну
@@ -3215,7 +3218,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Програм у структури накнада и студентској групи {0} су различити.
 DocType: Bank Statement Transaction Entry,Receivable Account,Потраживања рачуна
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Важи од датума мора бити мањи од важећег датума.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Ред # {0}: имовине {1} је већ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Ред # {0}: имовине {1} је већ {2}
 DocType: Quotation Item,Stock Balance,Берза Биланс
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Продаја Налог за плаћања
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,Директор
@@ -3257,6 +3260,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Дебитна Да је потребно
 DocType: Clinical Procedure,Inpatient Record,Записник о стационарном стању
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Тимесхеетс лакше пратили времена, трошкова и рачуна за АКТИВНОСТИ урадио ваш тим"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Супплиер&gt; Тип добављача
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Куповина Ценовник
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Датум трансакције
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Шаблони варијабли индекса добављача.
@@ -3300,7 +3304,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Курсне / Губитак
 DocType: Opportunity,Lost Reason,Лост Разлог
 DocType: Amazon MWS Settings,Enable Amazon,Омогући Амазон
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Ред # {0}: Рачун {1} не припада компанији {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Ред # {0}: Рачун {1} не припада компанији {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Не могу да пронађем ДоцТипе {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Нова адреса
 DocType: Quality Inspection,Sample Size,Величина узорка
@@ -3412,7 +3416,7 @@
 DocType: Water Analysis,Origin,Порекло
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Овај документ је преко границе од {0} {1} за ставку {4}. Правиш други {3} против исте {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Молимо поставите понављају након снимања
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Избор промена износ рачуна
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Избор промена износ рачуна
 DocType: Purchase Invoice,Price List Currency,Ценовник валута
 DocType: Naming Series,User must always select,Корисник мора увек изабрати
 DocType: Stock Settings,Allow Negative Stock,Дозволи Негативно Стоцк
@@ -3454,7 +3458,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Да ли сте сигурни да желите да откажете овај термин?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Пакет за хотелску собу
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Продаја Цевовод
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Молимо поставите подразумевани рачун у плате компоненте {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Молимо поставите подразумевани рачун у плате компоненте {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Обавезно На
 DocType: Rename Tool,File to Rename,Филе Ренаме да
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Молимо одаберите БОМ за предмета на Ров {0}
@@ -3475,7 +3479,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Трошкови Купљено
 DocType: Employee Separation,Employee Separation Template,Шаблон за раздвајање запослених
 DocType: Selling Settings,Sales Order Required,Продаја Наручите Обавезно
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Постаните Продавац
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Постаните Продавац
 DocType: Purchase Invoice,Credit To,Кредит би
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Активни Леадс / Купци
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Оставите празно да бисте користили стандардни формат напомене за испоруку
@@ -3516,7 +3520,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Направите порезну шему
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Корисник форум
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Сировине не може бити празан.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Ред # {0} (Табела за плаћање): Износ мора бити негативан
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Ред # {0} (Табела за плаћање): Износ мора бити негативан
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Није могуће ажурирати залихе, фактура садржи испоруку ставку дроп."
 DocType: Contract,Fulfilment Status,Статус испуне
 DocType: Lab Test Sample,Lab Test Sample,Узорак за лабораторијско испитивање
@@ -3676,7 +3680,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Доц Дате
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Накнада Записи Цреатед - {0}
 DocType: Asset Category Account,Asset Category Account,Средство Категорија налог
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Ред # {0} (Табела за плаћање): Износ мора бити позитиван
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Ред # {0} (Табела за плаћање): Износ мора бити позитиван
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете производить больше элемент {0} , чем количество продаж Заказать {1}"
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Изаберите вриједности атрибута
 DocType: Purchase Invoice,Reason For Issuing document,Разлог за издавање документа
@@ -3731,7 +3735,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Време у коме су примљене материјали
 DocType: Products Settings,Products per Page,Производи по страници
 DocType: Stock Ledger Entry,Outgoing Rate,Одлазећи курс
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,или
 DocType: Sales Order,Billing Status,Обрачун статус
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Пријави грешку
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Коммунальные расходы
@@ -3759,7 +3763,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Изјава о изузећу пореза на раднике
 DocType: Payment Entry,Cheque/Reference Date,Чек / Референтни датум
 DocType: Purchase Invoice,Total Taxes and Charges,Укупно Порези и накнаде
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Датум доступан за коришћење се уноси као прошли датум
 DocType: Employee,Emergency Contact,Хитна Контакт
 DocType: Bank Reconciliation Detail,Payment Entry,plaćanje Ступање
 ,sales-browser,продаја-претраживач
@@ -3806,6 +3809,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Је повратак (кредитна белешка)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Започните посао
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Серијски број је потребан за средство {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Поставите називе серије за {0} преко Сетуп&gt; Сеттингс&gt; Сериес Наминг
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Онемогућен шаблон не мора да буде подразумевани шаблон
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,За ред {0}: Унесите планирани број
 DocType: Account,Income Account,Приходи рачуна
@@ -3819,6 +3823,7 @@
 DocType: Loyalty Program,Help Section,Хелп Сецтион
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,прев
 DocType: Appraisal Goal,Key Responsibility Area,Кључна Одговорност Површина
+DocType: Delivery Trip,Distance UOM,Удаљеност УОМ
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Студент Пакети помоћи да пратите посећеност, процене и накнаде за студенте"
 DocType: Payment Entry,Total Allocated Amount,Укупно издвајају
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Сет Дефаулт инвентар рачун за вечити инвентар
@@ -3860,7 +3865,7 @@
 DocType: Item Supplier,Item Supplier,Ставка Снабдевач
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Унесите Шифра добити пакет не
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Није изабрана ставка за пренос
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Није изабрана ставка за пренос
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Све адресе.
 DocType: Company,Stock Settings,Стоцк Подешавања
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Спајање је могуће само ако следеће особине су исти у оба записа. Да ли је група, корен тип, Компанија"
@@ -4158,7 +4163,7 @@
 DocType: Patient,Personal and Social History,Лична и друштвена историја
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Корисник {0} је креиран
 DocType: Fee Schedule,Fee Breakup for each student,Накнада за сваки студент
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Укупно Адванце ({0}) против Реда {1} не може бити већи од Великог Укупно ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Укупно Адванце ({0}) против Реда {1} не може бити већи од Великог Укупно ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Изаберите мјесечни неравномерно дистрибуира широм мете месеци.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Промени код
 DocType: Purchase Invoice Item,Valuation Rate,Процена Стопа
@@ -4167,7 +4172,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Искористио ИТЦ Цесс
 ,Student Monthly Attendance Sheet,Студент Месечно Присуство лист
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Правило о испоруци примењује се само за продају
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Амортизацијски ред {0}: Следећи датум амортизације не може бити пре датума куповине
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Амортизацијски ред {0}: Следећи датум амортизације не може бити пре датума куповине
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Пројекат Датум почетка
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,До
 DocType: Rename Tool,Rename Log,Преименовање Лог
@@ -4185,12 +4190,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Колико често треба ажурирати пројекат и компанију на основу продајних трансакција.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Истиче
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Додај Студенти
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Избришите Емплоиее <a href=""#Form/Employee/{0}"">{0}</a> \ да бисте отказали овај документ"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},"Пожалуйста, выберите {0}"
 DocType: C-Form,C-Form No,Ц-Образац бр
 DocType: BOM,Exploded_items,Екплодед_итемс
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Удаљеност
+DocType: Delivery Stop,Distance,Удаљеност
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Наведите своје производе или услуге које купујете или продајете.
 DocType: Water Analysis,Storage Temperature,Температура складиштења
 DocType: Sales Order,SAL-ORD-.YYYY.-,САЛ-ОРД-ИИИИ.-
@@ -4217,7 +4220,7 @@
 DocType: Homepage,Company Description for website homepage,Опис Компаније за веб страницу
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","За практичност потрошача, ови кодови могу да се користе у штампаним форматима као што су фактуре и отпремнице"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,суплиер Име
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Не могу се преузети подаци за {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Не могу се преузети подаци за {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Отварање часописа
 DocType: Contract,Fulfilment Terms,Услови испуњавања
 DocType: Sales Invoice,Time Sheet List,Време Списак лист
@@ -4400,7 +4403,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Изаберите студенти ручно активности заснива Групе
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Изаберите студенти ручно активности заснива Групе
 DocType: Journal Entry,User Remark,Корисник Напомена
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Оптимизација рута.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Оптимизација рута.
 DocType: Travel Itinerary,Non Diary,Нон Дневник
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Не могу да креирам Бонус задржавања за леве запослене
 DocType: Lead,Market Segment,Сегмент тржишта
@@ -4431,7 +4434,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Програм лојалности
 DocType: Student Guardian,Father,отац
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Подршка улазнице
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;Ажурирање Сток &quot;не може да се провери за фиксну продаје имовине
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;Ажурирање Сток &quot;не може да се провери за фиксну продаје имовине
 DocType: Bank Reconciliation,Bank Reconciliation,Банка помирење
 DocType: Attendance,On Leave,На одсуству
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Гет Упдатес
@@ -4476,7 +4479,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Серијски број и партије
 DocType: Warranty Claim,From Company,Из компаније
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Збир Сцорес мерила за оцењивање треба да буде {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Молимо поставите Број Амортизација Жути картони
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Молимо поставите Број Амортизација Жути картони
 DocType: Supplier Scorecard Period,Calculations,Израчунавање
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Вредност или Кол
 DocType: Payment Terms Template,Payment Terms,Услови плаћања
@@ -4496,7 +4499,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Попуст (%) на цена Лист курс са маргине
 DocType: Healthcare Service Unit Type,Rate / UOM,Рате / УОМ
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,sve складишта
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Не {0} пронађено за трансакције компаније Интер.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Не {0} пронађено за трансакције компаније Интер.
 DocType: Travel Itinerary,Rented Car,Рентед Цар
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,О вашој Компанији
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Кредит на рачун мора да буде биланса стања
@@ -4598,6 +4601,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Критеријуми за анализу биљака
 DocType: Cheque Print Template,Cheque Height,Чек Висина
 DocType: Supplier,Supplier Details,Добављачи Детаљи
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Молимо да подесите серију бројева за присуство преко Сетуп&gt; Сериес Нумберинг
 DocType: Setup Progress,Setup Progress,Напредак подешавања
 DocType: Expense Claim,Approval Status,Статус одобравања
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},"От значение должно быть меньше , чем значение в строке {0}"
@@ -4690,7 +4694,6 @@
 DocType: Travel Request,Fully Sponsored,Потпуно спонзорисани
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Реверсе Јоурнал Ентри
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Клијент {0} је креиран.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Молимо да подесите систем именовања запослених у људским ресурсима&gt; ХР Сеттингс
 DocType: Stock Settings,Limit Percent,лимит Проценат
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Тренутно нема доступних трговина на залихама
 ,Payment Period Based On Invoice Date,Период отплате Басед Он Фактура Дате
@@ -4749,7 +4752,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Извор Магацин
 DocType: Installation Note,Installation Date,Инсталација Датум
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Схаре Ледгер
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Ред # {0}: имовине {1} не припада компанији {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Ред # {0}: имовине {1} не припада компанији {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Продајна фактура {0} креирана
 DocType: Employee,Confirmation Date,Потврда Датум
 DocType: Inpatient Occupancy,Check Out,Провери
@@ -4769,6 +4772,7 @@
 DocType: Production Plan,Sales Orders Detail,Продајна наруџбина Детаил
 DocType: Bin,Requested Quantity,Тражени Количина
 DocType: Fees,EDU-FEE-.YYYY.-,ЕДУ-ФЕЕ-.ИИИИ.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Молимо вас да подесите систем именовања инструктора у образовању&gt; Образовне поставке
 DocType: Patient,Marital Status,Брачни статус
 DocType: Stock Settings,Auto Material Request,Ауто Материјал Захтев
 DocType: Woocommerce Settings,API consumer secret,Потрошачка тајна АПИ-ја
@@ -4821,7 +4825,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Изаберите Дани
 DocType: Academic Term,Term Name,termin Име
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Кредит ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Креирање плата ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Креирање плата ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Не можете уређивати роот чвор.
 DocType: Buying Settings,Purchase Order Required,Наруџбенице Обавезно
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Тајмер
@@ -4859,7 +4863,7 @@
 DocType: Account,Rate at which this tax is applied,Стопа по којој се примењује овај порез
 DocType: Cash Flow Mapper,Section Name,Назив одељка
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Реордер ком
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Редослед амортизације {0}: Очекивана вредност након корисног века мора бити већа или једнака {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Редослед амортизације {0}: Очекивана вредност након корисног века мора бити већа или једнака {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Цуррент Јоб Опенингс
 DocType: Company,Stock Adjustment Account,Стоцк Подешавање налога
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Отписати
@@ -4906,7 +4910,7 @@
 DocType: Program Enrollment,School House,Школа Кућа
 DocType: Serial No,Out of AMC,Од АМЦ
 DocType: Opportunity,Opportunity Amount,Могућност Износ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Број Амортизација жути картон, не може бити већи од Укупан број Амортизација"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Број Амортизација жути картон, не може бити већи од Укупан број Амортизација"
 DocType: Purchase Order,Order Confirmation Date,Датум потврђивања поруџбине
 DocType: Driver,HR-DRI-.YYYY.-,ХР-ДРИ-.ИИИИ.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Маке одржавање Посетите
@@ -4947,7 +4951,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Батцх:
 DocType: Volunteer,Afternoon,Поподневни
 DocType: Loyalty Program,Loyalty Program Help,Помоћ програма за лојалност
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' је онемогућен
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' је онемогућен
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Постави као Опен
 DocType: Cheque Print Template,Scanned Cheque,скенирана Чек
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Пошаљи аутоматске поруке е-поште у Контакте о достављању трансакцијама.
@@ -4960,7 +4964,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Ставка и гаранције Детаљи
 DocType: Chapter,Chapter Members,Чланови поглавља
 DocType: Sales Team,Contribution (%),Учешће (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана , так как "" Наличные или Банковский счет "" не был указан"
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана , так как "" Наличные или Банковский счет "" не был указан"
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Пројекат {0} већ постоји
 DocType: Clinical Procedure,Nursing User,Нурсинг Усер
 DocType: Employee Benefit Application,Payroll Period,Период плаћања
@@ -4968,6 +4972,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Серијски број {0} не припада Батцх {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Одговорности
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Рок важности ове понуде је завршен.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Избришите Емплоиее <a href=""#Form/Employee/{0}"">{0}</a> \ да бисте отказали овај документ"
 DocType: Expense Claim Account,Expense Claim Account,Расходи Захтев налог
 DocType: Account,Capital Work in Progress,Капитални рад је у току
 DocType: Accounts Settings,Allow Stale Exchange Rates,Дозволите старе курсеве
@@ -5049,7 +5055,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Питање Материјал
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Повежите Схопифи са ЕРПНект
 DocType: Material Request Item,For Warehouse,За Варехоусе
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Белешке о достави {0} ажуриране
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Белешке о достави {0} ажуриране
 DocType: Employee,Offer Date,Понуда Датум
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Цитати
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Ви сте у оффлине моду. Нећете моћи да поново све док имате мрежу.
@@ -5100,7 +5106,7 @@
 DocType: Shipping Rule,Calculate Based On,Израчунајте Басед Он
 DocType: Contract,Unfulfilled,Неиспуњено
 DocType: Delivery Note Item,From Warehouse,Од Варехоусе
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Нема запослених по наведеним критеријумима
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Нема запослених по наведеним критеријумима
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Но Предмети са саставница у Производња
 DocType: Shopify Settings,Default Customer,Дефаулт Цустомер
 DocType: Sales Stage,Stage Name,Уметничко име
@@ -5143,7 +5149,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Сумма налога После скидка сумма
 DocType: Patient,Inpatient Status,Статус болесника
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Свакодневном раду Преглед подешавања
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Изабрана ценовна листа треба да има проверено поље куповине и продаје.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Изабрана ценовна листа треба да има проверено поље куповине и продаје.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Молимо унесите Рекд по датуму
 DocType: Payment Entry,Internal Transfer,Интерни пренос
 DocType: Asset Maintenance,Maintenance Tasks,Задаци одржавања
@@ -5180,7 +5186,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Група По
 DocType: Guardian,Interests,Интереси
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Включение / отключение валюты.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Не могу да поднесем неке плоче
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Не могу да поднесем неке плоче
 DocType: Exchange Rate Revaluation,Get Entries,Гет Ентриес
 DocType: Production Plan,Get Material Request,Гет Материал захтев
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Почтовые расходы
@@ -5267,7 +5273,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
 DocType: BOM,Website Description,Вебсајт Опис
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Нето промена у капиталу
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Откажите фактури {0} први
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Откажите фактури {0} први
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Није дозвољено. Молим вас искључите Типе Сервице Сервице Унит
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Е-маил адреса мора бити јединствена, већ постоји за {0}"
 DocType: Serial No,AMC Expiry Date,АМЦ Датум истека
@@ -5307,7 +5313,7 @@
 DocType: Hotel Room,Hotel Room,Хотелска соба
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Рачун {0} не припада компанији {1}
 DocType: Leave Type,Rounding,Заокруживање
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Серијски бројеви у низу {0} не поклапа са Деливери Ноте
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Серијски бројеви у низу {0} не поклапа са Деливери Ноте
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Диспенсед Амоунт (Про-ратед)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Тада Правила цене се филтрирају на основу клијента, клијената, територије, добављача, групе добављача, кампање, продајног партнера итд."
 DocType: Student,Guardian Details,гуардиан Детаљи
@@ -5362,7 +5368,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
 DocType: Leave Allocation,Unused leaves,Неискоришћени листови
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Изврши отплату
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Сви одјели
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Сви одјели
 DocType: Healthcare Service Unit,Vacant,Празан
 DocType: Patient,Alcohol Past Use,Употреба алкохола у прошлости
 DocType: Fertilizer Content,Fertilizer Content,Садржај ђубрива
@@ -5373,7 +5379,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Радни налог {0} мора бити отказан прије отказивања овог продајног налога
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Фетцх експлодирала бом ( укључујући подсклопова )
 DocType: Authorization Rule,Applicable To (Employee),Важећи Да (запослених)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Дуе Дате обавезна
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Дуе Дате обавезна
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Повећање за Аттрибуте {0} не може бити 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Тип и износ бенефита
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Собе резервиране
@@ -5522,7 +5528,7 @@
 DocType: Purchase Invoice Item,Total Weight,Укупна маса
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Комиссия по продажам
 DocType: Job Offer Term,Value / Description,Вредност / Опис
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ред # {0}: имовине {1} не може се поднети, већ је {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ред # {0}: имовине {1} не може се поднети, већ је {2}"
 DocType: Tax Rule,Billing Country,Zemlja naplate
 DocType: Purchase Order Item,Expected Delivery Date,Очекивани Датум испоруке
 DocType: Restaurant Order Entry,Restaurant Order Entry,Ордер Ордер Ентри
@@ -5561,12 +5567,13 @@
 DocType: Maintenance Visit,Breakdown,Слом
 DocType: Travel Itinerary,Vegetarian,Вегетаријанац
 DocType: Patient Encounter,Encounter Date,Датум сусрета
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Рачун: {0} са валутом: {1} не може бити изабран
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Рачун: {0} са валутом: {1} не може бити изабран
 DocType: Bank Statement Transaction Settings Item,Bank Data,Подаци банке
 DocType: Purchase Receipt Item,Sample Quantity,Количина узорка
 DocType: Bank Guarantee,Name of Beneficiary,Име корисника
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Аутоматско ажурирање трошкова БОМ-а путем Планера, на основу најновије процене стопе цена / цене цена / последње цене сировина."
 DocType: Supplier,SUP-.YYYY.-,СУП-.ИИИИ.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Добављач&gt; Група добављача
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Датум
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Рачун {0}: {1 Родитељ рачун} не припада компанији: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Успешно избрисали све трансакције везане за ову компанију!
@@ -5594,7 +5601,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Дете чворови се може створити само под типа чворова &#39;групе&#39;
 DocType: Attendance Request,Half Day Date,Полудневни Датум
 DocType: Academic Year,Academic Year Name,Академска Година Име
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} није дозвољено да трансакције са {1}. Замените Компанију.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} није дозвољено да трансакције са {1}. Замените Компанију.
 DocType: Sales Partner,Contact Desc,Контакт Десц
 DocType: Email Digest,Send regular summary reports via Email.,Пошаљи редовне збирне извештаје путем е-маил.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Молимо поставите подразумевани рачун у Расходи Цлаим тип {0}
@@ -5627,7 +5634,7 @@
 DocType: Hotel Room,Hotel Manager,Менаџер хотела
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Сет Пореска Правило за куповину
 DocType: Purchase Invoice,Taxes and Charges Added,Порези и накнаде додавања
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Амортизацијски ред {0}: Следећи датум амортизације не може бити пре Датум расположивог за употребу
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Амортизацијски ред {0}: Следећи датум амортизације не може бити пре Датум расположивог за употребу
 ,Sales Funnel,Продаја Левак
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Држава је обавезна
 DocType: Project,Task Progress,zadatak Напредак
@@ -5641,7 +5648,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Все Группы клиентов
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,картон Месечно
 DocType: Attendance Request,On Duty,На дужности
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} је обавезно. Можда Мењачница запис није створен за {1} на {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} је обавезно. Можда Мењачница запис није створен за {1} на {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},План запошљавања {0} већ постоји за ознаку {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Пореска Шаблон је обавезно.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Рачун {0}: {1 Родитељ рачун} не постоји
@@ -5722,11 +5729,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Атлеаст једно складиште је обавезно
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Конфигурирајте поља поља као што су УОМ, група ставки, опис и број сати."
 DocType: Certification Application,Certification Status,Статус сертификације
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Маркетплаце
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Маркетплаце
 DocType: Travel Itinerary,Travel Advance Required,Потребно је унапредити путовање
 DocType: Subscriber,Subscriber Name,Име претплатника
 DocType: Serial No,Out of Warranty,Од гаранције
-DocType: Cashier Closing,Cashier-closing-,Благајна-затварање-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Маппед Дата Типе
 DocType: BOM Update Tool,Replace,Заменити
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Нема нађених производа.
@@ -5814,7 +5820,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Основани порезни предлошци за продају и куповину су створени.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Оцењивање Резултат записа {0} већ постоји.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Пример: АБЦД. #####. Ако је серија подешена и Батцх Но се не помиње у трансакцијама, онда ће се на основу ове серије креирати аутоматски број серије. Уколико увек желите да експлицитно наведете Батцх Но за ову ставку, оставите ово празним. Напомена: ово подешавање ће имати приоритет над Префиксом назива серија у поставкама залиха."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Молимо да подесите серију бројева за присуство преко Сетуп&gt; Сериес Нумберинг
 DocType: BOM,Materials Required (Exploded),Материјали Обавезно (Екплодед)
 DocType: Contract,Party User,Парти Усер
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Молимо поставите Фирма филтер празно ако Група По је &#39;Фирма&#39;
@@ -6015,7 +6020,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,опп Точка
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Морају се подесити датум почетка пробног периода и датум завршетка пробног периода
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Просечна стопа
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Укупан износ плаћања у распореду плаћања мора бити једнак Гранд / заокруженом укупно
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Укупан износ плаћања у распореду плаћања мора бити једнак Гранд / заокруженом укупно
 DocType: Subscription Plan Detail,Plan,План
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Банка Биланс по Главној књизи
 DocType: Job Applicant,Applicant Name,Подносилац захтева Име
@@ -6084,7 +6089,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Сапун и детерџент
 DocType: BOM,Show Items,Схов Предмети
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Фром Тиме не може бити већи од на време.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Желите ли да обавестите све купце путем е-поште?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Желите ли да обавестите све купце путем е-поште?
 DocType: Subscription Plan,Billing Interval,Интервал зарачунавања
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Мотион Пицтуре & Видео
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ж
@@ -6093,9 +6098,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Ред {0}: {1} мора бити већи од 0
 DocType: Assessment Criteria,Assessment Criteria Group,Критеријуми за процену Група
 DocType: Healthcare Settings,Patient Name By,Име пацијента од
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Обавештење о дневном обрачуну за плате од {0} до {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Обавештење о дневном обрачуну за плате од {0} до {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Омогућите одложени приход
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Отварање акумулирана амортизација мора бити мањи од једнак {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Отварање акумулирана амортизација мора бити мањи од једнак {0}
 DocType: Warehouse,Warehouse Name,Магацин Име
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Стварни датум почетка мора бити мањи од тренутног датума завршетка
 DocType: Naming Series,Select Transaction,Изаберите трансакцију
@@ -6247,7 +6252,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Запослени {0} разреда {1} немају никакву политику за одлазни одмор
 DocType: Salary Detail,Salary Detail,плата Детаљ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Изаберите {0} први
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Додато је {0} корисника
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Додато је {0} корисника
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","У случају мулти-тиер програма, Корисници ће аутоматски бити додијељени за одређени ниво према њиховом потрошеном"
 DocType: Appointment Type,Physician,Лекар
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Батцх {0} од тачке {1} је истекао.
@@ -6392,7 +6397,7 @@
 DocType: Asset,Custodian,Скрбник
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Поинт-оф-Сале Профиле
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} треба да буде вредност између 0 и 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Исплата {0} од {1} до {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Исплата {0} од {1} до {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,необеспеченных кредитов
 DocType: Cost Center,Cost Center Name,Трошкови Име центар
 DocType: Student,B+,Б +
@@ -6424,6 +6429,7 @@
 DocType: Employee,Date of Issue,Датум издавања
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Према куповина Сеттингс ако објекат Рециепт Обавезно == &#39;ДА&#39;, а затим за стварање фактури, корисник треба да креира Куповина потврду за прву ставку за {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Ред # {0}: Сет добављача за ставку {1}
+DocType: Global Defaults,Default Distance Unit,Уобичајена јединица удаљености
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Ред {0}: Сати вредност мора бити већа од нуле.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Сајт Слика {0} везани са тачком {1} не могу наћи
 DocType: Issue,Content Type,Тип садржаја
@@ -6479,7 +6485,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Дебитна на рачун мора да буде биланса стања
 DocType: Asset,Naming Series,Именовање Сериес
 DocType: Vital Signs,Coated,Премазан
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Ред {0}: Очекивана вредност након корисног животног века мора бити мања од износа бруто куповине
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Ред {0}: Очекивана вредност након корисног животног века мора бити мања од износа бруто куповине
 DocType: GoCardless Settings,GoCardless Settings,ГоЦардлесс Сеттингс
 DocType: Leave Block List,Leave Block List Name,Оставите Име листу блокираних
 DocType: Certified Consultant,Certification Validity,Валидност сертификације
@@ -6548,6 +6554,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Банк Хеадер
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Погледајте лабораторијске тестове
 DocType: Hub Users,Hub Users,Корисници Хуб-а
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Корисник&gt; Корисничка група&gt; Територија
 DocType: Purchase Invoice,Y,И
 DocType: Maintenance Visit,Maintenance Date,Одржавање Датум
 DocType: Purchase Invoice Item,Rejected Serial No,Одбијен Серијски број
@@ -6563,7 +6570,7 @@
 DocType: SG Creation Tool Course,Max Strength,мак Снага
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Инсталирање подешавања
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,ЕДУ-ФСХ-ИИИИ.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Није одабрана белешка за испоруку за купца {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Није одабрана белешка за испоруку за купца {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Службеник {0} нема максимални износ накнаде
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Изаберите ставке на основу датума испоруке
 DocType: Grant Application,Has any past Grant Record,Има било какав прошли Грант Рецорд
@@ -6591,7 +6598,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Резервација хотела
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Кориснички сервис
 DocType: BOM,Thumbnail,Умањени
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Нема контаката са пронађеним ИД-има е-поште.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Нема контаката са пронађеним ИД-има е-поште.
 DocType: Item Customer Detail,Item Customer Detail,Ставка Кориснички Детаљ
 DocType: Notification Control,Prompt for Email on Submission of,Упитај Емаил за подношење
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Максимални износ накнаде запосленог {0} прелази {1}
@@ -6849,7 +6856,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,Не могу да цоверт групи јер је изабран Тип рачуна.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} был изменен. Обновите .
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Стоп кориснике од доношења Леаве апликација на наредним данима.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Шифра производа&gt; Група производа&gt; Бренд
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Ако је неограничен рок истицања за Лоиалти Бодове, задржите Трајање истека празног или 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Чланови тима за одржавање
 DocType: Loyalty Point Entry,Purchase Amount,Куповина Количина
@@ -6857,7 +6863,7 @@
 											to fullfill Sales Order {2}",Није могуће доставити Серијски број {0} ставке {1} пошто је резервисан \ да бисте испунили налог продаје {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,САЛ-КТН-ИИИИ.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Добављач Понуда {0} је направљена
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,До краја године не може бити пре почетка године
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,До краја године не може бити пре почетка године
 DocType: Employee Benefit Application,Employee Benefits,Примања запослених
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
 DocType: Work Order,Manufactured Qty,Произведено Кол
@@ -6873,6 +6879,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Изаберите Батцх Бројеви
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,За ГСТИН
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Рачуни подигао купцима.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Молимо да подесите систем именовања запослених у људским ресурсима&gt; ХР Сеттингс
 DocType: Healthcare Settings,Invoice Appointments Automatically,Аутоматско постављање фактуре
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Ид пројецт
 DocType: Salary Component,Variable Based On Taxable Salary,Варијабла заснована на опорезивој плаћи
@@ -6921,7 +6928,7 @@
 DocType: POS Profile,Account for Change Amount,Рачун за промене Износ
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Повезивање на КуицкБоокс
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Тотал Гаин / Губитак
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Неважећа компанија за рачун компаније.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Неважећа компанија за рачун компаније.
 DocType: Purchase Invoice,input service,улазна услуга
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ред {0}: Партија / налог не подудара са {1} / {2} {3} у {4}
 DocType: Employee Promotion,Employee Promotion,Промоција запослених
@@ -7052,7 +7059,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Преферирана област за смештај
 apps/erpnext/erpnext/config/selling.py +184,Analytics,аналитика
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Корпа је празна
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Молимо вас да подесите систем именовања инструктора у образовању&gt; Образовне поставке
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Ставка {0} нема Серијски број. Само серијализирани предмети \ могу имати испоруку засновану на Серијски број
 DocType: Vehicle,Model,модел
@@ -7082,7 +7088,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Ништа се не мења
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Изаберите ЦСВ датотеку
 DocType: Holiday List,Total Holidays,Тотал Холидаис
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Недостајући предложак е-поште за отпрему. Молимо вас да подесите једну у поставкама испоруке.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Недостајући предложак е-поште за отпрему. Молимо вас да подесите једну у поставкама испоруке.
 DocType: Student Leave Application,Mark as Present,Марк на поклон
 DocType: Supplier Scorecard,Indicator Color,Боја индикатора
 DocType: Purchase Order,To Receive and Bill,За примање и Бил
@@ -7091,7 +7097,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Изаберите серијски број
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,дизајнер
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Услови коришћења шаблона
-DocType: Serial No,Delivery Details,Достава Детаљи
+DocType: Delivery Trip,Delivery Details,Достава Детаљи
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
 DocType: Program,Program Code,programski код
 DocType: Terms and Conditions,Terms and Conditions Help,Правила и услови помоћ
@@ -7115,7 +7121,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Олово Дани Тиме
 DocType: Cash Flow Mapping,Is Income Tax Expense,Да ли је порез на доходак
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Ваша наруџба је испоручена!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ред # {0}: Постављање Дате мора бити исти као и датуму куповине {1} из средстава {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ред # {0}: Постављање Дате мора бити исти као и датуму куповине {1} из средстава {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Проверите ово ако је ученик борави у Института Хостел.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Молимо унесите продајних налога у горњој табели
 ,Stock Summary,стоцк Преглед
diff --git a/erpnext/translations/sv.csv b/erpnext/translations/sv.csv
index 8b604aa..f232fb3 100644
--- a/erpnext/translations/sv.csv
+++ b/erpnext/translations/sv.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Periodens namn
 DocType: Employee,Salary Mode,Lön Läge
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Registrera
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Registrera
 DocType: Patient,Divorced,Skild
 DocType: Support Settings,Post Route Key,Skriv in ruttnyckeln
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Tillåt Punkt som ska läggas till flera gånger i en transaktion
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Ny växelkurs
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Valuta krävs för prislista {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Kommer att beräknas i transaktionen.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Leverantör&gt; Leverantörstyp
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Kundkontakt
 DocType: Patient Appointment,Check availability,Kontrollera tillgänglighet
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Visa öppna
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Serie uppdaterats
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Checka ut
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} i rad {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} i rad {1}
 DocType: Asset Finance Book,Depreciation Start Date,Avskrivning Startdatum
 DocType: Pricing Rule,Apply On,Applicera på
 DocType: Item Price,Multiple Item prices.,Flera produktpriser.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Lab Prescription
 ,Delay Days,Fördröjningsdagar
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,tjänsten Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} är redan refererad i försäljningsfaktura: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} är redan refererad i försäljningsfaktura: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Faktura
 DocType: Purchase Invoice Item,Item Weight Details,Produkt Vikt detaljer
 DocType: Asset Maintenance Log,Periodicity,Periodicitet
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Revisor
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Försäljningsprislista
 DocType: Patient,Tobacco Current Use,Tobaks nuvarande användning
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Startdatum och slutdatum överlappar med jobbkortet <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Försäljningsfrekvens
 DocType: Cost Center,Stock User,Lager Användar
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Relaterad
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Närvaro datum kan inte vara mindre än arbetstagarens Inträdesdatum
 DocType: Grading Scale,Grading Scale Name,Bedömningsskala Namn
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Lägg till användare på Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Lägg till användare på Marketplace
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Detta är en root-kontot och kan inte ändras.
 DocType: Sales Invoice,Company Address,Företags Adress
 DocType: BOM,Operations,Verksamhet
@@ -322,7 +322,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Antal
 DocType: Production Plan,Material Request Detail,Materialförfrågan Detalj
 DocType: Selling Settings,Default Quotation Validity Days,Standard Offertid Giltighetsdagar
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om du vill inkludera skatt i rad {0} i punkt hastighet, skatter i rader {1} måste också inkluderas"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om du vill inkludera skatt i rad {0} i punkt hastighet, skatter i rader {1} måste också inkluderas"
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Payroll Entry,Validate Attendance,Validera närvaro
 DocType: Sales Invoice,Change Amount,Ändra Mängd
@@ -441,7 +441,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Radavstånd för beloppet i ord
 DocType: Vehicle,Additional Details,ytterligare detaljer
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Ingen beskrivning ges
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Leverantör&gt; Leverantörsgrupp
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Begäran om köp.
 DocType: POS Closing Voucher Details,Collected Amount,Samlat belopp
 DocType: Lab Test,Submitted Date,Inlämnad Datum
@@ -486,7 +485,7 @@
 DocType: Student Admission,Student Admission,Student Antagning
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Punkt {0} avbryts
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Avskrivningsraden {0}: Avskrivning Startdatum anges som förflutet datum
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Avskrivningsraden {0}: Avskrivning Startdatum anges som förflutet datum
 DocType: Contract Template,Fulfilment Terms and Conditions,Uppfyllande Villkor
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Materialförfrågan
 DocType: Bank Reconciliation,Update Clearance Date,Uppdatera Clearance Datum
@@ -543,6 +542,7 @@
 DocType: Accounts Settings,Settings for Accounts,Inställningar för konton
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Leverantör faktura nr existerar i inköpsfaktura {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Hantera Säljare.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.",Kan inte bearbeta rutt eftersom Google Maps-inställningar är inaktiverade.
 DocType: Job Applicant,Cover Letter,Personligt brev
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Utestående checkar och insättningar för att rensa
 DocType: Item,Synced With Hub,Synkroniserad med Hub
@@ -602,7 +602,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Nytt tillgångsvärde
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,I takt med vilket kundens Valuta omvandlas till kundens basvaluta
 DocType: Course Scheduling Tool,Course Scheduling Tool,Naturligtvis Scheduling Tool
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rad # {0}: Inköp Faktura kan inte göras mot en befintlig tillgång {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rad # {0}: Inköp Faktura kan inte göras mot en befintlig tillgång {1}
 DocType: Crop Cycle,LInked Analysis,Analys
 DocType: POS Closing Voucher,POS Closing Voucher,POS Closing Voucher
 DocType: Contract,Lapsed,förfallit
@@ -637,6 +637,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} är inte inskriven i kursen {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Elevs namn:
 DocType: POS Closing Voucher Details,Difference,Skillnad
+DocType: Delivery Settings,Delay between Delivery Stops,Fördröjning mellan leveransstopp
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serienummer {0} tillhör inte följesedel {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Det verkar finnas ett problem med serverns GoCardless-konfiguration. Oroa dig inte, i händelse av fel kommer beloppet att återbetalas till ditt konto."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -697,7 +698,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Kvantitet och betyg
 DocType: Delivery Note,% Installed,% Installerad
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,Klassrum / Laboratorier etc där föreläsningar kan schemaläggas.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Bolagets valutor för båda företagen ska matcha för Inter Company Transactions.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Bolagets valutor för båda företagen ska matcha för Inter Company Transactions.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Ange företagetsnamn först
 DocType: Travel Itinerary,Non-Vegetarian,Ickevegetarisk
 DocType: Purchase Invoice,Supplier Name,Leverantörsnamn
@@ -783,7 +784,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Hyrd från datum
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Tillräckligt med delar för att bygga
 DocType: POS Profile User,POS Profile User,POS Profil Användare
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Rad {0}: Avskrivnings Startdatum krävs
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Rad {0}: Avskrivnings Startdatum krävs
 DocType: Purchase Invoice Item,Service Start Date,Service Startdatum
 DocType: Subscription Invoice,Subscription Invoice,Prenumerationsfaktura
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Direkt inkomst
@@ -852,7 +853,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Förkortningen har redan används för ett annat företag
 DocType: Selling Settings,Default Customer Group,Standard Kundgrupp
 DocType: Employee,IFSC Code,IFSC-kod
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Startdatum och slutdatum överlappar med jobbkortet <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Om inaktiverad ""Rundad Totalt fältet inte syns i någon transaktion"
 DocType: BOM,Operating Cost,Rörelse Kostnad
 DocType: Crop,Produced Items,Producerade produkter
@@ -904,7 +904,7 @@
 DocType: Supplier,Prevent RFQs,Förhindra RFQs
 DocType: Hub User,Hub User,Hub-användare
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Skapa kundorder
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Löneskalan lämnas in för perioden från {0} till {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Löneskalan lämnas in för perioden från {0} till {1}
 DocType: Project Task,Project Task,Projektuppgift
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Inlösta poäng
 ,Lead Id,Prospekt Id
@@ -1035,7 +1035,7 @@
 DocType: Fee Validity,Max number of visit,Max antal besök
 ,Hotel Room Occupancy,Hotellrumsboende
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Tidrapport skapat:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Ställ in standard Kontant eller bankkonto i betalningssätt {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Ställ in standard Kontant eller bankkonto i betalningssätt {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Skriva in
 DocType: GST Settings,GST Settings,GST-inställningar
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Valuta bör vara samma som Prislista Valuta: {0}
@@ -1090,7 +1090,7 @@
 DocType: Vehicle Log,Service Details,Service detaljer
 DocType: Lab Test Template,Grouped,grupperade
 DocType: Selling Settings,Delivery Note Required,Följesedel Krävs
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Inlämning av lönekläder ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Inlämning av lönekläder ...
 DocType: Bank Guarantee,Bank Guarantee Number,Bankgaranti nummer
 DocType: Bank Guarantee,Bank Guarantee Number,Bankgaranti nummer
 DocType: Assessment Criteria,Assessment Criteria,Bedömningskriterier
@@ -1116,13 +1116,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Betalning Entry redan har skapats
 DocType: Request for Quotation,Get Suppliers,Få leverantörer
 DocType: Purchase Receipt Item Supplied,Current Stock,Nuvarande lager
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Rad # {0}: Asset {1} inte kopplad till punkt {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Rad # {0}: Asset {1} inte kopplad till punkt {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Förhandsvisning lönebesked
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Konto {0} har angetts flera gånger
 DocType: Account,Expenses Included In Valuation,Kostnader ingår i rapporten
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Du kan bara förnya om ditt medlemskap löper ut inom 30 dagar
 DocType: Shopping Cart Settings,Show Stock Availability,Visa lager tillgänglighet
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Ange {0} i tillgångskategori {1} eller företag {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Ange {0} i tillgångskategori {1} eller företag {2}
 DocType: Location,Longitude,Longitud
 ,Absent Student Report,Frånvarorapport Student
 DocType: Crop,Crop Spacing UOM,Beskära Spacing UOM
@@ -1195,7 +1195,7 @@
 DocType: Soil Texture,Sand,Sand
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energi
 DocType: Opportunity,Opportunity From,Möjlighet Från
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rad {0}: {1} Serienummer krävs för punkt {2}. Du har angett {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Rad {0}: {1} Serienummer krävs för punkt {2}. Du har angett {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Välj en tabell
 DocType: BOM,Website Specifications,Webbplats Specifikationer
 DocType: Special Test Items,Particulars,uppgifter
@@ -1287,7 +1287,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Produkter med högre medelvikt kommer att visas högre
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Lab-test och vitala tecken
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bankavstämning Detalj
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Rad # {0}: Asset {1} måste lämnas in
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Rad # {0}: Asset {1} måste lämnas in
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Ingen anställd hittades
 DocType: Item,If subcontracted to a vendor,Om underleverantörer till en leverantör
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Studentgruppen är redan uppdaterad.
@@ -1341,7 +1341,6 @@
 DocType: Loyalty Program Collection,Tier Name,Tier Name
 DocType: HR Settings,Enter retirement age in years,Ange pensionsåldern i år
 DocType: Crop,Target Warehouse,Target Lager
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ange Naming Series för {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Payroll Employee Detail,Payroll Employee Detail,Lön Employee Detail
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Var god välj ett lager
 DocType: Cheque Print Template,Starting location from left edge,Startplats från vänstra kanten
@@ -1431,7 +1430,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Planera material för underenheter
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Säljpartners och Territory
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} måste vara aktiv
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Inga objekt tillgängliga för överföring
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Inga objekt tillgängliga för överföring
 DocType: Employee Boarding Activity,Activity Name,Aktivitetsnamn
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Ändra Utgivningsdatum
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Slutproduktkvantitet <b>{0}</b> och För kvantitet <b>{1}</b> kan inte vara annorlunda
@@ -1661,6 +1660,7 @@
 DocType: Project,First Email,Första Email
 DocType: Company,Exception Budget Approver Role,Undantag Budget Approver Rol
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date",När den är inställd kommer den här fakturan att vara kvar tills det angivna datumet
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserverat lager i kundorder / färdigvarulagret
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Försäljningsbelopp
 DocType: Repayment Schedule,Interest Amount,räntebelopp
@@ -1672,7 +1672,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Uppgifter
 DocType: Asset,Scrapped,skrotas
 DocType: Item,Item Defaults,Objektstandard
-DocType: Purchase Invoice,Returns,avkastning
+DocType: Cashier Closing,Returns,avkastning
 DocType: Job Card,WIP Warehouse,WIP Lager
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Löpnummer {0} är under underhållsavtal upp {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,Rekrytering
@@ -1686,7 +1686,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Överföringstyp
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Försäljnings Kostnader
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kund&gt; Kundgrupp&gt; Territorium
 DocType: Diagnosis,Diagnosis,Diagnos
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standard handla
 DocType: Attendance Request,Explanation,Förklaring
@@ -1699,7 +1698,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Inköpsorder Föremål Försenade
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Postnummer
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Kundorder {0} är {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Välj ränteintäkter konto i lån {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Välj ränteintäkter konto i lån {0}
 DocType: Opportunity,Contact Info,Kontaktinformation
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Göra Stock Inlägg
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Kan inte marknadsföra Medarbetare med status Vänster
@@ -1711,7 +1710,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Faktura kan inte göras för noll faktureringstid
 DocType: Company,Date of Commencement,Datum för inledande
 DocType: Sales Person,Select company name first.,Välj företagsnamn först.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},E-post skickas till {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},E-post skickas till {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Offerter mottaget från leverantörer.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Byt BOM och uppdatera senaste pris i alla BOM
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Till {0} | {1} {2}
@@ -1733,7 +1732,7 @@
 DocType: Asset Movement,From Employee,Från anställd
 DocType: Driver,Cellphone Number,telefon nummer
 DocType: Project,Monitor Progress,Monitor Progress
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Varning: Systemet kommer inte att kontrollera överdebitering, eftersom belopp för punkt {0} i {1} är noll"
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Varning: Systemet kommer inte att kontrollera överdebitering, eftersom belopp för punkt {0} i {1} är noll"
 DocType: Journal Entry,Make Difference Entry,Skapa Differensinlägg
 DocType: Supplier Quotation,Auto Repeat Section,Auto Repeat Section
 DocType: Upload Attendance,Attendance From Date,Närvaro Från datum
@@ -1836,7 +1835,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Rad # {0}:  avvisat antal kan inte anmälas för retur
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Ändring av kundgrupp för vald kund är inte tillåtet.
 ,Purchase Order Items To Be Billed,Inköpsorder Artiklar att faktureras
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Uppdaterar beräknade ankomsttider.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Uppdaterar beräknade ankomsttider.
 DocType: Program Enrollment Tool,Enrollment Details,Inskrivningsdetaljer
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Kan inte ställa in flera standardinställningar för ett företag.
 DocType: Purchase Invoice Item,Net Rate,Netto kostnad
@@ -1850,7 +1849,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Lämna typ är galatory
 DocType: Support Settings,Close Issue After Days,Nära Problem Efter dagar
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Du måste vara användare med systemhanteraren och objekthanterarens roller för att lägga till användare på Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Du måste vara användare med systemhanteraren och objekthanterarens roller för att lägga till användare på Marketplace.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Lämna tomt om det anses vara för alla grenar
 DocType: Job Opening,Staffing Plan,Personalplan
 DocType: Bank Guarantee,Validity in Days,Giltighet i dagar
@@ -1872,7 +1871,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Duplicate raden {0} med samma {1}
 DocType: Marketplace Settings,Disable Marketplace,Inaktivera Marketplace
 ,Trial Balance,Trial Balans
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Räkenskapsårets {0} hittades inte
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Räkenskapsårets {0} hittades inte
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Ställa in Anställda
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotellbokningsanvändare
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Välj prefix först
@@ -1980,7 +1979,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Kunde inte logga in
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Tillgång {0} skapad
 DocType: Special Test Items,Special Test Items,Särskilda testpunkter
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Du måste vara en användare med systemhanteraren och objekthanterarens roller för att registrera dig på Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Du måste vara en användare med systemhanteraren och objekthanterarens roller för att registrera dig på Marketplace.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Betalningssätt
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Enligt din tilldelade lönestruktur kan du inte ansöka om förmåner
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Website Bild bör vara en offentlig fil eller webbadress
@@ -1992,7 +1991,7 @@
 DocType: Warehouse,Warehouse Contact Info,Lagrets kontaktinfo
 DocType: Payment Entry,Write Off Difference Amount,Skriv differensen Belopp
 DocType: Volunteer,Volunteer Name,Frivilligt namn
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Rader med dubbla förfallodatum i andra rader hittades: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Rader med dubbla förfallodatum i andra rader hittades: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: Anställd e-post hittades inte, därför e-post skickas inte"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Ingen lönestruktur tilldelad för anställd {0} på angivet datum {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Fraktregeln gäller inte för land {0}
@@ -2082,6 +2081,7 @@
 DocType: Salary Component,Earning,Tjänar
 DocType: Supplier Scorecard,Scoring Criteria,Scoringskriterier
 DocType: Purchase Invoice,Party Account Currency,Party konto Valuta
+DocType: Delivery Trip,Total Estimated Distance,Totalt beräknat avstånd
 ,BOM Browser,BOM läsare
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Vänligen uppdatera din status för den här träningsevenemanget
 DocType: Item Barcode,EAN,EAN
@@ -2120,7 +2120,7 @@
 DocType: Activity Cost,Projects,Projekt
 DocType: Payment Request,Transaction Currency,transaktionsvaluta
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Från {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Vissa e-postmeddelanden är ogiltiga
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Vissa e-postmeddelanden är ogiltiga
 DocType: Work Order Operation,Operation Description,Drift Beskrivning
 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.,Det går inte att ändra räkenskapsårets Startdatum och Räkenskapsårets Slutdatum när verksamhetsåret sparas.
 DocType: Quotation,Shopping Cart,Kundvagn
@@ -2144,7 +2144,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Netto Förändring av anläggningstillgång
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Antal
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lämna tomt om det anses vara för alla beteckningar
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Avgift av typ ""faktiska"" i raden {0} kan inte ingå i artikelomsättningen"
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Avgift av typ ""faktiska"" i raden {0} kan inte ingå i artikelomsättningen"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Från Daterad tid
 DocType: Shopify Settings,For Company,För Företag
@@ -2158,7 +2158,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Det fanns fel som skapade kursschema
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Den första expense-godkännaren i listan kommer att ställas som standard Expense Approver.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,kan inte vara större än 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Du måste vara en annan användare än Administratör med systemhanteraren och objekthanterarens roller för att registrera dig på Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Du måste vara en annan användare än Administratör med systemhanteraren och objekthanterarens roller för att registrera dig på Marketplace.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Produkt  {0} är inte en lagervara
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Ledig
@@ -2187,7 +2187,7 @@
 DocType: HR Settings,Employee Settings,Personal Inställningar
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Hämtar betalningssystemet
 ,Batch-Wise Balance History,Batchvis Balans Historik
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Row # {0}: Kan inte ställa in ränta om beloppet är större än fakturerat belopp för punkt {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Row # {0}: Kan inte ställa in ränta om beloppet är större än fakturerat belopp för punkt {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Utskriftsinställningar uppdateras i respektive utskriftsformat
 DocType: Package Code,Package Code,Package Code
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Lärling
@@ -2421,7 +2421,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} lediga tjänster och {1} budget för {2} som redan planerats för dotterbolag på {3}. \ Du kan bara planera upp till {4} lediga tjänster och och budget {5} enligt personalplan {6} för moderbolaget {3}.
 DocType: HR Settings,Stop Birthday Reminders,Stop födelsedag Påminnelser
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Ställ Default Lön betalas konto i bolaget {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Ställ Default Lön betalas konto i bolaget {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Få ekonomisk uppdelning av skatter och avgifter data av Amazon
 DocType: SMS Center,Receiver List,Mottagare Lista
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Sök Produkt
@@ -2491,7 +2491,7 @@
 DocType: Vital Signs,Constipated,toppad
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Mot leverantörsfakturor {0} den {1}
 DocType: Customer,Default Price List,Standard Prislista
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Asset Rörelse rekord {0} skapades
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Asset Rörelse rekord {0} skapades
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Inga föremål hittades.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Du kan inte ta bort Räkenskapsårets {0}. Räkenskapsårets {0} är satt som standard i Globala inställningar
 DocType: Share Transfer,Equity/Liability Account,Eget kapital / Ansvarskonto
@@ -2631,6 +2631,7 @@
 DocType: Blanket Order,Order Type,Beställ Type
 ,Item-wise Sales Register,Produktvis säljregister
 DocType: Asset,Gross Purchase Amount,Bruttoköpesumma
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Artikelnummer&gt; Varugrupp&gt; Varumärke
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Öppningsbalanser
 DocType: Asset,Depreciation Method,avskrivnings Metod
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Är denna skatt inkluderar i Basic kursen?
@@ -2714,7 +2715,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Åtgärd om årlig budget överskrider PO
 DocType: Student Leave Application,Student Leave Application,Student Lämna Application
 DocType: Item,Will also apply for variants,Kommer också att ansöka om varianter
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Asset kan inte avbrytas, eftersom det redan är {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Asset kan inte avbrytas, eftersom det redan är {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Anställd {0} på Halvdag på {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Totalt arbetstid bör inte vara större än max arbetstid {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,På
@@ -2738,6 +2739,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Hämta data
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Max tillåten semester i ledighetstyp {0} är {1}
 DocType: SMS Center,Create Receiver List,Skapa Mottagare Lista
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Tillgänglig för användning Datum ska vara efter inköpsdatum
 DocType: Vehicle,Wheels,hjul
 DocType: Packing Slip,To Package No.,Förpackningens Nej
 DocType: Patient Relation,Family,Familj
@@ -2751,7 +2753,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Faktureringsvaluta måste vara lika med antingen standardbolagets valuta eller parti konto konto valuta
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Anger att paketet är en del av denna leverans (endast utkast)
 DocType: Soil Texture,Loam,Lerjord
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Rad {0}: Förfallodatum kan inte vara innan bokningsdatum
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Rad {0}: Förfallodatum kan inte vara innan bokningsdatum
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Skapa inbetalninginlägg
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Kvantitet för artikel {0} måste vara mindre än {1}
 ,Sales Invoice Trends,Fakturan Trender
@@ -2824,7 +2826,7 @@
 DocType: Guardian,Guardian Interests,Guardian Intressen
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Uppdatera kontonamn / nummer
 DocType: Naming Series,Current Value,Nuvarande Värde
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flera räkenskapsår finns för dagen {0}. Ställ företag under räkenskapsåret
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flera räkenskapsår finns för dagen {0}. Ställ företag under räkenskapsåret
 DocType: Education Settings,Instructor Records to be created by,Instruktörsrekord som ska skapas av
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} skapad
 DocType: GST Account,GST Account,GST-konto
@@ -2841,7 +2843,7 @@
 DocType: Sales Person,Name and Employee ID,Namn och Anställnings ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Förfallodatum kan inte vara före Publiceringsdatum
 DocType: Website Item Group,Website Item Group,Webbplats Produkt Grupp
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Ingen löneavgift gjord för att lämna in för ovanstående valda kriterier ELLER lön som redan lämnats in
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Ingen löneavgift gjord för att lämna in för ovanstående valda kriterier ELLER lön som redan lämnats in
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Tullar och skatter
 DocType: Projects Settings,Projects Settings,Projektinställningar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Ange Referensdatum
@@ -2850,7 +2852,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Medföljande Antal
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Material Begäran Produkt
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Avbryt köps kvitto {0} först
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Avbryt köps kvitto {0} först
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Träd artikelgrupper.
 DocType: Production Plan,Total Produced Qty,Totalt producerad mängd
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Det går inte att hänvisa till radnr större än eller lika med aktuell rad nummer för denna avgiftstyp
@@ -2960,6 +2962,7 @@
 ,Vehicle Expenses,fordons Kostnader
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Skapa Lab Test (s) på Försäljningsfaktura Skicka
 DocType: Serial No,Invoice Details,Faktura detaljer
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Aktivera Google Maps Inställningar för att uppskatta och optimera rutter
 DocType: Grant Application,Show on Website,Visa på hemsidan
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Börja på
 DocType: Hub Tracked Item,Hub Category,Navkategori
@@ -3000,7 +3003,7 @@
 DocType: Inpatient Record,B Positive,B Positiv
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Maximal nytta av anställd {0} överstiger {1} med summan {2} av tidigare hävdat \ belopp
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rad # {0}: Antal måste vara en, som objektet är en anläggningstillgång. Använd separat rad för flera st."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rad # {0}: Antal måste vara en, som objektet är en anläggningstillgång. Använd separat rad för flera st."
 DocType: Leave Block List Allow,Leave Block List Allow,Lämna Block List Tillåt
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Förkortning kan inte vara tomt
 DocType: Patient Medical Record,Patient Medical Record,Patient Medical Record
@@ -3035,7 +3038,7 @@
 DocType: Workstation,Wages per hour,Löner per timme
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Lagersaldo i Batch {0} kommer att bli negativ {1} till punkt {2} på Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Efter Material Framställningar har höjts automatiskt baserat på punkt re-order nivå
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Konto {0} är ogiltig. Konto Valuta måste vara {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Konto {0} är ogiltig. Konto Valuta måste vara {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Från datum {0} kan inte vara efter arbetstagarens avlastningsdatum {1}
 DocType: Supplier,Is Internal Supplier,Är Intern Leverantör
 DocType: Employee,Create User Permission,Skapa användarbehörighet
@@ -3181,7 +3184,7 @@
 DocType: Account,Fixed Asset,Fast tillgångar
 DocType: Amazon MWS Settings,After Date,Efter datum
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Serial numrerade Inventory
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Ogiltig {0} för Inter Company Faktura.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Ogiltig {0} för Inter Company Faktura.
 ,Department Analytics,Department Analytics
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-post hittades inte i standardkontakt
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Generera hemlighet
@@ -3194,7 +3197,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Program i avgiftsstrukturen och studentgruppen {0} är olika.
 DocType: Bank Statement Transaction Entry,Receivable Account,Fordran Konto
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Giltig från datum måste vara mindre än Giltigt datum.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Rad # {0}: Asset {1} är redan {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Rad # {0}: Asset {1} är redan {2}
 DocType: Quotation Item,Stock Balance,Lagersaldo
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Kundorder till betalning
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,vd
@@ -3236,6 +3239,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Debitering krävs
 DocType: Clinical Procedure,Inpatient Record,Inpatient Record
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Tidrapporter hjälpa till att hålla reda på tid, kostnad och fakturering för aktiviteter som utförts av ditt team"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Leverantör&gt; Leverantörstyp
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Inköps Prislista
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Datum för transaktion
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Mallar med leverantörsspecifika variabler.
@@ -3279,7 +3283,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Exchange vinst / förlust
 DocType: Opportunity,Lost Reason,Förlorad Anledning
 DocType: Amazon MWS Settings,Enable Amazon,Aktivera Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Rad # {0}: Konto {1} hör inte till företag {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Rad # {0}: Konto {1} hör inte till företag {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Det gick inte att hitta DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Ny adress
 DocType: Quality Inspection,Sample Size,Provstorlek
@@ -3391,7 +3395,7 @@
 DocType: Water Analysis,Origin,Ursprung
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Detta dokument är över gränsen med {0} {1} för posten {4}. Är du göra en annan {3} mot samma {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Ställ återkommande efter att ha sparat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Välj förändringsbelopp konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Välj förändringsbelopp konto
 DocType: Purchase Invoice,Price List Currency,Prislista Valuta
 DocType: Naming Series,User must always select,Användaren måste alltid välja
 DocType: Stock Settings,Allow Negative Stock,Tillåt Negativ lager
@@ -3433,7 +3437,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Är du säker på att du vill avbryta detta möte?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Hotellrumsprispaket
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Sales Pipeline
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Ställ in standardkonto i lönedel {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Ställ in standardkonto i lönedel {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Obligatorisk På
 DocType: Rename Tool,File to Rename,Fil att byta namn på
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Välj BOM till punkt i rad {0}
@@ -3454,7 +3458,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostnad för köpta varor
 DocType: Employee Separation,Employee Separation Template,Medarbetarens separationsmall
 DocType: Selling Settings,Sales Order Required,Kundorder krävs
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Bli en säljare
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Bli en säljare
 DocType: Purchase Invoice,Credit To,Kredit till
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Aktiva Leads / Kunder
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Lämna tomt för att använda standardleveransnotatformatet
@@ -3496,7 +3500,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Gör Skattemall
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Användarforum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Råvaror kan inte vara tomt.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Rad # {0} (Betalnings tabell): Beloppet måste vara negativt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Rad # {0} (Betalnings tabell): Beloppet måste vara negativt
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Det gick inte att uppdatera lager, faktura innehåller släppa sjöfarten objekt."
 DocType: Contract,Fulfilment Status,Uppfyllningsstatus
 DocType: Lab Test Sample,Lab Test Sample,Lab Test Prov
@@ -3636,7 +3640,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Doc Datum
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Arvodes Records Skapad - {0}
 DocType: Asset Category Account,Asset Category Account,Tillgångsslag konto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Rad # {0} (Betalnings tabell): Beloppet måste vara positivt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Rad # {0} (Betalnings tabell): Beloppet måste vara positivt
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Det går inte att producera mer artiklar {0} än kundorderns mängd {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Välj Attributvärden
 DocType: Purchase Invoice,Reason For Issuing document,Orsak för att utfärda dokument
@@ -3691,7 +3695,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Tidpunkt för material mottogs
 DocType: Products Settings,Products per Page,Produkter per sida
 DocType: Stock Ledger Entry,Outgoing Rate,Utgående betyg
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,eller
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,eller
 DocType: Sales Order,Billing Status,Faktureringsstatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Rapportera ett problem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Utility Kostnader
@@ -3719,7 +3723,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Arbetsgivarbeskattningsdeklaration
 DocType: Payment Entry,Cheque/Reference Date,Check / Referens Datum
 DocType: Purchase Invoice,Total Taxes and Charges,Totala skatter och avgifter
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Tillgänglig för användning Datum är angiven som tidigare datum
 DocType: Employee,Emergency Contact,Kontaktinformation I En Nödsituation
 DocType: Bank Reconciliation Detail,Payment Entry,betalning Entry
 ,sales-browser,försäljning-browser
@@ -3766,6 +3769,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Är Retur (Kreditnot)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Starta jobbet
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Serienummer krävs för tillgången {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ange Naming Series för {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Funktionshindrade mall får inte vara standardmall
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,För rad {0}: Ange planerad mängd
 DocType: Account,Income Account,Inkomst konto
@@ -3779,6 +3783,7 @@
 DocType: Loyalty Program,Help Section,Hjälpavsnitt
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Föregående
 DocType: Appraisal Goal,Key Responsibility Area,Nyckelansvar Områden
+DocType: Delivery Trip,Distance UOM,Avstånd UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Student partier hjälpa dig att spåra närvaro, bedömningar och avgifter för studenter"
 DocType: Payment Entry,Total Allocated Amount,Sammanlagda anslaget
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Ange standardinventeringskonto för evig inventering
@@ -3820,7 +3825,7 @@
 DocType: Item Supplier,Item Supplier,Produkt Leverantör
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Ange Artikelkod att få batchnr
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Välj ett värde för {0} offert_till {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Inga objekt valda för överföring
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Inga objekt valda för överföring
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alla adresser.
 DocType: Company,Stock Settings,Stock Inställningar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammanslagning är endast möjligt om följande egenskaper är desamma i båda posterna. Är gruppen, Root typ, Företag"
@@ -4106,7 +4111,7 @@
 DocType: Patient,Personal and Social History,Personlig och social historia
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Användare {0} skapad
 DocType: Fee Schedule,Fee Breakup for each student,Avgift för varje elev
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totalt förskott ({0}) mot Order {1} kan inte vara större än totalsumman ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totalt förskott ({0}) mot Order {1} kan inte vara större än totalsumman ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Välj Månads Distribution till ojämnt fördela målen mellan månader.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Ändra kod
 DocType: Purchase Invoice Item,Valuation Rate,Värderings betyg
@@ -4115,7 +4120,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Utnyttjade ITC Cess
 ,Student Monthly Attendance Sheet,Student Monthly Närvaro Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Fraktregeln gäller endast för Försäljning
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Avskrivningsraden {0}: Nästa avskrivningsdatum kan inte vara före inköpsdatum
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Avskrivningsraden {0}: Nästa avskrivningsdatum kan inte vara före inköpsdatum
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt Startdatum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Tills
 DocType: Rename Tool,Rename Log,Ändra logg
@@ -4133,12 +4138,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Hur ofta ska projektet och företaget uppdateras baserat på försäljningstransaktioner.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Går ut den
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Lägg till elever
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Ta bort medarbetaren <a href=""#Form/Employee/{0}"">{0}</a> \ för att avbryta det här dokumentet"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Välj {0}
 DocType: C-Form,C-Form No,C-form Nr
 DocType: BOM,Exploded_items,Vidgade_artiklar
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Distans
+DocType: Delivery Stop,Distance,Distans
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Lista dina produkter eller tjänster som du köper eller säljer.
 DocType: Water Analysis,Storage Temperature,Förvaringstemperatur
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4165,7 +4168,7 @@
 DocType: Homepage,Company Description for website homepage,Beskrivning av företaget för webbplats hemsida
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","För att underlätta för kunderna, kan dessa koder användas i utskriftsformat som fakturor och följesedlar"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Namn
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Det gick inte att hämta information för {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Det gick inte att hämta information för {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Öppningsdatum Journal
 DocType: Contract,Fulfilment Terms,Uppfyllningsvillkor
 DocType: Sales Invoice,Time Sheet List,Tidrapportering Lista
@@ -4348,7 +4351,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Välj studenter manuellt för aktivitetsbaserad grupp
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Välj studenter manuellt för aktivitetsbaserad grupp
 DocType: Journal Entry,User Remark,Användar Anmärkning
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Optimera rutter.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Optimera rutter.
 DocType: Travel Itinerary,Non Diary,Icke-dagbok
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Kan inte skapa kvarhållningsbonus för kvarvarande anställda
 DocType: Lead,Market Segment,Marknadssegment
@@ -4379,7 +4382,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Lojalitetsprogram
 DocType: Student Guardian,Father,Far
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Support biljetter
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&quot;Update Stock&quot; kan inte kontrolleras för anläggningstillgång försäljning
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&quot;Update Stock&quot; kan inte kontrolleras för anläggningstillgång försäljning
 DocType: Bank Reconciliation,Bank Reconciliation,Bankavstämning
 DocType: Attendance,On Leave,tjänstledig
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Hämta uppdateringar
@@ -4424,7 +4427,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Löpnummer och Batch
 DocType: Warranty Claim,From Company,Från Företag
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Summan av Mängder av bedömningskriterier måste vara {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Ställ in Antal Avskrivningar bokat
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Ställ in Antal Avskrivningar bokat
 DocType: Supplier Scorecard Period,Calculations,beräkningar
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Värde eller Antal
 DocType: Payment Terms Template,Payment Terms,Betalningsvillkor
@@ -4444,7 +4447,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Rabatt (%) på prislista med marginal
 DocType: Healthcare Service Unit Type,Rate / UOM,Betygsätt / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,alla Lager
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Nej {0} hittades för Inter Company Transactions.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Nej {0} hittades för Inter Company Transactions.
 DocType: Travel Itinerary,Rented Car,Hyrbil
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Om ditt företag
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Tack till kontot måste vara ett balanskonto
@@ -4546,6 +4549,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Plantanalys Kriterier
 DocType: Cheque Print Template,Cheque Height,Check Höjd
 DocType: Supplier,Supplier Details,Leverantör Detaljer
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vänligen uppsätt nummerserien för deltagande via Inställningar&gt; Numreringsserie
 DocType: Setup Progress,Setup Progress,Setup Progress
 DocType: Expense Claim,Approval Status,Godkännandestatus
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Från Talet måste vara lägre än värdet i rad {0}
@@ -4639,7 +4643,6 @@
 DocType: Travel Request,Fully Sponsored,Fullt sponsrad
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Kund {0} är skapad.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vänligen uppsättning Anställningsnamnssystem i mänsklig resurs&gt; HR-inställningar
 DocType: Stock Settings,Limit Percent,gräns Procent
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,För närvarande finns ingen lager i lager
 ,Payment Period Based On Invoice Date,Betalningstiden Baserad på Fakturadatum
@@ -4698,7 +4701,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Källa Lager
 DocType: Installation Note,Installation Date,Installations Datum
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Dela Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Rad # {0}: Asset {1} tillhör inte företag {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Rad # {0}: Asset {1} tillhör inte företag {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Försäljningsfaktura {0} skapad
 DocType: Employee,Confirmation Date,Bekräftelsedatum
 DocType: Inpatient Occupancy,Check Out,Checka ut
@@ -4718,6 +4721,7 @@
 DocType: Production Plan,Sales Orders Detail,Försäljningsorder detalj
 DocType: Bin,Requested Quantity,begärda Kvantitet
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-fee-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Vänligen installera Instruktör Naming System i Utbildning&gt; Utbildningsinställningar
 DocType: Patient,Marital Status,Civilstånd
 DocType: Stock Settings,Auto Material Request,Automaterialförfrågan
 DocType: Woocommerce Settings,API consumer secret,API konsumenthemlighet
@@ -4770,7 +4774,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Välj dagar
 DocType: Academic Term,Term Name,termen Namn
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Kredit ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Skapa lönesedlar ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Skapa lönesedlar ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Du kan inte redigera rotknutpunkt.
 DocType: Buying Settings,Purchase Order Required,Inköpsorder krävs
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Timer
@@ -4808,7 +4812,7 @@
 DocType: Account,Rate at which this tax is applied,I takt med vilken denna skatt tillämpas
 DocType: Cash Flow Mapper,Section Name,Avsnittsnamn
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Ombeställningskvantitet
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Avskrivningsraden {0}: Förväntat värde efter nyttjandeperioden måste vara större än eller lika med {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Avskrivningsraden {0}: Förväntat värde efter nyttjandeperioden måste vara större än eller lika med {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Nuvarande jobb Öppningar
 DocType: Company,Stock Adjustment Account,Lager Justering Konto
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Avskrivning
@@ -4855,7 +4859,7 @@
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Slut på AMC
 DocType: Opportunity,Opportunity Amount,Opportunity Amount
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antal Avskrivningar bokat kan inte vara större än Totalt antal Avskrivningar
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antal Avskrivningar bokat kan inte vara större än Totalt antal Avskrivningar
 DocType: Purchase Order,Order Confirmation Date,Orderbekräftelsedatum
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Skapa Servicebesök
@@ -4896,7 +4900,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Sats:
 DocType: Volunteer,Afternoon,Eftermiddag
 DocType: Loyalty Program,Loyalty Program Help,Lojalitetsprogram Hjälp
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} {1} &quot;är inaktiverad
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} {1} &quot;är inaktiverad
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ange som Open
 DocType: Cheque Print Template,Scanned Cheque,skannad Check
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Skicka automatiska meddelanden till kontakter på Skickar transaktioner.
@@ -4909,7 +4913,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Punkt och garantiinformation
 DocType: Chapter,Chapter Members,Kapitelmedlemmar
 DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Obs: Betalningpost kommer inte skapas eftersom ""Kontanter eller bankkonto"" angavs inte"
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Obs: Betalningpost kommer inte skapas eftersom ""Kontanter eller bankkonto"" angavs inte"
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Projektet {0} finns redan
 DocType: Clinical Procedure,Nursing User,Sjuksköterska användare
 DocType: Employee Benefit Application,Payroll Period,Löneperiod
@@ -4917,6 +4921,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Serienummer {0} hör inte till batch {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Ansvarsområden
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Giltighetstiden för denna notering har upphört.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Ta bort medarbetaren <a href=""#Form/Employee/{0}"">{0}</a> \ för att avbryta det här dokumentet"
 DocType: Expense Claim Account,Expense Claim Account,Räkningen konto
 DocType: Account,Capital Work in Progress,Kapitalarbete pågår
 DocType: Accounts Settings,Allow Stale Exchange Rates,Tillåt inaktuella valutakurser
@@ -4998,7 +5004,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Problem Material
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Anslut Shopify med ERPNext
 DocType: Material Request Item,For Warehouse,För Lager
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Leveransnoteringar {0} uppdaterad
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Leveransnoteringar {0} uppdaterad
 DocType: Employee,Offer Date,Erbjudandet Datum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Citat
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Du befinner dig i offline-läge. Du kommer inte att kunna ladda tills du har nätverket.
@@ -5049,7 +5055,7 @@
 DocType: Shipping Rule,Calculate Based On,Beräkna baserad på
 DocType: Contract,Unfulfilled,Ouppfylld
 DocType: Delivery Note Item,From Warehouse,Från Warehouse
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Inga anställda för nämnda kriterier
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Inga anställda för nämnda kriterier
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Inga objekt med Bill of Materials att tillverka
 DocType: Shopify Settings,Default Customer,Standardkund
 DocType: Sales Stage,Stage Name,Artistnamn
@@ -5091,7 +5097,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skattebelopp efter rabatt Belopp
 DocType: Patient,Inpatient Status,Inpatient Status
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Det dagliga arbetet Sammanfattning Inställningar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Den valda prislistan ska ha kontroll och köpfält.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Den valda prislistan ska ha kontroll och köpfält.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Vänligen ange Reqd by Date
 DocType: Payment Entry,Internal Transfer,Intern transaktion
 DocType: Asset Maintenance,Maintenance Tasks,Underhållsuppgifter
@@ -5128,7 +5134,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Gruppera efter
 DocType: Guardian,Interests,Intressen
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Aktivera / inaktivera valutor.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Kunde inte skicka in några löneskalor
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Kunde inte skicka in några löneskalor
 DocType: Exchange Rate Revaluation,Get Entries,Få inlägg
 DocType: Production Plan,Get Material Request,Få Material Request
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Post Kostnader
@@ -5215,7 +5221,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Utgiftskonto är obligatorisk för produkten {0}
 DocType: BOM,Website Description,Webbplats Beskrivning
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Nettoförändringen i eget kapital
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Vänligen avbryta inköpsfaktura {0} först
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Vänligen avbryta inköpsfaktura {0} först
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Inte tillåten. Avaktivera serviceenhetstypen
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-postadress måste vara unikt, redan för {0}"
 DocType: Serial No,AMC Expiry Date,AMC Förfallodatum
@@ -5255,7 +5261,7 @@
 DocType: Hotel Room,Hotel Room,Hotellrum
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Kontot {0} till inte företaget {1}
 DocType: Leave Type,Rounding,Avrundning
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Serienumren i rad {0} matchar inte med leveransnotering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Serienumren i rad {0} matchar inte med leveransnotering
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Dispensed Amount (Pro-rated)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Därefter filtreras prisreglerna utifrån kund, kundgrupp, territorium, leverantör, leverantörsgrupp, kampanj, försäljningspartner etc."
 DocType: Student,Guardian Details,Guardian Detaljer
@@ -5310,7 +5316,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Lager krävs för Lagervara {0}
 DocType: Leave Allocation,Unused leaves,Oanvända blad
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Gör återbetalningsinmatning
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Alla avdelningar
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Alla avdelningar
 DocType: Healthcare Service Unit,Vacant,Ledig
 DocType: Patient,Alcohol Past Use,Alkohol tidigare användning
 DocType: Fertilizer Content,Fertilizer Content,Gödselinnehåll
@@ -5321,7 +5327,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Arbetsorder {0} måste avbrytas innan du avbryter denna försäljningsorder
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Fetch expanderande BOM (inklusive underenheter)
 DocType: Authorization Rule,Applicable To (Employee),Är tillämpligt för (anställd)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Förfallodatum är obligatorisk
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Förfallodatum är obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Påslag för Attribut {0} inte kan vara 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Förmånstyp och belopp
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Rum bokade
@@ -5470,7 +5476,7 @@
 DocType: Purchase Invoice Item,Total Weight,Totalvikt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Försäljningsprovision
 DocType: Job Offer Term,Value / Description,Värde / Beskrivning
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rad # {0}: Asset {1} kan inte lämnas, är det redan {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rad # {0}: Asset {1} kan inte lämnas, är det redan {2}"
 DocType: Tax Rule,Billing Country,Faktureringsland
 DocType: Purchase Order Item,Expected Delivery Date,Förväntat leveransdatum
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurang Order Entry
@@ -5509,12 +5515,13 @@
 DocType: Maintenance Visit,Breakdown,Nedbrytning
 DocType: Travel Itinerary,Vegetarian,Vegetarian
 DocType: Patient Encounter,Encounter Date,Mötesdatum
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan inte väljas {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan inte väljas {1}
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bankuppgifter
 DocType: Purchase Receipt Item,Sample Quantity,Provkvantitet
 DocType: Bank Guarantee,Name of Beneficiary,Stödmottagarens namn
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Uppdatera BOM-kostnad automatiskt via Scheduler, baserat på senaste värderingsfrekvens / prislista / senaste inköpshastighet för råvaror."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Leverantör&gt; Leverantörsgrupp
 DocType: Bank Reconciliation Detail,Cheque Date,Check Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Förälder konto {1} tillhör inte företaget: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Framgångsrikt bort alla transaktioner i samband med detta företag!
@@ -5542,7 +5549,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Underordnade noder kan endast skapas under &quot;grupp&quot; typ noder
 DocType: Attendance Request,Half Day Date,Halvdag Datum
 DocType: Academic Year,Academic Year Name,Läsåret Namn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} får inte göra transaktioner med {1}. Vänligen ändra bolaget.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} får inte göra transaktioner med {1}. Vänligen ändra bolaget.
 DocType: Sales Partner,Contact Desc,Kontakt Desc
 DocType: Email Digest,Send regular summary reports via Email.,Skicka regelbundna sammanfattande rapporter via e-post.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Ställ in standardkonto i räkningen typ {0}
@@ -5575,7 +5582,7 @@
 DocType: Hotel Room,Hotel Manager,Hotell chef
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Ställ skatt Regel för varukorgen
 DocType: Purchase Invoice,Taxes and Charges Added,Skatter och avgifter Added
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Avskrivningsraden {0}: Nästa avskrivningsdatum kan inte vara före tillgängliga datum
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Avskrivningsraden {0}: Nästa avskrivningsdatum kan inte vara före tillgängliga datum
 ,Sales Funnel,Försäljning tratt
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Förkortning är obligatorisk
 DocType: Project,Task Progress,Task framsteg
@@ -5589,7 +5596,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Alla kundgrupper
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,ackumulerade månads
 DocType: Attendance Request,On Duty,I tjänst
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} är obligatorisk. Kanske Valutaväxlingsposten  inte är skapad för {1} till {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} är obligatorisk. Kanske Valutaväxlingsposten  inte är skapad för {1} till {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Personalplan {0} finns redan för beteckning {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Skatte Mall är obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Konto {0}: Förälder konto {1} existerar inte
@@ -5669,11 +5676,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Minst ett lager är obligatorisk
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Konfigurera objektfält som UOM, Produktgrupp, Beskrivning och Antal timmar."
 DocType: Certification Application,Certification Status,Certifieringsstatus
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Marknad
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Marknad
 DocType: Travel Itinerary,Travel Advance Required,Resefordran krävs
 DocType: Subscriber,Subscriber Name,Abonnentens namn
 DocType: Serial No,Out of Warranty,Ingen garanti
-DocType: Cashier Closing,Cashier-closing-,Kassörska-closing-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Mappad datatyp
 DocType: BOM Update Tool,Replace,Ersätt
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Inga produkter hittades.
@@ -5761,7 +5767,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Standardskattmallar för försäljning och inköp skapas.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Bedömningsresultatrekord {0} existerar redan.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Exempel: ABCD. #####. Om serier är inställda och batchnummer inte nämns i transaktioner, kommer automatiskt batchnummer att skapas baserat på denna serie. Om du alltid vill uttryckligen ange parti nr för det här objektet, lämna det här tomt. Obs! Den här inställningen kommer att prioriteras över namngivningssprefixet i lagerinställningar."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vänligen uppsätt nummerserien för deltagande via Inställningar&gt; Numreringsserie
 DocType: BOM,Materials Required (Exploded),Material som krävs (Expanderad)
 DocType: Contract,Party User,Party-användare
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Vänligen ange Företagets filter tomt om Group By är &quot;Company&quot;
@@ -5963,7 +5968,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Oppräknare
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Både provperiodens startdatum och provperiodens slutdatum måste ställas in
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Genomsnitt
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Totala betalningsbeloppet i betalningsplanen måste vara lika med Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Totala betalningsbeloppet i betalningsplanen måste vara lika med Grand / Rounded Total
 DocType: Subscription Plan Detail,Plan,Planen
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Kontoutdrag balans per huvudbok
 DocType: Job Applicant,Applicant Name,Sökandes Namn
@@ -6032,7 +6037,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Soap &amp; tvättmedel
 DocType: BOM,Show Items,Visa artiklar
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Från Tiden kan inte vara större än då.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Vill du anmäla alla kunder via e-post?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Vill du anmäla alla kunder via e-post?
 DocType: Subscription Plan,Billing Interval,Faktureringsintervall
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Beställde
@@ -6041,9 +6046,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Rad {0}: {1} måste vara större än 0
 DocType: Assessment Criteria,Assessment Criteria Group,Bedömningskriteriegrupp
 DocType: Healthcare Settings,Patient Name By,Patientnamn Av
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Periodiseringsjournalen Inträde för löner från {0} till {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Periodiseringsjournalen Inträde för löner från {0} till {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Aktivera uppskjuten intäkt
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Ingående ackumulerade avskrivningar måste vara mindre än lika med {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Ingående ackumulerade avskrivningar måste vara mindre än lika med {0}
 DocType: Warehouse,Warehouse Name,Lager Namn
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Faktiskt startdatum måste vara mindre än det aktuella slutdatumet
 DocType: Naming Series,Select Transaction,Välj transaktion
@@ -6194,7 +6199,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Anställd {0} i betyg {1} har ingen standardlovspolicy
 DocType: Salary Detail,Salary Detail,lön Detalj
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Välj {0} först
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Tillagt {0} användare
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Tillagt {0} användare
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",När det gäller program med flera nivåer kommer kunderna automatiskt att tilldelas den aktuella tiern enligt deras tillbringade
 DocType: Appointment Type,Physician,Läkare
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Batch {0} av Punkt {1} har löpt ut.
@@ -6338,7 +6343,7 @@
 DocType: Asset,Custodian,Väktare
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Butikförsäljnings profil
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} bör vara ett värde mellan 0 och 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Betalning av {0} från {1} till {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Betalning av {0} från {1} till {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Lån utan säkerhet
 DocType: Cost Center,Cost Center Name,Kostnadcenter Namn
 DocType: Student,B+,B +
@@ -6370,6 +6375,7 @@
 DocType: Employee,Date of Issue,Utgivningsdatum
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",Enligt Köpinställningar om inköp krävs == &#39;JA&#39; och sedan för att skapa Köpfaktura måste användaren skapa Köp kvittot först för punkt {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Rad # {0}: Ställ Leverantör för punkt {1}
+DocType: Global Defaults,Default Distance Unit,Standarddistansenhet
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,V {0}: Timmar Värdet måste vara större än noll.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Website Bild {0} fäst till punkt {1} kan inte hittas
 DocType: Issue,Content Type,Typ av innehåll
@@ -6425,7 +6431,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Debitering av kontot måste vara ett balanskonto
 DocType: Asset,Naming Series,Namge Serien
 DocType: Vital Signs,Coated,Överdragen
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Rad {0}: Förväntat värde efter nyttjandeperioden måste vara mindre än bruttoinköpsbeloppet
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Rad {0}: Förväntat värde efter nyttjandeperioden måste vara mindre än bruttoinköpsbeloppet
 DocType: GoCardless Settings,GoCardless Settings,GoCardless-inställningar
 DocType: Leave Block List,Leave Block List Name,Lämna Blocklistnamn
 DocType: Certified Consultant,Certification Validity,Certifikat Giltighet
@@ -6494,6 +6500,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Bankrubrik
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Visa labtester
 DocType: Hub Users,Hub Users,Hub-användare
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kund&gt; Kundgrupp&gt; Territorium
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Underhållsdatum
 DocType: Purchase Invoice Item,Rejected Serial No,Avvisat Serienummer
@@ -6508,7 +6515,7 @@
 DocType: SG Creation Tool Course,Max Strength,max Styrka
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Installera förinställningar
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Ingen leveransnotering vald för kund {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Ingen leveransnotering vald för kund {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Anställd {0} har inget maximalt förmånsbelopp
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Välj objekt baserat på leveransdatum
 DocType: Grant Application,Has any past Grant Record,Har någon tidigare Grant Record
@@ -6536,7 +6543,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Hotellrum Bokning
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Kundtjänst
 DocType: BOM,Thumbnail,Miniatyr
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Inga kontakter med e-postadresser hittades.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Inga kontakter med e-postadresser hittades.
 DocType: Item Customer Detail,Item Customer Detail,Produktdetaljer kund
 DocType: Notification Control,Prompt for Email on Submission of,Fråga för e-post på Inlämning av
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Maximal förmånsbelopp för anställd {0} överstiger {1}
@@ -6797,7 +6804,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,Det går inte att konvertera till koncernen eftersom Kontotyp valts.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} har ändrats. Vänligen uppdatera.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stoppa användare från att göra Lämna program på följande dagarna.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Artikelnummer&gt; Varugrupp&gt; Varumärke
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Om obegränsat upphörande för lojalitetspoängen, håll utlåtningstiden tom eller 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Underhållspersonal
 DocType: Loyalty Point Entry,Purchase Amount,Köpesumma
@@ -6805,7 +6811,7 @@
 											to fullfill Sales Order {2}",Kan inte leverera serienumret {0} av objektet {1} eftersom det är reserverat \ för att fylla i försäljningsordern {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Leverantör Offert {0} skapades
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,End år kan inte vara före startåret
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,End år kan inte vara före startåret
 DocType: Employee Benefit Application,Employee Benefits,Ersättningar till anställda
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Packad kvantitet måste vara samma kvantitet för punkt {0} i rad {1}
 DocType: Work Order,Manufactured Qty,Tillverkas Antal
@@ -6821,6 +6827,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Välj batchnummer
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Till GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Fakturor till kunder.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vänligen uppsättning Anställningsnamnssystem i mänsklig resurs&gt; HR-inställningar
 DocType: Healthcare Settings,Invoice Appointments Automatically,Fakturaavnämningar automatiskt
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt Id
 DocType: Salary Component,Variable Based On Taxable Salary,Variabel baserad på beskattningsbar lön
@@ -6869,7 +6876,7 @@
 DocType: POS Profile,Account for Change Amount,Konto för förändring Belopp
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Anslutning till QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Totala vinst / förlust
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Ogiltigt företag för interfirma faktura.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Ogiltigt företag för interfirma faktura.
 DocType: Purchase Invoice,input service,inmatningstjänst
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rad {0}: Party / konto stämmer inte med {1} / {2} i {3} {4}
 DocType: Employee Promotion,Employee Promotion,Medarbetarreklam
@@ -7000,7 +7007,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Önskat område för logi
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Kundvagnen är tom
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Vänligen installera Instruktör Naming System i Utbildning&gt; Utbildningsinställningar
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Artikel {0} har ingen serienummer. Endast seriliserade artiklar \ kan ha leverans baserat på serienummer
 DocType: Vehicle,Model,Modell
@@ -7030,7 +7036,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Inget att ändra
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Välj en csv-fil
 DocType: Holiday List,Total Holidays,Totalt helgdagar
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Missande e-postmall för leverans. Ange en i Leveransinställningar.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Missande e-postmall för leverans. Ange en i Leveransinställningar.
 DocType: Student Leave Application,Mark as Present,Mark som Present
 DocType: Supplier Scorecard,Indicator Color,Indikatorfärg
 DocType: Purchase Order,To Receive and Bill,Ta emot och Bill
@@ -7039,7 +7045,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Välj serienummer
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Villkor Mall
-DocType: Serial No,Delivery Details,Leveransdetaljer
+DocType: Delivery Trip,Delivery Details,Leveransdetaljer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Kostnadsställe krävs rad {0} i skatte tabellen för typ {1}
 DocType: Program,Program Code,programkoden
 DocType: Terms and Conditions,Terms and Conditions Help,Villkor Hjälp
@@ -7063,7 +7069,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ledtid dagar
 DocType: Cash Flow Mapping,Is Income Tax Expense,Är inkomstskattkostnad
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Din beställning är ute för leverans!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rad # {0}: Publiceringsdatum måste vara densamma som inköpsdatum {1} av tillgångar {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rad # {0}: Publiceringsdatum måste vara densamma som inköpsdatum {1} av tillgångar {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Kolla här om studenten är bosatt vid institutets vandrarhem.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Ange kundorder i tabellen ovan
 ,Stock Summary,lager Sammanfattning
diff --git a/erpnext/translations/sw.csv b/erpnext/translations/sw.csv
index 2f27405..68a3110 100644
--- a/erpnext/translations/sw.csv
+++ b/erpnext/translations/sw.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Jina la Kipindi
 DocType: Employee,Salary Mode,Njia ya Mshahara
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Jisajili
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Jisajili
 DocType: Patient,Divorced,Talaka
 DocType: Support Settings,Post Route Key,Njia ya Njia ya Chapisho
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Ruhusu Item kuongezwa mara nyingi katika shughuli
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Kiwango cha New Exchange
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Fedha inahitajika kwa Orodha ya Bei {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Itahesabiwa katika shughuli.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Wasambazaji&gt; Aina ya Wasambazaji
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT -YYYY.-
 DocType: Purchase Order,Customer Contact,Mawasiliano ya Wateja
 DocType: Patient Appointment,Check availability,Angalia upatikanaji
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Onyesha wazi
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Mfululizo umehifadhiwa kwa ufanisi
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Angalia
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} mfululizo {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} mfululizo {1}
 DocType: Asset Finance Book,Depreciation Start Date,Tarehe ya kuanza ya kushuka kwa thamani
 DocType: Pricing Rule,Apply On,Tumia Ombi
 DocType: Item Price,Multiple Item prices.,Vipengee vya Bidhaa nyingi.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Dawa ya Dawa
 ,Delay Days,Siku za kuchelewa
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Gharama za Huduma
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Nambari ya Serial: {0} tayari imeelezea katika Invoice ya Mauzo: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Nambari ya Serial: {0} tayari imeelezea katika Invoice ya Mauzo: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Invoice
 DocType: Purchase Invoice Item,Item Weight Details,Kipengee Maelezo ya Uzito
 DocType: Asset Maintenance Log,Periodicity,Periodicity
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Mhasibu
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Orodha ya Bei ya Kuuza
 DocType: Patient,Tobacco Current Use,Tabibu Matumizi ya Sasa
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Tarehe ya mwanzo na tarehe ya kumalizika inaingiliana na kadi ya kazi <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Kiwango cha Mauzo
 DocType: Cost Center,Stock User,Mtumiaji wa hisa
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Kuhusiana
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Tarehe ya kuhudhuria haiwezi kuwa chini ya tarehe ya kujiunga na mfanyakazi
 DocType: Grading Scale,Grading Scale Name,Kuweka Jina la Scale
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Ongeza Watumiaji kwenye Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Ongeza Watumiaji kwenye Marketplace
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Hii ni akaunti ya mizizi na haiwezi kuhaririwa.
 DocType: Sales Invoice,Company Address,Anwani ya Kampuni
 DocType: BOM,Operations,Uendeshaji
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Tofauti
 DocType: Production Plan,Material Request Detail,Maelezo ya Maelezo ya Nyenzo
 DocType: Selling Settings,Default Quotation Validity Days,Siku za Uthibitishaji wa Nukuu za Default
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Ili ni pamoja na kodi katika mstari {0} katika kiwango cha kipengee, kodi katika safu {1} lazima pia ziingizwe"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Ili ni pamoja na kodi katika mstari {0} katika kiwango cha kipengee, kodi katika safu {1} lazima pia ziingizwe"
 DocType: SMS Center,SMS Center,Kituo cha SMS
 DocType: Payroll Entry,Validate Attendance,Thibitisha Mahudhurio
 DocType: Sales Invoice,Change Amount,Badilisha kiasi
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Upeo wa mstari wa kiasi kwa maneno
 DocType: Vehicle,Additional Details,Maelezo ya ziada
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Hakuna maelezo yaliyotolewa
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Wasambazaji&gt; Kikundi cha Wasambazaji
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Omba la ununuzi.
 DocType: POS Closing Voucher Details,Collected Amount,Kukusanya Kiasi
 DocType: Lab Test,Submitted Date,Tarehe iliyotolewa
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,Uingizaji wa Wanafunzi
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Kipengee {0} kimefutwa
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Upungufu Row {0}: Tarehe ya Kuondoa Dhamana imeingia kama tarehe iliyopita
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Upungufu Row {0}: Tarehe ya Kuondoa Dhamana imeingia kama tarehe iliyopita
 DocType: Contract Template,Fulfilment Terms and Conditions,Masharti na Masharti ya kukamilika
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Ombi la Nyenzo
 DocType: Bank Reconciliation,Update Clearance Date,Sasisha tarehe ya kufuta
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,Mipangilio ya Akaunti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Invozi ya Wauzaji Hakuna ipo katika ankara ya ununuzi {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Dhibiti Mti wa Watu wa Mauzo.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Haiwezi kusindika njia, kwa kuwa Mipangilio ya Ramani za Google imezimwa."
 DocType: Job Applicant,Cover Letter,Barua ya maombi
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cheki Bora na Deposits ili kufuta
 DocType: Item,Synced With Hub,Ilifananishwa na Hub
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Thamani mpya ya Mali
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Kiwango ambacho Fedha ya Wateja inabadilishwa kwa sarafu ya msingi ya wateja
 DocType: Course Scheduling Tool,Course Scheduling Tool,Chombo cha Mpangilio wa Kozi
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Invoice ya Ununuzi haiwezi kufanywa dhidi ya mali iliyopo {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Invoice ya Ununuzi haiwezi kufanywa dhidi ya mali iliyopo {1}
 DocType: Crop Cycle,LInked Analysis,Uchunguzi LInked
 DocType: POS Closing Voucher,POS Closing Voucher,Voucher ya POS ya Kufungwa
 DocType: Contract,Lapsed,Imeshindwa
@@ -635,6 +635,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} hajasajiliwa katika Kozi {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Jina la Mwanafunzi:
 DocType: POS Closing Voucher Details,Difference,Tofauti
+DocType: Delivery Settings,Delay between Delivery Stops,Punguza muda kati ya Utoaji wa Utoaji
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial Hakuna {0} sio wa Kumbuka Kumbuka {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Inaonekana kuna shida na Configuration ya GoCardless ya seva. Usijali, ikiwa hali ya kushindwa, kiasi hicho kitarejeshwa kwa akaunti yako."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -693,7 +694,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Wingi na Kiwango
 DocType: Delivery Note,% Installed,Imewekwa
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Madarasa / Maabara, nk ambapo mihadhara inaweza kufanyika."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Fedha za Kampuni ya makampuni hayo yote yanapaswa kufanana na Shughuli za Inter Company.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Fedha za Kampuni ya makampuni hayo yote yanapaswa kufanana na Shughuli za Inter Company.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Tafadhali ingiza jina la kampuni kwanza
 DocType: Travel Itinerary,Non-Vegetarian,Wasio Mboga
 DocType: Purchase Invoice,Supplier Name,Jina la wauzaji
@@ -778,7 +779,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Ilipangwa Tarehe
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Vipande vyenye Kujenga
 DocType: POS Profile User,POS Profile User,Mtumiaji wa Programu ya POS
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Row {0}: Tarehe ya Kuondoa Tamaa inahitajika
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Row {0}: Tarehe ya Kuondoa Tamaa inahitajika
 DocType: Purchase Invoice Item,Service Start Date,Tarehe ya Kuanza Huduma
 DocType: Subscription Invoice,Subscription Invoice,Invoice ya Usajili
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Mapato ya moja kwa moja
@@ -845,7 +846,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Hali tayari kutumika kwa kampuni nyingine
 DocType: Selling Settings,Default Customer Group,Kikundi cha Wateja Chaguo-msingi
 DocType: Employee,IFSC Code,IFSC Kanuni
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Tarehe ya mwanzo na tarehe ya kumalizika inaingiliana na kadi ya kazi <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ikiwa imezima, shamba &#39;Rounded Total&#39; halitaonekana katika shughuli yoyote"
 DocType: BOM,Operating Cost,Gharama za uendeshaji
 DocType: Crop,Produced Items,Vitu vinavyotengenezwa
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,Zuia RFQs
 DocType: Hub User,Hub User,Mtumiaji wa Hub
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Fanya Mauzo ya Mauzo
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Slip ya Mshahara imewasilishwa kwa kipindi cha {0} hadi {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Slip ya Mshahara imewasilishwa kwa kipindi cha {0} hadi {1}
 DocType: Project Task,Project Task,Kazi ya Mradi
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Vipengee Vyepesi
 ,Lead Id,Weka Id
@@ -1027,7 +1027,7 @@
 DocType: Fee Validity,Max number of visit,Idadi kubwa ya ziara
 ,Hotel Room Occupancy,Kazi ya chumba cha Hoteli
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet iliunda:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Tafadhali weka Akaunti ya Fedha au Benki ya Mkopo katika Mfumo wa Malipo {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Tafadhali weka Akaunti ya Fedha au Benki ya Mkopo katika Mfumo wa Malipo {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Ingia
 DocType: GST Settings,GST Settings,Mipangilio ya GST
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Fedha inapaswa kuwa sawa na Orodha ya Bei Fedha: {0}
@@ -1081,7 +1081,7 @@
 DocType: Vehicle Log,Service Details,Maelezo ya Huduma
 DocType: Lab Test Template,Grouped,Yameunganishwa
 DocType: Selling Settings,Delivery Note Required,Kumbuka Utoaji Inahitajika
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Inawasilisha Slips za Mshahara ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Inawasilisha Slips za Mshahara ...
 DocType: Bank Guarantee,Bank Guarantee Number,Nambari ya Dhamana ya Benki
 DocType: Assessment Criteria,Assessment Criteria,Vigezo vya Tathmini
 DocType: BOM Item,Basic Rate (Company Currency),Kiwango cha Msingi (Fedha la Kampuni)
@@ -1106,13 +1106,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Kuingia kwa Malipo tayari kuundwa
 DocType: Request for Quotation,Get Suppliers,Pata Wauzaji
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock sasa
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Mstari # {0}: Malipo {1} haihusishwa na Item {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Mstari # {0}: Malipo {1} haihusishwa na Item {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Angalia Slip ya Mshahara
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Akaunti {0} imeingizwa mara nyingi
 DocType: Account,Expenses Included In Valuation,Malipo Pamoja na Valuation
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Unaweza tu upya kama wanachama wako muda wake ndani ya siku 30
 DocType: Shopping Cart Settings,Show Stock Availability,Onyesha Upatikanaji wa hisa
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Weka {0} katika kiwanja cha mali {1} au kampuni {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Weka {0} katika kiwanja cha mali {1} au kampuni {2}
 DocType: Location,Longitude,Longitude
 ,Absent Student Report,Ripoti ya Wanafunzi Yasiyo
 DocType: Crop,Crop Spacing UOM,Ugawaji wa mazao ya UOM
@@ -1184,7 +1184,7 @@
 DocType: Soil Texture,Sand,Mchanga
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Nishati
 DocType: Opportunity,Opportunity From,Fursa Kutoka
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Nambari za nambari zinahitajika kwa Bidhaa {2}. Umetoa {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Nambari za nambari zinahitajika kwa Bidhaa {2}. Umetoa {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Tafadhali chagua meza
 DocType: BOM,Website Specifications,Ufafanuzi wa tovuti
 DocType: Special Test Items,Particulars,Maelezo
@@ -1276,7 +1276,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Vitu vinavyo na uzito mkubwa vitaonyeshwa juu
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Majaribio ya Lab na Ishara za Vital
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Upatanisho wa Benki ya Ufafanuzi
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Row # {0}: Mali {1} lazima iwasilishwa
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Row # {0}: Mali {1} lazima iwasilishwa
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Hakuna mfanyakazi aliyepatikana
 DocType: Item,If subcontracted to a vendor,Ikiwa unatambuliwa kwa muuzaji
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Kundi la Wanafunzi tayari limehifadhiwa.
@@ -1330,7 +1330,6 @@
 DocType: Loyalty Program Collection,Tier Name,Jina la Msingi
 DocType: HR Settings,Enter retirement age in years,Ingiza umri wa kustaafu kwa miaka
 DocType: Crop,Target Warehouse,Ghala la Ghala
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Tafadhali weka Mfululizo wa Naming kwa {0} kupitia Setup&gt; Mipangilio&gt; Mfululizo wa Naming
 DocType: Payroll Employee Detail,Payroll Employee Detail,Maelezo ya Waajiri wa Mishahara
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Tafadhali chagua ghala
 DocType: Cheque Print Template,Starting location from left edge,Kuanzia eneo kutoka kwa makali ya kushoto
@@ -1420,7 +1419,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Panga nyenzo kwa makusanyiko ndogo
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Washirika wa Mauzo na Wilaya
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} lazima iwe hai
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Hakuna Vipengele vinavyopatikana kwa uhamisho
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Hakuna Vipengele vinavyopatikana kwa uhamisho
 DocType: Employee Boarding Activity,Activity Name,Jina la Shughuli
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Tarehe ya Toleo la Mabadiliko
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Umefikia kiasi cha bidhaa <b>{0}</b> na Kwa Wingi <b>{1}</b> haiwezi kuwa tofauti
@@ -1647,6 +1646,7 @@
 DocType: Project,First Email,Barua ya Kwanza
 DocType: Company,Exception Budget Approver Role,Mpangilio wa Msaidizi wa Bajeti
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Mara baada ya kuweka, ankara hii itaendelea hadi tarehe ya kuweka"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Ghala iliyohifadhiwa katika Mauzo ya Hifadhi / Bidhaa Zilizohitimishwa
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Kuuza Kiasi
 DocType: Repayment Schedule,Interest Amount,Kiwango cha riba
@@ -1658,7 +1658,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Kumbukumbu
 DocType: Asset,Scrapped,Imepigwa
 DocType: Item,Item Defaults,Ufafanuzi wa Bidhaa
-DocType: Purchase Invoice,Returns,Inarudi
+DocType: Cashier Closing,Returns,Inarudi
 DocType: Job Card,WIP Warehouse,Ghala la WIP
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serial Hakuna {0} ni chini ya mkataba wa matengenezo hadi {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,Uajiri
@@ -1672,7 +1672,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Aina ya Uhamisho
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Gharama za Mauzo
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Wateja&gt; Kikundi cha Wateja&gt; Eneo
 DocType: Diagnosis,Diagnosis,Utambuzi
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Ununuzi wa kawaida
 DocType: Attendance Request,Explanation,Maelezo
@@ -1685,7 +1684,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Malipo ya Amri ya Ununuzi
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Namba ya Posta
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Amri ya Mauzo {0} ni {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Chagua akaunti ya mapato ya riba kwa mkopo {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Chagua akaunti ya mapato ya riba kwa mkopo {0}
 DocType: Opportunity,Contact Info,Maelezo ya Mawasiliano
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Kufanya Entries Stock
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Haiwezi kukuza mfanyakazi na hali ya kushoto
@@ -1697,7 +1696,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Invozi haiwezi kufanywa kwa saa ya kulipa zero
 DocType: Company,Date of Commencement,Tarehe ya Kuanza
 DocType: Sales Person,Select company name first.,Chagua jina la kampuni kwanza.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},Barua pepe imetumwa kwa {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},Barua pepe imetumwa kwa {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Nukuu zilizopokea kutoka kwa Wauzaji.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Badilisha BOM na usasishe bei ya hivi karibuni katika BOM zote
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Kwa {0} | {1} {2}
@@ -1717,7 +1716,7 @@
 DocType: Asset Movement,From Employee,Kutoka kwa Mfanyakazi
 DocType: Driver,Cellphone Number,Nambari ya simu ya mkononi
 DocType: Project,Monitor Progress,Kufuatilia Maendeleo
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Tahadhari: Mfumo hautaangalia overbilling tangu kiasi cha Bidhaa {0} katika {1} ni sifuri
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Tahadhari: Mfumo hautaangalia overbilling tangu kiasi cha Bidhaa {0} katika {1} ni sifuri
 DocType: Journal Entry,Make Difference Entry,Fanya Tofauti Kuingia
 DocType: Supplier Quotation,Auto Repeat Section,Sehemu ya kurudia kwa urahisi
 DocType: Upload Attendance,Attendance From Date,Kuhudhuria Tarehe Tarehe
@@ -1820,7 +1819,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Nambari iliyokataliwa haiwezi kuingizwa katika Kurudi kwa Ununuzi
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Kubadilisha Kundi la Wateja kwa Wateja waliochaguliwa hairuhusiwi.
 ,Purchase Order Items To Be Billed,Vitu vya Utaratibu wa Ununuzi Ili Kulipwa
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Inasasisha nyakati za kuwasili za makadirio.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Inasasisha nyakati za kuwasili za makadirio.
 DocType: Program Enrollment Tool,Enrollment Details,Maelezo ya Uandikishaji
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Haiwezi kuweka Vifungo vingi vya Bidhaa kwa kampuni.
 DocType: Purchase Invoice Item,Net Rate,Kiwango cha Nambari
@@ -1834,7 +1833,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Acha aina ni madhara
 DocType: Support Settings,Close Issue After Days,Funga Suala Baada ya Siku
 ,Eway Bill,Bunge Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Unahitaji kuwa mtumiaji na Meneja wa Mfumo na majukumu ya Meneja wa Bidhaa ili kuongeza watumiaji kwenye Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Unahitaji kuwa mtumiaji na Meneja wa Mfumo na majukumu ya Meneja wa Bidhaa ili kuongeza watumiaji kwenye Marketplace.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Acha tupu ikiwa inachukuliwa kwa matawi yote
 DocType: Job Opening,Staffing Plan,Mpango wa Utumishi
 DocType: Bank Guarantee,Validity in Days,Uthibitisho katika Siku
@@ -1854,7 +1853,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Mstari wa Duplicate {0} na sawa {1}
 DocType: Marketplace Settings,Disable Marketplace,Lemaza mahali pa Marketplace
 ,Trial Balance,Mizani ya majaribio
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Mwaka wa Fedha {0} haukupatikana
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Mwaka wa Fedha {0} haukupatikana
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Kuweka Wafanyakazi
 DocType: Hotel Room Reservation,Hotel Reservation User,User Reservation User
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Tafadhali chagua kiambatisho kwanza
@@ -1962,7 +1961,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Imeshindwa kuingia
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Malipo {0} yameundwa
 DocType: Special Test Items,Special Test Items,Vipimo vya Mtihani maalum
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Unahitaji kuwa mtumiaji na Meneja wa Mfumo na Majukumu ya Meneja wa Item kujiandikisha kwenye Soko.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Unahitaji kuwa mtumiaji na Meneja wa Mfumo na Majukumu ya Meneja wa Item kujiandikisha kwenye Soko.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Hali ya Malipo
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Kwa mujibu wa Mfumo wa Mshahara uliopangwa huwezi kuomba faida
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Image ya tovuti lazima iwe faili ya umma au URL ya tovuti
@@ -1974,7 +1973,7 @@
 DocType: Warehouse,Warehouse Contact Info,Info ya Kuwasiliana na Ghala
 DocType: Payment Entry,Write Off Difference Amount,Andika Tofauti Tofauti
 DocType: Volunteer,Volunteer Name,Jina la kujitolea
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Inapanda kwa duplicate tarehe kutokana na safu zingine zilipatikana: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Inapanda kwa duplicate tarehe kutokana na safu zingine zilipatikana: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: barua pepe ya mfanyakazi haipatikani, hivyo barua pepe haitumwa"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Hakuna Mfumo wa Mshahara uliopangwa kwa Mfanyakazi {0} kwenye tarehe iliyotolewa {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Sheria ya usafirishaji haifai kwa nchi {0}
@@ -2063,6 +2062,7 @@
 DocType: Salary Component,Earning,Kupata
 DocType: Supplier Scorecard,Scoring Criteria,Hifadhi ya Hifadhi
 DocType: Purchase Invoice,Party Account Currency,Fedha ya Akaunti ya Chama
+DocType: Delivery Trip,Total Estimated Distance,Jumla ya Umbali uliohesabiwa
 ,BOM Browser,BOM Browser
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Tafadhali sasisha hali yako ya tukio hili la mafunzo
 DocType: Item Barcode,EAN,EAN
@@ -2101,7 +2101,7 @@
 DocType: Activity Cost,Projects,Miradi
 DocType: Payment Request,Transaction Currency,Fedha ya Ushirika
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Kutoka {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Baadhi ya barua pepe ni batili
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Baadhi ya barua pepe ni batili
 DocType: Work Order Operation,Operation Description,Ufafanuzi wa Uendeshaji
 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.,Haiwezi kubadilisha tarehe ya kuanza kwa mwaka wa fedha na Tarehe ya Mwisho wa Fedha mara Mwaka wa Fedha inapohifadhiwa.
 DocType: Quotation,Shopping Cart,Duka la Ununuzi
@@ -2125,7 +2125,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Mabadiliko ya Net katika Mali isiyohamishika
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Kiasi
 DocType: Leave Control Panel,Leave blank if considered for all designations,Acha tupu ikiwa inachukuliwa kwa sifa zote
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Malipo ya aina ya &#39;Kweli&#39; katika mstari {0} haiwezi kuingizwa katika Kiwango cha Bidhaa
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Malipo ya aina ya &#39;Kweli&#39; katika mstari {0} haiwezi kuingizwa katika Kiwango cha Bidhaa
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Kutoka wakati wa Tarehe
 DocType: Shopify Settings,For Company,Kwa Kampuni
@@ -2139,7 +2139,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Kulikuwa na hitilafu za kuunda ratiba ya kozi
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Mpangilio wa kwanza wa gharama katika orodha utawekwa kama Msaidizi wa gharama ya chini.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,haiwezi kuwa zaidi ya 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Unahitaji kuwa mtumiaji mwingine isipokuwa Msimamizi na Meneja wa Mfumo na Majukumu ya Meneja wa Item kujiandikisha kwenye Soko.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Unahitaji kuwa mtumiaji mwingine isipokuwa Msimamizi na Meneja wa Mfumo na Majukumu ya Meneja wa Item kujiandikisha kwenye Soko.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Kipengee {0} si kitu cha hisa
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC -YYYY.-
 DocType: Maintenance Visit,Unscheduled,Haijahamishwa
@@ -2168,7 +2168,7 @@
 DocType: HR Settings,Employee Settings,Mipangilio ya Waajiriwa
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Inapakia Mfumo wa Malipo
 ,Batch-Wise Balance History,Historia ya Mizani-Hekima
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Row # {0}: Haiwezi kuweka Kiwango kama kiasi ni kikubwa kuliko kiasi cha malipo kwa Item {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Row # {0}: Haiwezi kuweka Kiwango kama kiasi ni kikubwa kuliko kiasi cha malipo kwa Item {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Mipangilio ya magazeti imewekwa katika fomu ya kuchapisha husika
 DocType: Package Code,Package Code,Kanuni ya pakiti
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Mwanafunzi
@@ -2401,7 +2401,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} nafasi na {1} bajeti ya {2} tayari iliyopangwa kwa kampuni ndogo za {3}. Unaweza tu kupanga mipango ya {4} na bajeti {5} kama mpango wa utumishi {6} kwa kampuni ya mzazi {3}.
 DocType: HR Settings,Stop Birthday Reminders,Weka Vikumbusho vya Kuzaliwa
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Tafadhali weka Akaunti ya Kulipa ya Payroll ya Kipawa katika Kampuni {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Tafadhali weka Akaunti ya Kulipa ya Payroll ya Kipawa katika Kampuni {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Pata uvunjaji wa kifedha wa Takwimu na mashtaka kwa Amazon
 DocType: SMS Center,Receiver List,Orodha ya Kupokea
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Tafuta kitu
@@ -2471,7 +2471,7 @@
 DocType: Vital Signs,Constipated,Imetumiwa
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Dhidi ya Invoice ya Wasambazaji {0} dated {1}
 DocType: Customer,Default Price List,Orodha ya Bei ya Hitilafu
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Rekodi ya Movement ya Malipo {0} imeundwa
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Rekodi ya Movement ya Malipo {0} imeundwa
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Hakuna vitu vilivyopatikana.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Huwezi kufuta Mwaka wa Fedha {0}. Mwaka wa Fedha {0} umewekwa kama default katika Mipangilio ya Global
 DocType: Share Transfer,Equity/Liability Account,Akaunti ya Equity / Dhima
@@ -2606,6 +2606,7 @@
 DocType: Blanket Order,Order Type,Aina ya Utaratibu
 ,Item-wise Sales Register,Daftari ya Mauzo ya hekima
 DocType: Asset,Gross Purchase Amount,Jumla ya Ununuzi wa Pato
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Msimbo wa Item&gt; Kikundi cha Bidhaa&gt; Brand
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Mizani ya Ufunguzi
 DocType: Asset,Depreciation Method,Njia ya kushuka kwa thamani
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,"Je, kodi hii imejumuishwa katika Msingi Msingi?"
@@ -2685,7 +2686,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Hatua kama Bajeti ya Mwaka imeongezeka kwenye PO
 DocType: Student Leave Application,Student Leave Application,Maombi ya Kuondoka kwa Wanafunzi
 DocType: Item,Will also apply for variants,Pia itatumika kwa vipengee
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Mali haziwezi kufutwa, kama tayari {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Mali haziwezi kufutwa, kama tayari {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Mfanyakazi {0} kwenye siku ya nusu kwenye {1}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,On
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Vifungu vya vitu wakati wa kuuza.
@@ -2708,6 +2709,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Pata data
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Upeo wa kuondoka kuruhusiwa katika aina ya kuondoka {0} ni {1}
 DocType: SMS Center,Create Receiver List,Unda Orodha ya Kupokea
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Tarehe inapatikana-kwa-tarehe inapaswa kuwa baada ya tarehe ya ununuzi
 DocType: Vehicle,Wheels,Magurudumu
 DocType: Packing Slip,To Package No.,Kwa Package No..
 DocType: Patient Relation,Family,Familia
@@ -2721,7 +2723,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Fedha ya kulipia lazima iwe sawa na sarafu au kampuni ya sarafu ya kampuni
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Inaonyesha kwamba mfuko ni sehemu ya utoaji huu (Tu Rasimu)
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Row {0}: Tarehe ya Tuzo haiwezi kuwa kabla ya kutuma tarehe
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Row {0}: Tarehe ya Tuzo haiwezi kuwa kabla ya kutuma tarehe
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Fanya Uingiaji wa Malipo
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Wingi wa Bidhaa {0} lazima iwe chini ya {1}
 ,Sales Invoice Trends,Mwelekeo wa Mauzo ya Invoice
@@ -2793,7 +2795,7 @@
 DocType: Guardian,Guardian Interests,Maslahi ya Guardian
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Sasisha Jina la Akaunti / Nambari
 DocType: Naming Series,Current Value,Thamani ya sasa
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Miaka kadhaa ya fedha ikopo kwa tarehe {0}. Tafadhali weka kampuni katika Mwaka wa Fedha
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Miaka kadhaa ya fedha ikopo kwa tarehe {0}. Tafadhali weka kampuni katika Mwaka wa Fedha
 DocType: Education Settings,Instructor Records to be created by,Kumbukumbu ya Mwalimu ili kuundwa na
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} imeundwa
 DocType: GST Account,GST Account,Akaunti ya GST
@@ -2810,7 +2812,7 @@
 DocType: Sales Person,Name and Employee ID,Jina na ID ya Waajiriwa
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Tarehe ya Kutokana haiwezi kuwa kabla ya Tarehe ya Kuweka
 DocType: Website Item Group,Website Item Group,Website Item Group
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Hakuna kuingizwa kwa mshahara kupatikana kwa kuwasilisha kwa vigezo vilivyochaguliwa hapo AU au malipo ya mshahara tayari yamewasilishwa
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Hakuna kuingizwa kwa mshahara kupatikana kwa kuwasilisha kwa vigezo vilivyochaguliwa hapo AU au malipo ya mshahara tayari yamewasilishwa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Kazi na Kodi
 DocType: Projects Settings,Projects Settings,Mipangilio ya Miradi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Tafadhali ingiza tarehe ya Marejeo
@@ -2819,7 +2821,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Ugavi wa Uchina
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR -YYYY.-
 DocType: Purchase Order Item,Material Request Item,Nakala ya Kuomba Nyenzo
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Tafadhali ghairi Receipt ya Ununuzi {0} kwanza
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Tafadhali ghairi Receipt ya Ununuzi {0} kwanza
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Mti wa Vikundi vya Bidhaa.
 DocType: Production Plan,Total Produced Qty,Uchina uliozalishwa
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Haiwezi kutaja nambari ya mstari zaidi kuliko au sawa na nambari ya mstari wa sasa kwa aina hii ya malipo
@@ -2928,6 +2930,7 @@
 ,Vehicle Expenses,Gharama za Gari
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Unda Majaribio ya Lab (Mawasilisho ya Mauzo)
 DocType: Serial No,Invoice Details,Maelezo ya ankara
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Tafadhali itawezesha Mipangilio ya Ramani za Google ili kukadiria na kuboresha njia
 DocType: Grant Application,Show on Website,Onyesha kwenye tovuti
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Anza
 DocType: Hub Tracked Item,Hub Category,Jamii ya Hub
@@ -2967,7 +2970,7 @@
 DocType: Inpatient Record,B Positive,B Chanya
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Ufikiaji mkubwa wa mfanyakazi {0} unazidi {1} kwa jumla {2} ya kiasi cha awali cha kudai \ kiasi
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Uchina lazima uwe 1, kama kipengee ni mali iliyobaki. Tafadhali tumia mstari wa tofauti kwa qty nyingi."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Uchina lazima uwe 1, kama kipengee ni mali iliyobaki. Tafadhali tumia mstari wa tofauti kwa qty nyingi."
 DocType: Leave Block List Allow,Leave Block List Allow,Acha orodha ya kuzuia Kuruhusu
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr haiwezi kuwa tupu au nafasi
 DocType: Patient Medical Record,Patient Medical Record,Kumbukumbu ya Matibabu Mgonjwa
@@ -3001,7 +3004,7 @@
 DocType: Workstation,Wages per hour,Mshahara kwa saa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Usawa wa hisa katika Batch {0} utakuwa hasi {1} kwa Bidhaa {2} kwenye Ghala {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Ufuatiliaji wa Nyenzo zifuatayo umefufuliwa kwa moja kwa moja kulingana na ngazi ya re-order ya Item
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Akaunti {0} ni batili. Fedha ya Akaunti lazima iwe {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Akaunti {0} ni batili. Fedha ya Akaunti lazima iwe {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Kutoka tarehe {0} haiwezi kuwa baada ya Tarehe ya kuondokana na mfanyakazi {1}
 DocType: Supplier,Is Internal Supplier,Ni wauzaji wa ndani
 DocType: Employee,Create User Permission,Unda Ruhusa ya Mtumiaji
@@ -3145,7 +3148,7 @@
 DocType: Account,Fixed Asset,Mali isiyohamishika
 DocType: Amazon MWS Settings,After Date,Baada ya Tarehe
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Mali isiyohamishika
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Invalid {0} kwa ankara ya Kampuni ya Inter.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Invalid {0} kwa ankara ya Kampuni ya Inter.
 ,Department Analytics,Idara ya Uchambuzi
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Barua pepe haipatikani kwa kuwasiliana na wakati wote
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Kuzalisha siri
@@ -3157,7 +3160,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Mpango katika muundo wa ada na kikundi cha wanafunzi {0} ni tofauti.
 DocType: Bank Statement Transaction Entry,Receivable Account,Akaunti ya Kupokea
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Tarehe Kutoka Tarehe lazima iwe ndogo zaidi kuliko Tarehe ya Halali ya Upto.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Row # {0}: Malipo {1} tayari {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Row # {0}: Malipo {1} tayari {2}
 DocType: Quotation Item,Stock Balance,Mizani ya hisa
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Mauzo ya Malipo ya Malipo
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,Mkurugenzi Mtendaji
@@ -3199,6 +3202,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Debit To inahitajika
 DocType: Clinical Procedure,Inpatient Record,Rekodi ya wagonjwa
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets kusaidia kuweka wimbo wa muda, gharama na bili kwa activites kufanyika kwa timu yako"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Wasambazaji&gt; Aina ya Wasambazaji
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Orodha ya Bei ya Ununuzi
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Tarehe ya Shughuli
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Matukio ya vigezo vya scorecard za wasambazaji.
@@ -3241,7 +3245,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Kubadilisha / Kupoteza
 DocType: Opportunity,Lost Reason,Sababu iliyopotea
 DocType: Amazon MWS Settings,Enable Amazon,Wezesha Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Row # {0}: Akaunti {1} si ya kampuni {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Row # {0}: Akaunti {1} si ya kampuni {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Haikuweza kupata DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Anwani mpya
 DocType: Quality Inspection,Sample Size,Ukubwa wa Mfano
@@ -3352,7 +3356,7 @@
 DocType: Water Analysis,Origin,Mwanzo
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Hati hii imepungua kwa {0} {1} kwa kipengee {4}. Je! Unafanya mwingine {3} dhidi ya sawa {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Tafadhali kuweka mara kwa mara baada ya kuokoa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Chagua akaunti ya kubadilisha kiasi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Chagua akaunti ya kubadilisha kiasi
 DocType: Purchase Invoice,Price List Currency,Orodha ya Bei ya Fedha
 DocType: Naming Series,User must always select,Mtumiaji lazima ague daima
 DocType: Stock Settings,Allow Negative Stock,Ruhusu Stock mbaya
@@ -3394,7 +3398,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Una uhakika unataka kufuta miadi hii?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Pakiti ya bei ya chumba cha Hoteli
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Bomba la Mauzo
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Tafadhali weka akaunti ya msingi katika Kipengele cha Mshahara {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Tafadhali weka akaunti ya msingi katika Kipengele cha Mshahara {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Inahitajika
 DocType: Rename Tool,File to Rename,Funga Kurejesha tena
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Tafadhali chagua BOM kwa Bidhaa katika Row {0}
@@ -3415,7 +3419,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Gharama ya Vitu Vilivyotunzwa
 DocType: Employee Separation,Employee Separation Template,Kigezo cha Utunzaji wa Waajiriwa
 DocType: Selling Settings,Sales Order Required,Amri ya Mauzo Inahitajika
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Kuwa Muzaji
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Kuwa Muzaji
 DocType: Purchase Invoice,Credit To,Mikopo Kwa
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Msaidizi wa Active / Wateja
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Acha tupu ili utumie muundo wa Kumbuka utoaji wa kawaida
@@ -3456,7 +3460,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Fanya Kigezo cha Kodi
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Malighafi haziwezi kuwa tupu.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Row # {0} (Jedwali la Malipo): Kiasi lazima iwe hasi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Row # {0} (Jedwali la Malipo): Kiasi lazima iwe hasi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Haikuweza kusasisha hisa, ankara ina bidhaa ya kusafirisha kushuka."
 DocType: Contract,Fulfilment Status,Hali ya Utekelezaji
 DocType: Lab Test Sample,Lab Test Sample,Mfano wa Mtihani wa Lab
@@ -3595,7 +3599,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Tarehe ya Hati
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Kumbukumbu za ada zilizoundwa - {0}
 DocType: Asset Category Account,Asset Category Account,Akaunti ya Jamii ya Mali
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Row # {0} (Jedwali la Malipo): Kiasi kinachofaa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Row # {0} (Jedwali la Malipo): Kiasi kinachofaa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Haiwezi kuzalisha kipengee zaidi {0} kuliko kiasi cha Mauzo ya Mauzo {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Chagua Maadili ya Tabia
 DocType: Purchase Invoice,Reason For Issuing document,Sababu ya Kuondoa hati
@@ -3650,7 +3654,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Wakati ambapo vifaa vilipokelewa
 DocType: Products Settings,Products per Page,Bidhaa kwa Ukurasa
 DocType: Stock Ledger Entry,Outgoing Rate,Kiwango cha Kuondoka
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,au
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,au
 DocType: Sales Order,Billing Status,Hali ya kulipia
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Ripoti Suala
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Malipo ya matumizi
@@ -3677,7 +3681,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Azimio la Ushuru wa Ushuru wa Wafanyakazi
 DocType: Payment Entry,Cheque/Reference Date,Tazama / Tarehe ya Marejeo
 DocType: Purchase Invoice,Total Taxes and Charges,Jumla ya Kodi na Malipo
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Tarehe inapatikana-kwa-tarehe imeingia kama tarehe iliyopita
 DocType: Employee,Emergency Contact,Mawasiliano ya dharura
 DocType: Bank Reconciliation Detail,Payment Entry,Kuingia kwa Malipo
 ,sales-browser,kivinjari cha mauzo
@@ -3723,6 +3726,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Inarudi (Maelezo ya Mikopo)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Anza Ayubu
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Hapana ya serial inahitajika kwa mali {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Tafadhali weka Mfululizo wa Naming kwa {0} kupitia Setup&gt; Mipangilio&gt; Mfululizo wa Naming
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Template ya ulemavu haipaswi kuwa template default
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Kwa mstari {0}: Ingiza qty iliyopangwa
 DocType: Account,Income Account,Akaunti ya Mapato
@@ -3736,6 +3740,7 @@
 DocType: Loyalty Program,Help Section,Sehemu ya Usaidizi
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Kabla
 DocType: Appraisal Goal,Key Responsibility Area,Eneo la Ujibu wa Ufunguo
+DocType: Delivery Trip,Distance UOM,Umbali wa UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Majaribio ya Wanafunzi husaidia kufuatilia mahudhurio, tathmini na ada kwa wanafunzi"
 DocType: Payment Entry,Total Allocated Amount,Kiasi kilichopangwa
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Weka akaunti ya hesabu ya msingi kwa hesabu ya daima
@@ -3777,7 +3782,7 @@
 DocType: Item Supplier,Item Supplier,Muuzaji wa Bidhaa
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Tafadhali ingiza Msimbo wa Nambari ili kupata bat
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Tafadhali chagua thamani ya {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Hakuna Vichaguliwa kwa uhamisho
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Hakuna Vichaguliwa kwa uhamisho
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Anwani zote.
 DocType: Company,Stock Settings,Mipangilio ya hisa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Kuunganisha inawezekana tu kama mali zifuatazo zimefanana katika kumbukumbu zote mbili. Ni Kikundi, Aina ya Mizizi, Kampuni"
@@ -4062,7 +4067,7 @@
 DocType: Patient,Personal and Social History,Historia ya kibinafsi na ya kijamii
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Mtumiaji {0} ameundwa
 DocType: Fee Schedule,Fee Breakup for each student,Kulipwa kwa kila mwanafunzi
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Jumla ya mapema ({0}) dhidi ya Amri {1} haiwezi kuwa kubwa kuliko Jumla ya Jumla ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Jumla ya mapema ({0}) dhidi ya Amri {1} haiwezi kuwa kubwa kuliko Jumla ya Jumla ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Chagua Usambazaji wa Kila mwezi ili usambaze malengo kwa miezi.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Badilisha Kanuni
 DocType: Purchase Invoice Item,Valuation Rate,Kiwango cha Thamani
@@ -4071,7 +4076,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Imepata ITC Cess
 ,Student Monthly Attendance Sheet,Karatasi ya Wahudumu wa Mwezi kila mwezi
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Sheria ya usafirishaji inatumika tu kwa Kuuza
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Upungufu wa Row {0}: Tarehe ya Utoaji wa Dhamana haiwezi kuwa kabla ya Tarehe ya Ununuzi
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Upungufu wa Row {0}: Tarehe ya Utoaji wa Dhamana haiwezi kuwa kabla ya Tarehe ya Ununuzi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Tarehe ya Kuanza Mradi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Mpaka
 DocType: Rename Tool,Rename Log,Rejesha Ingia
@@ -4088,12 +4093,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Ni mara ngapi mradi na kampuni zinasasishwa kulingana na Shughuli za Mauzo.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Inamalizika
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Ongeza Wanafunzi
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Tafadhali futa Waajiri <a href=""#Form/Employee/{0}"">{0}</a> \ ili kufuta hati hii"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Tafadhali chagua {0}
 DocType: C-Form,C-Form No,Fomu ya Fomu ya C
 DocType: BOM,Exploded_items,Ililipuka_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Umbali
+DocType: Delivery Stop,Distance,Umbali
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Andika orodha ya bidhaa au huduma zako unazouza au kuuza.
 DocType: Water Analysis,Storage Temperature,Joto la Uhifadhi
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD -YYYY.-
@@ -4120,7 +4123,7 @@
 DocType: Homepage,Company Description for website homepage,Maelezo ya Kampuni kwa homepage tovuti
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Kwa urahisi wa wateja, kanuni hizi zinaweza kutumiwa katika fomu za kuchapisha kama Invoices na Vidokezo vya Utoaji"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Jina la Juu
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Haikuweza kupata maelezo ya {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Haikuweza kupata maelezo ya {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Journal ya Kuingia ya Kuingia
 DocType: Contract,Fulfilment Terms,Masharti ya Utekelezaji
 DocType: Sales Invoice,Time Sheet List,Orodha ya Karatasi ya Muda
@@ -4298,7 +4301,7 @@
 DocType: Serial No,Warranty / AMC Details,Maelezo ya udhamini / AMC
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Chagua wanafunzi kwa kikundi kwa Kundi la Shughuli
 DocType: Journal Entry,User Remark,Remark ya Mtumiaji
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Kuboresha njia.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Kuboresha njia.
 DocType: Travel Itinerary,Non Diary,Haija Diary
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Haiwezi kuunda Bonus ya kuhifadhiwa kwa Waajiri wa kushoto
 DocType: Lead,Market Segment,Sehemu ya Soko
@@ -4327,7 +4330,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Programu ya Uaminifu
 DocType: Student Guardian,Father,Baba
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Tiketi za Msaada
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,Mwisho Stock &#39;hauwezi kuchunguziwa kwa uuzaji wa mali fasta
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,Mwisho Stock &#39;hauwezi kuchunguziwa kwa uuzaji wa mali fasta
 DocType: Bank Reconciliation,Bank Reconciliation,Upatanisho wa Benki
 DocType: Attendance,On Leave,Kuondoka
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Pata Marekebisho
@@ -4372,7 +4375,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serial Hakuna na Batch
 DocType: Warranty Claim,From Company,Kutoka kwa Kampuni
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Muhtasari wa Mipango ya Tathmini inahitaji kuwa {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Tafadhali weka Idadi ya Dhamana iliyopangwa
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Tafadhali weka Idadi ya Dhamana iliyopangwa
 DocType: Supplier Scorecard Period,Calculations,Mahesabu
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Thamani au Uchina
 DocType: Payment Terms Template,Payment Terms,Masharti ya Malipo
@@ -4391,7 +4394,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Punguzo (%) kwenye Orodha ya Bei Kiwango na Margin
 DocType: Healthcare Service Unit Type,Rate / UOM,Kiwango / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Wilaya zote
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Hakuna {0} kupatikana kwa Shughuli za Inter Company.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Hakuna {0} kupatikana kwa Shughuli za Inter Company.
 DocType: Travel Itinerary,Rented Car,Imesajiliwa Gari
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Kuhusu Kampuni yako
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Mikopo Kwa akaunti lazima iwe Hesabu ya Hesabu ya Hesabu
@@ -4492,6 +4495,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Vigezo vya Uchambuzi wa Kupanda
 DocType: Cheque Print Template,Cheque Height,Angalia Urefu
 DocType: Supplier,Supplier Details,Maelezo ya Wasambazaji
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Tafadhali kuanzisha mfululizo wa kuhesabu kwa Mahudhurio kupitia Upangilio&gt; Orodha ya Kuhesabu
 DocType: Setup Progress,Setup Progress,Maendeleo ya Kuweka
 DocType: Expense Claim,Approval Status,Hali ya kibali
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Kutoka thamani lazima iwe chini kuliko ya thamani katika mstari {0}
@@ -4584,7 +4588,6 @@
 DocType: Travel Request,Fully Sponsored,Inasaidiwa kikamilifu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Rejea Kuingia kwa Jarida
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Mteja {0} ameundwa.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Tafadhali kuanzisha Mfumo wa Jina la Waajiriwa katika Rasilimali za Binadamu&gt; Mipangilio ya HR
 DocType: Stock Settings,Limit Percent,Percent Limit
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Hivi sasa hakuna hisa zinazopatikana katika ghala lolote
 ,Payment Period Based On Invoice Date,Kipindi cha Malipo Kulingana na tarehe ya ankara
@@ -4643,7 +4646,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Ghala la Chanzo
 DocType: Installation Note,Installation Date,Tarehe ya Usanidi
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Shirikisha Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Malipo {1} si ya kampuni {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Malipo {1} si ya kampuni {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Invoice ya Mauzo {0} imeundwa
 DocType: Employee,Confirmation Date,Tarehe ya uthibitisho
 DocType: Inpatient Occupancy,Check Out,Angalia
@@ -4663,6 +4666,7 @@
 DocType: Production Plan,Sales Orders Detail,Maagizo ya Mauzo ya Maelezo
 DocType: Bin,Requested Quantity,Waliombwa Wingi
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE -YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Tafadhali kuanzisha Msaidizi wa Kuita Mfumo katika Elimu&gt; Mipangilio ya Elimu
 DocType: Patient,Marital Status,Hali ya ndoa
 DocType: Stock Settings,Auto Material Request,Ombi la Nyenzo za Auto
 DocType: Woocommerce Settings,API consumer secret,Siri ya watumiaji wa API
@@ -4714,7 +4718,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Chagua Siku
 DocType: Academic Term,Term Name,Jina la Muda
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Mikopo ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Kujenga Slips za Mshahara ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Kujenga Slips za Mshahara ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Huwezi kubadilisha node ya mizizi.
 DocType: Buying Settings,Purchase Order Required,Utaratibu wa Ununuzi Unahitajika
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Muda
@@ -4750,7 +4754,7 @@
 DocType: Account,Rate at which this tax is applied,Kiwango ambacho kodi hii inatumiwa
 DocType: Cash Flow Mapper,Section Name,Jina la Sehemu
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Rekebisha Uchina
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Upungufu Row {0}: Thamani inayotarajiwa baada ya maisha muhimu lazima iwe kubwa kuliko au sawa na {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Upungufu Row {0}: Thamani inayotarajiwa baada ya maisha muhimu lazima iwe kubwa kuliko au sawa na {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Open Job sasa
 DocType: Company,Stock Adjustment Account,Akaunti ya Marekebisho ya Hifadhi
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Andika
@@ -4797,7 +4801,7 @@
 DocType: Program Enrollment,School House,Shule ya Shule
 DocType: Serial No,Out of AMC,Nje ya AMC
 DocType: Opportunity,Opportunity Amount,Fursa Kiasi
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Idadi ya kushuka kwa thamani iliyotengenezwa haiwezi kuwa kubwa zaidi kuliko Jumla ya Idadi ya Dhamana
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Idadi ya kushuka kwa thamani iliyotengenezwa haiwezi kuwa kubwa zaidi kuliko Jumla ya Idadi ya Dhamana
 DocType: Purchase Order,Order Confirmation Date,Tarehe ya uthibitisho wa amri
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI -YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Fanya Ziara ya Utunzaji
@@ -4838,7 +4842,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Kundi:
 DocType: Volunteer,Afternoon,Saa ya asubuhi
 DocType: Loyalty Program,Loyalty Program Help,Msaada wa Programu ya Uaminifu
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} &#39;{1}&#39; imezimwa
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} &#39;{1}&#39; imezimwa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Weka kama Fungua
 DocType: Cheque Print Template,Scanned Cheque,Angalia Angalia
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Tuma barua pepe moja kwa moja kwa Wafanyabiashara juu ya Kuwasilisha shughuli.
@@ -4851,7 +4855,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Maelezo na maelezo ya dhamana
 DocType: Chapter,Chapter Members,Wanachama wa Sura
 DocType: Sales Team,Contribution (%),Mchango (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Kumbuka: Uingiaji wa Malipo hautaundwa tangu &#39;Akaunti ya Fedha au Benki&#39; haijainishwa
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Kumbuka: Uingiaji wa Malipo hautaundwa tangu &#39;Akaunti ya Fedha au Benki&#39; haijainishwa
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Mradi {0} tayari umepo
 DocType: Clinical Procedure,Nursing User,Mtumiaji wa Uuguzi
 DocType: Employee Benefit Application,Payroll Period,Kipindi cha Mishahara
@@ -4859,6 +4863,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Serial Hakuna {0} si ya Kundi {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Majukumu
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Kipindi cha uhalali wa nukuu hii imekwisha.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Tafadhali futa Waajiri <a href=""#Form/Employee/{0}"">{0}</a> \ ili kufuta hati hii"
 DocType: Expense Claim Account,Expense Claim Account,Akaunti ya dai ya gharama
 DocType: Account,Capital Work in Progress,Kazi ya Kitaifa katika Maendeleo
 DocType: Accounts Settings,Allow Stale Exchange Rates,Ruhusu Viwango vya Exchange za Stale
@@ -4939,7 +4945,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Matatizo ya Matatizo
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Unganisha Dukaify na ERPNext
 DocType: Material Request Item,For Warehouse,Kwa Ghala
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Vidokezo vya Utoaji {0} updated
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Vidokezo vya Utoaji {0} updated
 DocType: Employee,Offer Date,Tarehe ya Kutoa
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Nukuu
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Wewe uko katika hali ya mkondo. Hutaweza kupakia upya mpaka una mtandao.
@@ -4989,7 +4995,7 @@
 DocType: Shipping Rule,Calculate Based On,Tumia Mahesabu
 DocType: Contract,Unfulfilled,Haijajazwa
 DocType: Delivery Note Item,From Warehouse,Kutoka kwa Ghala
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Hakuna wafanyakazi kwa vigezo vilivyotajwa
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Hakuna wafanyakazi kwa vigezo vilivyotajwa
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Hakuna Vipengee Vipengee vya Vifaa vya Kutengeneza
 DocType: Shopify Settings,Default Customer,Wateja wa Mteja
 DocType: Sales Stage,Stage Name,Jina la hatua
@@ -5031,7 +5037,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Kiwango cha Ushuru Baada ya Kiasi Kikubwa
 DocType: Patient,Inpatient Status,Hali ya wagonjwa
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Mipangilio ya kila siku ya Kazi ya Kazi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Orodha ya Bei iliyochaguliwa inapaswa kuwa na ununuzi na kuuza mashamba yaliyochungwa.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Orodha ya Bei iliyochaguliwa inapaswa kuwa na ununuzi na kuuza mashamba yaliyochungwa.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Tafadhali ingiza Reqd kwa Tarehe
 DocType: Payment Entry,Internal Transfer,Uhamisho wa Ndani
 DocType: Asset Maintenance,Maintenance Tasks,Kazi za Matengenezo
@@ -5067,7 +5073,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Kikundi Kwa
 DocType: Guardian,Interests,Maslahi
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Wezesha / afya ya fedha.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Haikuweza kuwasilisha Slips za Mshahara
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Haikuweza kuwasilisha Slips za Mshahara
 DocType: Exchange Rate Revaluation,Get Entries,Pata Maingilio
 DocType: Production Plan,Get Material Request,Pata Ombi la Nyenzo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Malipo ya posta
@@ -5151,7 +5157,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Akaunti ya gharama ni lazima kwa kipengee {0}
 DocType: BOM,Website Description,Website Description
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Mabadiliko ya Net katika Equity
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Tafadhali cancel ankara ya Ununuzi {0} kwanza
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Tafadhali cancel ankara ya Ununuzi {0} kwanza
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Hairuhusiwi. Tafadhali afya Aina ya Huduma ya Huduma
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Anwani ya barua pepe inapaswa kuwa ya kipekee, tayari ipo kwa {0}"
 DocType: Serial No,AMC Expiry Date,Tarehe ya Kumalizika ya AMC
@@ -5191,7 +5197,7 @@
 DocType: Hotel Room,Hotel Room,Chumba cha hoteli
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Akaunti {0} sio ya kampuni {1}
 DocType: Leave Type,Rounding,Kupiga kura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Nambari za Serial katika mstari {0} haifani na Kumbuka Utoaji
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Nambari za Serial katika mstari {0} haifani na Kumbuka Utoaji
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Kiasi kilicholipwa (Pro-rated)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Halafu Kanuni za Bei zinachaguliwa kwa kuzingatia Wateja, Kikundi cha Wateja, Wilaya, Wasambazaji, Kikundi cha Wasambazaji, Kampeni, Mshiriki wa Mauzo nk."
 DocType: Student,Guardian Details,Maelezo ya Guardian
@@ -5246,7 +5252,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Ghala inayotakiwa kwa kipengee cha hisa {0}
 DocType: Leave Allocation,Unused leaves,Majani yasiyotumika
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Fanya Uingizaji wa Malipo
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Idara zote
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Idara zote
 DocType: Healthcare Service Unit,Vacant,Yakosa
 DocType: Patient,Alcohol Past Use,Pombe Matumizi ya Kale
 DocType: Fertilizer Content,Fertilizer Content,Maudhui ya Mbolea
@@ -5257,7 +5263,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Kazi ya Kazi {0} lazima iondoliwe kabla ya kufuta Sheria hii ya Mauzo
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Pata BOM ilipungua (ikiwa ni pamoja na mikutano ndogo)
 DocType: Authorization Rule,Applicable To (Employee),Inafaa kwa (Mfanyakazi)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Tarehe ya Kutokana ni ya lazima
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Tarehe ya Kutokana ni ya lazima
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Uingizaji wa Kushikilia {0} hauwezi kuwa 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Aina ya Faida na Kiasi
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Vyumba vimeandikwa
@@ -5401,7 +5407,7 @@
 DocType: Purchase Invoice Item,Total Weight,Uzito wote
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Tume ya Mauzo
 DocType: Job Offer Term,Value / Description,Thamani / Maelezo
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Malipo {1} haiwezi kufungwa, tayari ni {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Malipo {1} haiwezi kufungwa, tayari ni {2}"
 DocType: Tax Rule,Billing Country,Nchi ya kulipia
 DocType: Purchase Order Item,Expected Delivery Date,Tarehe ya Utoaji Inayotarajiwa
 DocType: Restaurant Order Entry,Restaurant Order Entry,Mkahawa wa Kuingia Uagizaji
@@ -5440,12 +5446,13 @@
 DocType: Maintenance Visit,Breakdown,Kuvunja
 DocType: Travel Itinerary,Vegetarian,Mboga
 DocType: Patient Encounter,Encounter Date,Kukutana Tarehe
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Akaunti: {0} kwa fedha: {1} haiwezi kuchaguliwa
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Akaunti: {0} kwa fedha: {1} haiwezi kuchaguliwa
 DocType: Bank Statement Transaction Settings Item,Bank Data,Takwimu za Benki
 DocType: Purchase Receipt Item,Sample Quantity,Mfano Wingi
 DocType: Bank Guarantee,Name of Beneficiary,Jina la Mfadhili
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Sasisha BOM gharama moja kwa moja kupitia Mpangilio, kwa kuzingatia kiwango cha hivi karibuni cha kiwango cha bei / bei ya bei / mwisho wa ununuzi wa vifaa vya malighafi."
 DocType: Supplier,SUP-.YYYY.-,SUP-YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Wasambazaji&gt; Kikundi cha Wasambazaji
 DocType: Bank Reconciliation Detail,Cheque Date,Tarehe ya Kuangalia
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Akaunti {0}: Akaunti ya Mzazi {1} si ya kampuni: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Imefanikiwa kufutwa shughuli zote zinazohusiana na kampuni hii!
@@ -5473,7 +5480,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Node za watoto zinaweza kuundwa tu chini ya nambari za aina ya &#39;Kikundi&#39;
 DocType: Attendance Request,Half Day Date,Tarehe ya Nusu ya Siku
 DocType: Academic Year,Academic Year Name,Jina la Mwaka wa Elimu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} haruhusiwi kuingiliana na {1}. Tafadhali mabadiliko ya Kampuni.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} haruhusiwi kuingiliana na {1}. Tafadhali mabadiliko ya Kampuni.
 DocType: Sales Partner,Contact Desc,Wasiliana Desc
 DocType: Email Digest,Send regular summary reports via Email.,Tuma taarifa za muhtasari wa mara kwa mara kupitia barua pepe.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html +11,Available Leaves,Majani Inapatikana
@@ -5505,7 +5512,7 @@
 DocType: Hotel Room,Hotel Manager,Meneja wa Hoteli
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Weka Kanuni ya Ushuru kwa gari la ununuzi
 DocType: Purchase Invoice,Taxes and Charges Added,Kodi na Malipo Aliongeza
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Upungufu Row {0}: Tarehe ya Utoaji wa Dhamana haiwezi kuwa kabla ya Tarehe ya kupatikana
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Upungufu Row {0}: Tarehe ya Utoaji wa Dhamana haiwezi kuwa kabla ya Tarehe ya kupatikana
 ,Sales Funnel,Funnel ya Mauzo
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Hali ni lazima
 DocType: Project,Task Progress,Maendeleo ya Kazi
@@ -5519,7 +5526,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Vikundi vyote vya Wateja
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,Imekusanywa kila mwezi
 DocType: Attendance Request,On Duty,Kazini
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ni lazima. Kumbukumbu ya Kubadilisha Fedha Labda haikuundwa kwa {1} kwa {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ni lazima. Kumbukumbu ya Kubadilisha Fedha Labda haikuundwa kwa {1} kwa {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Mpango wa Utumishi {0} tayari umekuwepo kwa ajili ya uteuzi {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Kigezo cha Kodi ni lazima.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Akaunti {0}: Akaunti ya Mzazi {1} haipo
@@ -5598,11 +5605,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Atleast ghala moja ni lazima
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Sanidi Mashamba ya Bidhaa kama UOM, Kikundi cha Maelezo, Maelezo na Hakuna Masaa."
 DocType: Certification Application,Certification Status,Hali ya vyeti
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Hifadhi ya Soko
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Hifadhi ya Soko
 DocType: Travel Itinerary,Travel Advance Required,Safari ya Safari inahitajika
 DocType: Subscriber,Subscriber Name,Jina la Msajili
 DocType: Serial No,Out of Warranty,Nje ya udhamini
-DocType: Cashier Closing,Cashier-closing-,Malipo ya kufungua-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Aina ya Data Mapped
 DocType: BOM Update Tool,Replace,Badilisha
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Hakuna bidhaa zilizopatikana.
@@ -5689,7 +5695,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Vidokezo vya kodi za kutosha kwa mauzo na ununuzi vinaloundwa.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Tathmini ya Matokeo ya Tathmini {0} tayari imepo.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Mfano: ABCD. #####. Ikiwa mfululizo umewekwa na Batch No haijajwajwa katika shughuli, basi nambari ya kundi la moja kwa moja litaundwa kulingana na mfululizo huu. Ikiwa daima unataka kueleza wazi Kundi Hakuna kwa kipengee hiki, chagua hii tupu. Kumbuka: mipangilio hii itachukua kipaumbele juu ya Kiambatisho cha Msaada wa Naming katika Mipangilio ya Hifadhi"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Tafadhali kuanzisha mfululizo wa kuhesabu kwa Mahudhurio kupitia Upangilio&gt; Orodha ya Kuhesabu
 DocType: BOM,Materials Required (Exploded),Vifaa vinavyotakiwa (Imelipuka)
 DocType: Contract,Party User,Mtumiaji wa Chama
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Tafadhali weka Chujio cha Kampuni kikiwa tupu ikiwa Kundi Na &#39;Kampuni&#39;
@@ -5889,7 +5894,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Upinzani wa Opp
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Kipindi cha kwanza cha majaribio Tarehe ya Kuanza na Tarehe ya Mwisho wa Kipindi lazima iwekwa
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Kiwango cha wastani
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Kiwango cha Malipo ya Jumla katika Ratiba ya Malipo lazima iwe sawa na Grand / Rounded Total
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Kiwango cha Malipo ya Jumla katika Ratiba ya Malipo lazima iwe sawa na Grand / Rounded Total
 DocType: Subscription Plan Detail,Plan,Mpango
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Usawa wa Taarifa ya Benki kama kwa Jedwali Mkuu
 DocType: Job Applicant,Applicant Name,Jina la Msaidizi
@@ -5958,7 +5963,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sabuni &amp; Daktari
 DocType: BOM,Show Items,Onyesha Vitu
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Kutoka Muda haiwezi kuwa kubwa zaidi kuliko Ili Muda.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Unataka kuwajulisha wateja wote kwa barua pepe?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Unataka kuwajulisha wateja wote kwa barua pepe?
 DocType: Subscription Plan,Billing Interval,Muda wa kulipia
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Picha na Video ya Mwendo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Amri
@@ -5967,9 +5972,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Row {0}: {1} lazima iwe kubwa kuliko 0
 DocType: Assessment Criteria,Assessment Criteria Group,Makundi ya Vigezo vya Tathmini
 DocType: Healthcare Settings,Patient Name By,Jina la Mgonjwa Na
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Usajili wa Taarifa ya Mishahara kutoka kwa {0} hadi {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Usajili wa Taarifa ya Mishahara kutoka kwa {0} hadi {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Wezesha Mapato yaliyofanywa
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Kufungua Upungufu wa Kusanyiko lazima uwe chini ya sawa na {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Kufungua Upungufu wa Kusanyiko lazima uwe chini ya sawa na {0}
 DocType: Warehouse,Warehouse Name,Jina la Ghala
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Tarehe ya kuanza halisi lazima iwe chini ya tarehe halisi ya mwisho
 DocType: Naming Series,Select Transaction,Chagua Shughuli
@@ -6120,7 +6125,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Mfanyakazi {0} wa daraja {1} hawana sera ya kuacha ya kuondoka
 DocType: Salary Detail,Salary Detail,Maelezo ya Mshahara
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Tafadhali chagua {0} kwanza
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Aliongeza {0} watumiaji
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Aliongeza {0} watumiaji
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","Katika kesi ya mpango wa mipango mbalimbali, Wateja watapatiwa auto kwa tier husika kama kwa matumizi yao"
 DocType: Appointment Type,Physician,Daktari
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Kipengee {0} cha Bidhaa {1} kimekamilika.
@@ -6263,7 +6268,7 @@
 DocType: Asset,Custodian,Mtunzaji
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Ushauri wa Maandishi ya Uhakika
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} lazima iwe thamani kati ya 0 na 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Malipo ya {0} kutoka {1} hadi {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Malipo ya {0} kutoka {1} hadi {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Mikopo isiyohakikishiwa
 DocType: Cost Center,Cost Center Name,Jina la Kituo cha Gharama
 DocType: Student,B+,B +
@@ -6295,6 +6300,7 @@
 DocType: Employee,Date of Issue,Tarehe ya Suala
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Kwa mujibu wa Mipangilio ya Ununuzi ikiwa Ununuzi wa Reciept Inahitajika == &#39;Ndiyo&#39;, kisha kwa Kujenga Invoice ya Ununuzi, mtumiaji haja ya kuunda Receipt ya Ununuzi kwanza kwa kipengee {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Row # {0}: Weka wauzaji kwa kipengee {1}
+DocType: Global Defaults,Default Distance Unit,Kitengo cha Default Distance
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Row {0}: Thamani ya saa lazima iwe kubwa kuliko sifuri.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Image ya tovuti {0} iliyoambatana na Item {1} haiwezi kupatikana
 DocType: Issue,Content Type,Aina ya Maudhui
@@ -6350,7 +6356,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Debit Kwa akaunti lazima iwe Hesabu ya Hesabu ya Hesabu
 DocType: Asset,Naming Series,Mfululizo wa majina
 DocType: Vital Signs,Coated,Imefunikwa
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Row {0}: Thamani Inayotarajiwa Baada ya Maisha ya Muhimu lazima iwe chini ya Kiasi cha Ununuzi wa Gross
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Row {0}: Thamani Inayotarajiwa Baada ya Maisha ya Muhimu lazima iwe chini ya Kiasi cha Ununuzi wa Gross
 DocType: GoCardless Settings,GoCardless Settings,Mipangilio ya GoCardless
 DocType: Leave Block List,Leave Block List Name,Acha jina la orodha ya kuzuia
 DocType: Certified Consultant,Certification Validity,Uthibitishaji wa vyeti
@@ -6417,6 +6423,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Kiongozi wa Benki
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Angalia Majaribio ya Lab
 DocType: Hub Users,Hub Users,Watumiaji wa Hub
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Wateja&gt; Kikundi cha Wateja&gt; Eneo
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Tarehe ya Matengenezo
 DocType: Purchase Invoice Item,Rejected Serial No,Imekataliwa Serial No
@@ -6431,7 +6438,7 @@
 DocType: SG Creation Tool Course,Max Strength,Nguvu ya Max
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Inaweka presets
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH -YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Hakuna Kumbukumbu ya Utoaji iliyochaguliwa kwa Wateja {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Hakuna Kumbukumbu ya Utoaji iliyochaguliwa kwa Wateja {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Mfanyakazi {0} hana kiwango cha juu cha faida
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Chagua Vitu kulingana na tarehe ya utoaji
 DocType: Grant Application,Has any past Grant Record,Ina nakala yoyote ya Ruzuku iliyopita
@@ -6458,7 +6465,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Uhifadhi wa Chumba cha Hoteli
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Huduma kwa wateja
 DocType: BOM,Thumbnail,Picha ndogo
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Hakuna anwani na Vitambulisho vya barua pepe vilivyopatikana.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Hakuna anwani na Vitambulisho vya barua pepe vilivyopatikana.
 DocType: Item Customer Detail,Item Customer Detail,Maelezo ya Wateja wa Bidhaa
 DocType: Notification Control,Prompt for Email on Submission of,Ombi kwa Barua pepe juu ya Uwasilishaji wa
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Ufikiaji wa kiasi cha mfanyakazi {0} unazidi {1}
@@ -6713,7 +6720,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,Haiwezi kufunika kwa Kundi kwa sababu Aina ya Akaunti imechaguliwa.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} imebadilishwa. Tafadhali furahisha.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Waacha watumiaji wa kufanya Maombi ya Kuacha siku zifuatazo.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Msimbo wa Item&gt; Kikundi cha Bidhaa&gt; Brand
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Iwapo muda usio na ukomo wa Pointi ya Uaminifu, endelea Muda wa Muda Uliopita tupu au 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Washirika wa Timu ya Matengenezo
 DocType: Loyalty Point Entry,Purchase Amount,Ununuzi wa Kiasi
@@ -6721,7 +6727,7 @@
 											to fullfill Sales Order {2}",Haiwezi kutoa Serial Hapana {0} ya kipengee {1} kama imehifadhiwa \ kwa Maagizo ya Mauzo Kamili {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN -YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Nukuu ya Wafanyabiashara {0} imeundwa
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Mwaka wa Mwisho hauwezi kuwa kabla ya Mwaka wa Mwanzo
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Mwaka wa Mwisho hauwezi kuwa kabla ya Mwaka wa Mwanzo
 DocType: Employee Benefit Application,Employee Benefits,Faida ya Waajiriwa
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Wingi uliowekwa lazima iwe sawa kiasi cha Bidhaa {0} mfululizo {1}
 DocType: Work Order,Manufactured Qty,Uchina uliotengenezwa
@@ -6737,6 +6743,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Chagua Hesabu za Batch
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Kwa GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Miradi iliyotolewa kwa Wateja.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Tafadhali kuanzisha Mfumo wa Jina la Waajiriwa katika Rasilimali za Binadamu&gt; Mipangilio ya HR
 DocType: Healthcare Settings,Invoice Appointments Automatically,Uteuzi wa ankara Moja kwa moja
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id ya Mradi
 DocType: Salary Component,Variable Based On Taxable Salary,Tofauti kulingana na Mshahara wa Ushuru
@@ -6785,7 +6792,7 @@
 DocType: POS Profile,Account for Change Amount,Akaunti ya Kiasi cha Mabadiliko
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Kuunganisha kwa QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Jumla ya Kupata / Kupoteza
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Kampuni isiyo sahihi ya Invoice ya Kampuni ya Inter.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Kampuni isiyo sahihi ya Invoice ya Kampuni ya Inter.
 DocType: Purchase Invoice,input service,huduma ya pembejeo
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Chama / Akaunti hailingani na {1} / {2} katika {3} {4}
 DocType: Employee Promotion,Employee Promotion,Kukuza waajiriwa
@@ -6913,7 +6920,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Eneo Lolote la Kuingia
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Cart ni tupu
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Tafadhali kuanzisha Msaidizi wa Kuita Mfumo katika Elimu&gt; Mipangilio ya Elimu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Kipengee {0} hazina vitu vya Serial No tu pekee \ vinaweza kuwa na utoaji kulingana na Serial No
 DocType: Vehicle,Model,Mfano
@@ -6943,7 +6949,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Hakuna mabadiliko
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Tafadhali chagua faili ya csv
 DocType: Holiday List,Total Holidays,Jumla ya Likizo
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Halafu ya template ya barua pepe ya kupeleka. Tafadhali weka moja kwenye Mipangilio ya Utoaji.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Halafu ya template ya barua pepe ya kupeleka. Tafadhali weka moja kwenye Mipangilio ya Utoaji.
 DocType: Student Leave Application,Mark as Present,Mark kama sasa
 DocType: Supplier Scorecard,Indicator Color,Rangi ya Kiashiria
 DocType: Purchase Order,To Receive and Bill,Kupokea na Bill
@@ -6952,7 +6958,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Chagua Serial No
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Muumbaji
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Masharti na Masharti Kigezo
-DocType: Serial No,Delivery Details,Maelezo ya utoaji
+DocType: Delivery Trip,Delivery Details,Maelezo ya utoaji
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Kituo cha gharama kinahitajika kwenye mstari {0} katika meza ya kodi kwa aina {1}
 DocType: Program,Program Code,Kanuni ya Programu
 DocType: Terms and Conditions,Terms and Conditions Help,Masharti na Masharti Msaada
@@ -6976,7 +6982,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Siku za Kiongozi
 DocType: Cash Flow Mapping,Is Income Tax Expense,"Je, gharama ya Kodi ya Mapato"
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Amri yako ni nje ya utoaji!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Tarehe ya Kuweka lazima iwe sawa na tarehe ya ununuzi {1} ya mali {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Tarehe ya Kuweka lazima iwe sawa na tarehe ya ununuzi {1} ya mali {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Angalia hii ikiwa Mwanafunzi anaishi katika Hosteli ya Taasisi.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Tafadhali ingiza Amri za Mauzo kwenye jedwali hapo juu
 ,Stock Summary,Summary Stock
diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv
index 5e860a5..3360dca 100644
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,காலம் பெயர்
 DocType: Employee,Salary Mode,சம்பளம் முறை
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,பதிவு
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,பதிவு
 DocType: Patient,Divorced,விவாகரத்து
 DocType: Support Settings,Post Route Key,போஸ்ட் வழி விசை
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,பொருள் ஒரு பரிமாற்றத்தில் பல முறை சேர்க்க அனுமதி
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,புதிய பரிவர்த்தனை விகிதம்
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},நாணய விலை பட்டியல் தேவையான {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* பரிமாற்றத்தில் கணக்கிடப்படுகிறது.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,சப்ளையர்&gt; சப்ளையர் வகை
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-டிடி-.YYYY.-
 DocType: Purchase Order,Customer Contact,வாடிக்கையாளர் தொடர்பு
 DocType: Patient Appointment,Check availability,கிடைக்கும் என்பதை சரிபார்க்கவும்
@@ -73,7 +72,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,திறந்த காட்டு
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,தொடர் வெற்றிகரமாக புதுப்பிக்கப்பட்டது
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,வெளியேறுதல்
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} வரிசையில் {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} வரிசையில் {0}
 DocType: Asset Finance Book,Depreciation Start Date,மறுதொடக்கம் தொடக்க தேதி
 DocType: Pricing Rule,Apply On,விண்ணப்பிக்க
 DocType: Item Price,Multiple Item prices.,பல பொருள் விலை .
@@ -119,7 +118,7 @@
 DocType: Lab Prescription,Lab Prescription,லேப் பரிந்துரைப்பு
 ,Delay Days,தாமதம் நாட்கள்
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,சேவை செலவு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},வரிசை எண்: {0} ஏற்கனவே விற்பனை விலைப்பட்டியல் குறிக்கப்படுகிறது உள்ளது: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},வரிசை எண்: {0} ஏற்கனவே விற்பனை விலைப்பட்டியல் குறிக்கப்படுகிறது உள்ளது: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,விலைப்பட்டியல்
 DocType: Purchase Invoice Item,Item Weight Details,பொருள் எடை விவரங்கள்
 DocType: Asset Maintenance Log,Periodicity,வட்டம்
@@ -144,6 +143,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,கணக்கர்
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,விலை பட்டியல் விற்பனை
 DocType: Patient,Tobacco Current Use,புகையிலை தற்போதைய பயன்பாடு
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","தொடக்க தேதி மற்றும் இறுதி தேதி வேலை அட்டைடன் <a href=""#Form/Job Card/{0}"">ஒன்றிணைக்கப்படுகிறது {1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,விலை விற்பனை
 DocType: Cost Center,Stock User,பங்கு பயனர்
 DocType: Soil Analysis,(Ca+Mg)/K,(+ எம்ஜி CA) / கே
@@ -163,7 +163,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,சம்பந்தப்பட்ட
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,வருகை தேதி ஊழியர் இணைந்ததாக தேதி விட குறைவாக இருக்க முடியாது
 DocType: Grading Scale,Grading Scale Name,தரம் பிரித்தல் அளவுகோல் பெயர்
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,சந்தைக்கு பயனர்களைச் சேர்க்கவும்
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,சந்தைக்கு பயனர்களைச் சேர்க்கவும்
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,இந்த ரூட் கணக்கு மற்றும் திருத்த முடியாது .
 DocType: Sales Invoice,Company Address,நிறுவன முகவரி
 DocType: BOM,Operations,நடவடிக்கைகள்
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,வேறுபாடு
 DocType: Production Plan,Material Request Detail,பொருள் கோரிக்கை விரிவாக
 DocType: Selling Settings,Default Quotation Validity Days,இயல்புநிலை மேற்கோள் செல்லுபடியாகும் நாட்கள்
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","வரிசையில் வரி ஆகியவை அடங்கும் {0} பொருள் விகிதம் , வரிசைகளில் வரிகளை {1} சேர்க்கப்பட்டுள்ளது"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","வரிசையில் வரி ஆகியவை அடங்கும் {0} பொருள் விகிதம் , வரிசைகளில் வரிகளை {1} சேர்க்கப்பட்டுள்ளது"
 DocType: SMS Center,SMS Center,எஸ்எம்எஸ் மையம்
 DocType: Payroll Entry,Validate Attendance,கலந்துகொள்வதை உறுதிப்படுத்துக
 DocType: Sales Invoice,Change Amount,அளவு மாற்ற
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,வார்த்தைகளில் அளவு வரி இடைவெளி
 DocType: Vehicle,Additional Details,கூடுதல் விவரங்கள்
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,கொடுக்கப்பட்ட விளக்கம் இல்லை
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,சப்ளையர்&gt; சப்ளையர் குழு
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,வாங்குவதற்கு கோரிக்கை.
 DocType: POS Closing Voucher Details,Collected Amount,சேகரிக்கப்பட்ட தொகை
 DocType: Lab Test,Submitted Date,சமர்ப்பிக்கப்பட்ட தேதி
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,மாணவர் சேர்க்கை
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,பொருள் {0} ரத்து
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,தேய்மானம் வரிசை {0}: தேதியற்ற தொடக்க தேதி கடந்த தேதியன்று உள்ளிடப்பட்டுள்ளது
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,தேய்மானம் வரிசை {0}: தேதியற்ற தொடக்க தேதி கடந்த தேதியன்று உள்ளிடப்பட்டுள்ளது
 DocType: Contract Template,Fulfilment Terms and Conditions,நிறைவேற்று விதிமுறைகள் மற்றும் நிபந்தனைகள்
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,பொருள் கோரிக்கை
 DocType: Bank Reconciliation,Update Clearance Date,இசைவு தேதி புதுப்பிக்க
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,கணக்குகளைத் அமைப்புகள்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},சப்ளையர் விலைப்பட்டியல் இல்லை கொள்முதல் விலைப்பட்டியல் உள்ளது {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,விற்பனை நபர் மரம் நிர்வகி .
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Google Maps அமைப்புகள் முடக்கப்பட்டதால், வழிச் செயலாக்க முடியாது."
 DocType: Job Applicant,Cover Letter,முகப்பு கடிதம்
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,மிகச்சிறந்த காசோலைகள் மற்றும் அழிக்க வைப்பு
 DocType: Item,Synced With Hub,ஹப் ஒத்திசைய
@@ -602,7 +602,7 @@
 DocType: Asset Value Adjustment,New Asset Value,புதிய சொத்து மதிப்பு
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,விகிதம் இது வாடிக்கையாளர் நாணயத்தின் வாடிக்கையாளர் அடிப்படை நாணய மாற்றப்படும்
 DocType: Course Scheduling Tool,Course Scheduling Tool,பாடநெறி திட்டமிடல் கருவி
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ரோ # {0}: கொள்முதல் விலைப்பட்டியல் இருக்கும் சொத்துடன் எதிராகவும் முடியாது {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ரோ # {0}: கொள்முதல் விலைப்பட்டியல் இருக்கும் சொத்துடன் எதிராகவும் முடியாது {1}
 DocType: Crop Cycle,LInked Analysis,Lynked பகுப்பாய்வு
 DocType: POS Closing Voucher,POS Closing Voucher,POS நிறைவு வவுச்சர்
 DocType: Contract,Lapsed,செலவான
@@ -637,6 +637,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} கோர்ஸ் பதிவுசெய்யாமலிருந்தால் உள்ளது {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,மாணவன் பெயர்:
 DocType: POS Closing Voucher Details,Difference,வேறுபாடு
+DocType: Delivery Settings,Delay between Delivery Stops,டெலிவரி ஸ்டோப்புகளுக்கு இடையில் தாமதம்
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},தொடர் இல {0} டெலிவரி குறிப்பு அல்ல {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","சேவையகத்தின் GoCardless கட்டமைப்பில் ஒரு சிக்கல் இருக்கிறது. கவலைப்படாதே, தோல்வி ஏற்பட்டால், உங்கள் கணக்கில் பணம் திரும்பப்பெறப்படும்."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext டெமோ
@@ -697,7 +698,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,அளவு மற்றும் விகிதம்
 DocType: Delivery Note,% Installed,% நிறுவப்பட்ட
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,வகுப்பறைகள் / ஆய்வுக்கூடங்கள் போன்றவை அங்கு விரிவுரைகள் திட்டமிடப்பட்டுள்ளது.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,இரு நிறுவனங்களின் நிறுவனத்தின் நாணயங்களும் இன்டர் கம்பெனி பரிவர்த்தனைகளுக்கு பொருந்த வேண்டும்.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,இரு நிறுவனங்களின் நிறுவனத்தின் நாணயங்களும் இன்டர் கம்பெனி பரிவர்த்தனைகளுக்கு பொருந்த வேண்டும்.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,முதல் நிறுவனத்தின் பெயரை உள்ளிடுக
 DocType: Travel Itinerary,Non-Vegetarian,போத்
 DocType: Purchase Invoice,Supplier Name,வழங்குபவர் பெயர்
@@ -783,7 +784,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,தேதி முதல் வாடகைக்கு
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,போதும் பாகங்கள் கட்டுவது எப்படி
 DocType: POS Profile User,POS Profile User,POS பயனர் பயனர்
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,வரிசை {0}: தேய்மானத் தொடக்க தேதி தேவைப்படுகிறது
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,வரிசை {0}: தேய்மானத் தொடக்க தேதி தேவைப்படுகிறது
 DocType: Purchase Invoice Item,Service Start Date,சேவையின் தொடக்க தேதி
 DocType: Subscription Invoice,Subscription Invoice,சந்தா விலைப்பட்டியல்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,நேரடி வருமானம்
@@ -851,7 +852,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,சுருக்கமான ஏற்கனவே மற்றொரு நிறுவனம் பயன்படுத்தப்படும்
 DocType: Selling Settings,Default Customer Group,இயல்புநிலை வாடிக்கையாளர் குழு
 DocType: Employee,IFSC Code,IFSC கோட்
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","தொடக்க தேதி மற்றும் இறுதி தேதி வேலை அட்டைடன் <a href=""#Form/Job Card/{0}"">ஒன்றிணைக்கப்படுகிறது {1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","முடக்கவும், &#39;வட்டமான மொத்த&#39; என்றால் துறையில் எந்த பரிமாற்றத்தில் பார்க்க முடியாது"
 DocType: BOM,Operating Cost,இயக்க செலவு
 DocType: Crop,Produced Items,தயாரிக்கப்பட்ட பொருட்கள்
@@ -903,7 +903,7 @@
 DocType: Supplier,Prevent RFQs,RFQ களை தடுக்கவும்
 DocType: Hub User,Hub User,மையம் பயனர்
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,விற்பனை ஆணை செய்ய
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},{0} முதல் {1} முதல் காலம் சம்பள சரிவு சமர்ப்பிக்கப்பட்டது
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},{0} முதல் {1} முதல் காலம் சம்பள சரிவு சமர்ப்பிக்கப்பட்டது
 DocType: Project Task,Project Task,திட்ட பணி
 DocType: Loyalty Point Entry Redemption,Redeemed Points,மீட்டெடுக்கப்பட்ட புள்ளிகள்
 ,Lead Id,முன்னணி ஐடி
@@ -1032,7 +1032,7 @@
 DocType: Fee Validity,Max number of visit,விஜயத்தின் அதிகபட்ச எண்ணிக்கை
 ,Hotel Room Occupancy,ஹோட்டல் அறை ஆக்கிரமிப்பு
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,டைம் ஷீட் உருவாக்கப்பட்ட:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},கொடுப்பனவு முறையில் இயல்புநிலை பண அல்லது வங்கி கணக்கு அமைக்கவும் {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},கொடுப்பனவு முறையில் இயல்புநிலை பண அல்லது வங்கி கணக்கு அமைக்கவும் {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,பதிவுசெய்யவும்
 DocType: GST Settings,GST Settings,ஜிஎஸ்டி அமைப்புகள்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},நாணயமானது விலை பட்டியல் போலவே இருக்க வேண்டும் நாணயம்: {0}
@@ -1087,7 +1087,7 @@
 DocType: Vehicle Log,Service Details,சேவை விவரங்கள்
 DocType: Lab Test Template,Grouped,தொகுக்கப்பட்டுள்ளது
 DocType: Selling Settings,Delivery Note Required,டெலிவரி குறிப்பு தேவை
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,சம்பள சரிவுகளைச் சமர்ப்பிப்ப ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,சம்பள சரிவுகளைச் சமர்ப்பிப்ப ...
 DocType: Bank Guarantee,Bank Guarantee Number,வங்கி உத்தரவாத எண்
 DocType: Bank Guarantee,Bank Guarantee Number,வங்கி உத்தரவாத எண்
 DocType: Assessment Criteria,Assessment Criteria,மதிப்பீடு அடிப்படை
@@ -1113,7 +1113,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,கொடுப்பனவு நுழைவு ஏற்கனவே உருவாக்கப்பட்ட
 DocType: Request for Quotation,Get Suppliers,சப்ளையர்கள் கிடைக்கும்
 DocType: Purchase Receipt Item Supplied,Current Stock,தற்போதைய பங்கு
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},ரோ # {0}: சொத்து {1} பொருள் இணைக்கப்பட்ட இல்லை {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},ரோ # {0}: சொத்து {1} பொருள் இணைக்கப்பட்ட இல்லை {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,முன்னோட்டம் சம்பளம் ஸ்லிப்
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,கணக்கு {0} பல முறை உள்ளிட்ட வருகிறது
 DocType: Account,Expenses Included In Valuation,செலவுகள் மதிப்பீட்டு சேர்க்கப்பட்டுள்ளது
@@ -1191,7 +1191,7 @@
 DocType: Soil Texture,Sand,மணல்
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,சக்தி
 DocType: Opportunity,Opportunity From,வாய்ப்பு வரம்பு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,வரிசை {0}: {1} பொருள் {2} க்கான தொடர் எண்கள் தேவைப்படும். நீங்கள் {3} வழங்கியுள்ளீர்கள்.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,வரிசை {0}: {1} பொருள் {2} க்கான தொடர் எண்கள் தேவைப்படும். நீங்கள் {3} வழங்கியுள்ளீர்கள்.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,ஒரு அட்டவணையைத் தேர்ந்தெடுக்கவும்
 DocType: BOM,Website Specifications,இணையத்தளம் விருப்பம்
 DocType: Special Test Items,Particulars,விவரங்கள்
@@ -1298,7 +1298,7 @@
 DocType: Item,Items with higher weightage will be shown higher,அதிக முக்கியத்துவம் கொண்ட உருப்படிகள் அதிக காட்டப்படும்
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,லேப் சோதனைகள் மற்றும் முக்கிய அறிகுறிகள்
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,வங்கி நல்லிணக்க விரிவாக
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,ரோ # {0}: சொத்து {1} சமர்ப்பிக்க வேண்டும்
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,ரோ # {0}: சொத்து {1} சமர்ப்பிக்க வேண்டும்
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ஊழியர்   இல்லை
 DocType: Item,If subcontracted to a vendor,ஒரு விற்பனையாளர் ஒப்பந்தக்காரர்களுக்கு என்றால்
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,மாணவர் குழு ஏற்கனவே புதுப்பிக்கப்பட்டது.
@@ -1352,7 +1352,6 @@
 DocType: Loyalty Program Collection,Tier Name,அடுக்கு பெயர்
 DocType: HR Settings,Enter retirement age in years,ஆண்டுகளில் ஓய்வு பெறும் வயதை உள்ளிடவும்
 DocType: Crop,Target Warehouse,இலக்கு கிடங்கு
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,அமைவு&gt; அமைப்புகள்&gt; பெயரிடும் தொடர்கள் வழியாக {0} பெயரிடும் தொடர்களை அமைக்கவும்
 DocType: Payroll Employee Detail,Payroll Employee Detail,சம்பள ஊழியர் விபரம்
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,ஒரு கிடங்கில் தேர்ந்தெடுக்கவும்
 DocType: Cheque Print Template,Starting location from left edge,இடது ஓரத்தில் இருந்து இடம் தொடங்கி
@@ -1442,7 +1441,7 @@
 DocType: Work Order,Plan material for sub-assemblies,துணை கூட்டங்கள் திட்டம் பொருள்
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,விற்பனை பங்குதாரர்கள் மற்றும் பிரதேச
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} செயலில் இருக்க வேண்டும்
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,இடமாற்றத்திற்கான உருப்படிகளும் கிடைக்கவில்லை
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,இடமாற்றத்திற்கான உருப்படிகளும் கிடைக்கவில்லை
 DocType: Employee Boarding Activity,Activity Name,செயல்பாடு பெயர்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,வெளியீட்டு தேதி மாற்றவும்
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +250,Closing (Opening + Total),நிறைவு (திறக்கும் + மொத்தம்)
@@ -1669,6 +1668,7 @@
 DocType: Project,First Email,முதல் மின்னஞ்சல்
 DocType: Company,Exception Budget Approver Role,விதிவிலக்கு வரவு செலவுத் திட்ட மதிப்பீடு பங்கு
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","ஒருமுறை அமைக்க, இந்த விலைப்பட்டியல் வரை தேதி வரை வைத்திருக்கும்"
+DocType: Cashier Closing,POS-CLO-,பிஓஎஸ் CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,விற்பனை ஆணை / இறுதிப்பொருட்களாக்கும் கிடங்கில் ஒதுக்கப்பட்ட கிடங்கு
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,விற்பனை தொகை
 DocType: Repayment Schedule,Interest Amount,வட்டி தொகை
@@ -1680,7 +1680,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,பதிவுகள்
 DocType: Asset,Scrapped,முறித்துள்ளது
 DocType: Item,Item Defaults,பொருள் இயல்புநிலை
-DocType: Purchase Invoice,Returns,ரிட்டர்ன்ஸ்
+DocType: Cashier Closing,Returns,ரிட்டர்ன்ஸ்
 DocType: Job Card,WIP Warehouse,காதல் களம் கிடங்கு
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},தொடர் இல {0} வரை பராமரிப்பு ஒப்பந்தத்தின் கீழ் உள்ளது {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,ஆட்சேர்ப்பு
@@ -1694,7 +1694,6 @@
 DocType: Student,A-,ஏ
 DocType: Share Transfer,Transfer Type,பரிமாற்ற வகை
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,விற்பனை செலவு
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,வாடிக்கையாளர்&gt; வாடிக்கையாளர் குழு&gt; மண்டலம்
 DocType: Diagnosis,Diagnosis,நோய் கண்டறிதல்
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,ஸ்டாண்டர்ட் வாங்குதல்
 DocType: Attendance Request,Explanation,விளக்கம்
@@ -1707,7 +1706,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,ஆர்டர்களை ஆர்டர் செய்த பொருட்களை வாங்கவும்
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,ஜிப் குறியீடு
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},விற்பனை ஆணை {0} {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},கடனுக்கான வட்டி வருமானக் கணக்கைத் தேர்ந்தெடுத்து {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},கடனுக்கான வட்டி வருமானக் கணக்கைத் தேர்ந்தெடுத்து {0}
 DocType: Opportunity,Contact Info,தகவல் தொடர்பு
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,பங்கு பதிவுகள் செய்தல்
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,பணியாளர் நிலையை நிலை இடது பக்கம் ஊக்குவிக்க முடியாது
@@ -1719,7 +1718,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,பூஜ்யம் பில்லிங் மணிநேரத்திற்கு விலைப்பட்டியல் செய்ய முடியாது
 DocType: Company,Date of Commencement,துவக்க தேதி
 DocType: Sales Person,Select company name first.,முதல் நிறுவனத்தின் பெயரை தேர்ந்தெடுக்கவும்.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},மின்னஞ்சல் அனுப்பி {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},மின்னஞ்சல் அனுப்பி {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,மேற்கோள்கள் சப்ளையர்கள் இருந்து பெற்றார்.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOM ஐ மாற்றவும் மற்றும் அனைத்து BOM களில் சமீபத்திய விலை புதுப்பிக்கவும்
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},எப்படி {0} | {1} {2}
@@ -1740,7 +1739,7 @@
 DocType: Asset Movement,From Employee,பணியாளர் இருந்து
 DocType: Driver,Cellphone Number,செல்போன் எண்
 DocType: Project,Monitor Progress,மானிட்டர் முன்னேற்றம்
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,எச்சரிக்கை: முறைமை {0} {1} பூஜ்யம் பொருள் தொகை என்பதால் overbilling பார்க்க மாட்டேன்
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,எச்சரிக்கை: முறைமை {0} {1} பூஜ்யம் பொருள் தொகை என்பதால் overbilling பார்க்க மாட்டேன்
 DocType: Journal Entry,Make Difference Entry,வித்தியாசம் நுழைவு செய்ய
 DocType: Supplier Quotation,Auto Repeat Section,ஆட்டோ மீண்டும் தொடரவும்
 DocType: Upload Attendance,Attendance From Date,வரம்பு தேதி வருகை
@@ -1842,7 +1841,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,ரோ # {0}: அளவு கொள்முதல் ரிட்டன் உள்ளிட முடியாது நிராகரிக்கப்பட்டது
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,தேர்ந்தெடுத்த வாடிக்கையாளருக்கு வாடிக்கையாளர் குழுவை மாற்றுதல் அனுமதிக்கப்படாது.
 ,Purchase Order Items To Be Billed,"பில்லிங் செய்யப்படும் விதமே இருக்கவும் செய்ய வாங்குதல், ஆர்டர் உருப்படிகள்"
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,மதிப்பிடப்பட்ட வருகையை புதுப்பிக்கிறது.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,மதிப்பிடப்பட்ட வருகையை புதுப்பிக்கிறது.
 DocType: Program Enrollment Tool,Enrollment Details,பதிவு விவரங்கள்
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,ஒரு நிறுவனத்திற்கான பல பொருள் இயல்புநிலைகளை அமைக்க முடியாது.
 DocType: Purchase Invoice Item,Net Rate,நிகர விகிதம்
@@ -1856,7 +1855,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,விடுப்பு வகை பிரமாதம்
 DocType: Support Settings,Close Issue After Days,நாட்கள் பிறகு மூடு வெளியீடு
 ,Eway Bill,ஈவ் பில்
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,சந்தையில் பயனர்களை சேர்க்க கணினி மேலாளர் மற்றும் பொருள் மேலாளர் பாத்திரங்களைக் கொண்ட பயனராக இருக்க வேண்டும்.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,சந்தையில் பயனர்களை சேர்க்க கணினி மேலாளர் மற்றும் பொருள் மேலாளர் பாத்திரங்களைக் கொண்ட பயனராக இருக்க வேண்டும்.
 DocType: Leave Control Panel,Leave blank if considered for all branches,அனைத்து கிளைகளையும் கருத்தில் இருந்தால் வெறுமையாக
 DocType: Job Opening,Staffing Plan,பணியிட திட்டம்
 DocType: Bank Guarantee,Validity in Days,நாட்கள் செல்லுமைக்கான
@@ -1878,7 +1877,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},பிரதி வரிசையில் {0} அதே {1}
 DocType: Marketplace Settings,Disable Marketplace,Marketplace ஐ முடக்கு
 ,Trial Balance,விசாரணை இருப்பு
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,நிதியாண்டு {0} காணவில்லை
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,நிதியாண்டு {0} காணவில்லை
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,ஊழியர் அமைத்தல்
 DocType: Hotel Room Reservation,Hotel Reservation User,ஹோட்டல் முன்பதிவு பயனர்
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,முதல் முன்னொட்டு தேர்வு செய்க
@@ -1986,7 +1985,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,உள்நுழைய முடியவில்லை
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,சொத்து {0} உருவாக்கப்பட்டது
 DocType: Special Test Items,Special Test Items,சிறப்பு டெஸ்ட் பொருட்கள்
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Marketplace இல் பதிவு செய்ய நீங்கள் கணினி மேலாளர் மற்றும் பொருள் நிர்வாக மேலாளர்களுடன் ஒரு பயனர் இருக்க வேண்டும்.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Marketplace இல் பதிவு செய்ய நீங்கள் கணினி மேலாளர் மற்றும் பொருள் நிர்வாக மேலாளர்களுடன் ஒரு பயனர் இருக்க வேண்டும்.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,கட்டணம் செலுத்தும் முறை
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,உங்கள் ஒதுக்கப்பட்ட சம்பள கட்டமைப்புப்படி நீங்கள் நன்மைக்காக விண்ணப்பிக்க முடியாது
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,இணைய பட ஒரு பொது கோப்பு அல்லது வலைத்தளத்தின் URL இருக்க வேண்டும்
@@ -1998,7 +1997,7 @@
 DocType: Warehouse,Warehouse Contact Info,சேமிப்பு கிடங்கு தொடர்பு தகவல்
 DocType: Payment Entry,Write Off Difference Amount,வேறுபாடு தொகை ஆஃப் எழுத
 DocType: Volunteer,Volunteer Name,தொண்டர் பெயர்
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},பிற வரிசைகளில் போலி தேதிகளை கொண்ட வரிசைகள் காணப்பட்டன: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},பிற வரிசைகளில் போலி தேதிகளை கொண்ட வரிசைகள் காணப்பட்டன: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: ஊழியர் மின்னஞ்சல் கிடைக்கவில்லை, எனவே மின்னஞ்சல் அனுப்பப்படவில்லை."
 DocType: Item,Foreign Trade Details,வெளிநாட்டு வர்த்தக விவரங்கள்
 ,Assessment Plan Status,மதிப்பீட்டு திட்டம் நிலை
@@ -2088,6 +2087,7 @@
 DocType: Salary Component,Earning,சம்பாதித்து
 DocType: Supplier Scorecard,Scoring Criteria,மதிப்பீட்டு அளவுகோல்
 DocType: Purchase Invoice,Party Account Currency,கட்சி கணக்கு நாணய
+DocType: Delivery Trip,Total Estimated Distance,மொத்த மதிப்பிடப்பட்ட தூரம்
 ,BOM Browser,"BOM, உலாவி"
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,இந்த பயிற்சி நிகழ்வுக்கு உங்கள் நிலையை புதுப்பிக்கவும்
 DocType: Item Barcode,EAN,ஈ.ஏ.என்
@@ -2126,7 +2126,7 @@
 DocType: Activity Cost,Projects,திட்டங்கள்
 DocType: Payment Request,Transaction Currency,பரிவர்த்தனை நாணய
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},இருந்து {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,சில மின்னஞ்சல்கள் தவறானவை
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,சில மின்னஞ்சல்கள் தவறானவை
 DocType: Work Order Operation,Operation Description,அறுவை சிகிச்சை விளக்கம்
 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.,நிதியாண்டு தொடக்க தேதி மற்றும் நிதியாண்டு சேமிக்கப்படும் முறை நிதி ஆண்டு இறுதியில் தேதி மாற்ற முடியாது.
 DocType: Quotation,Shopping Cart,வணிக வண்டி
@@ -2150,7 +2150,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,நிலையான சொத்து நிகர மாற்றம்
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,அனைத்து வடிவ கருத்தில் இருந்தால் வெறுமையாக
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,வகை வரிசையில் {0} ல் ' உண்மையான ' பொறுப்பு மதிப்பிட சேர்க்கப்பட்டுள்ளது முடியாது
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,வகை வரிசையில் {0} ல் ' உண்மையான ' பொறுப்பு மதிப்பிட சேர்க்கப்பட்டுள்ளது முடியாது
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},அதிகபட்சம்: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,தேதி நேரம் இருந்து
 DocType: Shopify Settings,For Company,நிறுவனத்தின்
@@ -2164,7 +2164,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,பாடநெறி அட்டவணையை உருவாக்கும் பிழைகள் இருந்தன
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,"பட்டியலில் முதல் செலவின மதிப்பீடு, முன்னிருப்பு செலவின மதிப்பீட்டாக அமைக்கப்படும்."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,100 க்கும் அதிகமாக இருக்க முடியாது
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,நீங்கள் மார்க்கெட்ப்ளேட்டில் பதிவு செய்ய கணினி நிர்வாகி மற்றும் பொருள் மேலாளர் பாத்திரங்களை நிர்வாகி தவிர வேறு பயனர் இருக்க வேண்டும்.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,நீங்கள் மார்க்கெட்ப்ளேட்டில் பதிவு செய்ய கணினி நிர்வாகி மற்றும் பொருள் மேலாளர் பாத்திரங்களை நிர்வாகி தவிர வேறு பயனர் இருக்க வேண்டும்.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-பேக்-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,திட்டமிடப்படாத
@@ -2193,7 +2193,7 @@
 DocType: HR Settings,Employee Settings,பணியாளர் அமைப்புகள்
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,கட்டணம் செலுத்தும் அமைப்பு ஏற்றுகிறது
 ,Batch-Wise Balance History,தொகுதி ஞானமுடையவனாகவும் இருப்பு வரலாறு
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,வரிசை # {0}: பொருள் {1} க்கான தொகைக்கு தொகை அதிகமாக இருந்தால் மதிப்பீட்டை அமைக்க முடியாது.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,வரிசை # {0}: பொருள் {1} க்கான தொகைக்கு தொகை அதிகமாக இருந்தால் மதிப்பீட்டை அமைக்க முடியாது.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,அச்சு அமைப்புகள் அந்தந்த அச்சு வடிவம் மேம்படுத்தப்பட்டது
 DocType: Package Code,Package Code,தொகுப்பு குறியீடு
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,வேலை கற்க நியமி
@@ -2427,7 +2427,7 @@
 DocType: Delivery Trip,Optimize Route,வழியை மேம்படுத்துக
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,முன்கூட்டியே எக்ஸ் நாட்கள் நடவடிக்கைகளுக்குத் திட்டமிட்டுள்ளது முயற்சி.
 DocType: HR Settings,Stop Birthday Reminders,நிறுத்து நினைவூட்டல்கள்
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},நிறுவனத்தின் இயல்புநிலை சம்பளப்பட்டியல் செலுத்த வேண்டிய கணக்கு அமைக்கவும் {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},நிறுவனத்தின் இயல்புநிலை சம்பளப்பட்டியல் செலுத்த வேண்டிய கணக்கு அமைக்கவும் {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,அமேசான் மூலம் வரி மற்றும் கட்டணம் தரவு நிதி உடைவு கிடைக்கும்
 DocType: SMS Center,Receiver List,பெறுநர் பட்டியல்
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,தேடல் பொருள்
@@ -2495,7 +2495,7 @@
 DocType: Vital Signs,Constipated,மலச்சிக்கல்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},வழங்குபவர் எதிராக விலைப்பட்டியல் {0} தேதியிட்ட {1}
 DocType: Customer,Default Price List,முன்னிருப்பு விலை பட்டியல்
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,சொத்து இயக்கம் சாதனை {0} உருவாக்கப்பட்ட
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,சொத்து இயக்கம் சாதனை {0} உருவாக்கப்பட்ட
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,உருப்படிகள் எதுவும் இல்லை.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,நீங்கள் நீக்க முடியாது நிதியாண்டு {0}. நிதியாண்டு {0} உலகளாவிய அமைப்புகள் முன்னிருப்பாக அமைக்க உள்ளது
 DocType: Share Transfer,Equity/Liability Account,பங்கு / பொறுப்பு கணக்கு
@@ -2635,6 +2635,7 @@
 DocType: Blanket Order,Order Type,வரிசை வகை
 ,Item-wise Sales Register,பொருள் வாரியான விற்பனை பதிவு
 DocType: Asset,Gross Purchase Amount,மொத்த கொள்முதல் அளவு
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,பொருள் குறியீடு&gt; பொருள் குழு&gt; பிராண்ட்
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,திறக்கும் இருப்பு
 DocType: Asset,Depreciation Method,தேய்மானம் முறை
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,இந்த வரி அடிப்படை விகிதம் சேர்க்கப்பட்டுள்ளது?
@@ -2715,7 +2716,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,வருடாந்த வரவு செலவு பற்றாக்குறை PO க்கு மேல் இருந்தால்
 DocType: Student Leave Application,Student Leave Application,மாணவர் விடுப்பு விண்ணப்பம்
 DocType: Item,Will also apply for variants,கூட வகைகளில் விண்ணப்பிக்க
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","அது ஏற்கனவே உள்ளது என, சொத்து இரத்து செய்ய முடியாது {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","அது ஏற்கனவே உள்ளது என, சொத்து இரத்து செய்ய முடியாது {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},பணியாளர் {0} அன்று அரை நாளில் {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},மொத்த வேலை மணி நேரம் அதிகபட்சம் வேலை நேரம் விட அதிகமாக இருக்க கூடாது {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,மீது
@@ -2739,6 +2740,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,தரவை எடு
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},விடுப்பு வகை {0} இல் அனுமதிக்கப்படும் அதிகபட்ச விடுப்பு {1}
 DocType: SMS Center,Create Receiver List,பெறுநர் பட்டியல் உருவாக்க
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,வாங்குவதற்கான தேதிக்குப் பிறகு கிடைக்கக்கூடிய தேதி பயன்படுத்தப்பட வேண்டும்
 DocType: Vehicle,Wheels,வீல்ஸ்
 DocType: Packing Slip,To Package No.,இல்லை தொகுப்பு வேண்டும்
 DocType: Patient Relation,Family,குடும்ப
@@ -2752,7 +2754,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,பில்லிங் நாணயம் இயல்புநிலை நிறுவன நாணய அல்லது கட்சி கணக்கு நாணயத்திற்கு சமமாக இருக்க வேண்டும்
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),தொகுப்பு இந்த விநியோக ஒரு பகுதியாக உள்ளது என்று குறிக்கிறது (மட்டும் வரைவு)
 DocType: Soil Texture,Loam,லோம்
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,வரிசை {0}: தேதி தேதி வெளியிடும் தேதி இருக்க முடியாது
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,வரிசை {0}: தேதி தேதி வெளியிடும் தேதி இருக்க முடியாது
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,கொடுப்பனவு நுழைவு செய்ய
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},அளவு உருப்படி {0} விட குறைவாக இருக்க வேண்டும் {1}
 ,Sales Invoice Trends,விற்பனை விலைப்பட்டியல் போக்குகள்
@@ -2824,7 +2826,7 @@
 DocType: Guardian,Guardian Interests,கார்டியன் ஆர்வம்
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,கணக்கு பெயர் / எண் புதுப்பிக்கவும்
 DocType: Naming Series,Current Value,தற்போதைய மதிப்பு
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,பல நிதியாண்டு தேதி {0} உள்ளன. இந்த நிதி ஆண்டில் நிறுவனம் அமைக்கவும்
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,பல நிதியாண்டு தேதி {0} உள்ளன. இந்த நிதி ஆண்டில் நிறுவனம் அமைக்கவும்
 DocType: Education Settings,Instructor Records to be created by,பயிற்றுவிப்பாளர் பதிவுகள் உருவாக்கப்பட வேண்டும்
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} உருவாக்கப்பட்டது
 DocType: GST Account,GST Account,GST கணக்கு
@@ -2842,7 +2844,7 @@
 DocType: Sales Person,Name and Employee ID,பெயர் மற்றும் பணியாளர் ஐடி
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,காரணம் தேதி தேதி தகவல்களுக்கு முன் இருக்க முடியாது
 DocType: Website Item Group,Website Item Group,இணைய தகவல்கள் குழு
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,சம்பள சரிவு இல்லை மேலே தேர்ந்தெடுக்கப்பட்ட அளவுகோல்கள் அல்லது சம்பள சரிவு ஏற்கனவே சமர்ப்பிக்கப்பட்டது
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,சம்பள சரிவு இல்லை மேலே தேர்ந்தெடுக்கப்பட்ட அளவுகோல்கள் அல்லது சம்பள சரிவு ஏற்கனவே சமர்ப்பிக்கப்பட்டது
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,கடமைகள் மற்றும் வரி
 DocType: Projects Settings,Projects Settings,திட்டங்கள் அமைப்புகள்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,குறிப்பு தேதியை உள்ளிடவும்
@@ -2851,7 +2853,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,வழங்கப்பட்ட அளவு
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,ஹெச்எல்சி-முதலுதவி-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,பொருள் கோரிக்கை பொருள்
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,முதலில் வாங்குதல் வாங்குவதை ரத்து செய் {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,முதலில் வாங்குதல் வாங்குவதை ரத்து செய் {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,பொருள் குழுக்கள் மரம் .
 DocType: Production Plan,Total Produced Qty,மொத்த உற்பத்தி Qty
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,இந்த குற்றச்சாட்டை வகை விட அல்லது தற்போதைய வரிசையில் எண்ணிக்கை சமமாக வரிசை எண் பார்க்கவும் முடியாது
@@ -2961,6 +2963,7 @@
 ,Vehicle Expenses,வாகன செலவுகள்
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,விற்பனை விலைப்பட்டியல் சமர்ப்பிப்பதில் லேப் டெஸ்ட் (களை) உருவாக்கவும்
 DocType: Serial No,Invoice Details,விவரப்பட்டியல் விவரங்கள்
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,பாதைகளை மதிப்பிடவும் மற்றும் மேம்படுத்தவும் Google வரைபட அமைப்புகளை இயக்கவும்
 DocType: Grant Application,Show on Website,இணையத்தளத்தில் காட்டு
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,தொடங்குங்கள்
 DocType: Hub Tracked Item,Hub Category,ஹப் பகுப்பு
@@ -3001,7 +3004,7 @@
 DocType: Inpatient Record,B Positive,பி நேர்மறை
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",பணியாளரின் அதிகபட்ச நன்மை {0} {1} முந்தையதாகக் கூறப்பட்ட தொகையின் {2} அளவை விட அதிகமாக உள்ளது
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ரோ # {0}: அளவு 1, உருப்படி ஒரு நிலையான சொத்தாக இருக்கிறது இருக்க வேண்டும். பல கொத்தமல்லி தனி வரிசையில் பயன்படுத்தவும்."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ரோ # {0}: அளவு 1, உருப்படி ஒரு நிலையான சொத்தாக இருக்கிறது இருக்க வேண்டும். பல கொத்தமல்லி தனி வரிசையில் பயன்படுத்தவும்."
 DocType: Leave Block List Allow,Leave Block List Allow,பிளாக் பட்டியல் அனுமதி விட்டு
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,சுருக்கம் வெற்று அல்லது இடைவெளி  இருக்க முடியாது
 DocType: Patient Medical Record,Patient Medical Record,நோயாளி மருத்துவ பதிவு
@@ -3036,7 +3039,7 @@
 DocType: Workstation,Wages per hour,ஒரு மணி நேரத்திற்கு ஊதியங்கள்
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},தொகுதி பங்குச் சமநிலை {0} மாறும் எதிர்மறை {1} கிடங்கு உள்ள பொருள் {2} ஐந்து {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,பொருள் கோரிக்கைகள் தொடர்ந்து பொருள் மறு ஒழுங்கு நிலை அடிப்படையில் தானாக எழுப்பினார்
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},கணக்கு {0} தவறானது. கணக்கு நாணய இருக்க வேண்டும் {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},கணக்கு {0} தவறானது. கணக்கு நாணய இருக்க வேண்டும் {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},தேதி முதல் {0} பணியாளரின் நிவாரணம் தேதி {1}
 DocType: Supplier,Is Internal Supplier,இன்டர்நெட் சப்ளையர்
 DocType: Employee,Create User Permission,பயனர் அனுமதி உருவாக்க
@@ -3181,7 +3184,7 @@
 DocType: Account,Fixed Asset,நிலையான சொத்து
 DocType: Amazon MWS Settings,After Date,தேதிக்குப் பிறகு
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,தொடர் சரக்கு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,இன்டர் கம்பெனி விலைப்பட்டியல்க்கு தவறான {0}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,இன்டர் கம்பெனி விலைப்பட்டியல்க்கு தவறான {0}.
 ,Department Analytics,துறை பகுப்பாய்வு
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,இயல்புநிலை தொடர்புகளில் மின்னஞ்சல் இல்லை
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,இரகசியத்தை உருவாக்குங்கள்
@@ -3193,7 +3196,7 @@
 DocType: Sales Invoice,Total Billing Amount,மொத்த பில்லிங் அளவு
 DocType: Bank Statement Transaction Entry,Receivable Account,பெறத்தக்க கணக்கு
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,தேதி வரை செல்லுபடியாகும் தேதி வரை செல்லுபடியாகும் குறைவாக இருக்க வேண்டும்.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},ரோ # {0}: சொத்து {1} ஏற்கனவே {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},ரோ # {0}: சொத்து {1} ஏற்கனவே {2}
 DocType: Quotation Item,Stock Balance,பங்கு இருப்பு
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,செலுத்துதல் விற்பனை ஆணை
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,தலைமை நிர்வாக அதிகாரி
@@ -3234,6 +3237,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,பற்று தேவைப்படுகிறது
 DocType: Clinical Procedure,Inpatient Record,உள்நோயாளி பதிவு
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets உங்கள் அணி செய்யப்படுகிறது செயல்பாடுகளுக்கு நேரம், செலவு மற்றும் பில்லிங் கண்காணிக்க உதவும்"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,சப்ளையர்&gt; சப்ளையர் வகை
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,கொள்முதல் விலை பட்டியல்
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,பரிவர்த்தனை தேதி
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,சப்ளையர் ஸ்கோர் கார்டு மாறிகளின் டெம்ப்ளேட்கள்.
@@ -3277,7 +3281,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,செலாவணி லாபம் / நஷ்டம்
 DocType: Opportunity,Lost Reason,இழந்த காரணம்
 DocType: Amazon MWS Settings,Enable Amazon,அமேசான் செயல்படுத்த
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},வரிசை # {0}: கணக்கு {1} நிறுவனத்திற்கு சொந்தமானது அல்ல {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},வரிசை # {0}: கணக்கு {1} நிறுவனத்திற்கு சொந்தமானது அல்ல {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType {0} கண்டுபிடிக்க முடியவில்லை
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,புதிய முகவரி
 DocType: Quality Inspection,Sample Size,மாதிரி அளவு
@@ -3388,7 +3392,7 @@
 DocType: Water Analysis,Origin,தோற்றம்
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,இந்த ஆவணம் மூலம் எல்லை மீறிவிட்டது {0} {1} உருப்படியை {4}. நீங்கள் கவனிக்கிறீர்களா மற்றொரு {3} அதே எதிராக {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,சேமிப்பு பிறகு மீண்டும் அமைக்கவும்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,மாற்றம் தேர்வு அளவு கணக்கு
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,மாற்றம் தேர்வு அளவு கணக்கு
 DocType: Purchase Invoice,Price List Currency,விலை பட்டியல் நாணயத்தின்
 DocType: Naming Series,User must always select,பயனர் எப்போதும் தேர்ந்தெடுக்க வேண்டும்
 DocType: Stock Settings,Allow Negative Stock,எதிர்மறை பங்கு அனுமதிக்கும்
@@ -3430,7 +3434,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,இந்த சந்திப்பை நிச்சயமாக ரத்துசெய்ய விரும்புகிறீர்களா?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,ஹோட்டல் அறை விலை தொகுப்பு
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,விற்பனை பைப்லைன்
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},சம்பளம் உபகரண உள்ள இயல்பான கணக்கு அமைக்கவும் {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},சம்பளம் உபகரண உள்ள இயல்பான கணக்கு அமைக்கவும் {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,தேவையான அன்று
 DocType: Rename Tool,File to Rename,மறுபெயர் கோப்புகள்
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"தயவு செய்து வரிசையில் பொருள் BOM, தேர்வு {0}"
@@ -3451,7 +3455,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,வாங்கிய பொருட்களை செலவு
 DocType: Employee Separation,Employee Separation Template,பணியாளர் பிரிப்பு டெம்ப்ளேட்
 DocType: Selling Settings,Sales Order Required,விற்பனை ஆர்டர் தேவை
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,ஒரு விற்பனையாளராகுங்கள்
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,ஒரு விற்பனையாளராகுங்கள்
 DocType: Purchase Invoice,Credit To,கடன்
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,செயலில் தடங்கள் / வாடிக்கையாளர்கள்
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,நிலையான டெலிவரி குறிப்பு வடிவமைப்பைப் பயன்படுத்த வெற்று விட்டு விடுங்கள்
@@ -3493,7 +3497,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,வரி வார்ப்புருவை உருவாக்குங்கள்
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,பயனர் கருத்துக்களம்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,மூலப்பொருட்கள் காலியாக இருக்க முடியாது.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,வரிசை # {0} (கட்டணம் அட்டவணை): தொகை எதிர்மறையாக இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,வரிசை # {0} (கட்டணம் அட்டவணை): தொகை எதிர்மறையாக இருக்க வேண்டும்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","பங்கு புதுப்பிக்க முடியவில்லை, விலைப்பட்டியல் துளி கப்பல் உருப்படி உள்ளது."
 DocType: Contract,Fulfilment Status,நிறைவேற்று நிலை
 DocType: Lab Test Sample,Lab Test Sample,லேப் டெஸ்ட் மாதிரி
@@ -3653,7 +3657,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,ஆவண தேதி
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},கட்டணம் பதிவுகள்   உருவாக்கப்பட்டது - {0}
 DocType: Asset Category Account,Asset Category Account,சொத்து வகை கணக்கு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,வரிசை # {0} (கட்டணம் அட்டவணை): தொகை நேர்மறையாக இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,வரிசை # {0} (கட்டணம் அட்டவணை): தொகை நேர்மறையாக இருக்க வேண்டும்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},மேலும் பொருள் தயாரிக்க முடியாது {0} விட விற்பனை ஆணை அளவு {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,பண்புக்கூறு மதிப்புகளைத் தேர்ந்தெடுக்கவும்
 DocType: Purchase Invoice,Reason For Issuing document,ஆவணம் வழங்குவதற்கான காரணம்
@@ -3708,7 +3712,7 @@
 DocType: Purchase Receipt,Time at which materials were received,பொருட்கள் பெற்றனர் எந்த நேரத்தில்
 DocType: Products Settings,Products per Page,பக்கத்திற்கு தயாரிப்புகள்
 DocType: Stock Ledger Entry,Outgoing Rate,வெளிச்செல்லும் விகிதம்
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,அல்லது
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,அல்லது
 DocType: Sales Order,Billing Status,பில்லிங் நிலைமை
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,சிக்கலை புகார்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,பயன்பாட்டு செலவுகள்
@@ -3736,7 +3740,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,பணியாளர் வரி விலக்கு பிரகடனம்
 DocType: Payment Entry,Cheque/Reference Date,காசோலை / பரிந்துரை தேதி
 DocType: Purchase Invoice,Total Taxes and Charges,மொத்த வரி மற்றும் கட்டணங்கள்
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,கிடைக்கக்கூடிய தேதி தேதி கடந்த தேதி என உள்ளிடப்பட்டுள்ளது
 DocType: Employee,Emergency Contact,அவசர தொடர்பு
 DocType: Bank Reconciliation Detail,Payment Entry,கொடுப்பனவு நுழைவு
 ,sales-browser,விற்பனை உலாவி
@@ -3782,6 +3785,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Depreciation Amount during the period,காலத்தில் தேய்மானம் தொகை
 DocType: Sales Invoice,Is Return (Credit Note),திரும்ப (கடன் குறிப்பு)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,வேலை தொடங்கு
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,அமைவு&gt; அமைப்புகள்&gt; பெயரிடும் தொடர்கள் வழியாக {0} பெயரிடும் தொடர்களை அமைக்கவும்
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,முடக்கப்பட்டது டெம்ப்ளேட் இயல்புநிலை டெம்ப்ளேட் இருக்க கூடாது
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,வரிசையில் {0}: திட்டமிட்ட qty ஐ உள்ளிடவும்
 DocType: Account,Income Account,வருமான கணக்கு
@@ -3795,6 +3799,7 @@
 DocType: Loyalty Program,Help Section,உதவி பிரிவு
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,முன்
 DocType: Appraisal Goal,Key Responsibility Area,முக்கிய பொறுப்பு பகுதி
+DocType: Delivery Trip,Distance UOM,தூரம் UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","மாணவர் தொகுப்புகளும் நீங்கள் வருகை, மாணவர்களுக்கு மதிப்பீடுகளை மற்றும் கட்டணங்கள் கண்காணிக்க உதவும்"
 DocType: Payment Entry,Total Allocated Amount,மொத்த ஒதுக்கப்பட்ட தொகை
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,நிரந்தர சரக்கு இயல்புநிலை சரக்கு கணக்கை அமை
@@ -3836,7 +3841,7 @@
 DocType: Item Supplier,Item Supplier,பொருள் சப்ளையர்
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,எந்த தொகுதி கிடைக்கும் பொருள் கோட் உள்ளிடவும்
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},ஒரு மதிப்பை தேர்ந்தெடுக்கவும் {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,பரிமாற்றத்திற்கு எந்த உருப்படிகளும் தேர்ந்தெடுக்கப்படவில்லை
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,பரிமாற்றத்திற்கு எந்த உருப்படிகளும் தேர்ந்தெடுக்கப்படவில்லை
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,அனைத்து முகவரிகள்.
 DocType: Company,Stock Settings,பங்கு அமைப்புகள்
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","பின்வரும் பண்புகளைக் சாதனைகளை அதே இருந்தால் அதை இணைத்தல் மட்டுமே சாத்தியம். குழு, ரூட் வகை, நிறுவனம்"
@@ -4131,7 +4136,7 @@
 DocType: Patient,Personal and Social History,தனிப்பட்ட மற்றும் சமூக வரலாறு
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,பயனர் {0} உருவாக்கப்பட்டது
 DocType: Fee Schedule,Fee Breakup for each student,ஒவ்வொரு மாணவனுக்கும் கட்டணம் விதிக்கப்படும்
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),மொத்த முன்கூட்டியே ({0}) ஒழுங்குக்கு எதிரான {1} மொத்தம் விட அதிகமாக இருக்க முடியாது ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),மொத்த முன்கூட்டியே ({0}) ஒழுங்குக்கு எதிரான {1} மொத்தம் விட அதிகமாக இருக்க முடியாது ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ஒரே சீராக பரவி மாதங்கள் முழுவதும் இலக்குகளை விநியோகிக்க மாதாந்திர விநியோகம் தேர்ந்தெடுக்கவும்.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,குறியீட்டை மாற்றவும்
 DocType: Purchase Invoice Item,Valuation Rate,மதிப்பீட்டு விகிதம்
@@ -4140,7 +4145,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,ITC செஸ் ஐப் பிடித்தது
 ,Student Monthly Attendance Sheet,மாணவர் மாதாந்திர வருகை தாள்
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,விற்பனைக்கு மட்டுமே பொருந்தக்கூடிய கப்பல் விதி
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,தேய்மானம் வரிசை {0}: அடுத்த தேதியிட்ட தேதி கொள்முதல் தேதிக்கு முன் இருக்க முடியாது
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,தேய்மானம் வரிசை {0}: அடுத்த தேதியிட்ட தேதி கொள்முதல் தேதிக்கு முன் இருக்க முடியாது
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,திட்ட தொடக்க தேதி
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,வரை
 DocType: Rename Tool,Rename Log,பதிவு மறுபெயர்
@@ -4157,12 +4162,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,அடிக்கடி விற்பனை மற்றும் பரிவர்த்தனைகளின் அடிப்படையில் நிறுவனம் மேம்படுத்தப்பட வேண்டும்.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,அன்று காலாவதியாகிறது
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,மாணவர்கள் சேர்
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","இந்த ஆவணத்தை ரத்து செய்ய ஊழியர் <a href=""#Form/Employee/{0}"">{0}</a> \"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},தேர்வு செய்க {0}
 DocType: C-Form,C-Form No,சி படிவம் எண்
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,தூரம்
+DocType: Delivery Stop,Distance,தூரம்
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,நீங்கள் வாங்க அல்லது விற்கிற உங்கள் தயாரிப்புகள் அல்லது சேவைகளை பட்டியலிடுங்கள்.
 DocType: Water Analysis,Storage Temperature,சேமிப்பு வெப்பநிலை
 DocType: Sales Order,SAL-ORD-.YYYY.-,சல்-ORD-.YYYY.-
@@ -4189,7 +4192,7 @@
 DocType: Homepage,Company Description for website homepage,இணைய முகப்பு நிறுவனம் விளக்கம்
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","வாடிக்கையாளர்களின் வசதிக்காக, இந்த குறியீடுகள் பற்றுச்சீட்டுகள் மற்றும் டெலிவரி குறிப்புகள் போன்ற அச்சு வடிவங்கள் பயன்படுத்த முடியும்"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier பெயர்
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,{0} க்கான தகவலை மீட்டெடுக்க முடியவில்லை.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,{0} க்கான தகவலை மீட்டெடுக்க முடியவில்லை.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,நுழைவு நுழைவுத் திறப்பு
 DocType: Contract,Fulfilment Terms,நிறைவேற்று விதிமுறைகள்
 DocType: Sales Invoice,Time Sheet List,நேரம் தாள் பட்டியல்
@@ -4371,7 +4374,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,நடவடிக்கை பொறுத்தே குழு கைமுறையாகச் மாணவர்கள் தேர்வு
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,நடவடிக்கை பொறுத்தே குழு கைமுறையாகச் மாணவர்கள் தேர்வு
 DocType: Journal Entry,User Remark,பயனர் குறிப்பு
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,பாதைகளை மேம்படுத்துகிறது.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,பாதைகளை மேம்படுத்துகிறது.
 DocType: Travel Itinerary,Non Diary,அல்லாத டைரி
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,இடது ஊழியர்களுக்கான தக்கவைப்பு போனஸை உருவாக்க முடியாது
 DocType: Lead,Market Segment,சந்தை பிரிவு
@@ -4402,7 +4405,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,விசுவாசம் திட்டம்
 DocType: Student Guardian,Father,அப்பா
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,ஆதரவு டிக்கெட்
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;மேம்படுத்தல் பங்கு&#39; நிலையான சொத்து விற்பனை சோதிக்க முடியவில்லை
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;மேம்படுத்தல் பங்கு&#39; நிலையான சொத்து விற்பனை சோதிக்க முடியவில்லை
 DocType: Bank Reconciliation,Bank Reconciliation,வங்கி நல்லிணக்க
 DocType: Attendance,On Leave,விடுப்பு மீது
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,மேம்படுத்தல்கள் கிடைக்கும்
@@ -4447,7 +4450,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,தொ.எ. மற்றும் தொகுதி
 DocType: Warranty Claim,From Company,நிறுவனத்தின் இருந்து
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,மதிப்பீடு அடிப்படியின் மதிப்பெண்கள் கூட்டுத்தொகை {0} இருக்க வேண்டும்.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Depreciations எண்ணிக்கை பதிவுசெய்தீர்கள் அமைக்கவும்
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Depreciations எண்ணிக்கை பதிவுசெய்தீர்கள் அமைக்கவும்
 DocType: Supplier Scorecard Period,Calculations,கணக்கீடுகள்
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,மதிப்பு அல்லது அளவு
 DocType: Payment Terms Template,Payment Terms,கட்டண வரையறைகள்
@@ -4467,7 +4470,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,மீது மார்ஜின் கொண்டு விலை பட்டியல் விகிதம் தள்ளுபடி (%)
 DocType: Healthcare Service Unit Type,Rate / UOM,விகிதம் / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,அனைத்து கிடங்குகள்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,இண்டர் கம்பனி பரிவர்த்தனைகளுக்கு {0} இல்லை.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,இண்டர் கம்பனி பரிவர்த்தனைகளுக்கு {0} இல்லை.
 DocType: Travel Itinerary,Rented Car,வாடகைக்கு கார்
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,உங்கள் நிறுவனத்தின் பற்றி
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,கணக்கில் பணம் வரவு ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
@@ -4569,6 +4572,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,தாவர பகுப்பாய்வு அளவுகோல்
 DocType: Cheque Print Template,Cheque Height,காசோலை உயரம்
 DocType: Supplier,Supplier Details,வழங்குபவர் விவரம்
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,அமைவு&gt; எண் வரிசை தொடர் மூலம் கலந்துரையாடலுக்கான வரிசை எண்ணை அமைக்கவும்
 DocType: Setup Progress,Setup Progress,அமைப்பு முன்னேற்றம்
 DocType: Expense Claim,Approval Status,ஒப்புதல் நிலைமை
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},மதிப்பு வரிசையில் மதிப்பு குறைவாக இருக்க வேண்டும் {0}
@@ -4662,7 +4666,6 @@
 DocType: Travel Request,Fully Sponsored,முழுமையாக ஸ்பான்சர்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,ஜர்னல் நுழைவுத் தலைகீழ்
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,வாடிக்கையாளர் {0} உருவாக்கப்பட்டது.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,மனித வளத்தில் பணியாளர் பெயரிடும் அமைப்பை அமைத்தல்&gt; HR அமைப்புகள்
 DocType: Stock Settings,Limit Percent,எல்லை சதவீதம்
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,தற்போது எந்த கிடங்கிலும் கையிருப்பு  இல்லை
 ,Payment Period Based On Invoice Date,விலைப்பட்டியல் தேதியின் அடிப்படையில் கொடுப்பனவு காலம்
@@ -4721,7 +4724,7 @@
 DocType: BOM Explosion Item,Source Warehouse,மூல கிடங்கு
 DocType: Installation Note,Installation Date,நிறுவல் தேதி
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,லெட்ஜர் பகிர்ந்து
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},ரோ # {0}: சொத்து {1} நிறுவனம் சொந்தமானது இல்லை {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},ரோ # {0}: சொத்து {1} நிறுவனம் சொந்தமானது இல்லை {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,விற்பனை விலைப்பட்டியல் {0} உருவாக்கப்பட்டது
 DocType: Employee,Confirmation Date,உறுதிப்படுத்தல் தேதி
 DocType: Inpatient Occupancy,Check Out,பாருங்கள்
@@ -4741,6 +4744,7 @@
 DocType: Production Plan,Sales Orders Detail,விற்பனை ஆணைகள் விவரம்
 DocType: Bin,Requested Quantity,கோரப்பட்ட அளவு
 DocType: Fees,EDU-FEE-.YYYY.-,Edu-கட்டணம் .YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,தயவுசெய்து கல்வி&gt; கல்வி அமைப்புகளில் கல்வி பயிற்றுவிப்பாளரை அமைத்தல்
 DocType: Patient,Marital Status,திருமண தகுதி
 DocType: Stock Settings,Auto Material Request,கார் பொருள் கோரிக்கை
 DocType: Woocommerce Settings,API consumer secret,ஏபிஐ நுகர்வோர் ரகசியம்
@@ -4793,7 +4797,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,நாட்கள் தேர்ந்தெடு
 DocType: Academic Term,Term Name,கால பெயர்
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),கடன் ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,சம்பள சரிவுகளை உருவாக்குகிறது ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,சம்பள சரிவுகளை உருவாக்குகிறது ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,ரூட் முனையை நீங்கள் திருத்த முடியாது.
 DocType: Buying Settings,Purchase Order Required,தேவையான கொள்முதல் ஆணை
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,டைமர்
@@ -4831,7 +4835,7 @@
 DocType: Account,Rate at which this tax is applied,இந்த வரி செலுத்தப்படுகிறது விகிதத்தில்
 DocType: Cash Flow Mapper,Section Name,பிரிவு பெயர்
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,மறுவரிசைப்படுத்துக அளவு
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},தேய்நிலை வரிசை {0}: பயனுள்ள வாழ்க்கைக்குப் பிறகு எதிர்பார்க்கப்படும் மதிப்பு {1} ஐ விட அதிகமாகவோ அல்லது சமமாகவோ இருக்க வேண்டும்
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},தேய்நிலை வரிசை {0}: பயனுள்ள வாழ்க்கைக்குப் பிறகு எதிர்பார்க்கப்படும் மதிப்பு {1} ஐ விட அதிகமாகவோ அல்லது சமமாகவோ இருக்க வேண்டும்
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,தற்போதைய வேலை வாய்ப்புகள்
 DocType: Company,Stock Adjustment Account,பங்கு சரிசெய்தல் கணக்கு
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,இனிய எழுதவும்
@@ -4878,7 +4882,7 @@
 DocType: Program Enrollment,School House,பள்ளி ஹவுஸ்
 DocType: Serial No,Out of AMC,AMC வெளியே
 DocType: Opportunity,Opportunity Amount,வாய்ப்பு தொகை
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,முன்பதிவு செய்யப்பட்டது தேய்மானம்  எண்ணிக்கையை விட அதிகமாக இருக்க முடியும்
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,முன்பதிவு செய்யப்பட்டது தேய்மானம்  எண்ணிக்கையை விட அதிகமாக இருக்க முடியும்
 DocType: Purchase Order,Order Confirmation Date,ஆர்டர் உறுதிப்படுத்தல் தேதி
 DocType: Driver,HR-DRI-.YYYY.-,மனிதவள-டிஆர்ஐ-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,பராமரிப்பு விஜயம் செய்ய
@@ -4919,7 +4923,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,தொகுதி:
 DocType: Volunteer,Afternoon,மதியம்
 DocType: Loyalty Program,Loyalty Program Help,விசுவாசம் திட்டம் உதவி
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} {1} 'முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} {1} 'முடக்கப்பட்டுள்ளது
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,திறந்த அமை
 DocType: Cheque Print Template,Scanned Cheque,ஸ்கேன் காசோலை
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,சமர்ப்பிக்கும் பரிமாற்றங்கள் மீது தொடர்புகள் தானியங்கி மின்னஞ்சல்களை அனுப்ப.
@@ -4932,7 +4936,7 @@
 DocType: Warranty Claim,Item and Warranty Details,பொருள் மற்றும் உத்தரவாதத்தை விபரங்கள்
 DocType: Chapter,Chapter Members,அத்தியாய உறுப்பினர்கள்
 DocType: Sales Team,Contribution (%),பங்களிப்பு (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,குறிப்பு: கொடுப்பனவு நுழைவு ' பண அல்லது வங்கி கணக்கு ' குறிப்பிடப்படவில்லை என்பதால் உருவாக்கப்பட்டது முடியாது
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,குறிப்பு: கொடுப்பனவு நுழைவு ' பண அல்லது வங்கி கணக்கு ' குறிப்பிடப்படவில்லை என்பதால் உருவாக்கப்பட்டது முடியாது
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,திட்டம் {0} ஏற்கனவே உள்ளது
 DocType: Clinical Procedure,Nursing User,நர்சிங் பயனர்
 DocType: Employee Benefit Application,Payroll Period,சம்பள காலம்
@@ -4940,6 +4944,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},சீரியல் இல்லை {0} தொகுதி {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,பொறுப்புகள்
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,இந்த மேற்கோள் செல்லுபடியாகும் காலம் முடிந்தது.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","இந்த ஆவணத்தை ரத்து செய்ய ஊழியர் <a href=""#Form/Employee/{0}"">{0}</a> \"
 DocType: Expense Claim Account,Expense Claim Account,செலவு கூறுகின்றனர் கணக்கு
 DocType: Account,Capital Work in Progress,முன்னேற்றம் மூலதனம் வேலை
 DocType: Accounts Settings,Allow Stale Exchange Rates,நிலையான மாற்று விகிதங்களை அனுமதி
@@ -5021,7 +5027,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,பிரச்சினை பொருள்
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,ERPNext உடன் Shopify ஐ இணைக்கவும்
 DocType: Material Request Item,For Warehouse,கிடங்கு
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,டெலிவரி குறிப்புகள் {0} புதுப்பிக்கப்பட்டன
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,டெலிவரி குறிப்புகள் {0} புதுப்பிக்கப்பட்டன
 DocType: Employee,Offer Date,சலுகை  தேதி
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,மேற்கோள்கள்
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,நீங்கள் ஆஃப்லைனில் உள்ளன. நீங்கள் பிணைய வேண்டும் வரை ஏற்றவும் முடியாது.
@@ -5072,7 +5078,7 @@
 DocType: Shipping Rule,Calculate Based On,ஆனால் அடிப்படையில் கணக்கிட
 DocType: Contract,Unfulfilled,நிறைவேறாமல்
 DocType: Delivery Note Item,From Warehouse,கிடங்கில் இருந்து
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,குறிப்பிடப்பட்ட அளவுகோல்களுக்கு ஊழியர்கள் இல்லை
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,குறிப்பிடப்பட்ட அளவுகோல்களுக்கு ஊழியர்கள் இல்லை
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,பொருட்களை பில் கொண்டு உருப்படிகள் இல்லை தயாரிப்பதற்கான
 DocType: Shopify Settings,Default Customer,இயல்புநிலை வாடிக்கையாளர்
 DocType: Sales Stage,Stage Name,மேடை பெயர்
@@ -5115,7 +5121,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,தள்ளுபடி தொகை பிறகு வரி தொகை
 DocType: Patient,Inpatient Status,உள்நோயாளி நிலை
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,தினசரி வேலை சுருக்கம் அமைப்புகள்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,தேர்ந்தெடுத்த விலை பட்டியல் சரிபார்க்கப்பட்ட துறைகள் வாங்கவும் விற்கவும் வேண்டும்.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,தேர்ந்தெடுத்த விலை பட்டியல் சரிபார்க்கப்பட்ட துறைகள் வாங்கவும் விற்கவும் வேண்டும்.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,தயவுசெய்து தேதியின்படி தேதி சேர்க்கவும்
 DocType: Payment Entry,Internal Transfer,உள்நாட்டு மாற்றம்
 DocType: Asset Maintenance,Maintenance Tasks,பராமரிப்பு பணிகள்
@@ -5152,7 +5158,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,குழு மூலம்
 DocType: Guardian,Interests,ஆர்வம்
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,/ முடக்கு நாணயங்கள் செயல்படுத்து.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,சில சம்பள சரிவுகளை சமர்ப்பிக்க முடியவில்லை
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,சில சம்பள சரிவுகளை சமர்ப்பிக்க முடியவில்லை
 DocType: Exchange Rate Revaluation,Get Entries,பதிவுகள் கிடைக்கும்
 DocType: Production Plan,Get Material Request,பொருள் வேண்டுகோள் பெற
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,தபால் செலவுகள்
@@ -5236,7 +5242,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},செலவு கணக்கு உருப்படியை கட்டாய {0}
 DocType: BOM,Website Description,இணையதளத்தில் விளக்கம்
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,ஈக்விட்டி நிகர மாற்றம்
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,கொள்முதல் விலைப்பட்டியல் {0} ரத்து செய்க முதல்
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,கொள்முதல் விலைப்பட்டியல் {0} ரத்து செய்க முதல்
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,அனுமதி இல்லை. சேவை பிரிவு வகை முடக்கவும்
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","மின்னஞ்சல் முகவரி, தனித்துவமானதாக இருக்க வேண்டும் ஏற்கனவே உள்ளது {0}"
 DocType: Serial No,AMC Expiry Date,AMC காலாவதியாகும் தேதி
@@ -5276,7 +5282,7 @@
 DocType: Hotel Room,Hotel Room,விடுதி அறை
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},கணக்கு {0} செய்கிறது நிறுவனம் சொந்தமானது {1}
 DocType: Leave Type,Rounding,முழுமையாக்கும் விதமாக
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,வரிசையில் {0} இல் சீரியல் எண்கள் டெலிவரி குறிப்பு உடன் பொருந்தவில்லை
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,வரிசையில் {0} இல் சீரியல் எண்கள் டெலிவரி குறிப்பு உடன் பொருந்தவில்லை
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),வழங்கப்பட்ட தொகை (சார்பு மதிப்பிடப்பட்டது)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","வாடிக்கையாளர், வாடிக்கையாளர் குழு, மண்டலம், சப்ளையர், சப்ளையர் குழு, பிரச்சாரம், விற்பனைப் பங்குதாரர் ஆகியவற்றை அடிப்படையாகக் கொண்டு விலையிடல்."
 DocType: Student,Guardian Details,பாதுகாவலர்  விபரங்கள்
@@ -5331,7 +5337,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},பங்கு பொருள் தேவை கிடங்கு {0}
 DocType: Leave Allocation,Unused leaves,பயன்படுத்தப்படாத இலைகள்
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,மீட்டெடுப்பு நுழைவு செய்யுங்கள்
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,அனைத்து துறைகள்
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,அனைத்து துறைகள்
 DocType: Healthcare Service Unit,Vacant,காலியாக
 DocType: Patient,Alcohol Past Use,மது போஸ்ட் பயன்படுத்து
 DocType: Fertilizer Content,Fertilizer Content,உரம் உள்ளடக்கம்
@@ -5342,7 +5348,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,இந்த விற்பனை ஆர்டர் ரத்துசெய்யப்படுவதற்கு முன்பு வேலை ஆர்டர் {0} ரத்து செய்யப்பட வேண்டும்
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),( துணை கூட்டங்கள் உட்பட ) வெடித்தது BOM எடு
 DocType: Authorization Rule,Applicable To (Employee),பொருந்தும் (பணியாளர்)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,தேதி அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,தேதி அத்தியாவசியமானதாகும்
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,பண்பு உயர்வு {0} 0 இருக்க முடியாது
 DocType: Employee Benefit Claim,Benefit Type and Amount,பயன் வகை மற்றும் தொகை
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,அறைகள் புத்தகம்
@@ -5489,7 +5495,7 @@
 DocType: Purchase Invoice Item,Total Weight,மொத்த எடை
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,விற்பனையில் கமிஷன்
 DocType: Job Offer Term,Value / Description,மதிப்பு / விளக்கம்
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ரோ # {0}: சொத்து {1} சமர்ப்பிக்க முடியாது, அது ஏற்கனவே {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ரோ # {0}: சொத்து {1} சமர்ப்பிக்க முடியாது, அது ஏற்கனவே {2}"
 DocType: Tax Rule,Billing Country,பில்லிங் நாடு
 DocType: Purchase Order Item,Expected Delivery Date,எதிர்பார்க்கப்படுகிறது டெலிவரி தேதி
 DocType: Restaurant Order Entry,Restaurant Order Entry,உணவகம் ஆர்டர் நுழைவு
@@ -5528,12 +5534,13 @@
 DocType: Maintenance Visit,Breakdown,முறிவு
 DocType: Travel Itinerary,Vegetarian,சைவம்
 DocType: Patient Encounter,Encounter Date,என்கவுண்டர் தேதி
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,கணக்கு: {0} நாணயத்துடன்: {1} தேர்வு செய்ய முடியாது
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,கணக்கு: {0} நாணயத்துடன்: {1} தேர்வு செய்ய முடியாது
 DocType: Bank Statement Transaction Settings Item,Bank Data,வங்கி தரவு
 DocType: Purchase Receipt Item,Sample Quantity,மாதிரி அளவு
 DocType: Bank Guarantee,Name of Beneficiary,பயனாளியின் பெயர்
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","சமீபத்திய மதிப்பீட்டு விகிதம் / விலை பட்டியல் விகிதம் / மூலப்பொருட்களின் கடைசி கொள்முதல் வீதத்தின் அடிப்படையில், திட்டமிடலின் மூலம் தானாக BOM செலவு புதுப்பிக்கவும்."
 DocType: Supplier,SUP-.YYYY.-,கீழெழுத்துகளுடன் .YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,சப்ளையர்&gt; சப்ளையர் குழு
 DocType: Bank Reconciliation Detail,Cheque Date,காசோலை தேதி
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},கணக்கு {0}: பெற்றோர் கணக்கு {1} நிறுவனத்திற்கு சொந்தமானது இல்லை: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,வெற்றிகரமாக இந்த நிறுவனம் தொடர்பான அனைத்து நடவடிக்கைகளில் நீக்கப்பட்டது!
@@ -5561,7 +5568,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,குழந்தை முனைகளில் மட்டும் &#39;குரூப்&#39; வகை முனைகளில் கீழ் உருவாக்கப்பட்ட முடியும்
 DocType: Attendance Request,Half Day Date,அரை நாள் தேதி
 DocType: Academic Year,Academic Year Name,கல்வி ஆண்டு பெயர்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} {1} உடன் பரிமாற அனுமதிக்கப்படவில்லை. நிறுவனத்தை மாற்றவும்.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} {1} உடன் பரிமாற அனுமதிக்கப்படவில்லை. நிறுவனத்தை மாற்றவும்.
 DocType: Sales Partner,Contact Desc,தொடர்பு DESC
 DocType: Email Digest,Send regular summary reports via Email.,மின்னஞ்சல் வழியாக வழக்கமான சுருக்கம் அறிக்கைகள் அனுப்பவும்.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},செலவு கூறுகின்றனர் வகை இயல்புநிலை கணக்கு அமைக்கவும் {0}
@@ -5594,7 +5601,7 @@
 DocType: Hotel Room,Hotel Manager,விடுதி மேலாளர்
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,வண்டியை அமைக்க வரி விதி
 DocType: Purchase Invoice,Taxes and Charges Added,வரிகள் மற்றும் கட்டணங்கள் சேர்க்கப்பட்டது
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,தேய்மானம் வரிசை {0}: அடுத்த தேதியிட்ட தேதி கிடைக்கக்கூடிய தேதிக்கு முன்பாக இருக்க முடியாது
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,தேய்மானம் வரிசை {0}: அடுத்த தேதியிட்ட தேதி கிடைக்கக்கூடிய தேதிக்கு முன்பாக இருக்க முடியாது
 ,Sales Funnel,விற்பனை நீக்க
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,சுருக்கம் கட்டாயமாகும்
 DocType: Project,Task Progress,டாஸ்க் முன்னேற்றம்
@@ -5608,7 +5615,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,அனைத்து வாடிக்கையாளர் குழுக்கள்
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,திரட்டப்பட்ட மாதாந்திர
 DocType: Attendance Request,On Duty,கடமை
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} கட்டாயமாகும். ஒருவேளை செலாவணி சாதனை {2} செய்ய {1} உருவாக்கப்பட்டது அல்ல.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} கட்டாயமாகும். ஒருவேளை செலாவணி சாதனை {2} செய்ய {1} உருவாக்கப்பட்டது அல்ல.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,வரி டெம்ப்ளேட் கட்டாயமாகும்.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,கணக்கு {0}: பெற்றோர் கணக்கு {1} இல்லை
 DocType: POS Closing Voucher,Period Start Date,காலம் தொடங்கும் தேதி
@@ -5687,11 +5694,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,குறைந்தது ஒரு கிடங்கில் அவசியமானதாகும்
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","UOM, பொருள் குழு, விளக்கம் மற்றும் நேரங்களின் எண்ணிக்கை போன்ற உருப்படிகளை கட்டமைக்கவும்."
 DocType: Certification Application,Certification Status,சான்றிதழ் நிலை
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,சந்தை
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,சந்தை
 DocType: Travel Itinerary,Travel Advance Required,பயண முன்கூட்டியே தேவை
 DocType: Subscriber,Subscriber Name,சந்தாதாரர் பெயர்
 DocType: Serial No,Out of Warranty,உத்தரவாதத்தை வெளியே
-DocType: Cashier Closing,Cashier-closing-,காசாளர்-closing-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,வரைபட தரவு வகை
 DocType: BOM Update Tool,Replace,பதிலாக
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,இல்லை பொருட்கள் கண்டுபிடிக்கப்பட்டது.
@@ -5778,7 +5784,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,விற்பனை மற்றும் வாங்குதலுக்கான இயல்புநிலை வரி வார்ப்புருக்கள் உருவாக்கப்படுகின்றன.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,மதிப்பீட்டு முடிவு பதிவேற்றம் {0} ஏற்கனவே உள்ளது.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","எடுத்துக்காட்டு: ABCD. #####. தொடர் அமைக்கப்பட்டிருந்தால், பரிமாற்றங்களில் பாஷ் நோட் குறிப்பிடப்படவில்லை என்றால், இந்தத் தொடரின் அடிப்படையில் தானியங்குத் தொகுதி எண் உருவாக்கப்படும். இந்த உருப்படியின் பேட்ச் இலக்கம் வெளிப்படையாக குறிப்பிட விரும்புவீர்களானால், இது வெறுமையாகும். குறிப்பு: இந்த அமைப்பு முன்னுரிமைகளை முன்னுரிமை பெறுகிறது."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,அமைவு&gt; எண் வரிசை தொடர் மூலம் கலந்துரையாடலுக்கான வரிசை எண்ணை அமைக்கவும்
 DocType: BOM,Materials Required (Exploded),பொருட்கள் தேவை (விரிவான)
 DocType: Contract,Party User,கட்சி பயனர்
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',நிறுவனத்தின் வெற்று வடிகட்ட அமைக்கவும் என்றால் குழுவினராக &#39;நிறுவனத்தின்&#39; ஆகும்
@@ -5980,7 +5985,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,எதிரில் கவுண்ட்
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,ட்ரெயல் பீரியட் தொடங்கும் மற்றும் முடியும் தேதிகள் அவசியம்
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,சராசரி விகிதம்
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,கட்டணம் செலுத்திய மொத்த கட்டண தொகை கிராண்ட் / வட்டமான மொத்தம் சமமாக இருக்க வேண்டும்
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,கட்டணம் செலுத்திய மொத்த கட்டண தொகை கிராண்ட் / வட்டமான மொத்தம் சமமாக இருக்க வேண்டும்
 DocType: Subscription Plan Detail,Plan,திட்டம்
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,பொது பேரேடு படி வங்கி அறிக்கை சமநிலை
 DocType: Job Applicant,Applicant Name,விண்ணப்பதாரர் பெயர்
@@ -6049,7 +6054,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,சோப் & சோப்பு
 DocType: BOM,Show Items,உருப்படிகளைக் காண்பி
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,அவ்வப்போது விட அதிகமாக இருக்க முடியாது.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,எல்லா வாடிக்கையாளர்களையும் மின்னஞ்சல் மூலம் அறிவிக்க விரும்புகிறீர்களா?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,எல்லா வாடிக்கையாளர்களையும் மின்னஞ்சல் மூலம் அறிவிக்க விரும்புகிறீர்களா?
 DocType: Subscription Plan,Billing Interval,பில்லிங் இடைவேளை
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,மோஷன் பிக்சர் & வீடியோ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ஆணையிட்டார்
@@ -6058,9 +6063,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,வரிசை {0}: {1} 0 விட அதிகமாக இருக்க வேண்டும்
 DocType: Assessment Criteria,Assessment Criteria Group,மதிப்பீடு செய்க மதீப்பீட்டு குழு
 DocType: Healthcare Settings,Patient Name By,மூலம் நோயாளி பெயர்
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},{0} முதல் {1} முதல் சம்பளத்திற்கான ஒழுங்கான பத்திரிகை நுழைவு
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},{0} முதல் {1} முதல் சம்பளத்திற்கான ஒழுங்கான பத்திரிகை நுழைவு
 DocType: Sales Invoice Item,Enable Deferred Revenue,ஒத்திவைக்கப்பட்ட வருவாயை இயக்கு
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},குவிக்கப்பட்ட தேய்மானம் திறந்து சமமாக விட குறைவாக இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},குவிக்கப்பட்ட தேய்மானம் திறந்து சமமாக விட குறைவாக இருக்க வேண்டும் {0}
 DocType: Warehouse,Warehouse Name,சேமிப்பு கிடங்கு பெயர்
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,உண்மையான தொடக்க தேதி உண்மையான முடிவு தேதிக்கு குறைவாக இருக்க வேண்டும்
 DocType: Naming Series,Select Transaction,பரிவர்த்தனை தேர்வு
@@ -6210,7 +6215,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,தரம் {0} தரத்தின் ஊழியர் {0} இயல்புநிலை விடுப்புக் கொள்கை இல்லை
 DocType: Salary Detail,Salary Detail,சம்பளம் விபரம்
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,முதல் {0} தேர்வு செய்க
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,{0} பயனர்கள் சேர்க்கப்பட்டது
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,{0} பயனர்கள் சேர்க்கப்பட்டது
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","பல அடுக்கு திட்டத்தின் விஷயத்தில், வாடிக்கையாளர்கள் தங்கள் செலவினங்களின்படி சம்பந்தப்பட்ட அடுக்குக்கு கார் ஒதுக்கப்படுவார்கள்"
 DocType: Appointment Type,Physician,மருத்துவர்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,பொருள் ஒரு தொகுதி {0} {1} காலாவதியாகிவிட்டது.
@@ -6355,7 +6360,7 @@
 DocType: Asset,Custodian,பாதுகாப்பாளர்
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,புள்ளி விற்பனை செய்தது
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} 0 மற்றும் 100 க்கு இடையில் ஒரு மதிப்பு இருக்க வேண்டும்
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},{0} {0} முதல் {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},{0} {0} முதல் {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,பிணையற்ற கடன்கள்
 DocType: Cost Center,Cost Center Name,மையம் பெயர் செலவு
 DocType: Student,B+,பி
@@ -6387,6 +6392,7 @@
 DocType: Employee,Date of Issue,இந்த தேதி
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","வாங்குதல் அமைப்புகள் படி கொள்முதல் Reciept தேவையான == &#39;ஆம்&#39;, பின்னர் கொள்முதல் விலைப்பட்டியல் உருவாக்கும், பயனர் உருப்படியை முதல் கொள்முதல் ரசீது உருவாக்க வேண்டும் என்றால் {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},ரோ # {0}: உருப்படியை அமைக்க சப்ளையர் {1}
+DocType: Global Defaults,Default Distance Unit,இயல்புநிலை தொலைவு அலகு
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,ரோ {0}: மணி மதிப்பு பூஜ்யம் விட அதிகமாக இருக்க வேண்டும்.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,பொருள் {1} இணைக்கப்பட்ட வலைத்தளம் பட {0} காணலாம்
 DocType: Issue,Content Type,உள்ளடக்க வகை
@@ -6442,7 +6448,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,கணக்கில் பற்று ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
 DocType: Asset,Naming Series,தொடர் பெயரிடும்
 DocType: Vital Signs,Coated,கோட்டேட்
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,வரிசை {0}: பயனுள்ள வாழ்க்கைக்குப் பிறகு எதிர்பார்க்கப்படும் மதிப்பு மொத்த கொள்முதல் தொகைக்கு குறைவாக இருக்க வேண்டும்
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,வரிசை {0}: பயனுள்ள வாழ்க்கைக்குப் பிறகு எதிர்பார்க்கப்படும் மதிப்பு மொத்த கொள்முதல் தொகைக்கு குறைவாக இருக்க வேண்டும்
 DocType: GoCardless Settings,GoCardless Settings,GoCardless அமைப்புகள்
 DocType: Leave Block List,Leave Block List Name,பிளாக் பட்டியல் பெயர் விட்டு
 DocType: Certified Consultant,Certification Validity,சான்றிதழ் செல்லுபடியாகும்
@@ -6510,6 +6516,7 @@
 DocType: Bank Statement Settings Item,Bank Header,வங்கி தலைப்பு
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,லேப் சோதனைகள் காண்க
 DocType: Hub Users,Hub Users,ஹப் பயனர்கள்
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,வாடிக்கையாளர்&gt; வாடிக்கையாளர் குழு&gt; மண்டலம்
 DocType: Purchase Invoice,Y,ஒய்
 DocType: Maintenance Visit,Maintenance Date,பராமரிப்பு தேதி
 DocType: Purchase Invoice Item,Rejected Serial No,நிராகரிக்கப்பட்டது சீரியல் இல்லை
@@ -6525,7 +6532,7 @@
 DocType: SG Creation Tool Course,Max Strength,அதிகபட்சம்  வலிமை
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,முன்னமைவுகளை நிறுவுகிறது
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,Edu-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},வாடிக்கையாளர்களுக்கான டெலிவரி குறிப்பு இல்லை
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},வாடிக்கையாளர்களுக்கான டெலிவரி குறிப்பு இல்லை
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,பணியாளர் {0} அதிகபட்ச ஆதாய அளவு இல்லை
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,டெலிவரி தேதி அடிப்படையில் தேர்ந்தெடுக்கப்பட்ட விடயங்கள்
 DocType: Grant Application,Has any past Grant Record,எந்த முன்னாள் கிராண்ட் ரெக்டும் உள்ளது
@@ -6553,7 +6560,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,ஹோட்டல் ரூம் முன்பதிவு
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,வாடிக்கையாளர் சேவை
 DocType: BOM,Thumbnail,சிறு
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,மின்னஞ்சல் ID களுடன் தொடர்புகள் இல்லை.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,மின்னஞ்சல் ID களுடன் தொடர்புகள் இல்லை.
 DocType: Item Customer Detail,Item Customer Detail,பொருள் வாடிக்கையாளர் விபரம்
 DocType: Notification Control,Prompt for Email on Submission of,இந்த சமர்ப்பிக்கும் மீது மின்னஞ்சல் கேட்டு
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +102,Total allocated leaves are more than days in the period,மொத்த ஒதுக்கீடு இலைகள் காலத்தில் நாட்கள் விட
@@ -6812,7 +6819,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,"கணக்கு வகை தேர்வு, ஏனெனில் குழு இரகசிய முடியாது."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} மாற்றப்பட்டுள்ளது . புதுப்பிக்கவும்.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,பின்வரும் நாட்களில் விடுப்பு விண்ணப்பங்கள் செய்து பயனர்களை நிறுத்த.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,பொருள் குறியீடு&gt; பொருள் குழு&gt; பிராண்ட்
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","லாயல்டி புள்ளிகள் வரம்பற்ற காலாவதி என்றால், காலாவதி காலம் காலியாக அல்லது 0 வைக்கவும்."
 DocType: Asset Maintenance Team,Maintenance Team Members,பராமரிப்பு குழு உறுப்பினர்கள்
 DocType: Loyalty Point Entry,Purchase Amount,கொள்முதல் அளவு
@@ -6820,7 +6826,7 @@
 											to fullfill Sales Order {2}","விற்பனையின் வரிசை முழுமையடைவதற்கு {0}, {0} வரிசை எண் {0}"
 DocType: Quotation,SAL-QTN-.YYYY.-,சல்-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,சப்ளையர் மேற்கோள் {0} உருவாக்கப்பட்ட
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,இறுதி ஆண்டு தொடக்க ஆண்டு முன் இருக்க முடியாது
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,இறுதி ஆண்டு தொடக்க ஆண்டு முன் இருக்க முடியாது
 DocType: Employee Benefit Application,Employee Benefits,பணியாளர் நன்மைகள்
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},{0} வரிசையில் {1} நிரம்பிய அளவு உருப்படி அளவு சமமாக வேண்டும்
 DocType: Work Order,Manufactured Qty,உற்பத்தி அளவு
@@ -6836,6 +6842,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,தொகுதி எண்கள் தேர்வு
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,GSTIN க்கு
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,பில்கள் வாடிக்கையாளர்கள் உயர்த்தப்பட்டுள்ளது.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,மனித வளத்தில் பணியாளர் பெயரிடும் அமைப்பை அமைத்தல்&gt; HR அமைப்புகள்
 DocType: Healthcare Settings,Invoice Appointments Automatically,விலைப்பட்டியல் நியமனங்கள் தானாகவே
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,திட்ட ஐடி
 DocType: Salary Component,Variable Based On Taxable Salary,வரிவிலக்கு சம்பளம் அடிப்படையில் மாறி
@@ -6884,7 +6891,7 @@
 DocType: POS Profile,Account for Change Amount,கணக்கு தொகை மாற்றம்
 DocType: QuickBooks Migrator,Connecting to QuickBooks,குவிக்புக்ஸில் இணைக்கிறது
 DocType: Exchange Rate Revaluation,Total Gain/Loss,மொத்த லான் / இழப்பு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,இன்டர் கம்பெனி இன்விசிற்கான தவறான நிறுவனம்.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,இன்டர் கம்பெனி இன்விசிற்கான தவறான நிறுவனம்.
 DocType: Purchase Invoice,input service,உள்ளீடு சேவை
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ரோ {0}: கட்சி / கணக்கு பொருந்தவில்லை {1} / {2} உள்ள {3} {4}
 DocType: Employee Promotion,Employee Promotion,பணியாளர் ஊக்குவிப்பு
@@ -7015,7 +7022,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,தங்கும் இடம் விருப்பம்
 apps/erpnext/erpnext/config/selling.py +184,Analytics,அனலிட்டிக்ஸ்
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,கார்ட் காலியாக உள்ளது
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,தயவுசெய்து கல்வி&gt; கல்வி அமைப்புகளில் கல்வி பயிற்றுவிப்பாளரை அமைத்தல்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",பொருள் {0} இல்லை வரிசை எண் இல்லை. Serialialized பொருட்கள் மட்டும் serial No அடிப்படையில் வழங்க முடியும்
 DocType: Vehicle,Model,மாதிரி
@@ -7045,7 +7051,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,மாற்ற எதுவும் இல்லை
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,ஒரு கோப்பை தேர்ந்தெடுக்கவும்
 DocType: Holiday List,Total Holidays,மொத்த விடுமுறை
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,அனுப்புவதற்கான மின்னஞ்சல் டெம்ப்ளேட்டை காணவில்லை. டெலிவரி அமைப்புகளில் ஒன்றை அமைக்கவும்.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,அனுப்புவதற்கான மின்னஞ்சல் டெம்ப்ளேட்டை காணவில்லை. டெலிவரி அமைப்புகளில் ஒன்றை அமைக்கவும்.
 DocType: Student Leave Application,Mark as Present,தற்போதைய மார்க்
 DocType: Supplier Scorecard,Indicator Color,காட்டி வண்ணம்
 DocType: Purchase Order,To Receive and Bill,பெறுதல் மற்றும் பில்
@@ -7054,7 +7060,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,தொடர் எண் தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,வடிவமைப்புகள்
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,நிபந்தனைகள் வார்ப்புரு
-DocType: Serial No,Delivery Details,விநியோக விவரம்
+DocType: Delivery Trip,Delivery Details,விநியோக விவரம்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},செலவு மையம் வரிசையில் தேவைப்படுகிறது {0} வரி அட்டவணையில் வகை {1}
 DocType: Program,Program Code,திட்டம் குறியீடு
 DocType: Terms and Conditions,Terms and Conditions Help,விதிமுறைகள் மற்றும் நிபந்தனைகள் உதவி
@@ -7078,7 +7084,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,நேரம் நாட்கள் வழிவகுக்கும்
 DocType: Cash Flow Mapping,Is Income Tax Expense,வருமான வரி செலவுகள்
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,உங்கள் ஆர்டரை விநியோகிப்பதற்கு இல்லை!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ரோ # {0}: தேதி பதிவுசெய்ய கொள்முதல் தேதி அதே இருக்க வேண்டும் {1} சொத்தின் {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ரோ # {0}: தேதி பதிவுசெய்ய கொள்முதல் தேதி அதே இருக்க வேண்டும் {1} சொத்தின் {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,மாணவர் நிறுவனத்தின் விடுதி வசிக்கிறார் இந்த பாருங்கள்.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,தயவு செய்து மேலே உள்ள அட்டவணையில் விற்பனை ஆணைகள் நுழைய
 ,Stock Summary,பங்கு சுருக்கம்
diff --git a/erpnext/translations/te.csv b/erpnext/translations/te.csv
index f1385d4..c7ea777 100644
--- a/erpnext/translations/te.csv
+++ b/erpnext/translations/te.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,కాలం పేరు
 DocType: Employee,Salary Mode,జీతం మోడ్
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,నమోదు
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,నమోదు
 DocType: Patient,Divorced,విడాకులు
 DocType: Support Settings,Post Route Key,పోస్ట్ రూట్ కీ
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,అంశం ఒక లావాదేవీ పలుమార్లు జోడించడానికి అనుమతించు
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,న్యూ ఎక్స్ఛేంజ్ రేట్
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},కరెన్సీ ధర జాబితా కోసం అవసరం {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* లావాదేవీ లెక్కించబడతాయి.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,సరఫరాదారు&gt; సరఫరాదారు రకం
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-డిటి .YYYY.-
 DocType: Purchase Order,Customer Contact,కస్టమర్ సంప్రదించండి
 DocType: Patient Appointment,Check availability,లభ్యతను తనిఖీలు చేయండి
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,ఓపెన్ చూపించు
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,సిరీస్ విజయవంతంగా నవీకరించబడింది
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,హోటల్ నుంచి బయటకు వెళ్లడం
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} వరుసలో {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} వరుసలో {0}
 DocType: Asset Finance Book,Depreciation Start Date,తరుగుదల ప్రారంభం తేదీ
 DocType: Pricing Rule,Apply On,న వర్తించు
 DocType: Item Price,Multiple Item prices.,బహుళ అంశం ధరలు.
@@ -118,7 +117,7 @@
 DocType: Lab Prescription,Lab Prescription,ల్యాబ్ ప్రిస్క్రిప్షన్
 ,Delay Days,ఆలస్యం డేస్
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,సర్వీస్ ఖర్చుల
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},క్రమ సంఖ్య: {0} ఇప్పటికే సేల్స్ వాయిస్ లో రిఫరెన్సుగా ఉంటుంది: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},క్రమ సంఖ్య: {0} ఇప్పటికే సేల్స్ వాయిస్ లో రిఫరెన్సుగా ఉంటుంది: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,వాయిస్
 DocType: Purchase Invoice Item,Item Weight Details,అంశం బరువు వివరాలు
 DocType: Asset Maintenance Log,Periodicity,ఆవర్తకత
@@ -143,6 +142,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,అకౌంటెంట్
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,ధర జాబితా అమ్మకం
 DocType: Patient,Tobacco Current Use,పొగాకు ప్రస్తుత ఉపయోగం
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","ప్రారంభ తేదీ మరియు ముగింపు తేదీ జాబ్ కార్డుతో అతివ్యాప్తి చెందుతుంది <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,రేట్ సెల్లింగ్
 DocType: Cost Center,Stock User,స్టాక్ వాడుకరి
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -162,7 +162,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,సంబంధిత
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,హాజరు తేదీ ఉద్యోగి చేరిన తేదీ కంటే తక్కువ ఉండకూడదు
 DocType: Grading Scale,Grading Scale Name,గ్రేడింగ్ స్కేల్ పేరు
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Marketplace కు వినియోగదారులను జోడించండి
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Marketplace కు వినియోగదారులను జోడించండి
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,ఈ root ఖాతా ఉంది మరియు సవరించడం సాధ్యం కాదు.
 DocType: Sales Invoice,Company Address,సంస్థ చిరునామా
 DocType: BOM,Operations,ఆపరేషన్స్
@@ -320,7 +320,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,తేడా Qty
 DocType: Production Plan,Material Request Detail,విషయం అభ్యర్థన వివరాలు
 DocType: Selling Settings,Default Quotation Validity Days,డిఫాల్ట్ కొటేషన్ చెల్లుబాటు డేస్
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","అంశం రేటు వరుసగా {0} లో పన్ను చేర్చడానికి, వరుసలలో పన్నులు {1} కూడా చేర్చారు తప్పక"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","అంశం రేటు వరుసగా {0} లో పన్ను చేర్చడానికి, వరుసలలో పన్నులు {1} కూడా చేర్చారు తప్పక"
 DocType: SMS Center,SMS Center,SMS సెంటర్
 DocType: Payroll Entry,Validate Attendance,హాజరును ధృవీకరించండి
 DocType: Sales Invoice,Change Amount,మొత్తం మారుతుంది
@@ -439,7 +439,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,పదాలు లో మొత్తం కోసం పంక్తి అంతరం
 DocType: Vehicle,Additional Details,అదనపు వివరాలు
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,ఇచ్చిన వివరణను
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,సరఫరాదారు&gt; సరఫరాదారు సమూహం
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,కొనుగోలు కోసం అభ్యర్థన.
 DocType: POS Closing Voucher Details,Collected Amount,సేకరించిన మొత్తం
 DocType: Lab Test,Submitted Date,సమర్పించిన తేదీ
@@ -484,7 +483,7 @@
 DocType: Student Admission,Student Admission,విద్యార్థి అడ్మిషన్
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,{0} అంశం రద్దు
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,తరుగుదల వరుస {0}: తరుగుదల ప్రారంభ తేదీ గత తేదీ వలె నమోదు చేయబడింది
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,తరుగుదల వరుస {0}: తరుగుదల ప్రారంభ తేదీ గత తేదీ వలె నమోదు చేయబడింది
 DocType: Contract Template,Fulfilment Terms and Conditions,నెరవేర్చుట నిబంధనలు మరియు షరతులు
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,మెటీరియల్ అభ్యర్థన
 DocType: Bank Reconciliation,Update Clearance Date,నవీకరణ క్లియరెన్స్ తేదీ
@@ -541,6 +540,7 @@
 DocType: Accounts Settings,Settings for Accounts,అకౌంట్స్ కోసం సెట్టింగులు
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},సరఫరాదారు వాయిస్ లేవు కొనుగోలు వాయిస్ లో ఉంది {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,సేల్స్ పర్సన్ ట్రీ నిర్వహించండి.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Google Maps సెట్టింగ్లు నిలిపివేయబడినందున, మార్గాన్ని ప్రాసెస్ చేయలేరు."
 DocType: Job Applicant,Cover Letter,కవర్ లెటర్
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,అత్యుత్తమ చెక్కుల మరియు క్లియర్ డిపాజిట్లు
 DocType: Item,Synced With Hub,హబ్ సమకాలీకరించబడింది
@@ -600,7 +600,7 @@
 DocType: Asset Value Adjustment,New Asset Value,కొత్త ఆస్తి విలువ
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,కస్టమర్ కరెన్సీ కస్టమర్ బేస్ కరెన్సీ మార్చబడుతుంది రేటుపై
 DocType: Course Scheduling Tool,Course Scheduling Tool,కోర్సు షెడ్యూల్ టూల్
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},రో # {0}: కొనుగోలు వాయిస్ ఇప్పటికే ఉన్న ఆస్తి వ్యతిరేకంగా చేయలేము {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},రో # {0}: కొనుగోలు వాయిస్ ఇప్పటికే ఉన్న ఆస్తి వ్యతిరేకంగా చేయలేము {1}
 DocType: Crop Cycle,LInked Analysis,Lynked విశ్లేషణ
 DocType: POS Closing Voucher,POS Closing Voucher,POS ముగింపు వోచర్
 DocType: Contract,Lapsed,lapsed
@@ -634,6 +634,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} కోర్సు చేరాడు లేదు {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,విద్యార్థి పేరు:
 DocType: POS Closing Voucher Details,Difference,తేడా
+DocType: Delivery Settings,Delay between Delivery Stops,డెలివరీ స్టాప్స్ మధ్య ఆలస్యం
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},సీరియల్ లేవు {0} డెలివరీ గమనిక చెందినది కాదు {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","సర్వర్ యొక్క GoCardless ఆకృతీకరణతో సమస్య ఉన్నట్లుంది. చింతించకండి, వైఫల్యం విషయంలో, మీ ఖాతాకు మొత్తం తిరిగి చెల్లించబడుతుంది."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext డెమో
@@ -694,7 +695,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,పరిమాణ మరియు రేటు
 DocType: Delivery Note,% Installed,% వ్యవస్థాపించిన
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,తరగతి / లాబొరేటరీస్ తదితర ఉపన్యాసాలు షెడ్యూల్ చేసుకోవచ్చు.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,రెండు సంస్థల కంపెనీ కరెన్సీలు ఇంటర్ కంపెనీ లావాదేవీలకు సరిపోలాలి.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,రెండు సంస్థల కంపెనీ కరెన్సీలు ఇంటర్ కంపెనీ లావాదేవీలకు సరిపోలాలి.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,మొదటి కంపెనీ పేరును నమోదు చేయండి
 DocType: Travel Itinerary,Non-Vegetarian,బోథ్
 DocType: Purchase Invoice,Supplier Name,సరఫరా చేయువాని పేరు
@@ -780,7 +781,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,తేదీ నుండి అద్దెకు తీసుకున్నారు
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,తగినంత భాగాలు బిల్డ్
 DocType: POS Profile User,POS Profile User,POS ప్రొఫైల్ వాడుకరి
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,వరుస {0}: తరుగుదల ప్రారంభ తేదీ అవసరం
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,వరుస {0}: తరుగుదల ప్రారంభ తేదీ అవసరం
 DocType: Purchase Invoice Item,Service Start Date,సర్వీస్ ప్రారంభ తేదీ
 DocType: Subscription Invoice,Subscription Invoice,సబ్స్క్రిప్షన్ ఇన్వాయిస్
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,ప్రత్యక్ష ఆదాయం
@@ -849,7 +850,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,సంక్షిప్త ఇప్పటికే మరొక సంస్థ కోసం ఉపయోగిస్తారు
 DocType: Selling Settings,Default Customer Group,డిఫాల్ట్ కస్టమర్ గ్రూప్
 DocType: Employee,IFSC Code,IFSC కోడ్
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","ప్రారంభ తేదీ మరియు ముగింపు తేదీ జాబ్ కార్డుతో అతివ్యాప్తి చెందుతుంది <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","ఆపివేసినా, &#39;నున్నటి మొత్తం&#39; రంగంలో ఏ లావాదేవీ లో కనిపించవు"
 DocType: BOM,Operating Cost,నిర్వహణ ఖర్చు
 DocType: Crop,Produced Items,ఉత్పత్తి అంశాలు
@@ -901,7 +901,7 @@
 DocType: Supplier,Prevent RFQs,RFQ లను నిరోధించండి
 DocType: Hub User,Hub User,హబ్ వాడుకరి
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,సేల్స్ ఆర్డర్ చేయండి
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},{0} నుండి {1} వరకు కాలం చెల్లించిన జీతం స్లిప్
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},{0} నుండి {1} వరకు కాలం చెల్లించిన జీతం స్లిప్
 DocType: Project Task,Project Task,ప్రాజెక్ట్ టాస్క్
 DocType: Loyalty Point Entry Redemption,Redeemed Points,రీడీమ్ చేసిన పాయింట్లు
 ,Lead Id,లీడ్ ID
@@ -1030,7 +1030,7 @@
 DocType: Fee Validity,Max number of visit,సందర్శన యొక్క అత్యధిక సంఖ్య
 ,Hotel Room Occupancy,హోటల్ రూం ఆక్యుపెన్సీ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet రూపొందించినవారు:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},చెల్లింపు విధానం లో డిఫాల్ట్ నగదు లేదా బ్యాంక్ ఖాతా సెట్ దయచేసి {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},చెల్లింపు విధానం లో డిఫాల్ట్ నగదు లేదా బ్యాంక్ ఖాతా సెట్ దయచేసి {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,నమోదు
 DocType: GST Settings,GST Settings,జిఎస్టి సెట్టింగులు
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},కరెన్సీ ధర జాబితాలో సమానంగా ఉండాలి కరెన్సీ: {0}
@@ -1085,7 +1085,7 @@
 DocType: Vehicle Log,Service Details,సర్వీస్ వివరాలు
 DocType: Lab Test Template,Grouped,గుంపు
 DocType: Selling Settings,Delivery Note Required,డెలివరీ గమనిక లు
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,జీతం స్లిప్లను సమర్పిస్తోంది ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,జీతం స్లిప్లను సమర్పిస్తోంది ...
 DocType: Bank Guarantee,Bank Guarantee Number,బ్యాంక్ గ్యారంటీ సంఖ్య
 DocType: Bank Guarantee,Bank Guarantee Number,బ్యాంక్ గ్యారంటీ సంఖ్య
 DocType: Assessment Criteria,Assessment Criteria,అంచనా ప్రమాణం
@@ -1111,13 +1111,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,చెల్లింపు ఎంట్రీ ఇప్పటికే రూపొందించినవారు ఉంటుంది
 DocType: Request for Quotation,Get Suppliers,సరఫరాదారులు పొందండి
 DocType: Purchase Receipt Item Supplied,Current Stock,ప్రస్తుత స్టాక్
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},రో # {0}: ఆస్తి {1} అంశం ముడిపడి లేదు {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},రో # {0}: ఆస్తి {1} అంశం ముడిపడి లేదు {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,ప్రివ్యూ వేతనం స్లిప్
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,ఖాతా {0} అనేకసార్లు నమోదు చేసిన
 DocType: Account,Expenses Included In Valuation,ఖర్చులు విలువలో
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,మీ సభ్యత్వం 30 రోజుల్లో ముగుస్తుంది ఉంటే మీరు మాత్రమే పునరుద్ధరించవచ్చు
 DocType: Shopping Cart Settings,Show Stock Availability,స్టాక్ లభ్యతను చూపించు
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},ఆస్తి వర్గం {0} లేదా సంస్థ {0} లో {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},ఆస్తి వర్గం {0} లేదా సంస్థ {0} లో {0}
 DocType: Location,Longitude,రేఖాంశం
 ,Absent Student Report,కరువవడంతో విద్యార్థి నివేదిక
 DocType: Crop,Crop Spacing UOM,పంట అంతరం UOM
@@ -1190,7 +1190,7 @@
 DocType: Soil Texture,Sand,ఇసుక
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,శక్తి
 DocType: Opportunity,Opportunity From,నుండి అవకాశం
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,వరుస {0}: {1} అంశం కోసం {2} క్రమ సంఖ్య అవసరం. మీరు {3} ను అందించారు.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,వరుస {0}: {1} అంశం కోసం {2} క్రమ సంఖ్య అవసరం. మీరు {3} ను అందించారు.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,దయచేసి ఒక పట్టికను ఎంచుకోండి
 DocType: BOM,Website Specifications,వెబ్సైట్ లక్షణాలు
 DocType: Special Test Items,Particulars,వివరముల
@@ -1250,6 +1250,8 @@
 DocType: Employee Transfer Property,Employee Transfer Property,ఉద్యోగి బదిలీ ఆస్తి
 apps/erpnext/erpnext/accounts/doctype/cashier_closing/cashier_closing.py +36,From Time Should Be Less Than To Time,సమయం నుండి సమయం తక్కువగా ఉండాలి
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,బయోటెక్నాలజీ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1117,"Item {0} (Serial No: {1}) cannot be consumed as is reserverd\
+						 to fullfill Sales Order {2}.",{2} (సీరియల్ నంబర్: {1}) అమ్మకందారు ఆర్డర్ {2} ను పూర్తి చేయడానికి reserverd వలె వినియోగించబడదు.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Office Maintenance Expenses,ఆఫీసు నిర్వహణ ఖర్చులు
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,వెళ్ళండి
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,ERPNext ధర జాబితాకు Shopify నుండి ధరను నవీకరించండి
@@ -1279,7 +1281,7 @@
 DocType: Item,Items with higher weightage will be shown higher,అధిక వెయిటేజీ ఉన్న అంశాలు అధికంగా చూపబడుతుంది
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,ల్యాబ్ పరీక్షలు మరియు ముఖ్యమైన సంకేతాలు
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,బ్యాంక్ సయోధ్య వివరాలు
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,రో # {0}: ఆస్తి {1} సమర్పించాలి
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,రో # {0}: ఆస్తి {1} సమర్పించాలి
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ఏ ఉద్యోగి దొరకలేదు
 DocType: Item,If subcontracted to a vendor,"ఒక వ్యాపారికి బహుకరించింది, మరలా ఉంటే"
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,స్టూడెంట్ గ్రూప్ ఇప్పటికే నవీకరించబడింది.
@@ -1334,7 +1336,6 @@
 DocType: Loyalty Program Collection,Tier Name,టైర్ పేరు
 DocType: HR Settings,Enter retirement age in years,సంవత్సరాలలో విరమణ వయసు ఎంటర్
 DocType: Crop,Target Warehouse,టార్గెట్ వేర్హౌస్
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,దయచేసి సెటప్&gt; సెట్టింగులు&gt; నామకరణ సిరీస్ ద్వారా {0} నామకరణ సిరీస్ను సెట్ చేయండి
 DocType: Payroll Employee Detail,Payroll Employee Detail,పేరోల్ ఉద్యోగి వివరాలు
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,దయచేసి ఒక గిడ్డంగి ఎంచుకోండి
 DocType: Cheque Print Template,Starting location from left edge,ఎడమ అంచు నుండి నగర ప్రారంభిస్తోంది
@@ -1424,7 +1425,7 @@
 DocType: Work Order,Plan material for sub-assemblies,ఉప శాసనసభలకు ప్రణాళిక పదార్థం
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,సేల్స్ భాగస్వాములు అండ్ టెరిటరీ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,బిఒఎం {0} సక్రియ ఉండాలి
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,బదిలీ కోసం అంశాలు ఏవీ అందుబాటులో లేవు
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,బదిలీ కోసం అంశాలు ఏవీ అందుబాటులో లేవు
 DocType: Employee Boarding Activity,Activity Name,కార్యాచరణ పేరు
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,విడుదల తేదీని మార్చండి
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +250,Closing (Opening + Total),మూసివేయడం (మొత్తం + తెరవడం)
@@ -1649,6 +1650,7 @@
 DocType: Project,First Email,మొదటి ఇమెయిల్
 DocType: Company,Exception Budget Approver Role,మినహాయింపు బడ్జెట్ అప్ప్రోవర్ పాత్ర
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","సెట్ చేసిన తర్వాత, సెట్ తేదీ వరకు ఈ వాయిస్ హోల్డ్లో ఉంటుంది"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,సేల్స్ ఆర్డర్ / తయారైన వస్తువులు గిడ్డంగిలో రిసర్వ్డ్ వేర్హౌస్
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,సెల్లింగ్ మొత్తం
 DocType: Repayment Schedule,Interest Amount,వడ్డీ మొత్తం
@@ -1660,7 +1662,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,రికార్డ్స్
 DocType: Asset,Scrapped,రద్దు
 DocType: Item,Item Defaults,అంశం డిఫాల్ట్లు
-DocType: Purchase Invoice,Returns,రిటర్న్స్
+DocType: Cashier Closing,Returns,రిటర్న్స్
 DocType: Job Card,WIP Warehouse,WIP వేర్హౌస్
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},సీరియల్ లేవు {0} వరకు నిర్వహణ ఒప్పందం కింద {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,నియామక
@@ -1674,7 +1676,6 @@
 DocType: Student,A-,ఒక-
 DocType: Share Transfer,Transfer Type,బదిలీ పద్ధతి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,సేల్స్ ఖర్చులు
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,కస్టమర్&gt; కస్టమర్ గ్రూప్&gt; భూభాగం
 DocType: Diagnosis,Diagnosis,డయాగ్నోసిస్
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,ప్రామాణిక కొనుగోలు
 DocType: Attendance Request,Explanation,వివరణ
@@ -1687,7 +1688,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,ఆర్డర్లు అంశాలు మీరిన కొనుగోలు
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,జిప్ కోడ్
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},అమ్మకాల ఆర్డర్ {0} ఉంది {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},రుణంలో వడ్డీ ఆదాయం ఖాతాను ఎంచుకోండి {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},రుణంలో వడ్డీ ఆదాయం ఖాతాను ఎంచుకోండి {0}
 DocType: Opportunity,Contact Info,సంప్రదింపు సమాచారం
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,స్టాక్ ఎంట్రీలు మేకింగ్
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,స్థితి ఎడమవైపు ఉద్యోగిని ప్రోత్సహించలేరు
@@ -1699,7 +1700,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,సున్నా బిల్లింగ్ గంటకు ఇన్వాయిస్ చేయలేము
 DocType: Company,Date of Commencement,ప్రారంభ తేదీ
 DocType: Sales Person,Select company name first.,మొదటిది ఎంచుకోండి కంపెనీ పేరు.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},{0} కు పంపిన ఇమెయిల్
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},{0} కు పంపిన ఇమెయిల్
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,కొటేషన్స్ పంపిణీదారుల నుండి పొందింది.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,"BOM ని పునఃస్థాపించి, అన్ని BOM లలో తాజా ధరను నవీకరించండి"
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},కు {0} | {1} {2}
@@ -1720,7 +1721,7 @@
 DocType: Asset Movement,From Employee,Employee నుండి
 DocType: Driver,Cellphone Number,సెల్ఫోన్ నంబర్
 DocType: Project,Monitor Progress,మానిటర్ ప్రోగ్రెస్
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,హెచ్చరిక: సిస్టమ్ అంశం కోసం మొత్తం నుండి overbilling తనిఖీ చెయ్యదు {0} లో {1} సున్నా
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,హెచ్చరిక: సిస్టమ్ అంశం కోసం మొత్తం నుండి overbilling తనిఖీ చెయ్యదు {0} లో {1} సున్నా
 DocType: Journal Entry,Make Difference Entry,తేడా ఎంట్రీ చేయండి
 DocType: Supplier Quotation,Auto Repeat Section,ఆటో రిపీట్ విభాగం
 DocType: Upload Attendance,Attendance From Date,తేదీ నుండి హాజరు
@@ -1823,7 +1824,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,రో # {0}: ప్యాక్ చేసిన అంశాల కొనుగోలు చూపించు నమోదు కాదు తిరస్కరించబడిన
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,ఎంచుకున్న కస్టమర్ కోసం కస్టమర్ సమూహాన్ని మార్చడం అనుమతించబడదు.
 ,Purchase Order Items To Be Billed,కొనుగోలు ఆర్డర్ అంశాలు బిల్ టు
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,అంచనా రాక సమయాన్ని నవీకరిస్తోంది.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,అంచనా రాక సమయాన్ని నవీకరిస్తోంది.
 DocType: Program Enrollment Tool,Enrollment Details,నమోదు వివరాలు
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,సంస్థ కోసం బహుళ అంశం డిఫాల్ట్లను సెట్ చేయలేరు.
 DocType: Purchase Invoice Item,Net Rate,నికర రేటు
@@ -1837,7 +1838,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,విడిచిపెట్టిన పద్ధతి మధుమేహం
 DocType: Support Settings,Close Issue After Days,ఇష్యూ డేస్ తర్వాత దగ్గరి
 ,Eway Bill,ఇవే బిల్
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,మీరు మార్కెట్ నిర్వాహకులకు వినియోగదారులను జోడించడానికి సిస్టమ్ మేనేజర్ మరియు అంశం మేనేజర్ పాత్రలతో వినియోగదారుగా ఉండాలి.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,మీరు మార్కెట్ నిర్వాహకులకు వినియోగదారులను జోడించడానికి సిస్టమ్ మేనేజర్ మరియు అంశం మేనేజర్ పాత్రలతో వినియోగదారుగా ఉండాలి.
 DocType: Leave Control Panel,Leave blank if considered for all branches,"అన్ని శాఖలు తీసుకోదలచిన, ఖాళీగా వదిలేయండి"
 DocType: Job Opening,Staffing Plan,సిబ్బంది ప్రణాళిక
 DocType: Bank Guarantee,Validity in Days,డేస్ లో చెల్లుబాటు
@@ -1858,7 +1859,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},తో నకిలీ వరుసగా {0} అదే {1}
 DocType: Marketplace Settings,Disable Marketplace,Marketplace ను డిసేబుల్ చెయ్యండి
 ,Trial Balance,ట్రయల్ బ్యాలెన్స్
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,ఫిస్కల్ ఇయర్ {0} దొరకలేదు
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,ఫిస్కల్ ఇయర్ {0} దొరకలేదు
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,ఉద్యోగులు ఏర్పాటు
 DocType: Hotel Room Reservation,Hotel Reservation User,హోటల్ రిజర్వేషన్ వినియోగదారు
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,మొదటి ఉపసర్గ దయచేసి ఎంచుకోండి
@@ -1966,7 +1967,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,లాగిన్ చేయడంలో విఫలమైంది
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,ఆస్తి {0} సృష్టించబడింది
 DocType: Special Test Items,Special Test Items,ప్రత్యేక టెస్ట్ అంశాలు
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Marketplace పై రిజిస్టర్ చేయడానికి మీరు సిస్టమ్ మేనేజర్ మరియు Item మేనేజర్ పాత్రలతో ఒక యూజర్గా ఉండాలి.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Marketplace పై రిజిస్టర్ చేయడానికి మీరు సిస్టమ్ మేనేజర్ మరియు Item మేనేజర్ పాత్రలతో ఒక యూజర్గా ఉండాలి.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,చెల్లింపు విధానం
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,మీ కేటాయించిన జీతం నిర్మాణం ప్రకారం మీరు ప్రయోజనాల కోసం దరఖాస్తు చేయలేరు
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,వెబ్సైట్ చిత్రం పబ్లిక్ ఫైలు లేదా వెబ్సైట్ URL అయి ఉండాలి
@@ -1978,7 +1979,7 @@
 DocType: Warehouse,Warehouse Contact Info,వేర్హౌస్ సంప్రదింపు సమాచారం
 DocType: Payment Entry,Write Off Difference Amount,తేడా మొత్తం ఆఫ్ వ్రాయండి
 DocType: Volunteer,Volunteer Name,వాలంటీర్ పేరు
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},ఇతర వరుసలలో నకిలీ తేదీలు ఉన్న వరుసలు కనుగొనబడ్డాయి: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},ఇతర వరుసలలో నకిలీ తేదీలు ఉన్న వరుసలు కనుగొనబడ్డాయి: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: ఉద్యోగి ఇమెయిల్ దొరకలేదు, అందుకే పంపలేదు ఇమెయిల్"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},ఇచ్చిన తేదీ {0} న ఉద్యోగి {0} కోసం కేటాయించిన జీతం నిర్మాణం
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},షిప్పింగ్ నియమం దేశం కోసం వర్తించదు {0}
@@ -2069,6 +2070,7 @@
 DocType: Salary Component,Earning,ఆదాయ
 DocType: Supplier Scorecard,Scoring Criteria,స్కోరింగ్ ప్రమాణం
 DocType: Purchase Invoice,Party Account Currency,పార్టీ ఖాతా కరెన్సీ
+DocType: Delivery Trip,Total Estimated Distance,మొత్తం అంచనా దూరం
 ,BOM Browser,బిఒఎం బ్రౌజర్
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,దయచేసి ఈ శిక్షణ ఈవెంట్ కోసం మీ స్థితిని నవీకరించండి
 DocType: Item Barcode,EAN,EAN
@@ -2107,7 +2109,7 @@
 DocType: Activity Cost,Projects,ప్రాజెక్ట్స్
 DocType: Payment Request,Transaction Currency,లావాదేవీ కరెన్సీ
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},నుండి {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,కొన్ని ఇమెయిల్లు చెల్లవు
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,కొన్ని ఇమెయిల్లు చెల్లవు
 DocType: Work Order Operation,Operation Description,ఆపరేషన్ వివరణ
 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.,ఫిస్కల్ ఇయర్ సేవ్ ఒకసారి ఫిస్కల్ ఇయర్ ప్రారంభ తేదీ మరియు ఫిస్కల్ ఇయర్ ఎండ్ తేదీ మార్చలేరు.
 DocType: Quotation,Shopping Cart,కొనుగోలు బుట్ట
@@ -2131,7 +2133,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,స్థిర ఆస్తి నికర మార్పును
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,అన్ని వివరణలకు భావిస్తారు ఉంటే ఖాళీ వదిలి
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,రకం &#39;యదార్థ&#39; వరుసగా బాధ్యతలు {0} అంశాన్ని రేటు చేర్చారు సాధ్యం కాదు
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,రకం &#39;యదార్థ&#39; వరుసగా బాధ్యతలు {0} అంశాన్ని రేటు చేర్చారు సాధ్యం కాదు
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},మాక్స్: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,తేదీసమయం నుండి
 DocType: Shopify Settings,For Company,కంపెనీ
@@ -2145,7 +2147,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,కోర్సు షెడ్యూల్ను సృష్టించే లోపాలు ఉన్నాయి
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,జాబితాలోని మొదటి ఖర్చు అప్ప్రోవర్ డిఫాల్ట్ వ్యయ అప్ప్రోవర్గా సెట్ చేయబడుతుంది.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,100 కంటే ఎక్కువ ఉండకూడదు
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,మీరు మార్కెట్ మేనేజర్లో రిజిస్టర్ చేసుకోవడానికి సిస్టమ్ మేనేజర్ మరియు ఐప్యాడ్ మేనేజర్ పాత్రలతో నిర్వాహకుడిగా కాకుండా వేరే వినియోగదారుగా ఉండాలి.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,మీరు మార్కెట్ మేనేజర్లో రిజిస్టర్ చేసుకోవడానికి సిస్టమ్ మేనేజర్ మరియు ఐప్యాడ్ మేనేజర్ పాత్రలతో నిర్వాహకుడిగా కాకుండా వేరే వినియోగదారుగా ఉండాలి.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,{0} అంశం స్టాక్ అంశం కాదు
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-పాక్-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,అనుకోని
@@ -2174,7 +2176,7 @@
 DocType: HR Settings,Employee Settings,Employee సెట్టింగ్స్
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,చెల్లింపు వ్యవస్థను లోడ్ చేస్తోంది
 ,Batch-Wise Balance History,బ్యాచ్-వైజ్ సంతులనం చరిత్ర
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,వరుస # {0}: అంశం {1} కోసం మొత్తం మొత్తాన్ని బట్టి మొత్తంగా ఉంటే రేట్ సెట్ చేయలేరు.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,వరుస # {0}: అంశం {1} కోసం మొత్తం మొత్తాన్ని బట్టి మొత్తంగా ఉంటే రేట్ సెట్ చేయలేరు.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,ముద్రణా సెట్టింగ్లను సంబంధిత print ఫార్మాట్లో నవీకరించబడింది
 DocType: Package Code,Package Code,ప్యాకేజీ కోడ్
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,అప్రెంటిస్
@@ -2406,7 +2408,7 @@
 DocType: Delivery Trip,Optimize Route,మార్గం ఆప్టిమైజ్
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ముందుగానే X రోజులు కార్యకలాపాలు ప్రణాళిక ప్రయత్నించండి.
 DocType: HR Settings,Stop Birthday Reminders,ఆపు జన్మదిన రిమైండర్లు
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},కంపెనీ డిఫాల్ట్ పేరోల్ చెల్లించవలసిన ఖాతా సెట్ దయచేసి {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},కంపెనీ డిఫాల్ట్ పేరోల్ చెల్లించవలసిన ఖాతా సెట్ దయచేసి {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,అమెజాన్ ద్వారా పన్నులు మరియు ఆరోపణల డేటా యొక్క ఆర్థిక విభజన పొందండి
 DocType: SMS Center,Receiver List,స్వీకర్త జాబితా
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,శోధన అంశం
@@ -2474,7 +2476,7 @@
 DocType: Vital Signs,Constipated,constipated
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},సరఫరాదారు వ్యతిరేకంగా వాయిస్ {0} నాటి {1}
 DocType: Customer,Default Price List,డిఫాల్ట్ ధర జాబితా
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,ఆస్తి ఉద్యమం రికార్డు {0} రూపొందించారు
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,ఆస్తి ఉద్యమం రికార్డు {0} రూపొందించారు
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,అంశాలు కనుగొనబడలేదు.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,మీరు తొలగించలేరు ఫిస్కల్ ఇయర్ {0}. ఫిస్కల్ ఇయర్ {0} గ్లోబల్ సెట్టింగ్స్ లో డిఫాల్ట్ గా సెట్
 DocType: Share Transfer,Equity/Liability Account,ఈక్విటీ / బాధ్యత ఖాతా
@@ -2613,6 +2615,7 @@
 DocType: Blanket Order,Order Type,ఆర్డర్ రకం
 ,Item-wise Sales Register,అంశం వారీగా సేల్స్ నమోదు
 DocType: Asset,Gross Purchase Amount,స్థూల కొనుగోలు మొత్తాన్ని
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,అంశం కోడ్&gt; అంశం సమూహం&gt; బ్రాండ్
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,ప్రారంభ నిల్వలు
 DocType: Asset,Depreciation Method,అరుగుదల విధానం
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,ప్రాథమిక రేటు లో కూడా ఈ పన్ను?
@@ -2694,7 +2697,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,వార్షిక బడ్జెట్ పావును మించి ఉంటే చర్య
 DocType: Student Leave Application,Student Leave Application,స్టూడెంట్ లీవ్ అప్లికేషన్
 DocType: Item,Will also apply for variants,కూడా రూపాంతరాలు వర్తిస్తాయని
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","అది ఇప్పటికే ఉంది గా ఆస్తి, రద్దు చేయబడదు {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","అది ఇప్పటికే ఉంది గా ఆస్తి, రద్దు చేయబడదు {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},ఉద్యోగి {0} లో హాఫ్ రోజున {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},మొత్తం పని గంటల గరిష్టంగా పని గంటల కంటే ఎక్కువ ఉండకూడదు {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,పై
@@ -2718,6 +2721,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,డేటాను పొందు
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},సెలవు రకం {0} లో అనుమతించబడిన గరిష్ఠ సెలవు {1}
 DocType: SMS Center,Create Receiver List,స్వీకర్త జాబితా సృష్టించు
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,అందుబాటులో ఉన్న తేదీకి కొనుగోలు తేదీ తర్వాత అందుబాటులో ఉండాలి
 DocType: Vehicle,Wheels,వీల్స్
 DocType: Packing Slip,To Package No.,నం ప్యాకేజి
 DocType: Patient Relation,Family,కుటుంబ
@@ -2731,7 +2735,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,బిల్లింగ్ కరెన్సీ డిఫాల్ట్ కంపెనీ కరెన్సీ లేదా పార్టీ ఖాతా కరెన్సీకి సమానంగా ఉండాలి
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),ప్యాకేజీ దూస్రా (మాత్రమే డ్రాఫ్ట్) లో ఒక భాగంగా ఉంది అని సూచిస్తుంది
 DocType: Soil Texture,Loam,లోవామ్
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,రో {0}: తేదీని పోస్ట్ చేసే ముందు తేదీ ఉండకూడదు
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,రో {0}: తేదీని పోస్ట్ చేసే ముందు తేదీ ఉండకూడదు
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,చెల్లింపు ఎంట్రీ చేయండి
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},అంశం పరిమాణం {0} కంటే తక్కువ ఉండాలి {1}
 ,Sales Invoice Trends,సేల్స్ వాయిస్ ట్రెండ్లులో
@@ -2801,7 +2805,7 @@
 DocType: Guardian,Guardian Interests,గార్డియన్ అభిరుచులు
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,అప్డేట్ ఖాతా పేరు / సంఖ్య
 DocType: Naming Series,Current Value,కరెంట్ వేల్యూ
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,బహుళ ఆర్థిక సంవత్సరాలలో తేదీ {0} ఉన్నాయి. ఫిస్కల్ ఇయర్ లో కంపెనీని స్థాపించారు దయచేసి
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,బహుళ ఆర్థిక సంవత్సరాలలో తేదీ {0} ఉన్నాయి. ఫిస్కల్ ఇయర్ లో కంపెనీని స్థాపించారు దయచేసి
 DocType: Education Settings,Instructor Records to be created by,బోధకుడు రికార్డ్స్ సృష్టించాలి
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} రూపొందించినవారు
 DocType: GST Account,GST Account,GST ఖాతా
@@ -2818,7 +2822,7 @@
 DocType: Sales Person,Name and Employee ID,పేరు మరియు Employee ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,గడువు తేదీ తేదీ చేసినది ముందు ఉండరాదు
 DocType: Website Item Group,Website Item Group,వెబ్సైట్ అంశం గ్రూప్
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ఇప్పటికే ఎంచుకున్న ప్రమాణం లేదా జీతం స్లిప్ సమర్పించినందుకు జీతం స్లిప్ లేదు
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ఇప్పటికే ఎంచుకున్న ప్రమాణం లేదా జీతం స్లిప్ సమర్పించినందుకు జీతం స్లిప్ లేదు
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,సుంకాలు మరియు పన్నుల
 DocType: Projects Settings,Projects Settings,ప్రాజెక్ట్స్ సెట్టింగులు
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,సూచన తేదీని ఎంటర్ చేయండి
@@ -2827,7 +2831,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,సరఫరా ప్యాక్ చేసిన అంశాల
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,మెటీరియల్ అభ్యర్థన అంశం
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,దయచేసి మొదటి కొనుగోలు కొనుగోలు రసీదు {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,దయచేసి మొదటి కొనుగోలు కొనుగోలు రసీదు {0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,అంశం గుంపులు వృక్షమును నేలనుండి మొలిపించెను.
 DocType: Production Plan,Total Produced Qty,మొత్తం ఉత్పత్తి Qty
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,ఈ ఛార్జ్ రకం కోసం ప్రస్తుత వరుస సంఖ్య కంటే ఎక్కువ లేదా సమాన వరుస సంఖ్య చూడండి కాదు
@@ -2937,6 +2941,7 @@
 ,Vehicle Expenses,వాహనం ఖర్చులు
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,సేల్స్ ఇన్వాయిస్ సమర్పించండి లాబ్ టెస్ట్ (లు) ను సృష్టించండి
 DocType: Serial No,Invoice Details,ఇన్వాయిస్ వివరాలు
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,మార్గాలను అంచనా వేయడానికి మరియు ఆప్టిమైజ్ చేయడానికి దయచేసి Google Maps సెట్టింగ్లను ప్రారంభించండి
 DocType: Grant Application,Show on Website,వెబ్సైట్లో చూపించు
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,ప్రారంభించండి
 DocType: Hub Tracked Item,Hub Category,హబ్ వర్గం
@@ -2977,7 +2982,7 @@
 DocType: Inpatient Record,B Positive,B అనుకూలమైన
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",ఉద్యోగుల యొక్క గరిష్ట లాభం {0} మునుపటి దావా \ మొత్తంలో మొత్తం {2} ద్వారా {1} మించిపోయింది
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","రో # {0}: ప్యాక్ చేసిన అంశాల 1, అంశం ఒక స్థిర ఆస్తి ఉంది ఉండాలి. దయచేసి బహుళ అంశాల కోసం ప్రత్యేక వరుస ఉపయోగించడానికి."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","రో # {0}: ప్యాక్ చేసిన అంశాల 1, అంశం ఒక స్థిర ఆస్తి ఉంది ఉండాలి. దయచేసి బహుళ అంశాల కోసం ప్రత్యేక వరుస ఉపయోగించడానికి."
 DocType: Leave Block List Allow,Leave Block List Allow,బ్లాక్ జాబితా అనుమతించు వదిలి
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr ఖాళీ లేదా ఖాళీ ఉండరాదు
 DocType: Patient Medical Record,Patient Medical Record,పేషెంట్ మెడికల్ రికార్డ్
@@ -3011,7 +3016,7 @@
 DocType: Workstation,Wages per hour,గంటకు వేతనాలు
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},బ్యాచ్ లో స్టాక్ సంతులనం {0} అవుతుంది ప్రతికూల {1} Warehouse వద్ద అంశం {2} కోసం {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,మెటీరియల్ అభ్యర్థనలను తరువాత అంశం యొక్క క్రమాన్ని స్థాయి ఆధారంగా స్వయంచాలకంగా బడ్డాయి
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},ఖాతా {0} చెల్లదు. ఖాతా కరెన్సీ ఉండాలి {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},ఖాతా {0} చెల్లదు. ఖాతా కరెన్సీ ఉండాలి {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},తేదీ నుండి {0} ఉద్యోగి యొక్క ఉపశమనం తేదీ తర్వాత {1}
 DocType: Supplier,Is Internal Supplier,అంతర్గత సరఫరాదారు
 DocType: Employee,Create User Permission,వాడుకరి అనుమతిని సృష్టించండి
@@ -3156,7 +3161,7 @@
 DocType: Account,Fixed Asset,స్థిర ఆస్తి
 DocType: Amazon MWS Settings,After Date,తేదీ తర్వాత
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,సీరియల్ ఇన్వెంటరీ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,ఇంటర్ కంపెనీ ఇన్వాయిస్ కోసం చెల్లని {0}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,ఇంటర్ కంపెనీ ఇన్వాయిస్ కోసం చెల్లని {0}.
 ,Department Analytics,డిపార్ట్మెంట్ ఎనలిటిక్స్
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,డిఫాల్ట్ పరిచయంలో ఇమెయిల్ కనుగొనబడలేదు
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,సీక్రెట్ను రూపొందించండి
@@ -3168,7 +3173,7 @@
 DocType: Sales Invoice,Total Billing Amount,మొత్తం బిల్లింగ్ మొత్తం
 DocType: Bank Statement Transaction Entry,Receivable Account,స్వీకరించదగిన ఖాతా
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,తేదీ వరకు చెల్లుతుంది చెల్లుబాటు అయ్యే తేదీ కంటే తక్కువగా ఉండాలి.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},రో # {0}: ఆస్తి {1} ఇప్పటికే ఉంది {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},రో # {0}: ఆస్తి {1} ఇప్పటికే ఉంది {2}
 DocType: Quotation Item,Stock Balance,స్టాక్ సంతులనం
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,చెల్లింపు కు అమ్మకాల ఆర్డర్
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,సియిఒ
@@ -3210,6 +3215,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,డెబిట్ అవసరం ఉంది
 DocType: Clinical Procedure,Inpatient Record,ఇన్పేషెంట్ రికార్డ్
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets మీ జట్టు చేసిన కృత్యాలు కోసం సమయం, ఖర్చు మరియు బిల్లింగ్ ట్రాక్ సహాయం"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,సరఫరాదారు&gt; సరఫరాదారు రకం
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,కొనుగోలు ధర జాబితా
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,లావాదేవీ తేదీ
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,సరఫరాదారు స్కోర్కార్డ్ వేరియబుల్స్ యొక్క టెంప్లేట్లు.
@@ -3253,7 +3259,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,ఎక్స్చేంజ్ పెరుగుట / నష్టం
 DocType: Opportunity,Lost Reason,లాస్ట్ కారణము
 DocType: Amazon MWS Settings,Enable Amazon,అమెజాన్ ప్రారంభించండి
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},రో # {0}: ఖాతా {1} సంస్థకు చెందినది కాదు {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},రో # {0}: ఖాతా {1} సంస్థకు చెందినది కాదు {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType {0} ను కనుగొనడం సాధ్యం కాలేదు
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,క్రొత్త చిరునామా
 DocType: Quality Inspection,Sample Size,నమూనా పరిమాణం
@@ -3363,7 +3369,7 @@
 DocType: Water Analysis,Origin,మూలం
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ఈ పత్రం పరిమితి {0} {1} అంశం {4}. మీరు తయారు మరొక {3} అదే వ్యతిరేకంగా {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,గండం పునరావృత సెట్ చెయ్యండి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,మార్పు ఎంచుకోండి మొత్తం ఖాతా
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,మార్పు ఎంచుకోండి మొత్తం ఖాతా
 DocType: Purchase Invoice,Price List Currency,ధర జాబితా కరెన్సీ
 DocType: Naming Series,User must always select,వినియోగదారు ఎల్లప్పుడూ ఎంచుకోవాలి
 DocType: Stock Settings,Allow Negative Stock,ప్రతికూల స్టాక్ అనుమతించు
@@ -3405,7 +3411,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,మీరు ఖచ్చితంగా ఈ అపాయింట్మెంట్ను రద్దు చేయాలనుకుంటున్నారా?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,హోటల్ రూమ్ ప్రైసింగ్ ప్యాకేజీ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,సేల్స్ పైప్లైన్
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},జీతం కాంపొనెంట్లో డిఫాల్ట్ ఖాతా సెట్ దయచేసి {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},జీతం కాంపొనెంట్లో డిఫాల్ట్ ఖాతా సెట్ దయచేసి {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Required న
 DocType: Rename Tool,File to Rename,పేరుమార్చు దాఖలు
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},దయచేసి రో అంశం బిఒఎం ఎంచుకోండి {0}
@@ -3426,7 +3432,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,కొనుగోలు వస్తువుల ధర
 DocType: Employee Separation,Employee Separation Template,Employee విడిపోవడానికి మూస
 DocType: Selling Settings,Sales Order Required,అమ్మకాల ఆర్డర్ అవసరం
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,ఒక విక్రేత అవ్వండి
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,ఒక విక్రేత అవ్వండి
 DocType: Purchase Invoice,Credit To,క్రెడిట్
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Active దారితీస్తుంది / వినియోగదారుడు
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,ప్రామాణిక డెలివరీ నోట్ ఫార్మాట్ ఉపయోగించడానికి ఖాళీగా వదలండి
@@ -3468,7 +3474,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,పన్ను మూసను చేయండి
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,వాడుకరి ఫోరం
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,రా మెటీరియల్స్ ఖాళీ ఉండకూడదు.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,వరుస # {0} (చెల్లింపు పట్టిక): మొత్తం ప్రతికూలంగా ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,వరుస # {0} (చెల్లింపు పట్టిక): మొత్తం ప్రతికూలంగా ఉండాలి
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","స్టాక్ అప్డేట్ కాలేదు, ఇన్వాయిస్ డ్రాప్ షిప్పింగ్ అంశం కలిగి."
 DocType: Contract,Fulfilment Status,నెరవేర్చుట స్థితి
 DocType: Lab Test Sample,Lab Test Sample,ల్యాబ్ పరీక్ష నమూనా
@@ -3607,7 +3613,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Doc తేదీ
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},ఫీజు రికార్డ్స్ రూపొందించబడింది - {0}
 DocType: Asset Category Account,Asset Category Account,ఆస్తి వర్గం ఖాతా
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,రో # {0} (చెల్లింపు టేబుల్): మొత్తాన్ని సానుకూలంగా ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,రో # {0} (చెల్లింపు టేబుల్): మొత్తాన్ని సానుకూలంగా ఉండాలి
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},అమ్మకాల ఆర్డర్ పరిమాణం కంటే ఎక్కువ అంశం {0} ఉత్పత్తి కాదు {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,ఎంచుకోండి లక్షణం విలువలు
 DocType: Purchase Invoice,Reason For Issuing document,పత్రం జారీ కోసం కారణం
@@ -3662,7 +3668,7 @@
 DocType: Purchase Receipt,Time at which materials were received,పదార్థాలు అందుకున్న సమయంలో
 DocType: Products Settings,Products per Page,పేజీకి ఉత్పత్తులు
 DocType: Stock Ledger Entry,Outgoing Rate,అవుట్గోయింగ్ రేటు
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,లేదా
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,లేదా
 DocType: Sales Order,Billing Status,బిల్లింగ్ స్థితి
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ఒక సమస్యను నివేదించండి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,యుటిలిటీ ఖర్చులు
@@ -3690,7 +3696,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,ఉద్యోగుల పన్ను మినహాయింపు ప్రకటన
 DocType: Payment Entry,Cheque/Reference Date,ప్రిపే / ప్రస్తావన తేదీ
 DocType: Purchase Invoice,Total Taxes and Charges,మొత్తం పన్నులు మరియు ఆరోపణలు
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,అందుబాటులో ఉన్న వినియోగ తేదీని గత తేదీగా నమోదు చేసింది
 DocType: Employee,Emergency Contact,అత్యవసర సంప్రదింపు
 DocType: Bank Reconciliation Detail,Payment Entry,చెల్లింపు ఎంట్రీ
 ,sales-browser,అమ్మకాలు బ్రౌజర్
@@ -3735,6 +3740,7 @@
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Depreciation Amount during the period,కాలంలో అరుగుదల మొత్తం
 DocType: Sales Invoice,Is Return (Credit Note),రిటర్న్ (క్రెడిట్ నోట్)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,ఉద్యోగం ప్రారంభించండి
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,దయచేసి సెటప్&gt; సెట్టింగులు&gt; నామకరణ సిరీస్ ద్వారా {0} నామకరణ సిరీస్ను సెట్ చేయండి
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,వికలాంగుల టెంప్లేట్ డిఫాల్ట్ టెంప్లేట్ ఉండకూడదు
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,వరుస కోసం {0}: అనుకున్న qty ను నమోదు చేయండి
 DocType: Account,Income Account,ఆదాయపు ఖాతా
@@ -3748,6 +3754,7 @@
 DocType: Loyalty Program,Help Section,సహాయం విభాగం
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,మునుపటి
 DocType: Appraisal Goal,Key Responsibility Area,కీ బాధ్యత ఏరియా
+DocType: Delivery Trip,Distance UOM,దూరం UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","స్టూడెంట్ ఇస్తున్న మీరు విద్యార్థులకు హాజరు, లెక్కింపులు మరియు ఫీజు ట్రాక్ సహాయం"
 DocType: Payment Entry,Total Allocated Amount,మొత్తం కేటాయించిన సొమ్ము
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,శాశ్వత జాబితా కోసం డిఫాల్ట్ జాబితా ఖాతా సెట్
@@ -3789,7 +3796,7 @@
 DocType: Item Supplier,Item Supplier,అంశం సరఫరాదారు
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,బ్యాచ్ ఏ పొందడానికి అంశం కోడ్ను నమోదు చేయండి
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},{0} quotation_to కోసం ఒక విలువను ఎంచుకోండి దయచేసి {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,బదిలీ కోసం ఎటువంటి అంశాలు ఎంచుకోబడలేదు
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,బదిలీ కోసం ఎటువంటి అంశాలు ఎంచుకోబడలేదు
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,అన్ని చిరునామాలు.
 DocType: Company,Stock Settings,స్టాక్ సెట్టింగ్స్
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","క్రింది రెండు లక్షణాలతో రికార్డులలో అదే ఉంటే విలీనం మాత్రమే సాధ్యమవుతుంది. గ్రూప్ రూట్ రకం, కంపెనీ"
@@ -4072,7 +4079,7 @@
 DocType: Patient,Personal and Social History,వ్యక్తిగత మరియు సామాజిక చరిత్ర
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,వినియోగదారు {0} సృష్టించారు
 DocType: Fee Schedule,Fee Breakup for each student,ఫీజు ప్రతి విద్యార్థి కోసం విభజన
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),మొత్తం ముందుగానే ({0}) ఉత్తర్వు మీద {1} గ్రాండ్ మొత్తం కన్నా ఎక్కువ ఉండకూడదు ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),మొత్తం ముందుగానే ({0}) ఉత్తర్వు మీద {1} గ్రాండ్ మొత్తం కన్నా ఎక్కువ ఉండకూడదు ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,అసమానంగా నెలల అంతటా లక్ష్యాలను పంపిణీ మంత్లీ పంపిణీ ఎంచుకోండి.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,కోడ్ మార్చండి
 DocType: Purchase Invoice Item,Valuation Rate,వాల్యువేషన్ రేటు
@@ -4081,7 +4088,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,ITC సెస్ను ఉపయోగించింది
 ,Student Monthly Attendance Sheet,స్టూడెంట్ మంత్లీ హాజరు షీట్
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,సెల్లింగ్ కోసం మాత్రమే షిప్పింగ్ నియమం వర్తిస్తుంది
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,తరుగుదల వరుస {0}: తదుపరి తరుగుదల తేదీ కొనుగోలు తేదీకి ముందు ఉండకూడదు
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,తరుగుదల వరుస {0}: తదుపరి తరుగుదల తేదీ కొనుగోలు తేదీకి ముందు ఉండకూడదు
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,ప్రాజెక్ట్ ప్రారంభ తేదీ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,వరకు
 DocType: Rename Tool,Rename Log,లోనికి ప్రవేశించండి పేరుమార్చు
@@ -4098,12 +4105,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,సేల్స్ ట్రాన్సాక్షన్స్ ఆధారంగా ఎంత తరచుగా ప్రాజెక్ట్ మరియు కంపెనీ అప్డేట్ చేయాలి.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,గడువు ముగిసేది
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,స్టూడెంట్స్ జోడించండి
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","దయచేసి ఈ పత్రాన్ని రద్దు చేయడానికి ఉద్యోగి <a href=""#Form/Employee/{0}"">{0}</a> ను తొలగించండి"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},దయచేసి ఎంచుకోండి {0}
 DocType: C-Form,C-Form No,సి ఫారం లేవు
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,దూరం
+DocType: Delivery Stop,Distance,దూరం
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,మీరు కొనుగోలు లేదా విక్రయించే మీ ఉత్పత్తులను లేదా సేవలను జాబితా చేయండి.
 DocType: Water Analysis,Storage Temperature,నిల్వ ఉష్ణోగ్రత
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4129,7 +4134,7 @@
 DocType: Homepage,Company Description for website homepage,వెబ్సైట్ హోమ్ కోసం కంపెనీ వివరణ
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","వినియోగదారుల సౌలభ్యం కోసం, ఈ సంకేతాలు ఇన్వాయిస్లు మరియు డెలివరీ గమనికలు వంటి ముద్రణ ఫార్మాట్లలో ఉపయోగించవచ్చు"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier పేరు
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,{0} కోసం సమాచారాన్ని తిరిగి పొందడం సాధ్యం కాలేదు.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,{0} కోసం సమాచారాన్ని తిరిగి పొందడం సాధ్యం కాలేదు.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,ఎంట్రీ జర్నల్ తెరవడం
 DocType: Contract,Fulfilment Terms,నెరవేర్చుట నిబంధనలు
 DocType: Sales Invoice,Time Sheet List,సమయం షీట్ జాబితా
@@ -4309,7 +4314,7 @@
 DocType: Serial No,Warranty / AMC Details,వారంటీ / AMC వివరాలు
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,కార్యాచరణ ఆధారంగా గ్రూప్ కోసం మానవీయంగా విద్యార్థులు ఎంచుకోండి
 DocType: Journal Entry,User Remark,వాడుకరి వ్యాఖ్య
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,మార్గాలను అనుకూలపరచడం.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,మార్గాలను అనుకూలపరచడం.
 DocType: Travel Itinerary,Non Diary,నాన్ డైరీ
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,ఎడమ ఉద్యోగుల కోసం నిలుపుదల బోనస్ను సృష్టించలేరు
 DocType: Lead,Market Segment,మార్కెట్ విభాగానికీ
@@ -4339,7 +4344,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,విధేయత కార్యక్రమం
 DocType: Student Guardian,Father,తండ్రి
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,మద్దతు టికెట్లు
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;సరిచేయబడిన స్టాక్&#39; స్థిర ఆస్తి అమ్మకం కోసం తనిఖీ చెయ్యబడదు
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;సరిచేయబడిన స్టాక్&#39; స్థిర ఆస్తి అమ్మకం కోసం తనిఖీ చెయ్యబడదు
 DocType: Bank Reconciliation,Bank Reconciliation,బ్యాంక్ సయోధ్య
 DocType: Attendance,On Leave,సెలవులో ఉన్నాను
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,నవీకరణలు పొందండి
@@ -4384,7 +4389,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,సీరియల్ లేవు మరియు బ్యాచ్
 DocType: Warranty Claim,From Company,కంపెనీ నుండి
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,అంచనా ప్రమాణం స్కోర్లు మొత్తం {0} ఉండాలి.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,దయచేసి Depreciations సంఖ్య బుక్ సెట్
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,దయచేసి Depreciations సంఖ్య బుక్ సెట్
 DocType: Supplier Scorecard Period,Calculations,గణాంకాలు
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,విలువ లేదా ప్యాక్ చేసిన అంశాల
 DocType: Payment Terms Template,Payment Terms,చెల్లింపు నిబందనలు
@@ -4403,7 +4408,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,లాభాలతో ధర జాబితా రేటు తగ్గింపు (%)
 DocType: Healthcare Service Unit Type,Rate / UOM,రేట్ / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,అన్ని గిడ్డంగులు
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,ఇంటర్ కంపెనీ లావాదేవీలకు ఎటువంటి {0} దొరకలేదు.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,ఇంటర్ కంపెనీ లావాదేవీలకు ఎటువంటి {0} దొరకలేదు.
 DocType: Travel Itinerary,Rented Car,అద్దె కారు
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,మీ కంపెనీ గురించి
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,ఖాతాకు క్రెడిట్ బాలన్స్ షీట్ ఖాతా ఉండాలి
@@ -4504,6 +4509,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,ప్లాంట్ అనాలిసిస్ క్రైటీరియా
 DocType: Cheque Print Template,Cheque Height,ప్రిపే ఎత్తు
 DocType: Supplier,Supplier Details,సరఫరాదారు వివరాలు
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,సెటప్&gt; నంబరింగ్ సిరీస్ ద్వారా హాజరు కోసం నంబర్ సిరీస్ను సెటప్ చేయండి
 DocType: Setup Progress,Setup Progress,ప్రోగ్రెస్ సెటప్
 DocType: Expense Claim,Approval Status,ఆమోద స్థితి
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},విలువ వరుసగా విలువ కంటే తక్కువ ఉండాలి నుండి {0}
@@ -4596,7 +4602,6 @@
 DocType: Travel Request,Fully Sponsored,పూర్తిగా ప్రాయోజితం
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,రివర్స్ జర్నల్ ఎంట్రీ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,కస్టమర్ {0} సృష్టించబడింది.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,దయచేసి మానవ వనరులో HR ఉద్యోగ నామకరణ వ్యవస్థ సెటప్ చేయండి&gt; హెచ్ఆర్ సెట్టింగులు
 DocType: Stock Settings,Limit Percent,పరిమితి శాతం
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,ఏ గిడ్డంగిలో ప్రస్తుతం స్టాక్ లేదు
 ,Payment Period Based On Invoice Date,వాయిస్ తేదీ ఆధారంగా చెల్లింపు కాలం
@@ -4655,7 +4660,7 @@
 DocType: BOM Explosion Item,Source Warehouse,మూల వేర్హౌస్
 DocType: Installation Note,Installation Date,సంస్థాపన తేదీ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,లెడ్జర్ను భాగస్వామ్యం చేయండి
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},రో # {0}: ఆస్తి {1} లేదు కంపెనీకి చెందిన లేదు {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},రో # {0}: ఆస్తి {1} లేదు కంపెనీకి చెందిన లేదు {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,సేల్స్ ఇన్వాయిస్ {0} సృష్టించబడింది
 DocType: Employee,Confirmation Date,నిర్ధారణ తేదీ
 DocType: Inpatient Occupancy,Check Out,తనిఖీ చేయండి
@@ -4675,6 +4680,7 @@
 DocType: Production Plan,Sales Orders Detail,సేల్స్ ఆర్డర్స్ వివరాలు
 DocType: Bin,Requested Quantity,అభ్యర్థించిన పరిమాణం
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-ఫి-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,దయచేసి ఎడ్యుకేషన్&gt; ఎడ్యుకేషన్ సెట్టింగులలో ఇన్స్ట్రక్టర్ నేమింగ్ సిస్టం సెటప్ చేయండి
 DocType: Patient,Marital Status,వైవాహిక స్థితి
 DocType: Stock Settings,Auto Material Request,ఆటో మెటీరియల్ అభ్యర్థన
 DocType: Woocommerce Settings,API consumer secret,API వినియోగదారు రహస్యం
@@ -4726,7 +4732,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,డేస్ ఎంచుకోండి
 DocType: Academic Term,Term Name,టర్మ్ పేరు
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),క్రెడిట్ ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,జీతం స్లిప్లను సృష్టిస్తోంది ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,జీతం స్లిప్లను సృష్టిస్తోంది ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,మీరు రూట్ నోడ్ను సవరించలేరు.
 DocType: Buying Settings,Purchase Order Required,ఆర్డర్ అవసరం కొనుగోలు
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,టైమర్
@@ -4762,7 +4768,7 @@
 DocType: Account,Rate at which this tax is applied,ఈ పన్ను వర్తించబడుతుంది రేటుపై
 DocType: Cash Flow Mapper,Section Name,విభాగం పేరు
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,క్రమాన్ని మార్చు ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},తరుగుదల వరుస {0}: ఉపయోగకరమైన జీవితము తర్వాత ఊహించిన విలువ తప్పక {1} కంటే ఎక్కువ లేదా సమానంగా ఉండాలి
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},తరుగుదల వరుస {0}: ఉపయోగకరమైన జీవితము తర్వాత ఊహించిన విలువ తప్పక {1} కంటే ఎక్కువ లేదా సమానంగా ఉండాలి
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,ప్రస్తుత Job ఖాళీలు
 DocType: Company,Stock Adjustment Account,స్టాక్ అడ్జస్ట్మెంట్ ఖాతా
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ఆఫ్ వ్రాయండి
@@ -4809,7 +4815,7 @@
 DocType: Program Enrollment,School House,స్కూల్ హౌస్
 DocType: Serial No,Out of AMC,AMC యొక్క అవుట్
 DocType: Opportunity,Opportunity Amount,అవకాశం మొత్తం
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,బుక్ Depreciations సంఖ్య Depreciations మొత్తం సంఖ్య కంటే ఎక్కువ ఉండకూడదు
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,బుక్ Depreciations సంఖ్య Depreciations మొత్తం సంఖ్య కంటే ఎక్కువ ఉండకూడదు
 DocType: Purchase Order,Order Confirmation Date,ఆర్డర్ నిర్ధారణ తేదీ
 DocType: Driver,HR-DRI-.YYYY.-,ఆర్-డ్రై-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,నిర్వహణ సందర్శించండి చేయండి
@@ -4850,7 +4856,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,బ్యాచ్:
 DocType: Volunteer,Afternoon,మధ్యాహ్నం
 DocType: Loyalty Program,Loyalty Program Help,లాయల్టీ ప్రోగ్రామ్ సహాయం
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} &#39;{1}&#39; నిలిపివేయబడింది
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} &#39;{1}&#39; నిలిపివేయబడింది
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ఓపెన్ గా సెట్
 DocType: Cheque Print Template,Scanned Cheque,స్కాన్ చేసిన ప్రిపే
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,సమర్పిస్తోంది లావాదేవీలపై కాంటాక్ట్స్ ఆటోమేటిక్ ఇమెయిల్స్ పంపడం.
@@ -4863,13 +4869,15 @@
 DocType: Warranty Claim,Item and Warranty Details,అంశం మరియు వారంటీ వివరాలు
 DocType: Chapter,Chapter Members,చాప్టర్ సభ్యులు
 DocType: Sales Team,Contribution (%),కాంట్రిబ్యూషన్ (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,గమనిక: చెల్లింపు ఎంట్రీ నుండి రూపొందించినవారు కాదు &#39;నగదు లేదా బ్యాంక్ ఖాతా&#39; పేర్కొనబడలేదు
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,గమనిక: చెల్లింపు ఎంట్రీ నుండి రూపొందించినవారు కాదు &#39;నగదు లేదా బ్యాంక్ ఖాతా&#39; పేర్కొనబడలేదు
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,ప్రాజెక్ట్ {0} ఇప్పటికే ఉంది
 DocType: Clinical Procedure,Nursing User,నర్సింగ్ వాడుకరి
 DocType: Employee Benefit Application,Payroll Period,పేరోల్ కాలం
 DocType: Plant Analysis,Plant Analysis Criterias,ప్లాంట్ అనాలిసిస్ క్రైటీరియస్
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,బాధ్యతలు
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,ఈ ఉల్లేఖన యొక్క కాలం చెల్లినది.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","దయచేసి ఈ పత్రాన్ని రద్దు చేయడానికి ఉద్యోగి <a href=""#Form/Employee/{0}"">{0}</a> ను తొలగించండి"
 DocType: Expense Claim Account,Expense Claim Account,ఖర్చు చెప్పడం ఖాతా
 DocType: Account,Capital Work in Progress,క్యాపిటల్ వర్క్ ఇన్ ప్రోగ్రెస్
 DocType: Accounts Settings,Allow Stale Exchange Rates,స్థిర మార్పిడి రేట్లు అనుమతించు
@@ -4951,7 +4959,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,ఇష్యూ మెటీరియల్
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,ERPNext తో Shopify ను కనెక్ట్ చేయండి
 DocType: Material Request Item,For Warehouse,వేర్హౌస్ కోసం
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,డెలివరీ గమనికలు {0} నవీకరించబడ్డాయి
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,డెలివరీ గమనికలు {0} నవీకరించబడ్డాయి
 DocType: Employee,Offer Date,ఆఫర్ తేదీ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,కొటేషన్స్
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,మీరు ఆఫ్లైన్ మోడ్లో ఉన్నాయి. మీరు నెట్వర్కు వరకు రీలోడ్ చేయలేరు.
@@ -5002,7 +5010,7 @@
 DocType: Shipping Rule,Calculate Based On,బేస్డ్ న లెక్కించు
 DocType: Contract,Unfulfilled,పూర్తి చేయని
 DocType: Delivery Note Item,From Warehouse,గిడ్డంగి నుండి
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,పేర్కొన్న ప్రమాణం కోసం ఉద్యోగులు లేరు
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,పేర్కొన్న ప్రమాణం కోసం ఉద్యోగులు లేరు
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,మెటీరియల్స్ బిల్ తో ఏ ఐటంలు తయారీకి
 DocType: Shopify Settings,Default Customer,డిఫాల్ట్ కస్టమర్
 DocType: Sales Stage,Stage Name,రంగస్థల పేరు
@@ -5045,7 +5053,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,డిస్కౌంట్ మొత్తాన్ని తర్వాత పన్ను సొమ్ము
 DocType: Patient,Inpatient Status,ఇన్పేషెంట్ స్థితి
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,డైలీ వర్క్ సారాంశం సెట్టింగులు
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,ఎంచుకున్న ధర జాబితా తనిఖీ చేసిన ఖాళీలను కొనడం మరియు అమ్మడం ఉండాలి.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,ఎంచుకున్న ధర జాబితా తనిఖీ చేసిన ఖాళీలను కొనడం మరియు అమ్మడం ఉండాలి.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,దయచేసి తేదీ ద్వారా రిక్డ్ నమోదు చేయండి
 DocType: Payment Entry,Internal Transfer,అంతర్గత బదిలీ
 DocType: Asset Maintenance,Maintenance Tasks,నిర్వహణ పనులు
@@ -5082,7 +5090,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,గ్రూప్ ద్వారా
 DocType: Guardian,Interests,అభిరుచులు
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,/ డిసేబుల్ కరెన్సీలు ప్రారంభించు.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,కొన్ని జీతం స్లిప్స్ సమర్పించలేకపోయాము
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,కొన్ని జీతం స్లిప్స్ సమర్పించలేకపోయాము
 DocType: Exchange Rate Revaluation,Get Entries,ఎంట్రీలను పొందండి
 DocType: Production Plan,Get Material Request,మెటీరియల్ అభ్యర్థన పొందండి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,పోస్టల్ ఖర్చులు
@@ -5169,7 +5177,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},ఖర్చు ఖాతా అంశం తప్పనిసరి {0}
 DocType: BOM,Website Description,వెబ్సైట్ వివరణ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,ఈక్విటీ నికర మార్పు
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,మొదటి కొనుగోలు వాయిస్ {0} రద్దు చేయండి
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,మొదటి కొనుగోలు వాయిస్ {0} రద్దు చేయండి
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,అనుమతి లేదు. దయచేసి సర్వీస్ యూనిట్ పద్ధతిని నిలిపివేయండి
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ఇమెయిల్ అడ్రస్ కోసం ఇప్పటికే ఉనికిలో ఉంది, ప్రత్యేకంగా ఉండాలి {0}"
 DocType: Serial No,AMC Expiry Date,ఎఎంసి గడువు తేదీ
@@ -5209,7 +5217,7 @@
 DocType: Hotel Room,Hotel Room,హోటల్ గది
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},ఖాతా {0} చేస్తుంది కంపెనీ చెందినవి కాదు {1}
 DocType: Leave Type,Rounding,చుట్టుముట్టే
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,వరుసగా {0} లో సీరియల్ సంఖ్యలు డెలివరీ గమనిక సరిపోలడం లేదు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,వరుసగా {0} లో సీరియల్ సంఖ్యలు డెలివరీ గమనిక సరిపోలడం లేదు
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),డిస్పెన్సెడ్ మొత్తం (ప్రో-రేటెడ్)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","అప్పుడు ధర నిబంధనలు కస్టమర్, కస్టమర్ గ్రూప్, భూభాగం, సరఫరాదారు, సరఫరాదారు సమూహం, ప్రచారం, సేల్స్ భాగస్వామి మొదలైనవి ఆధారంగా ఫిల్టర్ చేయబడతాయి."
 DocType: Student,Guardian Details,గార్డియన్ వివరాలు
@@ -5264,7 +5272,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},వేర్హౌస్ స్టాక్ అంశం అవసరం {0}
 DocType: Leave Allocation,Unused leaves,ఉపయోగించని ఆకులు
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,తిరిగి చెల్లించు ఎంట్రీ చేయండి
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,అన్ని విభాగాలు
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,అన్ని విభాగాలు
 DocType: Healthcare Service Unit,Vacant,ఖాళీగా
 DocType: Patient,Alcohol Past Use,ఆల్కహాల్ పాస్ట్ యూజ్
 DocType: Fertilizer Content,Fertilizer Content,ఎరువులు కంటెంట్
@@ -5275,7 +5283,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,ఈ సేల్స్ ఆర్డర్ను రద్దు చేయడానికి ముందు కార్య క్రమం {0} రద్దు చేయాలి
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),(ఉప అసెంబ్లీలను సహా) పేలింది BOM పొందు
 DocType: Authorization Rule,Applicable To (Employee),వర్తించదగిన (ఉద్యోగి)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,గడువు తేదీ తప్పనిసరి
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,గడువు తేదీ తప్పనిసరి
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,గుణానికి పెంపు {0} 0 ఉండకూడదు
 DocType: Employee Benefit Claim,Benefit Type and Amount,బెనిఫిట్ టైప్ మరియు మొత్తం
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,రూములు బుక్
@@ -5423,7 +5431,7 @@
 DocType: Purchase Invoice Item,Total Weight,మొత్తం బరువు
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,సేల్స్ కమిషన్
 DocType: Job Offer Term,Value / Description,విలువ / వివరణ
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","రో # {0}: ఆస్తి {1} సమర్పించిన కాదు, అది ఇప్పటికే ఉంది {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","రో # {0}: ఆస్తి {1} సమర్పించిన కాదు, అది ఇప్పటికే ఉంది {2}"
 DocType: Tax Rule,Billing Country,బిల్లింగ్ దేశం
 DocType: Purchase Order Item,Expected Delivery Date,ఊహించినది డెలివరీ తేదీ
 DocType: Restaurant Order Entry,Restaurant Order Entry,రెస్టారెంట్ ఆర్డర్ ఎంట్రీ
@@ -5462,12 +5470,13 @@
 DocType: Maintenance Visit,Breakdown,విభజన
 DocType: Travel Itinerary,Vegetarian,శాఖాహారం
 DocType: Patient Encounter,Encounter Date,ఎన్కౌంటర్ డేట్
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,ఖాతా: {0} కరెన్సీతో: {1} ఎంపిక సాధ్యం కాదు
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,ఖాతా: {0} కరెన్సీతో: {1} ఎంపిక సాధ్యం కాదు
 DocType: Bank Statement Transaction Settings Item,Bank Data,బ్యాంక్ డేటా
 DocType: Purchase Receipt Item,Sample Quantity,నమూనా పరిమాణం
 DocType: Bank Guarantee,Name of Beneficiary,లబ్ధిదారు పేరు
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",తాజా వాల్యుయేషన్ రేట్ / ధర జాబితా రేటు / ముడి పదార్థాల చివరి కొనుగోలు రేట్ ఆధారంగా షెడ్యూలర్ ద్వారా స్వయంచాలకంగా BOM ధరని నవీకరించండి.
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,సరఫరాదారు&gt; సరఫరాదారు సమూహం
 DocType: Bank Reconciliation Detail,Cheque Date,ప్రిపే తేదీ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},ఖాతా {0}: మాతృ ఖాతా {1} సంస్థ చెందదు: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,విజయవంతంగా ఈ కంపెనీకి సంబంధించిన అన్ని లావాదేవీలు తొలగించబడింది!
@@ -5495,7 +5504,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,చైల్డ్ నోడ్స్ మాత్రమే &#39;గ్రూప్&#39; రకం నోడ్స్ క్రింద రూపొందించినవారు చేయవచ్చు
 DocType: Attendance Request,Half Day Date,హాఫ్ డే తేదీ
 DocType: Academic Year,Academic Year Name,విద్యా సంవత్సరం పేరు
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} {1} తో లావాదేవీ చేయడానికి అనుమతించబడదు. దయచేసి కంపెనీని మార్చండి.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} {1} తో లావాదేవీ చేయడానికి అనుమతించబడదు. దయచేసి కంపెనీని మార్చండి.
 DocType: Sales Partner,Contact Desc,సంప్రదించండి desc
 DocType: Email Digest,Send regular summary reports via Email.,ఇమెయిల్ ద్వారా సాధారణ సారాంశం నివేదికలు పంపండి.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},ఖర్చుల దావా రకం లో డిఫాల్ట్ ఖాతా సెట్ దయచేసి {0}
@@ -5528,7 +5537,7 @@
 DocType: Hotel Room,Hotel Manager,హోటల్ మేనేజర్
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,షాపింగ్ కార్ట్ సెట్ పన్ను రూల్
 DocType: Purchase Invoice,Taxes and Charges Added,పన్నులు మరియు ఆరోపణలు చేర్చబడింది
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,తరుగుదల వరుస {0}: అప్రస్తుత తేదీ అందుబాటులో ఉండకపోవటానికి ముందు తేదీ ఉండకూడదు
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,తరుగుదల వరుస {0}: అప్రస్తుత తేదీ అందుబాటులో ఉండకపోవటానికి ముందు తేదీ ఉండకూడదు
 ,Sales Funnel,అమ్మకాల గరాటు
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,సంక్షిప్త తప్పనిసరి
 DocType: Project,Task Progress,టాస్క్ ప్రోగ్రెస్
@@ -5542,7 +5551,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,అన్ని కస్టమర్ సమూహాలు
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,పోగుచేసిన మంత్లీ
 DocType: Attendance Request,On Duty,విధి నిర్వహణలో
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} తప్పనిసరి. బహుశా కరెన్సీ ఎక్స్ఛేంజ్ రికార్డు {1} {2} కోసం సృష్టించబడలేదు.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} తప్పనిసరి. బహుశా కరెన్సీ ఎక్స్ఛేంజ్ రికార్డు {1} {2} కోసం సృష్టించబడలేదు.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,పన్ను మూస తప్పనిసరి.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,ఖాతా {0}: మాతృ ఖాతా {1} ఉనికిలో లేదు
 DocType: POS Closing Voucher,Period Start Date,కాలం ప్రారంభ తేదీ
@@ -5621,11 +5630,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,కనీసం ఒక గిడ్డంగి తప్పనిసరి
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","UOM, అంశం సమూహం, వివరణ మరియు సంఖ్యల సంఖ్య వంటి అంశం ఫీల్డ్లను కాన్ఫిగర్ చేయండి."
 DocType: Certification Application,Certification Status,ధృవీకరణ స్థితి
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,మార్కెట్
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,మార్కెట్
 DocType: Travel Itinerary,Travel Advance Required,ప్రయాణం అడ్వాన్స్ అవసరం
 DocType: Subscriber,Subscriber Name,సబ్స్క్రయిబర్ పేరు
 DocType: Serial No,Out of Warranty,వారంటీ బయటకు
-DocType: Cashier Closing,Cashier-closing-,క్యాషియర్-closing-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,మ్యాప్ చేసిన డేటా రకం
 DocType: BOM Update Tool,Replace,పునఃస్థాపించుము
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,ఏ ఉత్పత్తులు దొరకలేదు.
@@ -5713,7 +5721,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,అమ్మకాలు మరియు కొనుగోలు కోసం డిఫాల్ట్ పన్ను టెంప్లేట్లు సృష్టించబడతాయి.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,అసెస్మెంట్ ఫలితం రికార్డు {0} ఇప్పటికే ఉంది.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","ఉదాహరణ: ABCD. #####. సిరీస్ సెట్ చేయబడి ఉంటే మరియు బ్యాచ్ నో లావాదేవీలలో పేర్కొనబడకపోతే, ఈ సిరీస్ ఆధారంగా ఆటోమేటిక్ బ్యాచ్ నంబర్ సృష్టించబడుతుంది. ఈ అంశానికి బ్యాచ్ నంబర్ను స్పష్టంగా చెప్పాలని మీరు అనుకుంటే, దీన్ని ఖాళీగా వదిలేయండి. గమనిక: ఈ సెట్టింగులు స్టాకింగ్ సెట్టింగులలో నామకరణ సీరీస్ ప్రిఫిక్స్ మీద ప్రాధాన్యతనిస్తాయి."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,సెటప్&gt; నంబరింగ్ సిరీస్ ద్వారా హాజరు కోసం నంబర్ సిరీస్ను సెటప్ చేయండి
 DocType: BOM,Materials Required (Exploded),మెటీరియల్స్ (పేలుతున్న) అవసరం
 DocType: Contract,Party User,పార్టీ వాడుకరి
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',కంపెనీ ఖాళీ ఫిల్టర్ సెట్ చేయండి బృందంచే &#39;కంపెనీ&#39; ఉంది
@@ -5915,7 +5922,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp కౌంట్
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,ట్రయల్ పీరియడ్ ప్రారంభ తేదీ మరియు ట్రయల్ వ్యవధి ముగింపు తేదీ సెట్ చేయబడాలి
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,సగటు వెల
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,చెల్లింపు షెడ్యూల్లో మొత్తం చెల్లింపు మొత్తం గ్రాండ్ / వృత్తాకార మొత్తంకి సమానంగా ఉండాలి
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,చెల్లింపు షెడ్యూల్లో మొత్తం చెల్లింపు మొత్తం గ్రాండ్ / వృత్తాకార మొత్తంకి సమానంగా ఉండాలి
 DocType: Subscription Plan Detail,Plan,ప్రణాళిక
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,జనరల్ లెడ్జర్ ప్రకారం బ్యాంక్ స్టేట్మెంట్ సంతులనం
 DocType: Job Applicant,Applicant Name,దరఖాస్తుదారు పేరు
@@ -5984,7 +5991,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,సబ్బు &amp; డిటర్జెంట్
 DocType: BOM,Show Items,ఐటెమ్లను చూపించు
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,ఎప్పటికప్పుడు కంటే ఎక్కువ ఉండకూడదు.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,మీరు అన్ని కస్టమర్లకు ఇమెయిల్ ద్వారా తెలియజేయాలనుకుంటున్నారా?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,మీరు అన్ని కస్టమర్లకు ఇమెయిల్ ద్వారా తెలియజేయాలనుకుంటున్నారా?
 DocType: Subscription Plan,Billing Interval,బిల్లింగ్ విరామం
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,మోషన్ పిక్చర్ &amp; వీడియో
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,క్రమ
@@ -5993,9 +6000,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,అడ్డు వరుస {0}: {1} తప్పనిసరిగా 0 కన్నా ఎక్కువ ఉండాలి
 DocType: Assessment Criteria,Assessment Criteria Group,అంచనా ప్రమాణం గ్రూప్
 DocType: Healthcare Settings,Patient Name By,ద్వారా పేషంట్ పేరు
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},{0} నుండి {1} నుండి జీతాలు కోసం హక్కు కవరేజ్ జర్నల్ ఎంట్రీ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},{0} నుండి {1} నుండి జీతాలు కోసం హక్కు కవరేజ్ జర్నల్ ఎంట్రీ
 DocType: Sales Invoice Item,Enable Deferred Revenue,వాయిదా వేయబడిన ఆదాయాన్ని ప్రారంభించండి
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},పోగుచేసిన తరుగుదల తెరవడం సమానంగా కంటే తక్కువ ఉండాలి {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},పోగుచేసిన తరుగుదల తెరవడం సమానంగా కంటే తక్కువ ఉండాలి {0}
 DocType: Warehouse,Warehouse Name,వేర్హౌస్ పేరు
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,అసలైన ప్రారంభ తేదీ కంటే తక్కువ ప్రారంభ తేదీ ఉండాలి
 DocType: Naming Series,Select Transaction,Select లావాదేవీ
@@ -6146,7 +6153,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,గ్రేడ్ {1} యొక్క ఉద్యోగి {0} డిఫాల్ట్ లీక్ విధానాన్ని కలిగి లేరు
 DocType: Salary Detail,Salary Detail,జీతం వివరాలు
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,ముందుగా {0} దయచేసి ఎంచుకోండి
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,{0} వినియోగదారులు జోడించబడ్డారు
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,{0} వినియోగదారులు జోడించబడ్డారు
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","మల్టీ-టైర్ ప్రోగ్రామ్ విషయంలో, కస్టమర్లు వారి గడువు ప్రకారం, సంబంధిత స్థాయికి కేటాయించబడతారు"
 DocType: Appointment Type,Physician,వైద్యుడు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,అంశం బ్యాచ్ {0} {1} గడువు ముగిసింది.
@@ -6291,7 +6298,7 @@
 DocType: Asset,Custodian,కస్టోడియన్
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,పాయింట్ ఆఫ్ అమ్మకానికి ప్రొఫైల్
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} 0 మరియు 100 మధ్య విలువ ఉండాలి
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},{0} నుండి {0} {0} చెల్లింపు
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},{0} నుండి {0} {0} చెల్లింపు
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,హామీలేని రుణాలు
 DocType: Cost Center,Cost Center Name,ఖర్చు సెంటర్ పేరు
 DocType: Student,B+,B +
@@ -6323,6 +6330,7 @@
 DocType: Employee,Date of Issue,జారీ చేసిన తేది
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","కొనుగోలు సెట్టింగులు ప్రకారం కొనుగోలు Reciept అవసరం == &#39;అవును&#39;, అప్పుడు కొనుగోలు వాయిస్ సృష్టించడానికి, యూజర్ అంశం కోసం మొదటి కొనుగోలు స్వీకరణపై సృష్టించాలి ఉంటే {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},రో # {0}: అంశాన్ని సెట్ సరఫరాదారు {1}
+DocType: Global Defaults,Default Distance Unit,డిఫాల్ట్ దూరం విభాగం
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,రో {0}: గంటలు విలువ సున్నా కంటే ఎక్కువ ఉండాలి.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,అంశం {1} జత వెబ్సైట్ చిత్రం {0} కనుగొనబడలేదు
 DocType: Issue,Content Type,కంటెంట్ రకం
@@ -6378,7 +6386,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,ఖాతాకు డెబిట్ బాలన్స్ షీట్ ఖాతా ఉండాలి
 DocType: Asset,Naming Series,నామకరణ సిరీస్
 DocType: Vital Signs,Coated,కోటెడ్
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,రో {0}: ఉపయోగకరమైన లైఫ్ తర్వాత ఊహించిన విలువ తప్పనిసరిగా స్థూల కొనుగోలు మొత్తం కంటే తక్కువగా ఉండాలి
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,రో {0}: ఉపయోగకరమైన లైఫ్ తర్వాత ఊహించిన విలువ తప్పనిసరిగా స్థూల కొనుగోలు మొత్తం కంటే తక్కువగా ఉండాలి
 DocType: GoCardless Settings,GoCardless Settings,GoCardless సెట్టింగులు
 DocType: Leave Block List,Leave Block List Name,బ్లాక్ జాబితా వదిలి పేరు
 DocType: Certified Consultant,Certification Validity,సర్టిఫికేషన్ చెల్లుబాటు
@@ -6447,6 +6455,7 @@
 DocType: Bank Statement Settings Item,Bank Header,బ్యాంకు హెడర్
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,ల్యాబ్ పరీక్షలను వీక్షించండి
 DocType: Hub Users,Hub Users,హబ్ యూజర్లు
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,కస్టమర్&gt; కస్టమర్ గ్రూప్&gt; భూభాగం
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,నిర్వహణ తేదీ
 DocType: Purchase Invoice Item,Rejected Serial No,తిరస్కరించబడిన సీరియల్ లేవు
@@ -6461,7 +6470,7 @@
 DocType: SG Creation Tool Course,Max Strength,మాక్స్ శక్తి
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,ప్రీసెట్లు ఇన్స్టాల్ చేస్తోంది
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},కస్టమర్ కోసం డెలివరీ నోట్ ఎంపిక చేయబడలేదు
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},కస్టమర్ కోసం డెలివరీ నోట్ ఎంపిక చేయబడలేదు
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,ఉద్యోగి {0} ఎటువంటి గరిష్ట లాభం లేదు
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,డెలివరీ తేదీ ఆధారంగా అంశాలను ఎంచుకోండి
 DocType: Grant Application,Has any past Grant Record,గత గ్రాంట్ రికార్డు ఉంది
@@ -6489,7 +6498,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,హోటల్ రూం రిజర్వేషన్
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,వినియోగదారుల సేవ
 DocType: BOM,Thumbnail,సూక్ష్మచిత్రం
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,ఇమెయిల్ ID లతో పరిచయాలు కనుగొనబడలేదు.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,ఇమెయిల్ ID లతో పరిచయాలు కనుగొనబడలేదు.
 DocType: Item Customer Detail,Item Customer Detail,అంశం కస్టమర్ వివరాలు
 DocType: Notification Control,Prompt for Email on Submission of,సమర్పణ ఇమెయిల్ కోసం ప్రేరేపిస్తుంది
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},ఉద్యోగి యొక్క గరిష్ట లాభం మొత్తం {0} {1}
@@ -6749,7 +6758,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,ఖాతా రకం ఎంపిక ఎందుకంటే గ్రూప్ ప్రచ్ఛన్న కాదు.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} మారిస్తే. రిఫ్రెష్ చెయ్యండి.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,కింది రోజులలో లీవ్ అప్లికేషన్స్ తయారీ నుండి వినియోగదారులు ఆపు.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,అంశం కోడ్&gt; అంశం సమూహం&gt; బ్రాండ్
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","లాయల్టీ పాయింట్స్ కోసం అపరిమిత గడువు ఉంటే, గడువు వ్యవధి ఖాళీగా లేదా 0 గా ఉంచండి."
 DocType: Asset Maintenance Team,Maintenance Team Members,నిర్వహణ జట్టు సభ్యులు
 DocType: Loyalty Point Entry,Purchase Amount,కొనుగోలు మొత్తాన్ని
@@ -6757,7 +6765,7 @@
 											to fullfill Sales Order {2}",విక్రయించబడుతున్నందున సీరియల్ నో {1} {1} ను పూర్తిగా సేల్స్ ఆర్డర్ {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,సరఫరాదారు కొటేషన్ {0} రూపొందించారు
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,ముగింపు సంవత్సరం ప్రారంభ సంవత్సరం కంటే ముందు ఉండకూడదు
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,ముగింపు సంవత్సరం ప్రారంభ సంవత్సరం కంటే ముందు ఉండకూడదు
 DocType: Employee Benefit Application,Employee Benefits,ఉద్యోగుల లాభాల
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},ప్యాక్ పరిమాణం వరుసగా అంశం {0} పరిమాణం సమానంగా ఉండాలి {1}
 DocType: Work Order,Manufactured Qty,తయారు ప్యాక్ చేసిన అంశాల
@@ -6773,6 +6781,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,బ్యాచ్ సంఖ్యలు ఎంచుకోండి
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,GSTIN కు
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,వినియోగదారుడు ఎదిగింది బిల్లులు.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,దయచేసి మానవ వనరులో HR ఉద్యోగ నామకరణ వ్యవస్థ సెటప్ చేయండి&gt; హెచ్ఆర్ సెట్టింగులు
 DocType: Healthcare Settings,Invoice Appointments Automatically,స్వయంచాలకంగా ఇన్వాయిస్ నియామకాలు
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ప్రాజెక్ట్ ఐడి
 DocType: Salary Component,Variable Based On Taxable Salary,పన్నుచెల్లింపు జీతం ఆధారంగా వేరియబుల్
@@ -6821,7 +6830,7 @@
 DocType: POS Profile,Account for Change Amount,మొత్తం చేంజ్ ఖాతా
 DocType: QuickBooks Migrator,Connecting to QuickBooks,క్విక్బుక్స్లో కనెక్ట్ చేస్తోంది
 DocType: Exchange Rate Revaluation,Total Gain/Loss,మొత్తం లాభం / నష్టం
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,ఇంటర్ కంపెనీ ఇన్వాయిస్ కోసం చెల్లని కంపెనీ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,ఇంటర్ కంపెనీ ఇన్వాయిస్ కోసం చెల్లని కంపెనీ.
 DocType: Purchase Invoice,input service,ఇన్పుట్ సేవ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},రో {0}: పార్టీ / ఖాతాతో సరిపోలడం లేదు {1} / {2} లో {3} {4}
 DocType: Employee Promotion,Employee Promotion,ఉద్యోగి ప్రమోషన్
@@ -6952,7 +6961,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,లాడ్జింగ్ కోసం ఇష్టపడే ప్రాంతం
 apps/erpnext/erpnext/config/selling.py +184,Analytics,విశ్లేషణలు
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,కార్ట్ ఖాళీగా ఉంది
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,దయచేసి ఎడ్యుకేషన్&gt; ఎడ్యుకేషన్ సెట్టింగులలో ఇన్స్ట్రక్టర్ నేమింగ్ సిస్టం సెటప్ చేయండి
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",అంశం {0} వరుస సంఖ్య లేదు. సీరియల్ నంబర్ పై ఆధారపడిన డెలివరీను మాత్రమే కలిగి ఉంటాయి
 DocType: Vehicle,Model,మోడల్
@@ -6982,7 +6990,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,మార్చడానికి ఏమీ లేదు
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,ఒక csv ఫైల్ను ఎంచుకోండి
 DocType: Holiday List,Total Holidays,మొత్తం సెలవులు
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,డిస్పాచ్ కోసం ఇమెయిల్ టెంప్లేట్ లేదు. దయచేసి డెలివరీ సెట్టింగులలో ఒకదాన్ని సెట్ చేయండి.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,డిస్పాచ్ కోసం ఇమెయిల్ టెంప్లేట్ లేదు. దయచేసి డెలివరీ సెట్టింగులలో ఒకదాన్ని సెట్ చేయండి.
 DocType: Student Leave Application,Mark as Present,కానుకగా మార్క్
 DocType: Supplier Scorecard,Indicator Color,సూచిక రంగు
 DocType: Purchase Order,To Receive and Bill,స్వీకరించండి మరియు బిల్
@@ -6991,7 +6999,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,సీరియల్ నంబర్ ఎంచుకోండి
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,డిజైనర్
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,నియమాలు మరియు నిబంధనలు మూస
-DocType: Serial No,Delivery Details,డెలివరీ వివరాలు
+DocType: Delivery Trip,Delivery Details,డెలివరీ వివరాలు
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},రకం కోసం ఖర్చు సెంటర్ వరుసగా అవసరం {0} పన్నులు పట్టిక {1}
 DocType: Program,Program Code,ప్రోగ్రామ్ కోడ్
 DocType: Terms and Conditions,Terms and Conditions Help,నియమాలు మరియు నిబంధనలు సహాయం
@@ -7015,7 +7023,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,సమయం రోజులు లీడ్
 DocType: Cash Flow Mapping,Is Income Tax Expense,ఆదాయ పన్ను ఖర్చు
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,మీ ఆర్డర్ డెలివరీ కోసం ముగిసింది!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},రో # {0}: తేదీ పోస్టింగ్ కొనుగోలు తేదీని అదే ఉండాలి {1} ఆస్తి యొక్క {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},రో # {0}: తేదీ పోస్టింగ్ కొనుగోలు తేదీని అదే ఉండాలి {1} ఆస్తి యొక్క {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,విద్యార్థుల సంస్థ హాస్టల్ వద్ద నివసిస్తున్నారు ఉంది అయితే దీన్ని ఎంచుకోండి.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,పైన ఇచ్చిన పట్టికలో సేల్స్ ఆర్డర్స్ నమోదు చేయండి
 ,Stock Summary,స్టాక్ సారాంశం
diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv
index f04f662..fa996ca 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,ชื่อช่วงเวลา
 DocType: Employee,Salary Mode,โหมดเงินเดือน
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,สมัครสมาชิก
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,สมัครสมาชิก
 DocType: Patient,Divorced,หย่าร้าง
 DocType: Support Settings,Post Route Key,รหัสเส้นทางการโพสต์
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,อนุญาตให้รายการที่จะเพิ่มหลายครั้งในการทำธุรกรรม
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,อัตราแลกเปลี่ยนใหม่
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},สกุลเงินเป็นสิ่งจำเป็นสำหรับราคา {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* จะถูกคำนวณในขณะทำรายการ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,ผู้จัดจำหน่าย&gt; ประเภทผู้จัดจำหน่าย
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,ติดต่อลูกค้า
 DocType: Patient Appointment,Check availability,ตรวจสอบความพร้อมใช้งาน
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,แสดงเปิด
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,ชุด ล่าสุด ที่ประสบความสำเร็จ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,เช็คเอาท์
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} ในแถว {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} ในแถว {1}
 DocType: Asset Finance Book,Depreciation Start Date,ค่าเสื่อมราคาวันที่เริ่มต้น
 DocType: Pricing Rule,Apply On,สมัคร เมื่อวันที่
 DocType: Item Price,Multiple Item prices.,ราคา หลายรายการ
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,การกําหนด Lab
 ,Delay Days,Delay Days
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ค่าใช้จ่ายในการให้บริการ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},หมายเลขซีเรียล: {0} มีการอ้างถึงในใบแจ้งหนี้การขายแล้ว: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},หมายเลขซีเรียล: {0} มีการอ้างถึงในใบแจ้งหนี้การขายแล้ว: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,ใบกำกับสินค้า
 DocType: Purchase Invoice Item,Item Weight Details,รายละเอียดน้ำหนักรายการ
 DocType: Asset Maintenance Log,Periodicity,การเป็นช่วง ๆ
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,นักบัญชี
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,รายการราคาขาย
 DocType: Patient,Tobacco Current Use,การใช้ในปัจจุบันของยาสูบ
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","วันที่เริ่มต้นและวันที่สิ้นสุดซ้อนทับกับบัตรงาน <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,ราคาขาย
 DocType: Cost Center,Stock User,หุ้นผู้ใช้
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,ที่เกี่ยวข้อง
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,วันที่เข้าร่วมประชุมไม่น้อยกว่าวันที่เข้าร่วมของพนักงาน
 DocType: Grading Scale,Grading Scale Name,การวัดผลการศึกษาชื่อชั่ง
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,เพิ่มผู้ใช้ลงใน Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,เพิ่มผู้ใช้ลงใน Marketplace
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,นี่คือบัญชี รากและ ไม่สามารถแก้ไขได้
 DocType: Sales Invoice,Company Address,ที่อยู่ บริษัท
 DocType: BOM,Operations,การดำเนินงาน
@@ -322,7 +322,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,จำนวนเงินต่างกัน
 DocType: Production Plan,Material Request Detail,รายละเอียดคำขอเนื้อหา
 DocType: Selling Settings,Default Quotation Validity Days,วันที่ถูกต้องของใบเสนอราคาเริ่มต้น
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",จะรวมถึง ภาษี ในแถว {0} ใน อัตรา รายการ ภาษี ใน แถว {1} จะต้องรวม
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",จะรวมถึง ภาษี ในแถว {0} ใน อัตรา รายการ ภาษี ใน แถว {1} จะต้องรวม
 DocType: SMS Center,SMS Center,ศูนย์ SMS
 DocType: Payroll Entry,Validate Attendance,ตรวจสอบการเข้าร่วม
 DocType: Sales Invoice,Change Amount,เปลี่ยนจำนวน
@@ -441,7 +441,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,ระยะห่างระหว่างบรรทัดสำหรับจำนวนเงินในคำพูด
 DocType: Vehicle,Additional Details,รายละเอียดเพิ่มเติม
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,ให้ คำอธิบาย
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,ผู้จัดจำหน่าย&gt; กลุ่มผู้จัดจำหน่าย
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ขอซื้อ
 DocType: POS Closing Voucher Details,Collected Amount,จำนวนที่สะสม
 DocType: Lab Test,Submitted Date,วันที่ส่ง
@@ -486,7 +485,7 @@
 DocType: Student Admission,Student Admission,การรับสมัครนักศึกษา
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,ค่าเสื่อมราคาแถว {0}: ค่าเสื่อมราคาวันเริ่มต้นถูกป้อนตามวันที่ผ่านมา
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,ค่าเสื่อมราคาแถว {0}: ค่าเสื่อมราคาวันเริ่มต้นถูกป้อนตามวันที่ผ่านมา
 DocType: Contract Template,Fulfilment Terms and Conditions,ข้อกำหนดในการให้บริการ Fulfillment
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,ขอวัสดุ
 DocType: Bank Reconciliation,Update Clearance Date,อัพเดทวันที่ Clearance
@@ -543,6 +542,7 @@
 DocType: Accounts Settings,Settings for Accounts,การตั้งค่าสำหรับบัญชี
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},ผู้ผลิตใบแจ้งหนี้ไม่มีอยู่ในการซื้อใบแจ้งหนี้ {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,จัดการ คนขาย ต้นไม้
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.",ไม่สามารถประมวลผลเส้นทางได้เนื่องจากการตั้งค่า Google Maps ถูกปิดใช้งาน
 DocType: Job Applicant,Cover Letter,จดหมาย
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,เช็คที่โดดเด่นและเงินฝากที่จะล้าง
 DocType: Item,Synced With Hub,ซิงค์กับฮับ
@@ -602,7 +602,7 @@
 DocType: Asset Value Adjustment,New Asset Value,มูลค่าของสินทรัพย์ใหม่
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,อัตราที่สกุลเงินลูกค้าจะแปลงเป็นสกุลเงินหลักของลูกค้า
 DocType: Course Scheduling Tool,Course Scheduling Tool,หลักสูตรเครื่องมือการตั้งเวลา
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},แถว # {0}: ซื้อใบแจ้งหนี้ไม่สามารถทำกับเนื้อหาที่มีอยู่ {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},แถว # {0}: ซื้อใบแจ้งหนี้ไม่สามารถทำกับเนื้อหาที่มีอยู่ {1}
 DocType: Crop Cycle,LInked Analysis,การวิเคราะห์ LInked
 DocType: POS Closing Voucher,POS Closing Voucher,POS ปิดบัญชี Voucher
 DocType: Contract,Lapsed,ที่ผ่านพ้นไป
@@ -637,6 +637,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} ไม่ได้ลงทะเบียนในหลักสูตร {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,ชื่อนักเรียน:
 DocType: POS Closing Voucher Details,Difference,ข้อแตกต่าง
+DocType: Delivery Settings,Delay between Delivery Stops,ความล่าช้าระหว่างการจัดส่ง
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},อนุกรม ไม่มี {0} ไม่ได้อยู่ใน การจัดส่งสินค้า หมายเหตุ {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.",ดูเหมือนว่าจะมีปัญหากับการกำหนดค่า GoCardless ของเซิร์ฟเวอร์ ไม่ต้องกังวลในกรณีของความล้มเหลวจำนวนเงินจะได้รับคืนไปยังบัญชีของคุณ
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext สาธิต
@@ -697,7 +698,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,จำนวนและอัตรา
 DocType: Delivery Note,% Installed,% ที่ติดตั้งแล้ว
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,ห้องเรียน / ห้องปฏิบัติการอื่น ๆ ที่บรรยายสามารถกำหนด
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,สกุลเงินของ บริษัท ทั้งสอง บริษัท ควรตรงกับรายการระหว่าง บริษัท
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,สกุลเงินของ บริษัท ทั้งสอง บริษัท ควรตรงกับรายการระหว่าง บริษัท
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,กรุณาใส่ ชื่อของ บริษัท เป็นครั้งแรก
 DocType: Travel Itinerary,Non-Vegetarian,มังสวิรัติ
 DocType: Purchase Invoice,Supplier Name,ชื่อผู้จัดจำหน่าย
@@ -784,7 +785,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,เช่าจากวันที่
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,อะไหล่พอที่จะสร้าง
 DocType: POS Profile User,POS Profile User,ผู้ใช้โปรไฟล์ POS
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,แถว {0}: ต้องระบุวันที่เริ่มต้นค่าเสื่อมราคา
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,แถว {0}: ต้องระบุวันที่เริ่มต้นค่าเสื่อมราคา
 DocType: Purchase Invoice Item,Service Start Date,วันที่เริ่มบริการ
 DocType: Subscription Invoice,Subscription Invoice,ใบแจ้งหนี้การสมัครสมาชิก
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,รายได้ โดยตรง
@@ -853,7 +854,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,ชื่อย่อที่ใช้แล้วสำหรับ บริษัท อื่น
 DocType: Selling Settings,Default Customer Group,กลุ่มลูกค้าเริ่มต้น
 DocType: Employee,IFSC Code,รหัส IFSC
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","วันที่เริ่มต้นและวันที่สิ้นสุดซ้อนทับกับบัตรงาน <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",ถ้าปิดการใช้งาน &#39;ปัดรวมฟิลด์จะมองไม่เห็นในการทำธุรกรรมใด ๆ
 DocType: BOM,Operating Cost,ค่าใช้จ่ายในการดำเนินงาน
 DocType: Crop,Produced Items,รายการที่ผลิต
@@ -905,7 +905,7 @@
 DocType: Supplier,Prevent RFQs,ป้องกัน RFQs
 DocType: Hub User,Hub User,ผู้ใช้ศูนย์
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,สร้างการขายสินค้า
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},ส่งสลิปเงินเดือนเป็นระยะเวลาตั้งแต่ {0} ถึง {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},ส่งสลิปเงินเดือนเป็นระยะเวลาตั้งแต่ {0} ถึง {1}
 DocType: Project Task,Project Task,โครงการงาน
 DocType: Loyalty Point Entry Redemption,Redeemed Points,คะแนนแลกรับ
 ,Lead Id,รหัสช่องทาง
@@ -1037,7 +1037,7 @@
 DocType: Fee Validity,Max number of visit,จำนวนการเข้าชมสูงสุด
 ,Hotel Room Occupancy,อัตราห้องพักของโรงแรม
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet สร้าง:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},กรุณาตั้ง ค่าเริ่มต้น เงินสด หรือ บัญชีเงินฝากธนาคาร ใน โหมด ของ การชำระเงิน {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},กรุณาตั้ง ค่าเริ่มต้น เงินสด หรือ บัญชีเงินฝากธนาคาร ใน โหมด ของ การชำระเงิน {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,ลงทะเบียน
 DocType: GST Settings,GST Settings,การตั้งค่า GST
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},สกุลเงินควรเหมือนกับ Price Currency Currency: {0}
@@ -1092,7 +1092,7 @@
 DocType: Vehicle Log,Service Details,รายละเอียดการให้บริการ
 DocType: Lab Test Template,Grouped,การจัดกลุ่ม
 DocType: Selling Settings,Delivery Note Required,หมายเหตุจัดส่งสินค้าที่จำเป็น
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,ส่งสลิปเงินเดือน ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,ส่งสลิปเงินเดือน ...
 DocType: Bank Guarantee,Bank Guarantee Number,หมายเลขการรับประกันธนาคาร
 DocType: Bank Guarantee,Bank Guarantee Number,หมายเลขการรับประกันธนาคาร
 DocType: Assessment Criteria,Assessment Criteria,เกณฑ์การประเมิน
@@ -1118,13 +1118,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,รายการชำระเงินที่สร้างไว้แล้ว
 DocType: Request for Quotation,Get Suppliers,รับซัพพลายเออร์
 DocType: Purchase Receipt Item Supplied,Current Stock,สต็อกปัจจุบัน
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},แถว # {0}: สินทรัพย์ {1} ไม่เชื่อมโยงกับรายการ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},แถว # {0}: สินทรัพย์ {1} ไม่เชื่อมโยงกับรายการ {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,ดูตัวอย่างสลิปเงินเดือน
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,บัญชี {0} ได้รับการป้อนหลายครั้ง
 DocType: Account,Expenses Included In Valuation,ค่าใช้จ่ายรวมอยู่ในการประเมินมูลค่า
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,คุณสามารถต่ออายุได้เฉพาะเมื่อสมาชิกของคุณหมดอายุภายใน 30 วันเท่านั้น
 DocType: Shopping Cart Settings,Show Stock Availability,แสดงสต็อคที่ใช้ได้
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},ตั้ง {0} ในหมวดสินทรัพย์ {1} หรือ บริษัท {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},ตั้ง {0} ในหมวดสินทรัพย์ {1} หรือ บริษัท {2}
 DocType: Location,Longitude,ลองจิจูด
 ,Absent Student Report,รายงานนักศึกษาขาด
 DocType: Crop,Crop Spacing UOM,ระยะปลูกพืช UOM
@@ -1197,7 +1197,7 @@
 DocType: Soil Texture,Sand,ทราย
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,พลังงาน
 DocType: Opportunity,Opportunity From,โอกาสจาก
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,แถว {0}: {1} ต้องระบุหมายเลขผลิตภัณฑ์สำหรับรายการ {2} คุณได้ให้ {3} แล้ว
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,แถว {0}: {1} ต้องระบุหมายเลขผลิตภัณฑ์สำหรับรายการ {2} คุณได้ให้ {3} แล้ว
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,โปรดเลือกตาราง
 DocType: BOM,Website Specifications,ข้อมูลจำเพาะเว็บไซต์
 DocType: Special Test Items,Particulars,รายละเอียด
@@ -1308,7 +1308,7 @@
 DocType: Item,Items with higher weightage will be shown higher,รายการที่มี weightage ที่สูงขึ้นจะแสดงที่สูงขึ้น
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Lab Tests และ Vital Signs
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,รายละเอียดการกระทบยอดธนาคาร
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,แถว # {0}: สินทรัพย์ {1} จะต้องส่ง
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,แถว # {0}: สินทรัพย์ {1} จะต้องส่ง
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,พบว่า พนักงานที่ ไม่มี
 DocType: Item,If subcontracted to a vendor,ถ้าเหมาไปยังผู้ขาย
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,มีการอัปเดตกลุ่มนักเรียนแล้ว
@@ -1363,7 +1363,6 @@
 DocType: Loyalty Program Collection,Tier Name,ชื่อระดับ
 DocType: HR Settings,Enter retirement age in years,ใส่อายุเกษียณในปีที่ผ่าน
 DocType: Crop,Target Warehouse,คลังสินค้าเป้าหมาย
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,โปรดตั้งค่าชุดการตั้งชื่อสำหรับ {0} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; การตั้งชื่อซีรี่ส์
 DocType: Payroll Employee Detail,Payroll Employee Detail,เงินเดือนพนักงานรายละเอียด
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,โปรดเลือกคลังสินค้า
 DocType: Cheque Print Template,Starting location from left edge,สถานที่เริ่มต้นจากขอบด้านซ้าย
@@ -1453,7 +1452,7 @@
 DocType: Work Order,Plan material for sub-assemblies,วัสดุแผนประกอบย่อย
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,พันธมิตรการขายและดินแดน
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} จะต้องใช้งาน
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,ไม่มีรายการสำหรับโอน
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,ไม่มีรายการสำหรับโอน
 DocType: Employee Boarding Activity,Activity Name,ชื่อกิจกรรม
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,เปลี่ยนวันที่เผยแพร่
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,ปริมาณผลิตภัณฑ์สำเร็จรูป <b>{0}</b> และสำหรับปริมาณ <b>{1}</b> ไม่ต่างกัน
@@ -1682,6 +1681,7 @@
 DocType: Project,First Email,อีเมลฉบับแรก
 DocType: Company,Exception Budget Approver Role,บทบาทผู้ประเมินงบประมาณข้อยกเว้น
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date",เมื่อตั้งค่าใบแจ้งหนี้นี้จะถูกระงับไว้จนกว่าจะถึงวันที่กำหนด
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,คลังสินค้าสำรองในการขายการสั่งซื้อ / โกดังสินค้าสำเร็จรูป
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,ปริมาณการขาย
 DocType: Repayment Schedule,Interest Amount,จำนวนเงินที่น่าสนใจ
@@ -1693,7 +1693,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,ประวัติ
 DocType: Asset,Scrapped,ทะเลาะวิวาท
 DocType: Item,Item Defaults,ค่าดีฟอลต์ของสินค้า
-DocType: Purchase Invoice,Returns,ผลตอบแทน
+DocType: Cashier Closing,Returns,ผลตอบแทน
 DocType: Job Card,WIP Warehouse,WIP คลังสินค้า
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},อนุกรม ไม่มี {0} อยู่ภายใต้สัญญา การบำรุงรักษา ไม่เกิน {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,รับสมัครงาน
@@ -1707,7 +1707,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,ประเภทการโอนย้าย
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,ค่าใช้จ่ายในการขาย
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ลูกค้า&gt; กลุ่มลูกค้า&gt; เขตแดน
 DocType: Diagnosis,Diagnosis,การวินิจฉัยโรค
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,การซื้อมาตรฐาน
 DocType: Attendance Request,Explanation,คำอธิบาย
@@ -1720,7 +1719,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,สั่งซื้อสินค้ารายการค้างชำระ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,รหัสไปรษณีย์
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},ใบสั่งขาย {0} เป็น {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},เลือกบัญชีเงินฝากดอกเบี้ย {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},เลือกบัญชีเงินฝากดอกเบี้ย {0}
 DocType: Opportunity,Contact Info,ข้อมูลการติดต่อ
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,ทำรายการสต็อก
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,ไม่สามารถส่งเสริมพนักงานที่มีสถานะเหลือ
@@ -1732,7 +1731,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,ไม่สามารถจัดทำใบแจ้งหนี้สำหรับศูนย์เรียกเก็บเงินได้เป็นศูนย์
 DocType: Company,Date of Commencement,วันที่เริ่มเรียน
 DocType: Sales Person,Select company name first.,เลือกชื่อ บริษัท แรก
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},อีเมล์ ส่งไปที่ {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},อีเมล์ ส่งไปที่ {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ใบเสนอราคาที่ได้รับจากผู้จัดจำหน่าย
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,แทนที่ BOM และอัปเดตราคาล่าสุดใน BOM ทั้งหมด
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},เพื่อ {0} | {1} {2}
@@ -1754,7 +1753,7 @@
 DocType: Asset Movement,From Employee,จากพนักงาน
 DocType: Driver,Cellphone Number,หมายเลขโทรศัพท์มือถือ
 DocType: Project,Monitor Progress,ติดตามความคืบหน้า
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,คำเตือน: ระบบ จะไม่ตรวจสอบ overbilling ตั้งแต่ จำนวนเงิน รายการ {0} ใน {1} เป็นศูนย์
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,คำเตือน: ระบบ จะไม่ตรวจสอบ overbilling ตั้งแต่ จำนวนเงิน รายการ {0} ใน {1} เป็นศูนย์
 DocType: Journal Entry,Make Difference Entry,บันทึกผลต่าง
 DocType: Supplier Quotation,Auto Repeat Section,ส่วนทำซ้ำอัตโนมัติ
 DocType: Upload Attendance,Attendance From Date,ผู้เข้าร่วมจากวันที่
@@ -1857,7 +1856,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,แถว # {0}: ปฏิเสธจำนวนไม่สามารถเข้าไปอยู่ในการซื้อกลับ
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,ไม่สามารถเปลี่ยนกลุ่มลูกค้าสำหรับลูกค้าที่เลือกได้
 ,Purchase Order Items To Be Billed,รายการใบสั่งซื้อที่จะได้รับจำนวนมากที่สุด
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,กำลังอัปเดตเวลาเดินทางมาถึงโดยประมาณ
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,กำลังอัปเดตเวลาเดินทางมาถึงโดยประมาณ
 DocType: Program Enrollment Tool,Enrollment Details,รายละเอียดการลงทะเบียน
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,ไม่สามารถกำหนดค่าเริ่มต้นของรายการสำหรับ บริษัท ได้หลายรายการ
 DocType: Purchase Invoice Item,Net Rate,อัตราการสุทธิ
@@ -1871,7 +1870,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,ประเภทการปล่อยตัวเป็นแบบวิกลจริต
 DocType: Support Settings,Close Issue After Days,ปิดฉบับหลังจากวัน
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,คุณต้องเป็นผู้ใช้ที่มีบทบาท System Manager และ Item Manager เพื่อเพิ่มผู้ใช้ลงใน Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,คุณต้องเป็นผู้ใช้ที่มีบทบาท System Manager และ Item Manager เพื่อเพิ่มผู้ใช้ลงใน Marketplace
 DocType: Leave Control Panel,Leave blank if considered for all branches,เว้นไว้หากพิจารณาสำหรับทุกสาขา
 DocType: Job Opening,Staffing Plan,แผนการจัดหาพนักงาน
 DocType: Bank Guarantee,Validity in Days,ความถูกต้องในวัน
@@ -1893,7 +1892,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},แถว ที่ซ้ำกัน {0} ด้วย เหมือนกัน {1}
 DocType: Marketplace Settings,Disable Marketplace,ปิดการใช้งาน Marketplace
 ,Trial Balance,งบทดลอง
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,ปีงบประมาณ {0} ไม่พบ
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,ปีงบประมาณ {0} ไม่พบ
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,การตั้งค่าพนักงาน
 DocType: Hotel Room Reservation,Hotel Reservation User,ผู้จองโรงแรม
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,กรุณาเลือก คำนำหน้า เป็นครั้งแรก
@@ -2001,7 +2000,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,ไม่สามารถเข้าสู่ระบบได้
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,สร้างเนื้อหา {0} แล้ว
 DocType: Special Test Items,Special Test Items,รายการทดสอบพิเศษ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,คุณต้องเป็นผู้ใช้ที่มีบทบาท System Manager และ Item Manager เพื่อลงทะเบียนใน Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,คุณต้องเป็นผู้ใช้ที่มีบทบาท System Manager และ Item Manager เพื่อลงทะเบียนใน Marketplace
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,โหมดของการชำระเงิน
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,ตามโครงสร้างค่าจ้างที่ได้รับมอบหมายคุณไม่สามารถยื่นขอผลประโยชน์ได้
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,ภาพ Website ควรจะเป็นไฟล์สาธารณะหรือ URL ของเว็บไซต์
@@ -2013,7 +2012,7 @@
 DocType: Warehouse,Warehouse Contact Info,ข้อมูลติดต่อคลังสินค้า
 DocType: Payment Entry,Write Off Difference Amount,จำนวนหนี้สูญความแตกต่าง
 DocType: Volunteer,Volunteer Name,อาสาสมัครชื่อ
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},แถวที่มีวันครบกำหนดที่ซ้ำกันในแถวอื่น ๆ พบ: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},แถวที่มีวันครบกำหนดที่ซ้ำกันในแถวอื่น ๆ พบ: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent",{0}: ไม่พบอีเมลของพนักงาน อีเมล์นี้จึงไม่ได้ถูกส่ง
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},ไม่มีโครงสร้างเงินเดือนที่กำหนดสำหรับพนักงาน {0} ในวันที่กำหนด {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},กฎการจัดส่งไม่สามารถใช้ได้กับประเทศ {0}
@@ -2104,6 +2103,7 @@
 DocType: Salary Component,Earning,รายได้
 DocType: Supplier Scorecard,Scoring Criteria,เกณฑ์การให้คะแนน
 DocType: Purchase Invoice,Party Account Currency,พรรคบัญชีเงินฝากเงินตรา
+DocType: Delivery Trip,Total Estimated Distance,รวมระยะทางโดยรวม
 ,BOM Browser,BOM เบราว์เซอร์
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,โปรดอัปเดตสถานะของคุณสำหรับกิจกรรมการฝึกอบรมนี้
 DocType: Item Barcode,EAN,EAN
@@ -2142,7 +2142,7 @@
 DocType: Activity Cost,Projects,โครงการ
 DocType: Payment Request,Transaction Currency,ธุรกรรมเงินตรา
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},จาก {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,อีเมลบางฉบับไม่ถูกต้อง
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,อีเมลบางฉบับไม่ถูกต้อง
 DocType: Work Order Operation,Operation Description,ดำเนินการคำอธิบาย
 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.,ไม่สามารถเปลี่ยนแปลงวันเริ่มต้นปีงบประมาณและปีงบประมาณวันที่สิ้นสุดเมื่อปีงบประมาณจะถูกบันทึกไว้
 DocType: Quotation,Shopping Cart,รถเข็นช้อปปิ้ง
@@ -2166,7 +2166,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,เปลี่ยนสุทธิในสินทรัพย์ถาวร
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,จำนวน Reqd
 DocType: Leave Control Panel,Leave blank if considered for all designations,เว้นไว้หากพิจารณากำหนดทั้งหมด
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ค่าใช้จ่าย ประเภท ' จริง ' ในแถว {0} ไม่สามารถ รวมอยู่ใน อัตรา รายการ
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ค่าใช้จ่าย ประเภท ' จริง ' ในแถว {0} ไม่สามารถ รวมอยู่ใน อัตรา รายการ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},สูงสุด: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,จาก Datetime
 DocType: Shopify Settings,For Company,สำหรับ บริษัท
@@ -2180,7 +2180,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,มีข้อผิดพลาดในการสร้างตารางเรียน
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,ผู้ประเมินค่าใช้จ่ายรายแรกในรายการจะได้รับการกำหนดให้เป็นผู้ใช้ค่าใช้จ่ายเริ่มต้น
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,ไม่สามารถมีค่ามากกว่า 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,คุณต้องเป็นผู้ใช้อื่นที่ไม่ใช่ผู้ดูแลระบบด้วยบทบาท System Manager และ Item Manager เพื่อลงทะเบียนใน Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,คุณต้องเป็นผู้ใช้อื่นที่ไม่ใช่ผู้ดูแลระบบด้วยบทบาท System Manager และ Item Manager เพื่อลงทะเบียนใน Marketplace
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,ไม่ได้หมายกำหนดการ
@@ -2209,7 +2209,7 @@
 DocType: HR Settings,Employee Settings,การตั้งค่า การทำงานของพนักงาน
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,กำลังโหลดระบบการชำระเงิน
 ,Batch-Wise Balance History,ชุดฉลาดประวัติยอดคงเหลือ
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,แถว # {0}: ไม่สามารถกำหนดอัตราหากจำนวนเงินสูงกว่าจำนวนเงินที่เรียกเก็บจากรายการ {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,แถว # {0}: ไม่สามารถกำหนดอัตราหากจำนวนเงินสูงกว่าจำนวนเงินที่เรียกเก็บจากรายการ {1}
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,ตั้งค่าการพิมพ์การปรับปรุงในรูปแบบการพิมพ์ที่เกี่ยวข้อง
 DocType: Package Code,Package Code,รหัสแพคเกจ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,เด็กฝึกงาน
@@ -2444,7 +2444,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} ตำแหน่งงานว่างและ {1} งบประมาณสำหรับ {2} ที่กำหนดไว้สำหรับ บริษัท ย่อยของ {3} แล้ว \ คุณสามารถวางแผนได้ไม่เกิน {4} ตำแหน่งงานว่างและงบประมาณ {5} ตามแผนพนักงาน {6} สำหรับ บริษัท แม่ {3}
 DocType: HR Settings,Stop Birthday Reminders,หยุด วันเกิด การแจ้งเตือน
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},กรุณาตั้งค่าเริ่มต้นเงินเดือนบัญชีเจ้าหนี้ บริษัท {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},กรุณาตั้งค่าเริ่มต้นเงินเดือนบัญชีเจ้าหนี้ บริษัท {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,รับข้อมูลทางการเงินและภาษีจาก Amazon
 DocType: SMS Center,Receiver List,รายชื่อผู้รับ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,ค้นหาค้นหาสินค้า
@@ -2514,7 +2514,7 @@
 DocType: Vital Signs,Constipated,มีอาการท้องผูก
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},กับผู้ผลิตใบแจ้งหนี้ {0} วัน {1}
 DocType: Customer,Default Price List,รายการราคาเริ่มต้น
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,บันทึกการเคลื่อนไหวของสินทรัพย์ {0} สร้าง
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,บันทึกการเคลื่อนไหวของสินทรัพย์ {0} สร้าง
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,ไม่พบรายการ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,คุณไม่สามารถลบปีงบประมาณ {0} ปีงบประมาณ {0} ตั้งเป็นค่าเริ่มต้นในการตั้งค่าส่วนกลาง
 DocType: Share Transfer,Equity/Liability Account,บัญชีหนี้สิน / หนี้สิน
@@ -2654,6 +2654,7 @@
 DocType: Blanket Order,Order Type,ประเภทสั่งซื้อ
 ,Item-wise Sales Register,การขายสินค้าที่ชาญฉลาดสมัครสมาชิก
 DocType: Asset,Gross Purchase Amount,จำนวนการสั่งซื้อขั้นต้น
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,รหัสรายการ&gt; กลุ่มสินค้า&gt; แบรนด์
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,ยอดคงเหลือเปิด
 DocType: Asset,Depreciation Method,วิธีการคิดค่าเสื่อมราคา
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,คือภาษีนี้รวมอยู่ในอัตราขั้นพื้นฐาน?
@@ -2737,7 +2738,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,การดำเนินการหากงบประมาณรายปีเกินกว่า PO
 DocType: Student Leave Application,Student Leave Application,แอพลิเคชันออกจากนักศึกษา
 DocType: Item,Will also apply for variants,นอกจากนี้ยังจะใช้สำหรับสายพันธุ์
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}",สินทรัพย์ที่ไม่สามารถยกเลิกขณะที่มันมีอยู่แล้ว {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}",สินทรัพย์ที่ไม่สามารถยกเลิกขณะที่มันมีอยู่แล้ว {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},พนักงาน {0} ในครึ่งวันในวันที่ {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},ชั่วโมงการทำงานรวมไม่ควรมากกว่าชั่วโมงการทำงานสูงสุด {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,บน
@@ -2761,6 +2762,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,ดึงข้อมูล
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},อนุญาตให้ใช้งานได้สูงสุดในประเภทการลา {0} คือ {1}
 DocType: SMS Center,Create Receiver List,สร้างรายการรับ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,วันที่มีจำหน่ายสำหรับวันที่ซื้อควรเป็นหลังจากวันที่ซื้อ
 DocType: Vehicle,Wheels,ล้อ
 DocType: Packing Slip,To Package No.,กับแพคเกจหมายเลข
 DocType: Patient Relation,Family,ครอบครัว
@@ -2774,7 +2776,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,สกุลเงินการเรียกเก็บเงินต้องเท่ากับสกุลเงินของ บริษัท หรือสกุลเงินของ บริษัท ที่เป็นค่าเริ่มต้น
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),แสดงให้เห็นว่าแพคเกจเป็นส่วนหนึ่งของการส่งมอบนี้ (เฉพาะร่าง)
 DocType: Soil Texture,Loam,พื้นที่อันอุดมสมบูรณ์
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,แถว {0}: วันครบกำหนดไม่สามารถเป็นได้ก่อนวันที่ผ่านรายการ
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,แถว {0}: วันครบกำหนดไม่สามารถเป็นได้ก่อนวันที่ผ่านรายการ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,บันทึกรายการชำระเงิน
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},ปริมาณ รายการ {0} ต้องน้อยกว่า {1}
 ,Sales Invoice Trends,แนวโน้มการขายใบแจ้งหนี้
@@ -2847,7 +2849,7 @@
 DocType: Guardian,Guardian Interests,สนใจการ์เดียน
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,อัปเดตชื่อบัญชี / หมายเลข
 DocType: Naming Series,Current Value,ค่าปัจจุบัน
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,รอบระยะเวลาบัญชีที่มีอยู่หลายสำหรับวันที่ {0} โปรดตั้ง บริษัท ในปีงบประมาณ
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,รอบระยะเวลาบัญชีที่มีอยู่หลายสำหรับวันที่ {0} โปรดตั้ง บริษัท ในปีงบประมาณ
 DocType: Education Settings,Instructor Records to be created by,บันทึกผู้สอนที่จะสร้างขึ้นโดย
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} สร้าง
 DocType: GST Account,GST Account,บัญชี GST
@@ -2865,7 +2867,7 @@
 DocType: Sales Person,Name and Employee ID,ชื่อและลูกจ้าง ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,วันที่ครบกำหนด ไม่สามารถ ก่อน วันที่ประกาศ
 DocType: Website Item Group,Website Item Group,กลุ่มสินค้าเว็บไซต์
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ไม่มีสลิปเงินเดือนที่จะส่งสำหรับเกณฑ์ที่เลือกไว้ข้างต้นหรือส่งสลิปเงินเดือนแล้ว
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,ไม่มีสลิปเงินเดือนที่จะส่งสำหรับเกณฑ์ที่เลือกไว้ข้างต้นหรือส่งสลิปเงินเดือนแล้ว
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,หน้าที่ และภาษี
 DocType: Projects Settings,Projects Settings,การตั้งค่าโครงการ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,กรุณากรอก วันที่ อ้างอิง
@@ -2874,7 +2876,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,จำหน่ายจำนวน
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,รายการวัสดุที่ขอ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,โปรดยกเลิกการรับซื้อ {0} ครั้งแรก
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,โปรดยกเลิกการรับซื้อ {0} ครั้งแรก
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,ต้นไม้ ของ กลุ่ม รายการ
 DocType: Production Plan,Total Produced Qty,จำนวนที่ผลิตรวม
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,ไม่ สามารถดู จำนวน แถว มากกว่าหรือ เท่ากับจำนวน แถวปัจจุบัน ค่าใช้จ่าย สำหรับประเภท นี้
@@ -2985,6 +2987,7 @@
 ,Vehicle Expenses,ค่าใช้จ่ายในยานพาหนะ
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,สร้าง Lab Test (s) ในใบแจ้งหนี้การขาย
 DocType: Serial No,Invoice Details,รายละเอียดใบแจ้งหนี้
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,โปรดเปิดใช้งานการตั้งค่า Google Maps เพื่อประมาณและเพิ่มประสิทธิภาพเส้นทาง
 DocType: Grant Application,Show on Website,แสดงบนเว็บไซต์
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,เริ่มต้นเมื่อ
 DocType: Hub Tracked Item,Hub Category,หมวดหมู่ฮับ
@@ -3024,7 +3027,7 @@
 DocType: Inpatient Record,B Positive,B บวก
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",ผลประโยชน์สูงสุดของพนักงาน {0} เกินกว่า {1} โดยผลรวม {2} ของจำนวนที่อ้างถึงก่อนหน้านี้ \ amount
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",แถว # {0}: จำนวนต้องเป็น 1 เป็นรายการที่เป็นสินทรัพย์ถาวร โปรดใช้แถวแยกต่างหากสำหรับจำนวนหลาย
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",แถว # {0}: จำนวนต้องเป็น 1 เป็นรายการที่เป็นสินทรัพย์ถาวร โปรดใช้แถวแยกต่างหากสำหรับจำนวนหลาย
 DocType: Leave Block List Allow,Leave Block List Allow,ฝากรายการบล็อกอนุญาตให้
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,เงื่อนไขที่ไม่สามารถเป็นที่ว่างเปล่าหรือพื้นที่
 DocType: Patient Medical Record,Patient Medical Record,บันทึกการแพทย์ของผู้ป่วย
@@ -3059,7 +3062,7 @@
 DocType: Workstation,Wages per hour,ค่าจ้างต่อชั่วโมง
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},สมดุลหุ้นใน Batch {0} จะกลายเป็นเชิงลบ {1} สำหรับรายการ {2} ที่โกดัง {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,ต่อไปนี้ขอวัสดุได้รับการยกโดยอัตโนมัติตามระดับสั่งซื้อใหม่ของรายการ
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},บัญชี {0} ไม่ถูกต้อง สกุลเงินในบัญชีจะต้องเป็น {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},บัญชี {0} ไม่ถูกต้อง สกุลเงินในบัญชีจะต้องเป็น {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},จากวันที่ {0} ไม่สามารถเป็นได้หลังจากที่พนักงานลบวันที่ {1}
 DocType: Supplier,Is Internal Supplier,เป็นผู้จัดหาภายใน
 DocType: Employee,Create User Permission,สร้างการอนุญาตผู้ใช้
@@ -3205,7 +3208,7 @@
 DocType: Account,Fixed Asset,สินทรัพย์ คงที่
 DocType: Amazon MWS Settings,After Date,หลังวันที่
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,เนื่องสินค้าคงคลัง
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Invalid {0} สำหรับ Invoice ของ บริษัท Inter
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Invalid {0} สำหรับ Invoice ของ บริษัท Inter
 ,Department Analytics,แผนก Analytics
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,ไม่พบอีเมลในรายชื่อติดต่อมาตรฐาน
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,สร้างความลับ
@@ -3218,7 +3221,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,หลักสูตรในโครงสร้างค่าธรรมเนียมและกลุ่มนักเรียน {0} แตกต่างกัน
 DocType: Bank Statement Transaction Entry,Receivable Account,ลูกหนี้การค้า
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,ใช้ได้ตั้งแต่วันที่ต้องน้อยกว่าวันที่ไม่ถูกต้อง
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},แถว # {0}: สินทรัพย์ {1} อยู่แล้ว {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},แถว # {0}: สินทรัพย์ {1} อยู่แล้ว {2}
 DocType: Quotation Item,Stock Balance,ยอดคงเหลือสต็อก
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,ใบสั่งขายถึงการชำระเงิน
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,ผู้บริหารสูงสุด
@@ -3260,6 +3263,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,เดบิตในการที่จะต้อง
 DocType: Clinical Procedure,Inpatient Record,บันทึกผู้ป่วย
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",Timesheets ช่วยให้การติดตามของเวลาค่าใช้จ่ายและการเรียกเก็บเงินสำหรับกิจกรรมที่ทำโดยทีมงานของคุณ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,ผู้จัดจำหน่าย&gt; ประเภทผู้จัดจำหน่าย
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,ซื้อราคา
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,วันที่ทำรายการ
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,เทมเพลตของตัวแปรชี้วัดของซัพพลายเออร์
@@ -3303,7 +3307,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,กำไรจากอัตราแลกเปลี่ยน / ขาดทุน
 DocType: Opportunity,Lost Reason,เหตุผลที่สูญหาย
 DocType: Amazon MWS Settings,Enable Amazon,เปิดใช้งาน Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},แถว # {0}: บัญชี {1} ไม่ได้เป็นของ บริษัท {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},แถว # {0}: บัญชี {1} ไม่ได้เป็นของ บริษัท {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},ไม่พบ DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,ที่อยู่ใหม่
 DocType: Quality Inspection,Sample Size,ขนาดของกลุ่มตัวอย่าง
@@ -3415,7 +3419,7 @@
 DocType: Water Analysis,Origin,ที่มา
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,เอกสารนี้เป็นเกินขีด จำกัด โดย {0} {1} สำหรับรายการ {4} คุณกำลังทำอีก {3} กับเดียวกัน {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,กรุณาตั้งค่าที่เกิดขึ้นหลังจากการบันทึก
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,บัญชีจำนวนเงินที่เลือกเปลี่ยน
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,บัญชีจำนวนเงินที่เลือกเปลี่ยน
 DocType: Purchase Invoice,Price List Currency,สกุลเงินรายการราคา
 DocType: Naming Series,User must always select,ผู้ใช้จะต้องเลือก
 DocType: Stock Settings,Allow Negative Stock,อนุญาตให้สต็อกเชิงลบ
@@ -3457,7 +3461,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,คุณแน่ใจหรือว่าต้องการยกเลิกการนัดหมายนี้
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,ราคาห้องพัก
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,ท่อขาย
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},กรุณาตั้งค่าบัญชีเริ่มต้นเงินเดือนตัวแทน {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},กรุณาตั้งค่าบัญชีเริ่มต้นเงินเดือนตัวแทน {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ต้องใช้ใน
 DocType: Rename Tool,File to Rename,การเปลี่ยนชื่อไฟล์
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},กรุณาเลือก BOM สำหรับสินค้าในแถว {0}
@@ -3478,7 +3482,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ค่าใช้จ่ายของรายการที่ซื้อ
 DocType: Employee Separation,Employee Separation Template,เทมเพลตการแบ่งแยกลูกจ้าง
 DocType: Selling Settings,Sales Order Required,สั่งซื้อยอดขายที่ต้องการ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,มาเป็นผู้ขาย
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,มาเป็นผู้ขาย
 DocType: Purchase Invoice,Credit To,เครดิต
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,นำไปสู่การใช้ / ลูกค้า
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,เว้นว่างไว้เพื่อใช้รูปแบบการจัดส่งแบบมาตรฐาน
@@ -3520,7 +3524,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,ทำแม่แบบภาษี
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ผู้ใช้งานฟอรั่ม
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,วัตถุดิบไม่สามารถมีช่องว่าง
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,แถว # {0} (ตารางการชำระเงิน): จำนวนเงินต้องเป็นค่าลบ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,แถว # {0} (ตารางการชำระเงิน): จำนวนเงินต้องเป็นค่าลบ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","ไม่สามารถอัปเดสต็อก, ใบแจ้งหนี้ที่มีรายการการขนส่งลดลง"
 DocType: Contract,Fulfilment Status,สถานะ Fulfillment
 DocType: Lab Test Sample,Lab Test Sample,Lab Test Sample
@@ -3680,7 +3684,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Doc Date
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},ค่าธรรมเนียมระเบียนที่สร้าง - {0}
 DocType: Asset Category Account,Asset Category Account,บัญชีสินทรัพย์ประเภท
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,แถว # {0} (ตารางการชำระเงิน): จำนวนเงินต้องเป็นบวก
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,แถว # {0} (ตารางการชำระเงิน): จำนวนเงินต้องเป็นบวก
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},ไม่สามารถผลิต สินค้า ได้มากขึ้น {0} กว่าปริมาณ การขายสินค้า {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,เลือกค่าแอตทริบิวต์
 DocType: Purchase Invoice,Reason For Issuing document,เหตุผลในการออกเอกสาร
@@ -3735,7 +3739,7 @@
 DocType: Purchase Receipt,Time at which materials were received,เวลาที่ได้รับวัสดุ
 DocType: Products Settings,Products per Page,ผลิตภัณฑ์ต่อหน้า
 DocType: Stock Ledger Entry,Outgoing Rate,อัตราการส่งออก
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,หรือ
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,หรือ
 DocType: Sales Order,Billing Status,สถานะการเรียกเก็บเงิน
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,รายงาน ฉบับ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,ค่าใช้จ่ายใน ยูทิลิตี้
@@ -3763,7 +3767,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,ประกาศยกเว้นภาษีพนักงาน
 DocType: Payment Entry,Cheque/Reference Date,เช็ค / วันที่อ้างอิง
 DocType: Purchase Invoice,Total Taxes and Charges,ภาษีและค่าบริการรวม
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,วันที่ที่มีจำหน่ายสำหรับใช้งานถูกป้อนตามวันที่ที่ผ่านมา
 DocType: Employee,Emergency Contact,ติดต่อฉุกเฉิน
 DocType: Bank Reconciliation Detail,Payment Entry,รายการชำระเงิน
 ,sales-browser,ขายเบราว์เซอร์
@@ -3810,6 +3813,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Return (Credit Note)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,เริ่มต้นงาน
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},ต้องระบุเลขที่ประจำผลิตภัณฑ์สำหรับเนื้อหา {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,โปรดตั้งค่าชุดการตั้งชื่อสำหรับ {0} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; การตั้งชื่อซีรี่ส์
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,แม่แบบสำหรับผู้พิการจะต้องไม่เป็นแม่แบบเริ่มต้น
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,สำหรับแถว {0}: ป้อนจำนวนที่วางแผนไว้
 DocType: Account,Income Account,บัญชีรายได้
@@ -3823,6 +3827,7 @@
 DocType: Loyalty Program,Help Section,ส่วนช่วยเหลือ
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,ก่อนหน้า
 DocType: Appraisal Goal,Key Responsibility Area,พื้นที่ความรับผิดชอบหลัก
+DocType: Delivery Trip,Distance UOM,Distance UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",ชุดนักศึกษาช่วยให้คุณติดตามการเข้าร่วมการประเมินและค่าธรรมเนียมสำหรับนักเรียน
 DocType: Payment Entry,Total Allocated Amount,จำนวนเงินที่ได้รับจัดสรร
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,ตั้งค่าบัญชีพื้นที่โฆษณาเริ่มต้นสำหรับพื้นที่โฆษณาถาวร
@@ -3864,7 +3869,7 @@
 DocType: Item Supplier,Item Supplier,ผู้ผลิตรายการ
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,กรุณากรอก รหัสสินค้า ที่จะได้รับ ชุด ไม่
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},กรุณาเลือก ค่าสำหรับ {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,ไม่มีรายการที่เลือกสำหรับการถ่ายโอน
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,ไม่มีรายการที่เลือกสำหรับการถ่ายโอน
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ที่อยู่ทั้งหมด
 DocType: Company,Stock Settings,การตั้งค่าหุ้น
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",การควบรวมจะเป็นไปได้ถ้าคุณสมบัติต่อไปนี้จะเหมือนกันทั้งในบันทึก เป็นกลุ่มประเภทราก บริษัท
@@ -4162,7 +4167,7 @@
 DocType: Patient,Personal and Social History,ประวัติส่วนตัวและสังคม
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,สร้างผู้ใช้ {0} แล้ว
 DocType: Fee Schedule,Fee Breakup for each student,การแบ่งค่าธรรมเนียมสำหรับนักเรียนแต่ละคน
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ล่วงหน้ารวม ({0}) กับการสั่งซื้อ {1} ไม่สามารถจะสูงกว่าแกรนด์รวม ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ล่วงหน้ารวม ({0}) กับการสั่งซื้อ {1} ไม่สามารถจะสูงกว่าแกรนด์รวม ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,เลือกการกระจายรายเดือนที่จะไม่สม่ำเสมอกระจายเป้าหมายข้ามเดือน
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,เปลี่ยนรหัส
 DocType: Purchase Invoice Item,Valuation Rate,อัตราการประเมิน
@@ -4171,7 +4176,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,มี ITC Cess
 ,Student Monthly Attendance Sheet,นักศึกษาแผ่นเข้าร่วมประชุมรายเดือน
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,กฎการจัดส่งสำหรับการขายเท่านั้น
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,แถวค่าเสื่อมราคา {0}: วันที่คิดค่าเสื่อมราคาต่อไปต้องไม่ก่อนวันที่ซื้อ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,แถวค่าเสื่อมราคา {0}: วันที่คิดค่าเสื่อมราคาต่อไปต้องไม่ก่อนวันที่ซื้อ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,วันที่เริ่มต้นโครงการ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,จนกระทั่ง
 DocType: Rename Tool,Rename Log,เปลี่ยนชื่อเข้าสู่ระบบ
@@ -4189,12 +4194,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,บ่อยครั้งที่โครงการและ บริษัท ควรได้รับการปรับปรุงตามธุรกรรมการขาย
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,หมดอายุเมื่อวันที่
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,เพิ่มนักเรียน
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","โปรดลบพนักงาน <a href=""#Form/Employee/{0}"">{0}</a> \ เพื่อยกเลิกเอกสารนี้"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},กรุณาเลือก {0}
 DocType: C-Form,C-Form No,C-Form ไม่มี
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,ระยะทาง
+DocType: Delivery Stop,Distance,ระยะทาง
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,แสดงรายการผลิตภัณฑ์หรือบริการที่คุณซื้อหรือขาย
 DocType: Water Analysis,Storage Temperature,อุณหภูมิในการจัดเก็บ
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4221,7 +4224,7 @@
 DocType: Homepage,Company Description for website homepage,รายละเอียด บริษัท สำหรับหน้าแรกของเว็บไซต์
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",เพื่อความสะดวกของลูกค้า รหัสเหล่านี้จะถูกใช้ในการพิมพ์เอกสาร เช่น ใบแจ้งหนี้ และใบนำส่งสินค้า
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,ชื่อ suplier
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,ไม่สามารถเรียกข้อมูลสำหรับ {0}
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,ไม่สามารถเรียกข้อมูลสำหรับ {0}
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,บันทึกรายการเปิด
 DocType: Contract,Fulfilment Terms,Fulfillment Terms
 DocType: Sales Invoice,Time Sheet List,เวลารายการแผ่น
@@ -4404,7 +4407,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,เลือกนักเรียนด้วยตนเองสำหรับกลุ่มกิจกรรม
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,เลือกนักเรียนด้วยตนเองสำหรับกลุ่มกิจกรรม
 DocType: Journal Entry,User Remark,หมายเหตุผู้ใช้
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,การเพิ่มประสิทธิภาพเส้นทาง
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,การเพิ่มประสิทธิภาพเส้นทาง
 DocType: Travel Itinerary,Non Diary,Non Diary
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,ไม่สามารถสร้างโบนัสการเก็บรักษาสำหรับพนักงานที่เหลือได้
 DocType: Lead,Market Segment,ส่วนตลาด
@@ -4435,7 +4438,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,โปรแกรมความภักดี
 DocType: Student Guardian,Father,พ่อ
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,ตั๋วสนับสนุน
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,ไม่สามารถตรวจสอบ 'การปรับสต๊อก' สำหรับการขายสินทรัพย์ถาวร
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,ไม่สามารถตรวจสอบ 'การปรับสต๊อก' สำหรับการขายสินทรัพย์ถาวร
 DocType: Bank Reconciliation,Bank Reconciliation,กระทบยอดธนาคาร
 DocType: Attendance,On Leave,ลา
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ได้รับการปรับปรุง
@@ -4480,7 +4483,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,ไม่มี Serial และแบทช์
 DocType: Warranty Claim,From Company,จาก บริษัท
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,ผลรวมของคะแนนของเกณฑ์การประเมินจะต้อง {0}
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,กรุณาตั้งค่าจำนวนค่าเสื่อมราคาจอง
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,กรุณาตั้งค่าจำนวนค่าเสื่อมราคาจอง
 DocType: Supplier Scorecard Period,Calculations,การคำนวณ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,ค่าหรือ จำนวน
 DocType: Payment Terms Template,Payment Terms,เงื่อนไขการชำระเงิน
@@ -4500,7 +4503,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,ส่วนลด (%) ของราคาตามราคาตลาด
 DocType: Healthcare Service Unit Type,Rate / UOM,อัตรา / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,โกดังทั้งหมด
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,ไม่พบ {0} รายการระหว่าง บริษัท
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,ไม่พบ {0} รายการระหว่าง บริษัท
 DocType: Travel Itinerary,Rented Car,เช่ารถ
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,เกี่ยวกับ บริษัท ของคุณ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,เครดิตไปยังบัญชีจะต้องเป็นบัญชีงบดุล
@@ -4602,6 +4605,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,เกณฑ์การวิเคราะห์พืช
 DocType: Cheque Print Template,Cheque Height,เช็คความสูง
 DocType: Supplier,Supplier Details,รายละเอียดผู้จัดจำหน่าย
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,กรุณาตั้งหมายเลขชุดสำหรับการเข้าร่วมประชุมผ่านทาง Setup&gt; Numbering Series
 DocType: Setup Progress,Setup Progress,ตั้งค่าความคืบหน้า
 DocType: Expense Claim,Approval Status,สถานะการอนุมัติ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},จากค่า ต้องน้อยกว่า ค่า ในแถว {0}
@@ -4695,7 +4699,6 @@
 DocType: Travel Request,Fully Sponsored,สนับสนุนอย่างเต็มที่
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,สร้างลูกค้า {0} แล้ว
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,กรุณาติดตั้ง System Employee Naming System ใน Human Resource&gt; HR Settings
 DocType: Stock Settings,Limit Percent,ร้อยละขีด จำกัด
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,ไม่มีคลังสินค้าในคลังสินค้าใด ๆ
 ,Payment Period Based On Invoice Date,ระยะเวลา ในการชำระเงิน ตาม ใบแจ้งหนี้ ใน วันที่
@@ -4754,7 +4757,7 @@
 DocType: BOM Explosion Item,Source Warehouse,คลังสินค้าที่มา
 DocType: Installation Note,Installation Date,วันที่ติดตั้ง
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,บัญชีแยกประเภท
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},แถว # {0}: สินทรัพย์ {1} ไม่ได้เป็นของ บริษัท {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},แถว # {0}: สินทรัพย์ {1} ไม่ได้เป็นของ บริษัท {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,สร้างใบแจ้งหนี้การขาย {0} แล้ว
 DocType: Employee,Confirmation Date,ยืนยัน วันที่
 DocType: Inpatient Occupancy,Check Out,เช็คเอาท์
@@ -4774,6 +4777,7 @@
 DocType: Production Plan,Sales Orders Detail,รายละเอียดใบสั่งขาย
 DocType: Bin,Requested Quantity,จำนวนการขอใช้บริการ
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-Fee-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,โปรดตั้งค่าระบบการตั้งชื่อผู้สอนในการศึกษา&gt; การตั้งค่าการศึกษา
 DocType: Patient,Marital Status,สถานภาพการสมรส
 DocType: Stock Settings,Auto Material Request,ขอวัสดุอัตโนมัติ
 DocType: Woocommerce Settings,API consumer secret,ความลับของผู้ใช้ API
@@ -4826,7 +4830,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,เลือกวัน
 DocType: Academic Term,Term Name,ชื่อระยะ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),เครดิต ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,สร้างสลิปเงินเดือน ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,สร้างสลิปเงินเดือน ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,คุณไม่สามารถแก้ไขโหนดรากได้
 DocType: Buying Settings,Purchase Order Required,ใบสั่งซื้อที่ต้องการ
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,เครื่องจับเวลา
@@ -4864,7 +4868,7 @@
 DocType: Account,Rate at which this tax is applied,อัตราที่ภาษีนี้จะถูกใช้
 DocType: Cash Flow Mapper,Section Name,ชื่อส่วน
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,สั่งซื้อใหม่จำนวน
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},ค่าเสื่อมราคาแถว {0}: มูลค่าที่คาดว่าจะได้รับหลังจากอายุการใช้งานต้องมากกว่าหรือเท่ากับ {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},ค่าเสื่อมราคาแถว {0}: มูลค่าที่คาดว่าจะได้รับหลังจากอายุการใช้งานต้องมากกว่าหรือเท่ากับ {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,เปิดงานปัจจุบัน
 DocType: Company,Stock Adjustment Account,การปรับบัญชีสินค้า
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,เขียนปิด
@@ -4911,7 +4915,7 @@
 DocType: Program Enrollment,School House,โรงเรียนบ้าน
 DocType: Serial No,Out of AMC,ออกของ AMC
 DocType: Opportunity,Opportunity Amount,จำนวนโอกาส
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,จำนวนค่าเสื่อมราคาจองไม่สามารถจะสูงกว่าจำนวนค่าเสื่อมราคา
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,จำนวนค่าเสื่อมราคาจองไม่สามารถจะสูงกว่าจำนวนค่าเสื่อมราคา
 DocType: Purchase Order,Order Confirmation Date,วันที่ยืนยันการสั่งซื้อ
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,ทำให้ การบำรุงรักษา เยี่ยมชม
@@ -4952,7 +4956,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Batch:
 DocType: Volunteer,Afternoon,ตอนบ่าย
 DocType: Loyalty Program,Loyalty Program Help,โปรแกรมความภักดี
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} ‘{1}' ถูกปิดใช้งาน
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} ‘{1}' ถูกปิดใช้งาน
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ตั้งเป็นเปิด
 DocType: Cheque Print Template,Scanned Cheque,สแกนเช็ค
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ส่งอีเมลโดยอัตโนมัติไปยังรายชื่อในการทำธุรกรรมการส่ง
@@ -4965,7 +4969,7 @@
 DocType: Warranty Claim,Item and Warranty Details,รายการและรายละเอียดการรับประกัน
 DocType: Chapter,Chapter Members,สมาชิกบท
 DocType: Sales Team,Contribution (%),สมทบ (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,หมายเหตุ : รายการ การชำระเงินจะ ไม่ได้รับการ สร้างขึ้นตั้งแต่ ' เงินสด หรือ บัญชี ธนาคาร ไม่ได้ระบุ
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,หมายเหตุ : รายการ การชำระเงินจะ ไม่ได้รับการ สร้างขึ้นตั้งแต่ ' เงินสด หรือ บัญชี ธนาคาร ไม่ได้ระบุ
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,โครงการ {0} มีอยู่แล้ว
 DocType: Clinical Procedure,Nursing User,ผู้ใช้พยาบาล
 DocType: Employee Benefit Application,Payroll Period,ระยะเวลาการจ่ายเงินเดือน
@@ -4973,6 +4977,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Serial No {0} ไม่ได้เป็นของ Batch {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,ความรับผิดชอบ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,ช่วงสิ้นสุดของใบเสนอราคานี้สิ้นสุดลงแล้ว
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","โปรดลบพนักงาน <a href=""#Form/Employee/{0}"">{0}</a> \ เพื่อยกเลิกเอกสารนี้"
 DocType: Expense Claim Account,Expense Claim Account,บัญชีค่าใช้จ่ายเรียกร้อง
 DocType: Account,Capital Work in Progress,ทุนระหว่างดำเนินการ
 DocType: Accounts Settings,Allow Stale Exchange Rates,อนุญาตอัตราแลกเปลี่ยนที่อ่อนลง
@@ -5054,7 +5060,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,ฉบับวัสดุ
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,เชื่อมต่อ Shopify กับ ERPNext
 DocType: Material Request Item,For Warehouse,สำหรับโกดัง
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,บันทึกการจัดส่ง {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,บันทึกการจัดส่ง {0}
 DocType: Employee,Offer Date,ข้อเสนอ วันที่
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,ใบเสนอราคา
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,คุณกำลังอยู่ในโหมดออฟไลน์ คุณจะไม่สามารถที่จะโหลดจนกว่าคุณจะมีเครือข่าย
@@ -5105,7 +5111,7 @@
 DocType: Shipping Rule,Calculate Based On,การคำนวณพื้นฐานตาม
 DocType: Contract,Unfulfilled,ไม่ได้ผล
 DocType: Delivery Note Item,From Warehouse,จากคลังสินค้า
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,ไม่มีพนักงานสำหรับเกณฑ์ดังกล่าว
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,ไม่มีพนักงานสำหรับเกณฑ์ดังกล่าว
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,ไม่มีรายการที่มี Bill of Materials การผลิต
 DocType: Shopify Settings,Default Customer,ลูกค้าเริ่มต้น
 DocType: Sales Stage,Stage Name,ชื่อเวที
@@ -5148,7 +5154,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,จำนวน ภาษี หลังจากที่ จำนวน ส่วนลด
 DocType: Patient,Inpatient Status,สถานะผู้ป่วย
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,การตั้งค่าการทำงานในชีวิตประจำวันอย่างย่อ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,รายการราคาที่เลือกควรได้รับการตรวจสอบการซื้อและขาย
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,รายการราคาที่เลือกควรได้รับการตรวจสอบการซื้อและขาย
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,โปรดป้อน Reqd by Date
 DocType: Payment Entry,Internal Transfer,โอนภายใน
 DocType: Asset Maintenance,Maintenance Tasks,งานบำรุงรักษา
@@ -5184,7 +5190,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,กลุ่มตาม
 DocType: Guardian,Interests,ความสนใจ
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,เปิด / ปิดการใช้งาน สกุลเงิน
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,ไม่สามารถส่งสลิปเงินเดือนบางส่วนได้
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,ไม่สามารถส่งสลิปเงินเดือนบางส่วนได้
 DocType: Exchange Rate Revaluation,Get Entries,รับรายการ
 DocType: Production Plan,Get Material Request,ได้รับวัสดุที่ขอ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,ค่าใช้จ่าย ไปรษณีย์
@@ -5271,7 +5277,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},บัญชีค่าใช้จ่าย ที่จำเป็น สำหรับรายการที่ {0}
 DocType: BOM,Website Description,คำอธิบายเว็บไซต์
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,เปลี่ยนแปลงสุทธิในส่วนของเจ้าของ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,กรุณายกเลิกการซื้อใบแจ้งหนี้ {0} แรก
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,กรุณายกเลิกการซื้อใบแจ้งหนี้ {0} แรก
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,ไม่อนุญาต โปรดปิดใช้งานประเภทหน่วยบริการ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",อีเมล์ต้องไม่ซ้ำกันอยู่แล้วสำหรับ {0}
 DocType: Serial No,AMC Expiry Date,วันที่หมดอายุ AMC
@@ -5311,7 +5317,7 @@
 DocType: Hotel Room,Hotel Room,ห้องพักโรงแรม
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},บัญชี {0} ไม่ได้เป็นของ บริษัท {1}
 DocType: Leave Type,Rounding,การล้อม
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,หมายเลขซีเรียลในแถว {0} ไม่ตรงกับหมายเหตุการจัดส่ง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,หมายเลขซีเรียลในแถว {0} ไม่ตรงกับหมายเหตุการจัดส่ง
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),จำนวนเงินที่จ่าย (Pro-rated)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.",กฎราคาจะถูกกรองออกตามลูกค้ากลุ่มลูกค้ากลุ่มผู้จัดหากลุ่มผู้จัดจำหน่ายแคมเปญพันธมิตรการขาย ฯลฯ
 DocType: Student,Guardian Details,รายละเอียดผู้ปกครอง
@@ -5366,7 +5372,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},คลังสินค้า ที่จำเป็นสำหรับ รายการ หุ้น {0}
 DocType: Leave Allocation,Unused leaves,ใบที่ไม่ได้ใช้
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,ทำรายการชำระคืน
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,แผนกทั้งหมด
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,แผนกทั้งหมด
 DocType: Healthcare Service Unit,Vacant,ว่าง
 DocType: Patient,Alcohol Past Use,การใช้แอลกอฮอล์ในอดีต
 DocType: Fertilizer Content,Fertilizer Content,เนื้อหาปุ๋ย
@@ -5377,7 +5383,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,สั่งซื้องาน {0} ต้องถูกยกเลิกก่อนที่จะยกเลิกใบสั่งขายนี้
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),เรียก BOM ระเบิด (รวมถึงการ ประกอบย่อย )
 DocType: Authorization Rule,Applicable To (Employee),ที่ใช้บังคับกับ (พนักงาน)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,วันที่ครบกำหนดมีผลบังคับใช้
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,วันที่ครบกำหนดมีผลบังคับใช้
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,เพิ่มสำหรับแอตทริบิวต์ {0} ไม่สามารถเป็น 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,ชนิดของผลประโยชน์และจำนวนเงิน
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,จองห้องพัก
@@ -5526,7 +5532,7 @@
 DocType: Purchase Invoice Item,Total Weight,น้ำหนักรวม
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,สำนักงานคณะกรรมการกำกับ การขาย
 DocType: Job Offer Term,Value / Description,ค่า / รายละเอียด
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",แถว # {0}: สินทรัพย์ {1} ไม่สามารถส่งมันมีอยู่แล้ว {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",แถว # {0}: สินทรัพย์ {1} ไม่สามารถส่งมันมีอยู่แล้ว {2}
 DocType: Tax Rule,Billing Country,ประเทศการเรียกเก็บเงิน
 DocType: Purchase Order Item,Expected Delivery Date,คาดว่าวันที่ส่ง
 DocType: Restaurant Order Entry,Restaurant Order Entry,รายการสั่งซื้อร้านอาหาร
@@ -5565,12 +5571,13 @@
 DocType: Maintenance Visit,Breakdown,การเสีย
 DocType: Travel Itinerary,Vegetarian,มังสวิรัติ
 DocType: Patient Encounter,Encounter Date,พบวันที่
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,บัญชี: {0} กับสกุลเงิน: {1} ไม่สามารถเลือกได้
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,บัญชี: {0} กับสกุลเงิน: {1} ไม่สามารถเลือกได้
 DocType: Bank Statement Transaction Settings Item,Bank Data,ข้อมูลธนาคาร
 DocType: Purchase Receipt Item,Sample Quantity,ตัวอย่างปริมาณ
 DocType: Bank Guarantee,Name of Beneficiary,ชื่อผู้รับประโยชน์
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",อัพเดตค่าใช้จ่าย BOM โดยอัตโนมัติผ่าน Scheduler ตามอัตราการประเมินล่าสุด / อัตราราคา / อัตราการซื้อวัตถุดิบครั้งล่าสุด
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,ผู้จัดจำหน่าย&gt; กลุ่มผู้จัดจำหน่าย
 DocType: Bank Reconciliation Detail,Cheque Date,วันที่เช็ค
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},บัญชี {0}: บัญชีผู้ปกครอง {1} ไม่ได้เป็นของ บริษัท : {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,ประสบความสำเร็จในการทำธุรกรรมที่ถูกลบทั้งหมดที่เกี่ยวข้องกับ บริษัท นี้!
@@ -5598,7 +5605,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,โหนดลูกจะสามารถสร้างได้ภายใต้ &#39;กลุ่ม&#39; ต่อมน้ำประเภท
 DocType: Attendance Request,Half Day Date,ครึ่งวันวัน
 DocType: Academic Year,Academic Year Name,ชื่อปีการศึกษา
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} ไม่สามารถทำธุรกรรมกับ {1} ได้ โปรดเปลี่ยน บริษัท
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} ไม่สามารถทำธุรกรรมกับ {1} ได้ โปรดเปลี่ยน บริษัท
 DocType: Sales Partner,Contact Desc,Desc ติดต่อ
 DocType: Email Digest,Send regular summary reports via Email.,ส่งรายงานสรุปปกติผ่านทางอีเมล์
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},กรุณาตั้งค่าบัญชีเริ่มต้นในการเรียกร้องค่าใช้จ่ายประเภท {0}
@@ -5631,7 +5638,7 @@
 DocType: Hotel Room,Hotel Manager,ผู้จัดการโรงแรม
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,ตั้งกฎภาษีสำหรับรถเข็น
 DocType: Purchase Invoice,Taxes and Charges Added,ภาษีและค่าบริการเพิ่ม
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,แถวค่าเสื่อมราคา {0}: วันที่คิดค่าเสื่อมราคาต่อไปไม่ได้ก่อนวันที่ที่พร้อมใช้งาน
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,แถวค่าเสื่อมราคา {0}: วันที่คิดค่าเสื่อมราคาต่อไปไม่ได้ก่อนวันที่ที่พร้อมใช้งาน
 ,Sales Funnel,ช่องทาง ขาย
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,ชื่อย่อมีผลบังคับใช้
 DocType: Project,Task Progress,ความคืบหน้าของงาน
@@ -5645,7 +5652,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,ทุกกลุ่ม ลูกค้า
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,สะสมรายเดือน
 DocType: Attendance Request,On Duty,กำลังปฏิบัติหน้าที่
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} มีความจำเป็น รายการบันทึกอัตราแลกเปลี่ยนเงินตราไม่ได้สร้างขึ้นสำหรับ {1} เป็น {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} มีความจำเป็น รายการบันทึกอัตราแลกเปลี่ยนเงินตราไม่ได้สร้างขึ้นสำหรับ {1} เป็น {2}
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},มีแผนงานการรับพนักงาน {0} อยู่แล้วสำหรับการกำหนด {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,แม่แบบภาษีมีผลบังคับใช้
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,บัญชี {0}: บัญชีผู้ปกครอง {1} ไม่อยู่
@@ -5725,11 +5732,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,อย่างน้อยหนึ่งคลังสินค้ามีผลบังคับใช้
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.",กำหนดค่าฟิลด์รายการเช่น UOM กลุ่มรายการคำอธิบายและจำนวนของชั่วโมง
 DocType: Certification Application,Certification Status,สถานะการรับรอง
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,ตลาด
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,ตลาด
 DocType: Travel Itinerary,Travel Advance Required,จำเป็นต้องเดินทางล่วงหน้า
 DocType: Subscriber,Subscriber Name,ชื่อผู้สมัครสมาชิก
 DocType: Serial No,Out of Warranty,ออกจากการรับประกัน
-DocType: Cashier Closing,Cashier-closing-,แคชเชียร์-closing-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,ประเภทข้อมูลที่แมป
 DocType: BOM Update Tool,Replace,แทนที่
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,ไม่พบผลิตภัณฑ์
@@ -5817,7 +5823,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,เทมเพลตภาษีที่เป็นค่าเริ่มต้นสำหรับการขายและซื้อจะสร้างขึ้น
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,บันทึกผลลัพธ์การประเมิน {0} มีอยู่แล้ว
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",ตัวอย่าง: ABCD ##### ถ้ามีชุดชุดและเลขที่แบทช์ไม่ได้กล่าวถึงในธุรกรรมระบบจะสร้างเลขที่แบทช์อัตโนมัติตามชุดข้อมูลนี้ หากคุณต้องการระบุอย่างชัดแจ้งถึงแบทช์สำหรับรายการนี้ให้เว้นว่างไว้ หมายเหตุ: การตั้งค่านี้จะมีความสำคัญเหนือคำนำหน้าแบบตั้งชื่อในการตั้งค่าสต็อก
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,กรุณาตั้งหมายเลขชุดสำหรับการเข้าร่วมประชุมผ่านทาง Setup&gt; Numbering Series
 DocType: BOM,Materials Required (Exploded),วัสดุบังคับ (ระเบิด)
 DocType: Contract,Party User,ผู้ใช้พรรค
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',โปรดตั้งค่าตัวกรอง บริษัท หาก Group By เป็น &#39;Company&#39;
@@ -6020,7 +6025,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,ต้องตั้งค่าวันที่เริ่มต้นทดลองใช้และวันที่สิ้นสุดระยะทดลองใช้
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,อัตราเฉลี่ย
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,จำนวนเงินที่ชำระในตารางการชำระเงินต้องเท่ากับยอดรวม / ยอดรวม
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,จำนวนเงินที่ชำระในตารางการชำระเงินต้องเท่ากับยอดรวม / ยอดรวม
 DocType: Subscription Plan Detail,Plan,วางแผน
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,ยอดเงินบัญชีธนาคารตามบัญชีแยกประเภททั่วไป
 DocType: Job Applicant,Applicant Name,ชื่อผู้ยื่นคำขอ
@@ -6089,7 +6094,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,สบู่ และ ผงซักฟอก
 DocType: BOM,Show Items,แสดงรายการ
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,จากเวลาที่ไม่สามารถมีค่ามากกว่าการเวลา
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,คุณต้องการแจ้งให้ลูกค้าทราบทางอีเมลหรือไม่?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,คุณต้องการแจ้งให้ลูกค้าทราบทางอีเมลหรือไม่?
 DocType: Subscription Plan,Billing Interval,ช่วงเวลาการเรียกเก็บเงิน
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,ภาพยนตร์ และวิดีโอ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ได้รับคำสั่ง
@@ -6098,9 +6103,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,แถว {0}: {1} ต้องมีค่ามากกว่า 0
 DocType: Assessment Criteria,Assessment Criteria Group,กลุ่มเกณฑ์การประเมิน
 DocType: Healthcare Settings,Patient Name By,ชื่อผู้ป่วยโดย
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},รายการบันทึกยอดคงค้างสำหรับเงินเดือนจาก {0} ถึง {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},รายการบันทึกยอดคงค้างสำหรับเงินเดือนจาก {0} ถึง {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,เปิดใช้รายได้รอการตัดบัญชี
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},เปิดค่าเสื่อมราคาสะสมต้องน้อยกว่าเท่ากับ {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},เปิดค่าเสื่อมราคาสะสมต้องน้อยกว่าเท่ากับ {0}
 DocType: Warehouse,Warehouse Name,ชื่อคลังสินค้า
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,วันที่เริ่มต้นจริงต้องน้อยกว่าวันที่สิ้นสุดจริง
 DocType: Naming Series,Select Transaction,เลือกรายการ
@@ -6252,7 +6257,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,พนักงาน {0} ของเกรด {1} ไม่มีนโยบายลาออกเริ่มต้น
 DocType: Salary Detail,Salary Detail,รายละเอียดเงินเดือน
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,กรุณาเลือก {0} ครั้งแรก
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,เพิ่ม {0} ผู้ใช้แล้ว
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,เพิ่ม {0} ผู้ใช้แล้ว
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",ในกรณีของโปรแกรมแบบหลายชั้นลูกค้าจะได้รับการกำหนดให้โดยอัตโนมัติตามระดับที่เกี่ยวข้องตามการใช้จ่าย
 DocType: Appointment Type,Physician,แพทย์
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,รุ่นที่ {0} ของรายการ {1} หมดอายุ
@@ -6397,7 +6402,7 @@
 DocType: Asset,Custodian,ผู้ปกครอง
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,จุดขายข้อมูลส่วนตัว
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} ควรเป็นค่าระหว่าง 0 ถึง 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},การชำระเงิน {0} จาก {1} ถึง {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},การชำระเงิน {0} จาก {1} ถึง {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,เงินให้กู้ยืม ที่ไม่มีหลักประกัน
 DocType: Cost Center,Cost Center Name,ค่าใช้จ่ายชื่อศูนย์
 DocType: Student,B+,B+
@@ -6429,6 +6434,7 @@
 DocType: Employee,Date of Issue,วันที่ออก
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",ตามการตั้งค่าการซื้อหาก Purchase Reciept Required == &#39;YES&#39; จากนั้นสำหรับการสร้าง Invoice ซื้อผู้ใช้ต้องสร้างใบเสร็จการรับสินค้าเป็นอันดับแรกสำหรับรายการ {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},แถว # {0}: ตั้งผู้ผลิตสำหรับรายการ {1}
+DocType: Global Defaults,Default Distance Unit,หน่วยระยะห่างเริ่มต้น
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,แถว {0}: ค่าเวลาทำการต้องมีค่ามากกว่าศูนย์
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,ภาพ Website {0} แนบไปกับรายการ {1} ไม่สามารถพบได้
 DocType: Issue,Content Type,ประเภทเนื้อหา
@@ -6484,7 +6490,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,เพื่อเดบิตบัญชีจะต้องเป็นบัญชีงบดุล
 DocType: Asset,Naming Series,การตั้งชื่อซีรีส์
 DocType: Vital Signs,Coated,เคลือบ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,แถว {0}: มูลค่าที่คาดว่าจะได้รับหลังจากชีวิตที่มีประโยชน์ต้องน้อยกว่ายอดรวมการสั่งซื้อ
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,แถว {0}: มูลค่าที่คาดว่าจะได้รับหลังจากชีวิตที่มีประโยชน์ต้องน้อยกว่ายอดรวมการสั่งซื้อ
 DocType: GoCardless Settings,GoCardless Settings,การตั้งค่า GoCardless
 DocType: Leave Block List,Leave Block List Name,ฝากชื่อรายการที่ถูกบล็อก
 DocType: Certified Consultant,Certification Validity,ความถูกต้องของใบรับรอง
@@ -6553,6 +6559,7 @@
 DocType: Bank Statement Settings Item,Bank Header,ส่วนหัวของธนาคาร
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,ดูการทดสอบ Lab
 DocType: Hub Users,Hub Users,ผู้ใช้ Hub
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ลูกค้า&gt; กลุ่มลูกค้า&gt; เขตแดน
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,วันที่ทำการบำรุงรักษา
 DocType: Purchase Invoice Item,Rejected Serial No,หมายเลขเครื่องปฏิเสธ
@@ -6568,7 +6575,7 @@
 DocType: SG Creation Tool Course,Max Strength,ความแรงของแม็กซ์
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,การติดตั้งค่าที่ตั้งล่วงหน้า
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU ที่ FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},ไม่ได้เลือกหมายเหตุการจัดส่งสำหรับลูกค้า {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},ไม่ได้เลือกหมายเหตุการจัดส่งสำหรับลูกค้า {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,พนักงาน {0} ไม่มีผลประโยชน์สูงสุด
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,เลือกรายการตามวันที่จัดส่ง
 DocType: Grant Application,Has any past Grant Record,มี Grant Record ที่ผ่านมา
@@ -6596,7 +6603,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,สำรองห้องพักในโรงแรม
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,บริการลูกค้า
 DocType: BOM,Thumbnail,รูปขนาดย่อ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,ไม่พบรายชื่อติดต่อที่มีรหัสอีเมล
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,ไม่พบรายชื่อติดต่อที่มีรหัสอีเมล
 DocType: Item Customer Detail,Item Customer Detail,รายละเอียดรายการของลูกค้า
 DocType: Notification Control,Prompt for Email on Submission of,แจ้งอีเมลในการยื่น
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},จำนวนเงินที่ได้รับประโยชน์สูงสุดของพนักงาน {0} เกินกว่า {1}
@@ -6857,7 +6864,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,ไม่สามารถแอบแฝงเข้ากลุ่มเพราะประเภทบัญชีถูกเลือก
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} ถูกแก้ไขแล้ว กรุณาโหลดใหม่อีกครั้ง
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,หยุดผู้ใช้จากการทำแอพพลิเคที่เดินทางในวันที่ดังต่อไปนี้
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,รหัสรายการ&gt; กลุ่มสินค้า&gt; แบรนด์
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.",หากหมดอายุไม่ จำกัด สำหรับคะแนนความภักดีให้กำหนดระยะเวลาหมดอายุว่างหรือ 0
 DocType: Asset Maintenance Team,Maintenance Team Members,ทีมงานฝ่ายซ่อมบำรุง
 DocType: Loyalty Point Entry,Purchase Amount,ปริมาณการซื้อ
@@ -6865,7 +6871,7 @@
 											to fullfill Sales Order {2}",ไม่สามารถส่ง Serial No {0} ของสินค้า {1} ได้ตามที่จองไว้ \ to fullfill Sales Order {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,ใบเสนอราคาผู้ผลิต {0} สร้าง
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,ปีที่จบการไม่สามารถก่อนที่จะเริ่มปี
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,ปีที่จบการไม่สามารถก่อนที่จะเริ่มปี
 DocType: Employee Benefit Application,Employee Benefits,ผลประโยชน์ของพนักงาน
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},ปริมาณ การบรรจุ จะต้องเท่ากับ ปริมาณ สินค้า {0} ในแถว {1}
 DocType: Work Order,Manufactured Qty,จำนวนการผลิต
@@ -6881,6 +6887,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,เลือกเลขแบทช์
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,ไปที่ GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ตั๋วเงินยกให้กับลูกค้า
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,กรุณาติดตั้ง System Employee Naming System ใน Human Resource&gt; HR Settings
 DocType: Healthcare Settings,Invoice Appointments Automatically,การนัดหมายใบแจ้งหนี้โดยอัตโนมัติ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id โครงการ
 DocType: Salary Component,Variable Based On Taxable Salary,ตัวแปรตามเงินเดือนที่ต้องเสียภาษี
@@ -6929,7 +6936,7 @@
 DocType: POS Profile,Account for Change Amount,บัญชีเพื่อการเปลี่ยนแปลงจำนวน
 DocType: QuickBooks Migrator,Connecting to QuickBooks,การเชื่อมต่อกับ QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,รวมกำไร / ขาดทุน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,บริษัท ที่ไม่เกี่ยวข้องกับใบกำกับสินค้าของ บริษัท ระหว่าง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,บริษัท ที่ไม่เกี่ยวข้องกับใบกำกับสินค้าของ บริษัท ระหว่าง
 DocType: Purchase Invoice,input service,บริการอินพุต
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},แถว {0}: ปาร์ตี้ / บัญชีไม่ตรงกับ {1} / {2} ใน {3} {4}
 DocType: Employee Promotion,Employee Promotion,การส่งเสริมพนักงาน
@@ -7060,7 +7067,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,พื้นที่ที่ต้องการสำหรับที่พัก
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,รถเข็นที่ว่างเปล่า
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,โปรดตั้งค่าระบบการตั้งชื่อผู้สอนในการศึกษา&gt; การตั้งค่าการศึกษา
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",รายการ {0} ไม่มีหมายเลขประจำผลิตภัณฑ์เท่านั้นรายการ serilialized \ สามารถมีการจัดส่งตามหมายเลขลำดับ
 DocType: Vehicle,Model,แบบ
@@ -7090,7 +7096,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,ไม่มีอะไรเปลี่ยนแปลง
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,เลือกไฟล์ CSV
 DocType: Holiday List,Total Holidays,รวมวันหยุด
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,ไม่มีเทมเพลตอีเมลสำหรับจัดส่ง โปรดตั้งค่าในการตั้งค่าการจัดส่ง
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,ไม่มีเทมเพลตอีเมลสำหรับจัดส่ง โปรดตั้งค่าในการตั้งค่าการจัดส่ง
 DocType: Student Leave Application,Mark as Present,มาร์คเป็นปัจจุบัน
 DocType: Supplier Scorecard,Indicator Color,สีตัวบ่งชี้
 DocType: Purchase Order,To Receive and Bill,การรับและบิล
@@ -7099,7 +7105,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,เลือก Serial No
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,นักออกแบบ
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,ข้อตกลงและเงื่อนไขของแม่แบบ
-DocType: Serial No,Delivery Details,รายละเอียดการจัดส่งสินค้า
+DocType: Delivery Trip,Delivery Details,รายละเอียดการจัดส่งสินค้า
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},ศูนย์ต้นทุน ที่จะต้อง อยู่ในแถว {0} ในตาราง ภาษี สำหรับประเภท {1}
 DocType: Program,Program Code,รหัสโปรแกรม
 DocType: Terms and Conditions,Terms and Conditions Help,ข้อตกลงและเงื่อนไขช่วยเหลือ
@@ -7123,7 +7129,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,นำวันเวลา
 DocType: Cash Flow Mapping,Is Income Tax Expense,เป็นค่าใช้จ่ายภาษีเงินได้
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,คำสั่งซื้อของคุณไม่ได้จัดส่ง!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},แถว # {0}: โพสต์วันที่ต้องเป็นเช่นเดียวกับวันที่ซื้อ {1} สินทรัพย์ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},แถว # {0}: โพสต์วันที่ต้องเป็นเช่นเดียวกับวันที่ซื้อ {1} สินทรัพย์ {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,ตรวจสอบว่านักเรียนอาศัยอยู่ที่ Hostel ของสถาบันหรือไม่
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,โปรดป้อนคำสั่งขายในตารางข้างต้น
 ,Stock Summary,แจ้งข้อมูลอย่างย่อ
diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv
index c7ada50..53a91ee 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -1,7 +1,7 @@
 DocType: Accounting Period,Period Name,Dönem Adı
 DocType: Employee,Salary Mode,Maaş Modu
 DocType: Employee,Salary Mode,Maaş Modu
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Kayıt olmak
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Kayıt olmak
 DocType: Patient,Divorced,Ayrılmış
 DocType: Support Settings,Post Route Key,Rota Yolu Sonrası
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Bir işlemde öğenin birden çok eklenmesine izin ver
@@ -39,7 +39,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Yeni Döviz Kuru
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Döviz Fiyat Listesi için gereklidir {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* İşlemde hesaplanacaktır.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Tedarikçi&gt; Tedarikçi Türü
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Müşteri İletişim
 DocType: Patient Appointment,Check availability,Uygunluğu kontrol et
@@ -78,7 +77,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Açık olanları göster
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Seri Başarıyla güncellendi
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Çıkış yapmak
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{1} satırında {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{1} satırında {0}
 DocType: Asset Finance Book,Depreciation Start Date,Amortisman Başlangıç Tarihi
 DocType: Pricing Rule,Apply On,Uygula
 DocType: Item Price,Multiple Item prices.,Çoklu Ürün fiyatları.
@@ -131,7 +130,7 @@
 DocType: Lab Prescription,Lab Prescription,Laboratuar Reçetesi
 ,Delay Days,Gecikme günleri
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,hizmet Gideri
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},"Seri Numarası: {0}, Satış Faturasında zaten atıfta bulunuldu: {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},"Seri Numarası: {0}, Satış Faturasında zaten atıfta bulunuldu: {1}"
 DocType: Bank Statement Transaction Invoice Item,Invoice,Fatura
 DocType: Purchase Invoice Item,Item Weight Details,Öğe Ağırlık Ayrıntılar
 DocType: Asset Maintenance Log,Periodicity,Periyodik olarak tekrarlanma
@@ -162,6 +161,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Muhasebeci
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Satış Fiyatı Listesi
 DocType: Patient,Tobacco Current Use,Tütün Mevcut Kullanımı
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Başlangıç tarihi ve bitiş tarihi, iş kartı <a href=""#Form/Job Card/{0}"">{1}</a> ile çakışıyor"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Satış oranı
 DocType: Cost Center,Stock User,Hisse Senedi Kullanıcı
 DocType: Soil Analysis,(Ca+Mg)/K,"(Mg + Ca) / K,"
@@ -182,7 +182,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,İlgili
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Seyirci tarih çalışanın katılmadan tarihten daha az olamaz
 DocType: Grading Scale,Grading Scale Name,Not Verme Ölçeği Adı
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Kullanıcıları Pazara Ekleme
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Kullanıcıları Pazara Ekleme
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Bu bir kök hesabıdır ve düzenlenemez.
 DocType: Sales Invoice,Company Address,şirket adresi
 DocType: BOM,Operations,Operasyonlar
@@ -353,7 +353,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Adet
 DocType: Production Plan,Material Request Detail,Malzeme İstek Ayrıntısı
 DocType: Selling Settings,Default Quotation Validity Days,Varsayılan Teklif Geçerlilik Günleri
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Satır {0} a vergi eklemek için  {1} satırlarındaki vergiler de dahil edilmelidir
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Satır {0} a vergi eklemek için  {1} satırlarındaki vergiler de dahil edilmelidir
 DocType: SMS Center,SMS Center,SMS Merkezi
 DocType: SMS Center,SMS Center,SMS Merkezi
 DocType: Payroll Entry,Validate Attendance,Katılımı Doğrula
@@ -484,7 +484,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,sözleriyle miktarı için satır aralığı
 DocType: Vehicle,Additional Details,ek detaylar
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Açıklama verilmemiştir
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Tedarikçi&gt; Tedarikçi Grubu
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Satın alma talebi
 DocType: POS Closing Voucher Details,Collected Amount,Toplanan Tutar
 DocType: Lab Test,Submitted Date,Teslim Tarihi
@@ -533,7 +532,7 @@
 DocType: Student Admission,Student Admission,Öğrenci Kabulü
 ,Terretory,Bölge
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Ürün {0} iptal edildi
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Amortisman Satırı {0}: Amortisman Başlangıç Tarihi geçmiş olarak girildi
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Amortisman Satırı {0}: Amortisman Başlangıç Tarihi geçmiş olarak girildi
 DocType: Contract Template,Fulfilment Terms and Conditions,Yerine Getirme Koşulları ve Koşulları
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Malzeme Talebi
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Malzeme Talebi
@@ -596,6 +595,7 @@
 DocType: Accounts Settings,Settings for Accounts,Hesaplar için Ayarlar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},"Tedarikçi Fatura Numarası, {0} nolu Satınalma Faturasında bulunuyor."
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Satış Elemanı Ağacını Yönetin.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.",Google Haritalar Ayarları devre dışı olduğundan rota işlenemiyor.
 DocType: Job Applicant,Cover Letter,Ön yazı
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Üstün Çekler ve temizlemek için Mevduat
 DocType: Item,Synced With Hub,Hub ile Senkronize
@@ -657,7 +657,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Yeni Varlık Değeri
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Müşteri Para Biriminin Müşterinin temel birimine dönüştürülme oranı
 DocType: Course Scheduling Tool,Course Scheduling Tool,Ders Planlama Aracı
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Satır # {0}: Alış Fatura varolan varlık karşı yapılamaz {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Satır # {0}: Alış Fatura varolan varlık karşı yapılamaz {1}
 DocType: Crop Cycle,LInked Analysis,Soluk Analiz
 DocType: POS Closing Voucher,POS Closing Voucher,POS Kapanış Kuponu
 DocType: Contract,Lapsed,Sona
@@ -697,6 +697,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},"{0} - {1}, {2} Kursuna kayıtlı değil"
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Öğrenci adı:
 DocType: POS Closing Voucher Details,Difference,fark
+DocType: Delivery Settings,Delay between Delivery Stops,Teslimat Durakları arasındaki gecikme
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Seri No {0} İrsaliye  {1} e ait değil
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Sunucunun GoCardless yapılandırmasında bir sorun var gibi görünüyor. Endişelenme, başarısızlık durumunda, tutar hesabınıza iade edilir."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demosu
@@ -766,7 +767,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Miktarı ve Oranı
 DocType: Delivery Note,% Installed,% Montajlanan
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,Derslik / dersler planlanmış olabilir Laboratuvarlar vb.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Her iki şirketin şirket para birimleri Inter Şirket İşlemleri için eşleşmelidir.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Her iki şirketin şirket para birimleri Inter Şirket İşlemleri için eşleşmelidir.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Lütfen ilk önce şirket adını girin
 DocType: Travel Itinerary,Non-Vegetarian,Vejeteryan olmayan
 DocType: Purchase Invoice,Supplier Name,Tedarikçi Adı
@@ -860,7 +861,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Tarihten Kiralanmış
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Yeter Parçaları Build
 DocType: POS Profile User,POS Profile User,POS Profil Kullanıcıları
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Satır {0}: Amortisman Başlangıç Tarihi gerekli
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Satır {0}: Amortisman Başlangıç Tarihi gerekli
 DocType: Purchase Invoice Item,Service Start Date,Servis Başlangıç Tarihi
 DocType: Subscription Invoice,Subscription Invoice,Abonelik Faturası
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Doğrudan Gelir
@@ -937,7 +938,6 @@
 DocType: Selling Settings,Default Customer Group,Varsayılan Müşteri Grubu
 DocType: Selling Settings,Default Customer Group,Varsayılan Müşteri Grubu
 DocType: Employee,IFSC Code,IFSC Kodu
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Başlangıç tarihi ve bitiş tarihi, iş kartı <a href=""#Form/Job Card/{0}"">{1}</a> ile çakışıyor"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Devre dışıysa, 'Yuvarlanmış Toplam' alanı hiçbir işlemde görünmeyecektir."
 DocType: BOM,Operating Cost,İşletme Maliyeti
 DocType: Crop,Produced Items,Üretilen Ürünler
@@ -997,7 +997,7 @@
 DocType: Supplier,Prevent RFQs,RFQ&#39;ları önle
 DocType: Hub User,Hub User,Hub kullanıcısı
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Satış Emri verin
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},{0} &#39;dan {1}&#39; e kadar dönem için gönderilen maaş kaydı
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},{0} &#39;dan {1}&#39; e kadar dönem için gönderilen maaş kaydı
 DocType: Project Task,Project Task,Proje Görevi
 DocType: Loyalty Point Entry Redemption,Redeemed Points,İtfa Edilen Puanlar
 ,Lead Id,Talep Yaratma  Kimliği
@@ -1142,7 +1142,7 @@
 DocType: Fee Validity,Max number of visit,Maks Ziyaret Sayısı
 ,Hotel Room Occupancy,Otel Odasının Kullanımı
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Mesai Kartı oluşturuldu:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},{0} Ödeme şeklinde varsayılan nakit veya banka hesabı ayarlayınız
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},{0} Ödeme şeklinde varsayılan nakit veya banka hesabı ayarlayınız
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,kaydetmek
 DocType: GST Settings,GST Settings,GST Ayarları
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},"Para birimi, Fiyat Listesi Para Birimi ile aynı olmalıdır: {0}"
@@ -1203,7 +1203,7 @@
 DocType: Vehicle Log,Service Details,Hizmet Detayları
 DocType: Lab Test Template,Grouped,gruplanmış
 DocType: Selling Settings,Delivery Note Required,İrsaliye Gerekli
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Maaş Fişlerini Göndermek ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Maaş Fişlerini Göndermek ...
 DocType: Bank Guarantee,Bank Guarantee Number,Banka Garanti Numarası
 DocType: Bank Guarantee,Bank Guarantee Number,Banka Garanti Numarası
 DocType: Assessment Criteria,Assessment Criteria,Değerlendirme Kriterleri
@@ -1233,13 +1233,13 @@
 DocType: Request for Quotation,Get Suppliers,Tedarikçiler Al
 DocType: Purchase Receipt Item Supplied,Current Stock,Güncel Stok
 DocType: Purchase Receipt Item Supplied,Current Stock,Güncel Stok
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},"Satır {0}: Sabit Varlık {1}, {2} kalemiyle ilişkilendirilmiş değil"
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},"Satır {0}: Sabit Varlık {1}, {2} kalemiyle ilişkilendirilmiş değil"
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Önizleme Maaş Kayma
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Hesap {0} birden çok kez girilmiş
 DocType: Account,Expenses Included In Valuation,Değerlemeye dahil giderler
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Üyeliğinizin süresi 30 gün içinde dolarsa yenileyebilirsiniz
 DocType: Shopping Cart Settings,Show Stock Availability,Stok Uygunluğunu Göster
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},{1} varlık kategorisinde veya {2} şirkette {0} ayarlayın
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},{1} varlık kategorisinde veya {2} şirkette {0} ayarlayın
 DocType: Location,Longitude,Boylam
 ,Absent Student Report,Öğrenci Devamsızlık Raporu
 DocType: Crop,Crop Spacing UOM,Kırpma Aralığı UOM
@@ -1320,7 +1320,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Enerji
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Enerji
 DocType: Opportunity,Opportunity From,Fırsattan itibaren
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{0} Satırı: {1} {2} Numarası için seri numarası gerekli. {3} adresini verdiniz.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{0} Satırı: {1} {2} Numarası için seri numarası gerekli. {3} adresini verdiniz.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Lütfen bir tablo seçin
 DocType: BOM,Website Specifications,Web Sitesi Özellikleri
 DocType: Special Test Items,Particulars,Ayrıntılar
@@ -1436,7 +1436,7 @@
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Laboratuar Testleri ve Hayati İşaretler
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Mutabakat Ayrıntısı
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Uzlaşma Detay
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Satır {0}: Sabit Varlık {1} gönderilmelidir
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Satır {0}: Sabit Varlık {1} gönderilmelidir
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Çalışan bulunmadı
 DocType: Item,If subcontracted to a vendor,Bir satıcıya taşeron durumunda
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Öğrenci Grubu zaten güncellendi.
@@ -1493,7 +1493,6 @@
 DocType: Loyalty Program Collection,Tier Name,Katman Adı
 DocType: HR Settings,Enter retirement age in years,yıllarda emeklilik yaşı girin
 DocType: Crop,Target Warehouse,Hedef Depo
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Lütfen {0} için İsimlendirme Serisini Kurulum&gt; Ayarlar&gt; İsimlendirme Dizisi ile ayarlayın
 DocType: Payroll Employee Detail,Payroll Employee Detail,Bordro Çalışan Ayrıntısı
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Lütfen bir depo seçiniz
 DocType: Cheque Print Template,Starting location from left edge,sol kenarından yerini başlayan
@@ -1591,7 +1590,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Alt-montajlar Plan malzeme
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Satış Ortakları ve Bölge
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,Ürün Ağacı {0} aktif olmalıdır
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Hayır Öğeler transfer için kullanılabilir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Hayır Öğeler transfer için kullanılabilir
 DocType: Employee Boarding Activity,Activity Name,Etkinlik adı
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Yayın Tarihi Değiştir
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Bitmiş ürün miktarı <b>{0}</b> ve Miktar <b>{1}</b> için farklı olamaz
@@ -1833,6 +1832,7 @@
 DocType: Project,First Email,İlk e-posta
 DocType: Company,Exception Budget Approver Role,İstisna Bütçe Onaylayan Rolü
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Ayarlandıktan sonra, bu fatura belirlenen tarihe kadar beklemeye alınır."
+DocType: Cashier Closing,POS-CLO-,POS-ClO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Satış Sipariş / Satış Emrinde ayrılan Depo/ Mamül Deposu
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Satış Tutarı
 DocType: Repayment Schedule,Interest Amount,Faiz Tutarı
@@ -1844,7 +1844,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,kayıtlar
 DocType: Asset,Scrapped,Hurda edilmiş
 DocType: Item,Item Defaults,Öğe Varsayılanları
-DocType: Purchase Invoice,Returns,İade
+DocType: Cashier Closing,Returns,İade
 DocType: Job Card,WIP Warehouse,WIP Depo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Seri No {0} Bakım sözleşmesi {1} uyarınca bakımda
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,İşe Alım
@@ -1860,7 +1860,6 @@
 DocType: Share Transfer,Transfer Type,Aktarım Türü
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Satış Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Satış Giderleri
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Müşteri&gt; Müşteri Grubu&gt; Bölge
 DocType: Diagnosis,Diagnosis,tanı
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standart Satın Alma
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standart Satın Alma
@@ -1875,7 +1874,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Satın alınan siparişler gecikmiş ürünler
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Posta Kodu
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Satış Sipariş {0} {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},{0} kredisinde faiz gelir hesabını seçin
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},{0} kredisinde faiz gelir hesabını seçin
 DocType: Opportunity,Contact Info,İletişim Bilgileri
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Stok Girişleri Yapımı
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Çalışan durumu solda tanıtılamaz
@@ -1888,7 +1887,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,"Fatura, sıfır faturalandırma saati için yapılamaz"
 DocType: Company,Date of Commencement,Başlama tarihi
 DocType: Sales Person,Select company name first.,Önce şirket adı seçiniz
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},E-posta gönderildi {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},E-posta gönderildi {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Tedarikçilerden alınan teklifler.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Tüm BOM&#39;larda BOM&#39;u değiştirin ve en son fiyatı güncelleyin.
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Şu kişi(lere) {0} | {1} {2}
@@ -1911,7 +1910,7 @@
 DocType: Asset Movement,From Employee,Çalışanlardan
 DocType: Driver,Cellphone Number,cep telefonu numarası
 DocType: Project,Monitor Progress,İzleme İlerlemesi
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Uyarı: {1} deki {0} ürünü miktarı sıfır olduğu için sistem fazla faturalamayı kontrol etmeyecektir
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Uyarı: {1} deki {0} ürünü miktarı sıfır olduğu için sistem fazla faturalamayı kontrol etmeyecektir
 DocType: Journal Entry,Make Difference Entry,Fark Girişi yapın
 DocType: Supplier Quotation,Auto Repeat Section,Otomatik Tekrar Bölümü
 DocType: Upload Attendance,Attendance From Date,Tarihten itibaren katılım
@@ -2023,7 +2022,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Satır # {0}: Miktar Satınalma Return girilemez Reddedildi
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Seçilen Müşteri için Müşteri Grubunu değiştirmeye izin verilmiyor.
 ,Purchase Order Items To Be Billed,Faturalanacak Satınalma Siparişi Kalemleri
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Tahmini varış zamanları güncelleniyor.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Tahmini varış zamanları güncelleniyor.
 DocType: Program Enrollment Tool,Enrollment Details,Kayıt Ayrıntıları
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Bir şirket için birden fazla Öğe Varsayılanı belirlenemiyor.
 DocType: Purchase Invoice Item,Net Rate,Net Hızı
@@ -2038,7 +2037,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,İzin Türü madatory
 DocType: Support Settings,Close Issue After Days,Gün Sonra Kapat Sayı
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Kullanıcıları Marketplace&#39;e eklemek için Sistem Yöneticisi ve Ürün Yöneticisi rolleri olan bir kullanıcı olmanız gerekir.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Kullanıcıları Marketplace&#39;e eklemek için Sistem Yöneticisi ve Ürün Yöneticisi rolleri olan bir kullanıcı olmanız gerekir.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Tüm branşlarda için kabul ise boş bırakın
 DocType: Job Opening,Staffing Plan,Personel planı
 DocType: Bank Guarantee,Validity in Days,Gün İçinde Geçerlilik
@@ -2063,7 +2062,7 @@
 DocType: Marketplace Settings,Disable Marketplace,Marketplace&#39;i Devre Dışı Bırak
 ,Trial Balance,Mizan
 ,Trial Balance,Mizan
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,bulunamadı Mali Yılı {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,bulunamadı Mali Yılı {0}
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Çalışanlar kurma
 DocType: Hotel Room Reservation,Hotel Reservation User,Otel Rezervasyonu Kullanıcısı
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Önce Ön ek seçiniz
@@ -2180,7 +2179,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Giriş yapılamadı
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Öğe {0} oluşturuldu
 DocType: Special Test Items,Special Test Items,Özel Test Öğeleri
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Marketplace&#39;e kayıt olmak için Sistem Yöneticisi ve Ürün Yöneticisi rolleri olan bir kullanıcı olmanız gerekir.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Marketplace&#39;e kayıt olmak için Sistem Yöneticisi ve Ürün Yöneticisi rolleri olan bir kullanıcı olmanız gerekir.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Ödeme Şekli
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Ödeme Şekli
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,"Atanan Maaş Yapınıza göre, faydalar için başvuruda bulunamazsınız."
@@ -2194,7 +2193,7 @@
 DocType: Warehouse,Warehouse Contact Info,Depo İletişim Bilgileri
 DocType: Payment Entry,Write Off Difference Amount,Şüpheli Alacak Fark Hesabı
 DocType: Volunteer,Volunteer Name,Gönüllülük Adı
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Diğer satırlardaki yinelenen teslim tarihlerine sahip satırlar bulundu: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Diğer satırlardaki yinelenen teslim tarihlerine sahip satırlar bulundu: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent",{0}: Çalışanın e-posta adresi bulunamadığı için e-posta gönderilemedi
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},{1} belirli bir tarihte Çalışana {0} atanan Maaş Yapısı yok
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Nakliye kuralı {0} ülkesi için geçerli değil
@@ -2296,6 +2295,7 @@
 DocType: Salary Component,Earning,Kazanma
 DocType: Supplier Scorecard,Scoring Criteria,Puanlama Kriterleri
 DocType: Purchase Invoice,Party Account Currency,Parti Hesap Döviz
+DocType: Delivery Trip,Total Estimated Distance,Toplam Tahmini Mesafe
 ,BOM Browser,Ürün Ağacı Tarayıcı
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Lütfen bu eğitim olayına ilişkin durumunuzu güncelleyin
 DocType: Item Barcode,EAN,EAN
@@ -2339,7 +2339,7 @@
 DocType: Activity Cost,Projects,Projeler
 DocType: Payment Request,Transaction Currency,İşlem Döviz
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Gönderen {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Bazı e-postalar geçersiz
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Bazı e-postalar geçersiz
 DocType: Work Order Operation,Operation Description,İşletme Tanımı
 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.,Mali Yıl Başlangıç Tarihi ve Mali Yılı kaydedildikten sonra Mali Yıl Sonu Tarihi değiştiremezsiniz.
 DocType: Quotation,Shopping Cart,Alışveriş Sepeti
@@ -2369,7 +2369,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Sabit Varlık Net Değişim
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Adet
 DocType: Leave Control Panel,Leave blank if considered for all designations,Tüm tanımları için kabul ise boş bırakın
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Satır {0}'daki 'Gerçek' ücret biçimi Ürün Br.Fiyatına dahil edilemez
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Satır {0}'daki 'Gerçek' ücret biçimi Ürün Br.Fiyatına dahil edilemez
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,DateTime Gönderen
 DocType: Shopify Settings,For Company,Şirket için
@@ -2384,7 +2384,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Ders Programı Oluşturma Hataları Oluştu
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Listedeki ilk Gider Onaycısı varsayılan Gider Onaylayıcı olarak ayarlanacaktır.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,100 'den daha büyük olamaz
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Marketplace&#39;e kayıt olmak için Sistem Yöneticisi ve Ürün Yöneticisi rolleriyle Yönetici dışında bir kullanıcı olmanız gerekir.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Marketplace&#39;e kayıt olmak için Sistem Yöneticisi ve Ürün Yöneticisi rolleriyle Yönetici dışında bir kullanıcı olmanız gerekir.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Ürün {0} bir stok ürünü değildir
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Plânlanmamış
@@ -2416,7 +2416,7 @@
 DocType: HR Settings,Employee Settings,Çalışan Ayarları
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Ödeme Sistemi Yükleniyor
 ,Batch-Wise Balance History,Parti Geneli Bakiye Geçmişi
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Satır # {0}: Öğe {1} için faturalanan tutardan daha büyükse Oran ayarlanamaz.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Satır # {0}: Öğe {1} için faturalanan tutardan daha büyükse Oran ayarlanamaz.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,"Yazdırma ayarları, ilgili baskı biçiminde güncellendi"
 DocType: Package Code,Package Code,Paket Kodu
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Çırak
@@ -2671,7 +2671,7 @@
 DocType: Delivery Trip,Optimize Route,Rotayı Optimize Et
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Peşin X gün için operasyonlar planlama deneyin.
 DocType: HR Settings,Stop Birthday Reminders,Doğum günü hatırlatıcılarını durdur
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Şirket Standart Bordro Ödenecek Hesap ayarlayın {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Şirket Standart Bordro Ödenecek Hesap ayarlayın {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Vergi&#39;nin mali ayrılığını al ve Amazon tarafından veri topla
 DocType: SMS Center,Receiver List,Alıcı Listesi
 DocType: SMS Center,Receiver List,Alıcı Listesi
@@ -2747,7 +2747,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},{1} tarihli {0} Tedarikçi Faturası karşılığı
 DocType: Customer,Default Price List,Standart Fiyat Listesi
 DocType: Customer,Default Price List,Standart Fiyat Listesi
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Varlık Hareket kaydı {0} oluşturuldu
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Varlık Hareket kaydı {0} oluşturuldu
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Hiç bir öğe bulunamadı.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Silemezsiniz Mali Yılı {0}. Mali yıl {0} Genel ayarlar varsayılan olarak ayarlanır
 DocType: Share Transfer,Equity/Liability Account,Özkaynak / Sorumluluk Hesabı
@@ -2897,6 +2897,7 @@
 DocType: Blanket Order,Order Type,Sipariş Türü
 ,Item-wise Sales Register,Ürün bilgisi Satış Kaydı
 DocType: Asset,Gross Purchase Amount,Brüt sipariş tutarı
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Ürün Kodu&gt; Ürün Grubu&gt; Marka
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Açılış Bakiyeleri
 DocType: Asset,Depreciation Method,Amortisman Yöntemi
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Bu Vergi Temel Br.Fiyata dahil mi?
@@ -2987,7 +2988,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Yıllık Bütçe Bütçesi Aşıldıysa Eylem
 DocType: Student Leave Application,Student Leave Application,Öğrenci bırak Uygulaması
 DocType: Item,Will also apply for variants,Ayrıca varyantları için geçerli olacaktır
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Varlık iptal edilemez, hala  {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Varlık iptal edilemez, hala  {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},"Yarım günde Çalışan {0}, {1}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Toplam çalışma süresi maksimum çalışma saatleri fazla olmamalıdır {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Üzerinde
@@ -3012,6 +3013,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Veriyi getir
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},{0} izin türünde izin verilen maksimum izin {1}
 DocType: SMS Center,Create Receiver List,Alıcı listesi oluşturma
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,"Kullanıma hazır tarih, satın alma tarihinden sonra olmalıdır."
 DocType: Vehicle,Wheels,Tekerlekler
 DocType: Packing Slip,To Package No.,Ambalaj No.
 DocType: Patient Relation,Family,Aile
@@ -3026,7 +3028,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,"Faturalandırma para birimi, varsayılan şirketin para birimi veya parti hesabı para birimine eşit olmalıdır"
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Paketin bu teslimatın bir parçası olduğunu gösterir (Sadece Taslak)
 DocType: Soil Texture,Loam,verimli toprak
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Satır {0}: Teslim Tarihi gönderim tarihinden önce olamaz
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Satır {0}: Teslim Tarihi gönderim tarihinden önce olamaz
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Ödeme Girdisi Oluştur
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Ürün {0} için miktar{1} den az olmalıdır
 ,Sales Invoice Trends,Satış Faturası Trendler
@@ -3104,7 +3106,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Hesap Adını / Numarasını Güncelle
 DocType: Naming Series,Current Value,Mevcut değer
 DocType: Naming Series,Current Value,Mevcut değer
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,{0} tarihi için birden fazla mali yıl bulunuyor. Lütfen firma için mali yıl tanımlayınız.
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,{0} tarihi için birden fazla mali yıl bulunuyor. Lütfen firma için mali yıl tanımlayınız.
 DocType: Education Settings,Instructor Records to be created by,Öğretmen Kayıtları tarafından oluşturulacak
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} oluşturuldu
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} oluşturuldu
@@ -3126,7 +3128,7 @@
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Bitiş Tarihi gönderim tarihinden önce olamaz
 DocType: Website Item Group,Website Item Group,Web Sitesi Ürün Grubu
 DocType: Website Item Group,Website Item Group,Web Sitesi Ürün Grubu
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Yukarıdaki kriterlere göre maaş fişi bulunamadı VEYA maaş fişi zaten gönderildi
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Yukarıdaki kriterlere göre maaş fişi bulunamadı VEYA maaş fişi zaten gönderildi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Harç ve Vergiler
 DocType: Projects Settings,Projects Settings,Projeler Ayarları
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Referrans tarihi girin
@@ -3135,7 +3137,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Verilen Adet
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Malzeme Talebi Kalemi
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Lütfen önce &quot;{0} Satın Alma Makbuzu&#39;nu iptal edin
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Lütfen önce &quot;{0} Satın Alma Makbuzu&#39;nu iptal edin
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Ürün Grupları Ağacı
 DocType: Production Plan,Total Produced Qty,Toplam Üretilen Miktar
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Kolon numarası bu Ücret tipi için kolon numarasından büyük veya eşit olamaz
@@ -3256,6 +3258,7 @@
 ,Vehicle Expenses,araç Giderleri
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Satış Faturası Gönderiminde Lab Testleri Oluşturun
 DocType: Serial No,Invoice Details,Fatura detayları
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Rotaları tahmin etmek ve optimize etmek için lütfen Google Haritalar Ayarlarını etkinleştirin
 DocType: Grant Application,Show on Website,Web sitesinde göster
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Başla
 DocType: Hub Tracked Item,Hub Category,Hub Kategorisi
@@ -3298,7 +3301,7 @@
 DocType: Inpatient Record,B Positive,B Olumlu
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount","{0} çalışanının maksimum yararı, önceki talep edilen tutarın {2} {1} tutarını aşar."
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Satır # {0}: öğe sabit kıymet olarak Adet, 1 olmalıdır. Birden fazla qty için ayrı bir satır kullanın."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Satır # {0}: öğe sabit kıymet olarak Adet, 1 olmalıdır. Birden fazla qty için ayrı bir satır kullanın."
 DocType: Leave Block List Allow,Leave Block List Allow,İzin engel listesi müsaade eder
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Kısaltma boş veya boşluktan oluşamaz
 DocType: Patient Medical Record,Patient Medical Record,Hasta Tıbbi Kayıt
@@ -3339,7 +3342,7 @@
 DocType: Workstation,Wages per hour,Saatlik ücret
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Toplu stok bakiyesi {0} olacak olumsuz {1} Warehouse Ürün {2} için {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Malzeme İstekleri ardından öğesinin yeniden sipariş seviyesine göre otomatik olarak gündeme gelmiş
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Hesap {0} geçersiz. Hesap Para olmalıdır {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Hesap {0} geçersiz. Hesap Para olmalıdır {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},{0} tarihinden itibaren çalışanın işten ayrılmasından sonra tarih {1} olamaz
 DocType: Supplier,Is Internal Supplier,İç Tedarikçi mi
 DocType: Employee,Create User Permission,Kullanıcı İzni Yarat
@@ -3498,7 +3501,7 @@
 DocType: Account,Fixed Asset,Sabit Varlık
 DocType: Amazon MWS Settings,After Date,Tarihten sonra
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Serileştirilmiş Envanteri
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Şirket İçi Fatura için geçersiz {0}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Şirket İçi Fatura için geçersiz {0}.
 ,Department Analytics,Departman Analitiği
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Varsayılan iletişimde e-posta bulunamadı
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Gizli Oluştur
@@ -3510,7 +3513,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Ücret Yapısı ve Öğrenci Grubu {0} içindeki program farklıdır.
 DocType: Bank Statement Transaction Entry,Receivable Account,Alacak Hesabı
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,"Tarihten Geçerli Tarih, Geçerlie Kadar Geçerli olandan daha az olmalıdır."
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Satır {0}: Sabit Varlık {1} zaten {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Satır {0}: Sabit Varlık {1} zaten {2}
 DocType: Quotation Item,Stock Balance,Stok Bakiye
 DocType: Quotation Item,Stock Balance,Stok Bakiye
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Ödeme Satış Sipariş
@@ -3556,6 +3559,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Bankamatik To gereklidir
 DocType: Clinical Procedure,Inpatient Record,Yatan Kayıt
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Zaman çizelgeleri ekip tarafından yapılan aktiviteler için zaman, maliyet ve fatura izlemenize yardımcı"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Tedarikçi&gt; Tedarikçi Türü
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Satınalma Fiyat Listesi
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,İşlem tarihi
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Tedarikçi puan kartı değişkenlerinin şablonları.
@@ -3602,7 +3606,7 @@
 DocType: Opportunity,Lost Reason,Kayıp Nedeni
 DocType: Opportunity,Lost Reason,Kayıp Nedeni
 DocType: Amazon MWS Settings,Enable Amazon,Amazon&#39;u etkinleştir
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},"Sıra # {0}: Hesap {1}, şirkete {2} ait değil"
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},"Sıra # {0}: Hesap {1}, şirkete {2} ait değil"
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType {0} bulunamadı
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Yeni Adres
 DocType: Quality Inspection,Sample Size,Numune Miktarı
@@ -3724,7 +3728,7 @@
 DocType: Water Analysis,Origin,Menşei
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Bu belge ile sınırı üzerinde {0} {1} öğe için {4}. yapıyoruz aynı karşı başka {3} {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,kaydettikten sonra yinelenen ayarlayın
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Seç değişim miktarı hesabı
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Seç değişim miktarı hesabı
 DocType: Purchase Invoice,Price List Currency,Fiyat Listesi Para Birimi
 DocType: Purchase Invoice,Price List Currency,Fiyat Listesi Para Birimi
 DocType: Naming Series,User must always select,Kullanıcı her zaman seçmelidir
@@ -3771,7 +3775,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Bu randevuyu iptal etmek istediğinize emin misiniz?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Otel Odasında Fiyatlandırma Paketi
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,satış Hattı
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Maaş Bileşeni varsayılan hesabı ayarlamak Lütfen {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Maaş Bileşeni varsayılan hesabı ayarlamak Lütfen {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Gerekli Açık
 DocType: Rename Tool,File to Rename,Rename Dosya
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Satır Öğe için BOM seçiniz {0}
@@ -3792,7 +3796,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Satın Öğeler Maliyeti
 DocType: Employee Separation,Employee Separation Template,Çalışan Ayırma Şablonu
 DocType: Selling Settings,Sales Order Required,Satış Sipariş Gerekli
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Satıcı Olun
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Satıcı Olun
 DocType: Purchase Invoice,Credit To,Kredi için
 DocType: Purchase Invoice,Credit To,Kredi için
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Aktif Potansiyeller / Müşteriler
@@ -3837,7 +3841,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Vergi Şablonu Yap
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,kullanıcı Forumu
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Hammaddeler boş olamaz.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Satır # {0} (Ödeme Tablosu): Tutar negatif olmalı
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Satır # {0} (Ödeme Tablosu): Tutar negatif olmalı
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Stok güncelleme olamazdı, fatura damla nakliye öğe içeriyor."
 DocType: Contract,Fulfilment Status,Yerine Getirilme Durumu
 DocType: Lab Test Sample,Lab Test Sample,Laboratuvar Testi Örneği
@@ -4004,7 +4008,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Doküman Tarihi
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Ücret Kayıtları düzenlendi - {0}
 DocType: Asset Category Account,Asset Category Account,Varlık Tipi Hesabı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Sıra # {0} (Ödeme Tablosu): Miktarın pozitif olması gerekir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Sıra # {0} (Ödeme Tablosu): Miktarın pozitif olması gerekir
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Satış Sipariş Miktarı {1} den fazla Ürün {0} üretilemez
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Özellik Değerlerini Seç
 DocType: Purchase Invoice,Reason For Issuing document,Belgenin Verilmesi Nedeni
@@ -4065,7 +4069,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Malzemelerin alındığı zaman
 DocType: Products Settings,Products per Page,Sayfa Başına Ürünler
 DocType: Stock Ledger Entry,Outgoing Rate,Giden Oranı
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,veya
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,veya
 DocType: Sales Order,Billing Status,Fatura Durumu
 DocType: Sales Order,Billing Status,Fatura Durumu
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Hata Bildir
@@ -4097,7 +4101,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Çalışan Vergisi İstisnası Beyanı
 DocType: Payment Entry,Cheque/Reference Date,Çek / Referans Tarihi
 DocType: Purchase Invoice,Total Taxes and Charges,Toplam Vergi ve Harçlar
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,"Kullanıma hazır Tarih, geçmiş tarih olarak girilir"
 DocType: Employee,Emergency Contact,Acil Durum İrtibat Kişisi
 DocType: Bank Reconciliation Detail,Payment Entry,Ödeme giriş
 ,sales-browser,Satış tarayıcı
@@ -4147,6 +4150,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Dönüşü (Kredi Notu)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,İşi Başlat
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},{0} varlığına ait seri no.
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Lütfen {0} için İsimlendirme Serisini Kurulum&gt; Ayarlar&gt; İsimlendirme Dizisi ile ayarlayın
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Engelli şablon varsayılan şablon olmamalıdır
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,{0} satırı için: Planlanan miktarı girin
 DocType: Account,Income Account,Gelir Hesabı
@@ -4161,6 +4165,7 @@
 DocType: Loyalty Program,Help Section,Yardım Bölümü
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Önceki
 DocType: Appraisal Goal,Key Responsibility Area,Kilit Sorumluluk Alanı
+DocType: Delivery Trip,Distance UOM,Uzak UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Öğrenci Partileri Eğer öğrenciler için katılım, değerlendirme ve ücretler izlemenize yardımcı"
 DocType: Payment Entry,Total Allocated Amount,Toplam Ayrılan Tutar
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Sürekli envanter için varsayılan envanter hesabı ayarla
@@ -4208,7 +4213,7 @@
 DocType: Item Supplier,Item Supplier,Ürün Tedarikçisi
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Toplu almak için Ürün Kodu girin
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},{0} - {1} teklifi için bir değer seçiniz
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Transfer için hiçbir öğe seçilmedi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Transfer için hiçbir öğe seçilmedi
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Tüm adresler.
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Tüm adresler.
 DocType: Company,Stock Settings,Stok Ayarları
@@ -4531,7 +4536,7 @@
 DocType: Patient,Personal and Social History,Kişisel ve Sosyal Tarih
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,{0} kullanıcısı oluşturuldu
 DocType: Fee Schedule,Fee Breakup for each student,Her öğrenci için Ücret Ayrılması
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Toplam avans ({0}) Sipariş karşı {1} Genel Toplam den büyük olamaz ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Toplam avans ({0}) Sipariş karşı {1} Genel Toplam den büyük olamaz ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Dengesiz ay boyunca hedefleri dağıtmak için Aylık Dağıtım seçin.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Kodu Değiştir
 DocType: Purchase Invoice Item,Valuation Rate,Değerleme Oranı
@@ -4541,7 +4546,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Bilinen ITC Cess
 ,Student Monthly Attendance Sheet,Öğrenci Aylık Hazirun Cetveli
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Nakliye kuralı yalnızca Satış için geçerlidir
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,"Amortisör Satırı {0}: Sonraki Amortisman Tarihi, Satın Alma Tarihinden önce olamaz"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,"Amortisör Satırı {0}: Sonraki Amortisman Tarihi, Satın Alma Tarihinden önce olamaz"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Proje Başlangıç Tarihi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Kadar
 DocType: Rename Tool,Rename Log,Girişi yeniden adlandır
@@ -4560,13 +4565,11 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Satış İşlemlerine göre proje ve şirket ne sıklıkla güncellenmelidir.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Tarihinde sona eriyor
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Öğrenci ekle
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Lütfen bu dokümanı iptal etmek için <a href=""#Form/Employee/{0}"">{0}</a> \ çalışanını silin."
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Lütfen  {0} seçiniz
 DocType: C-Form,C-Form No,C-Form No
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Mesafe
+DocType: Delivery Stop,Distance,Mesafe
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Satın aldığınız veya sattığınız ürünleri veya hizmetleri listeleyin.
 DocType: Water Analysis,Storage Temperature,Depolama sıcaklığı
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4597,7 +4600,7 @@
 DocType: Homepage,Company Description for website homepage,web sitesinin ana Firma Açıklaması
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Müşterilerinin rahatlığı için, bu kodlar faturalarda ve irsaliyelerde olduğu gibi basılı formatta kullanılabilir."
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Adı
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,{0} için bilgi alınamadı.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,{0} için bilgi alınamadı.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Açılış Giriş Dergisi
 DocType: Contract,Fulfilment Terms,Yerine Getirme Koşulları
 DocType: Sales Invoice,Time Sheet List,Mesai Kartı Listesi
@@ -4796,7 +4799,7 @@
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detayları
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Etkinliğe Dayalı Grup için öğrencileri manuel olarak seçin
 DocType: Journal Entry,User Remark,Kullanıcı Açıklaması
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Rotaları optimize etme.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Rotaları optimize etme.
 DocType: Travel Itinerary,Non Diary,Günlük Olmayan
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Sol Çalışanlar için Tutma Bonusu oluşturulamıyor
 DocType: Lead,Market Segment,Pazar Segmenti
@@ -4828,7 +4831,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Sadakat programı
 DocType: Student Guardian,Father,baba
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,destek biletleri
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,'Stoğu Güncelle' sabit varlık satışları için kullanılamaz
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,'Stoğu Güncelle' sabit varlık satışları için kullanılamaz
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Mutabakatı
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Uzlaşma
 DocType: Attendance,On Leave,İzinli
@@ -4876,7 +4879,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Seri No ve Toplu
 DocType: Warranty Claim,From Company,Şirketten
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Değerlendirme Kriterleri Puanlarının Toplamı {0} olması gerekir.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Amortisman Sayısı rezervasyonu ayarlayın
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Amortisman Sayısı rezervasyonu ayarlayın
 DocType: Supplier Scorecard Period,Calculations,Hesaplamalar
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Değer veya Miktar
 DocType: Payment Terms Template,Payment Terms,Ödeme şartları
@@ -4897,7 +4900,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Fiyat Listesindeki İndirim (%) Marjlı Oran
 DocType: Healthcare Service Unit Type,Rate / UOM,Oran / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Tüm Depolar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Inter Şirket İşlemleri için {0} bulunamadı.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Inter Şirket İşlemleri için {0} bulunamadı.
 DocType: Travel Itinerary,Rented Car,Kiralanmış araba
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Şirketiniz hakkında
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Hesabın için Kredi bir bilanço hesabı olmalıdır
@@ -5004,6 +5007,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Bitki Analiz Kriterleri
 DocType: Cheque Print Template,Cheque Height,Çek Yükseklik
 DocType: Supplier,Supplier Details,Tedarikçi Ayrıntıları
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Lütfen Kurulum&gt; Numaralandırma Serileri ile Katılım için numaralandırma dizisini ayarlayın
 DocType: Setup Progress,Setup Progress,Kurulum İlerlemesi
 DocType: Expense Claim,Approval Status,Onay Durumu
 DocType: Expense Claim,Approval Status,Onay Durumu
@@ -5105,7 +5109,6 @@
 DocType: Travel Request,Fully Sponsored,Tamamen Sponsorlu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Ters Günlük Girişi
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Müşteri {0} oluşturuldu.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lütfen İnsan Kaynağında Çalışan Adlandırma Sistemini Kurun&gt; HR Ayarları
 DocType: Stock Settings,Limit Percent,Sınır Yüzde
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Şu an herhangi bir depoda stok yok
 ,Payment Period Based On Invoice Date,Fatura Tarihine Dayalı Ödeme Süresi
@@ -5166,7 +5169,7 @@
 DocType: Installation Note,Installation Date,Kurulum Tarihi
 DocType: Installation Note,Installation Date,Kurulum Tarihi
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Defteri Birlikte Paylaş
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},"Satır {0}: Sabit Varlık {1}, {2} firmasına ait değil"
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},"Satır {0}: Sabit Varlık {1}, {2} firmasına ait değil"
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Satış Fatura {0} oluşturuldu
 DocType: Employee,Confirmation Date,Onay Tarihi
 DocType: Employee,Confirmation Date,Onay Tarihi
@@ -5187,6 +5190,7 @@
 DocType: Production Plan,Sales Orders Detail,Satış Siparişleri Ayrıntısı
 DocType: Bin,Requested Quantity,istenen Miktar
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-ÜCRET-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Lütfen Eğitimde Eğitmen Adlandırma Sistemi&gt; Eğitim Ayarları&#39;nı kurun
 DocType: Patient,Marital Status,Medeni durum
 DocType: Stock Settings,Auto Material Request,Otomatik Malzeme Talebi
 DocType: Stock Settings,Auto Material Request,Otomatik Malzeme Talebi
@@ -5242,7 +5246,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Günleri Seç
 DocType: Academic Term,Term Name,Dönem Adı
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Kredi ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Maaş Fişleri Oluşturma ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Maaş Fişleri Oluşturma ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Kök düğümünü düzenleyemezsiniz.
 DocType: Buying Settings,Purchase Order Required,gerekli Satın alma Siparişi
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,kronometre
@@ -5282,7 +5286,7 @@
 DocType: Account,Rate at which this tax is applied,Vergi uygulanma oranı
 DocType: Cash Flow Mapper,Section Name,Bölüm adı
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Yeniden Sipariş Adet
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},"Amortisör Satırı {0}: Faydalı ömür sonrasında beklenen değer, {1} değerinden büyük veya ona eşit olmalıdır."
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},"Amortisör Satırı {0}: Faydalı ömür sonrasında beklenen değer, {1} değerinden büyük veya ona eşit olmalıdır."
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Güncel İş Olanakları
 DocType: Company,Stock Adjustment Account,Stok Düzeltme Hesabı
 DocType: Company,Stock Adjustment Account,Stok Düzeltme Hesabı
@@ -5331,7 +5335,7 @@
 DocType: Program Enrollment,School House,Okul Evi
 DocType: Serial No,Out of AMC,Çıkış AMC
 DocType: Opportunity,Opportunity Amount,Fırsat Tutarı
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Rezervasyon amortismanları sayısı amortismanlar Toplam Sayısı fazla olamaz
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Rezervasyon amortismanları sayısı amortismanlar Toplam Sayısı fazla olamaz
 DocType: Purchase Order,Order Confirmation Date,Sipariş Onay Tarihi
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Bakım Ziyareti Yapın
@@ -5375,7 +5379,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Toplu:
 DocType: Volunteer,Afternoon,Öğleden sonra
 DocType: Loyalty Program,Loyalty Program Help,Bağlılık Programı Yardımı
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' devre dışı
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' devre dışı
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Açık olarak ayarlayın
 DocType: Cheque Print Template,Scanned Cheque,taranan Çek
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Gönderilmesi işlemlere Kişiler otomatik e-postalar gönderin.
@@ -5389,7 +5393,7 @@
 DocType: Chapter,Chapter Members,Bölüm Üyeleri
 DocType: Sales Team,Contribution (%),Katkı Payı (%)
 DocType: Sales Team,Contribution (%),Katkı Payı (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"'Nakit veya Banka Hesabı' belirtilmediğinden ötürü, Ödeme Girdisi oluşturulmayacaktır"
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"'Nakit veya Banka Hesabı' belirtilmediğinden ötürü, Ödeme Girdisi oluşturulmayacaktır"
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,{0} projesi zaten mevcut
 DocType: Clinical Procedure,Nursing User,Hemşirelik kullanıcısı
 DocType: Employee Benefit Application,Payroll Period,Bordro Dönemi
@@ -5397,6 +5401,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},"{0} Seri Numarası, {1} Batch&#39;a ait değil"
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Sorumluluklar
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Bu fiyat teklifinin geçerlilik süresi sona erdi.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Lütfen bu dokümanı iptal etmek için <a href=""#Form/Employee/{0}"">{0}</a> \ çalışanını silin."
 DocType: Expense Claim Account,Expense Claim Account,Gider Talep Hesabı
 DocType: Account,Capital Work in Progress,Devam Eden Sermaye Çalışması
 DocType: Accounts Settings,Allow Stale Exchange Rates,Eski Döviz Kurlarına İzin Ver
@@ -5488,7 +5494,7 @@
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,ERPNext ile Shopify&#39;ı bağlayın
 DocType: Material Request Item,For Warehouse,Depo için
 DocType: Material Request Item,For Warehouse,Depo için
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Teslimat Notları {0} güncellendi
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Teslimat Notları {0} güncellendi
 DocType: Employee,Offer Date,Teklif Tarihi
 DocType: Employee,Offer Date,Teklif Tarihi
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Özlü Sözler
@@ -5545,7 +5551,7 @@
 DocType: Shipping Rule,Calculate Based On,Tabanlı hesaplayın
 DocType: Contract,Unfulfilled,yerine getirilmemiş
 DocType: Delivery Note Item,From Warehouse,Atölyesi&#39;nden
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Sözü edilen ölçütler için çalışan yok
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Sözü edilen ölçütler için çalışan yok
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Malzeme Listesine Öğe Yok İmalat için
 DocType: Shopify Settings,Default Customer,Varsayılan Müşteri
 DocType: Sales Stage,Stage Name,Sahne adı
@@ -5592,7 +5598,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,İndirim Tutarından sonraki vergi miktarı
 DocType: Patient,Inpatient Status,Yatan Hasta Durumu
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Günlük Çalışma Özet Ayarları
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Seçilen Fiyat Listesi alım satım alanlarına sahip olmalıdır.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Seçilen Fiyat Listesi alım satım alanlarına sahip olmalıdır.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Lütfen Reqd&#39;yi Tarihe Göre Girin
 DocType: Payment Entry,Internal Transfer,İç transfer
 DocType: Asset Maintenance,Maintenance Tasks,Bakım Görevleri
@@ -5633,7 +5639,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Grup tarafından
 DocType: Guardian,Interests,İlgi
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,/ Para birimlerini etkinleştir/devre dışı bırak.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Bazı Maaş Fişleri gönderilemedi
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Bazı Maaş Fişleri gönderilemedi
 DocType: Exchange Rate Revaluation,Get Entries,Girişleri Alın
 DocType: Production Plan,Get Material Request,Malzeme İsteği alın
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Posta Giderleri
@@ -5727,7 +5733,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Ürün {0} için gider hesabı zorunludur
 DocType: BOM,Website Description,Web Sitesi Açıklaması
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Özkaynak Net Değişim
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Lütfen önce iptal edin: Satınalma Faturası {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Lütfen önce iptal edin: Satınalma Faturası {0}
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,İzin verilmedi. Lütfen Servis Ünitesi Tipini devre dışı bırakın
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","{0} E-posta adresi zaten var, benzersiz olmalıdır."
 DocType: Serial No,AMC Expiry Date,AMC Bitiş Tarihi
@@ -5769,7 +5775,7 @@
 DocType: Hotel Room,Hotel Room,Otel odası
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Hesap {0} yapan şirkete ait değil {1}
 DocType: Leave Type,Rounding,yuvarlatma
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,{0} satırındaki Seri Numaraları Teslimat Notu ile eşleşmiyor
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,{0} satırındaki Seri Numaraları Teslimat Notu ile eşleşmiyor
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Dağıtım Miktarı (Pro dereceli)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Daha sonra Fiyatlandırma Kuralları Müşteri, Müşteri Grubu, Bölge, Tedarikçi, Tedarikçi Grubu, Kampanya, Satış Ortağı vb."
 DocType: Student,Guardian Details,Guardian Detayları
@@ -5830,7 +5836,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Stok Ürünü {0} için depo gereklidir
 DocType: Leave Allocation,Unused leaves,Kullanılmayan yapraklar
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Geri Ödeme Girişi Yap
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Bütün bölümler
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Bütün bölümler
 DocType: Healthcare Service Unit,Vacant,Boş
 DocType: Patient,Alcohol Past Use,Alkol Geçmiş Kullanım
 DocType: Fertilizer Content,Fertilizer Content,Gübre İçerik
@@ -5842,7 +5848,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Bu Müşteri Siparişi iptal edilmeden önce İş Emri {0} iptal edilmelidir
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),(Alt-montajlar dahil) patlamış BOM'ları getir
 DocType: Authorization Rule,Applicable To (Employee),(Çalışana) uygulanabilir
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Due Date zorunludur
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Due Date zorunludur
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Attribute için Artım {0} 0 olamaz
 DocType: Employee Benefit Claim,Benefit Type and Amount,Fayda Türü ve Tutarı
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Rezervasyonlu Odalar
@@ -5999,7 +6005,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Satış Komisyonu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Satış Komisyonu
 DocType: Job Offer Term,Value / Description,Değer / Açıklama
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Satır {0}: Sabit Varlık {1} gönderilemedi, zaten {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Satır {0}: Sabit Varlık {1} gönderilemedi, zaten {2}"
 DocType: Tax Rule,Billing Country,Fatura Ülkesi
 DocType: Purchase Order Item,Expected Delivery Date,Beklenen Teslim Tarihi
 DocType: Purchase Order Item,Expected Delivery Date,Beklenen Teslim Tarihi
@@ -6047,12 +6053,13 @@
 DocType: Maintenance Visit,Breakdown,Arıza
 DocType: Travel Itinerary,Vegetarian,Vejetaryen
 DocType: Patient Encounter,Encounter Date,Karşılaşma Tarihi
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Hesap: {0} para ile: {1} seçilemez
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Hesap: {0} para ile: {1} seçilemez
 DocType: Bank Statement Transaction Settings Item,Bank Data,Banka Verileri
 DocType: Purchase Receipt Item,Sample Quantity,Numune Miktarı
 DocType: Bank Guarantee,Name of Beneficiary,Yararlanıcının Adı
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","BOM maliyetini, son değerleme oranı / fiyat listesi oranı / son hammadde alım oranı temel alınarak, Zamanlayıcı aracılığıyla otomatik olarak güncelleyin."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Tedarikçi&gt; Tedarikçi Grubu
 DocType: Bank Reconciliation Detail,Cheque Date,Çek Tarih
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Hesap {0}: Ana hesap {1} şirkete ait değil: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Başarıyla bu şirket ile ilgili tüm işlemleri silindi!
@@ -6082,7 +6089,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Çocuk düğümleri sadece &#39;Grup&#39; tür düğüm altında oluşturulabilir
 DocType: Attendance Request,Half Day Date,Yarım Gün Tarih
 DocType: Academic Year,Academic Year Name,Akademik Yıl Adı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,"{0}, {1} ile işlem yapmasına izin verilmiyor. Lütfen Şirketi değiştirin."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,"{0}, {1} ile işlem yapmasına izin verilmiyor. Lütfen Şirketi değiştirin."
 DocType: Sales Partner,Contact Desc,İrtibat Desc
 DocType: Email Digest,Send regular summary reports via Email.,E-posta yoluyla düzenli özet raporlar gönder.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Gider Talep Tip varsayılan hesap ayarlayın {0}
@@ -6118,7 +6125,7 @@
 DocType: Hotel Room,Hotel Manager,Otel yöneticisi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Alışveriş sepeti için ayarla Vergi Kural
 DocType: Purchase Invoice,Taxes and Charges Added,Eklenen Vergi ve Harçlar
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,"Amortisör Satırı {0}: Sonraki Amortisman Tarihi, Kullanıma hazır Tarih&#39;ten önce olamaz"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,"Amortisör Satırı {0}: Sonraki Amortisman Tarihi, Kullanıma hazır Tarih&#39;ten önce olamaz"
 ,Sales Funnel,Satış Yolu
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Kısaltma zorunludur
 DocType: Project,Task Progress,görev İlerleme
@@ -6132,7 +6139,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Bütün Müşteri Grupları
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,Aylık Birikim
 DocType: Attendance Request,On Duty,Görevde
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} zorunludur. {1} ve {2} için Döviz kaydı oluşturulmayabilir.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} zorunludur. {1} ve {2} için Döviz kaydı oluşturulmayabilir.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},{1} atanması için {0} Personel Planı zaten mevcut
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Vergi şablonu zorunludur.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Hesap {0}: Ana hesap {1} yok
@@ -6222,12 +6229,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,En az bir depo zorunludur
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","UOM, Öğe Grubu, Açıklama ve Saat Sayısı gibi Öğeleri Yapılandırın."
 DocType: Certification Application,Certification Status,Sertifika Durumu
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Pazaryeri
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Pazaryeri
 DocType: Travel Itinerary,Travel Advance Required,Seyahat Öncesi Gerekli
 DocType: Subscriber,Subscriber Name,Abone Adı
 DocType: Serial No,Out of Warranty,Garanti Dışı
 DocType: Serial No,Out of Warranty,Garanti Dışı
-DocType: Cashier Closing,Cashier-closing-,Kasiyer-closing-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Eşlenen Veri Türü
 DocType: BOM Update Tool,Replace,Değiştir
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Hiçbir ürün bulunamadı.
@@ -6324,7 +6330,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Satışlar ve satın alımlar için varsayılan vergi şablonları oluşturulmuştur.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Değerlendirme Sonuç kaydı {0} zaten var.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Örnek: ABCD. #####. İşlemler için seri ayarlanmış ve Parti Numarası belirtilmediyse, bu seriye göre otomatik parti numarası oluşturulacaktır. Bu öğe için her zaman Batch No&#39;dan açıkça bahsetmek isterseniz, bunu boş bırakın. Not: Bu ayar, Stok Ayarları&#39;nda Adlandırma Serisi Önekine göre öncelikli olacaktır."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Lütfen Kurulum&gt; Numaralandırma Serileri ile Katılım için numaralandırma dizisini ayarlayın
 DocType: BOM,Materials Required (Exploded),Gerekli Malzemeler (patlamış)
 DocType: Contract,Party User,Parti Kullanıcısı
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Gruplandırılmış &#39;Şirket&#39; ise lütfen şirket filtresini boş olarak ayarlayın.
@@ -6538,7 +6543,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Sayısı
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Her iki Deneme Süresi Başlangıç Tarihi ve Deneme Dönemi Bitiş Tarihi ayarlanmalıdır
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Ortalama oran
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Ödeme Planındaki Toplam Ödeme Tutarı Grand / Rounded Total&#39;e eşit olmalıdır.
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Ödeme Planındaki Toplam Ödeme Tutarı Grand / Rounded Total&#39;e eşit olmalıdır.
 DocType: Subscription Plan Detail,Plan,Plan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Genel Muhasebe uyarınca Banka Hesap bakiyesi
 DocType: Job Applicant,Applicant Name,Başvuru sahibinin adı
@@ -6617,7 +6622,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sabun ve Deterjan
 DocType: BOM,Show Items,göster Öğeler
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Zaman zaman daha büyük olamaz.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Tüm müşterilere e-posta ile haber vermek istiyor musunuz?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Tüm müşterilere e-posta ile haber vermek istiyor musunuz?
 DocType: Subscription Plan,Billing Interval,Faturalama Aralığı
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
@@ -6628,9 +6633,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,{0} satırı: {1} 0&#39;dan büyük olmalı
 DocType: Assessment Criteria,Assessment Criteria Group,Değerlendirme Ölçütleri Grup
 DocType: Healthcare Settings,Patient Name By,Hasta Adı Tarafından
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},{0} - {1} tarihleri arasında maaşlar için Tahakkuk Günlük Girişi
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},{0} - {1} tarihleri arasında maaşlar için Tahakkuk Günlük Girişi
 DocType: Sales Invoice Item,Enable Deferred Revenue,Ertelenmiş Geliri Etkinleştir
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Birikmiş Amortisman Açılış eşit az olmalıdır {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Birikmiş Amortisman Açılış eşit az olmalıdır {0}
 DocType: Warehouse,Warehouse Name,Depo Adı
 DocType: Warehouse,Warehouse Name,Depo Adı
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,"Gerçek başlangıç tarihi, gerçek bitiş tarihinden az olmalıdır."
@@ -6795,7 +6800,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,{1} notunun {0} çalışanında varsayılan izin yok politikası yoktur
 DocType: Salary Detail,Salary Detail,Maaş Detay
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Önce {0} seçiniz
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,{0} kullanıcı eklendi
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,{0} kullanıcı eklendi
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","Çok katmanlı program söz konusu olduğunda, Müşteriler harcanan esasa göre ilgili kademeye otomatik olarak atanacaktır."
 DocType: Appointment Type,Physician,Doktor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,{0} partisindeki {1} ürününün ömrü doldu
@@ -6956,7 +6961,7 @@
 DocType: Asset,Custodian,bekçi
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Satış Noktası Profili
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,"{0}, 0 ile 100 arasında bir değer olmalıdır"
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},{1} ile {2} arasındaki {0} ödemesi
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},{1} ile {2} arasındaki {0} ödemesi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Teminatsız Krediler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Teminatsız Krediler
 DocType: Cost Center,Cost Center Name,Maliyet Merkezi Adı
@@ -6992,6 +6997,7 @@
 DocType: Employee,Date of Issue,Veriliş tarihi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Satın Alma Gerekliliği Alımı == &#39;EVET&#39; ise Satın Alma Ayarlarına göre, Satın Alma Faturası oluşturmak için kullanıcı {0} öğesi için önce Satın Alma Makbuzu oluşturmalıdır."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Satır # {0}: öğe için Set Tedarikçi {1}
+DocType: Global Defaults,Default Distance Unit,Varsayılan Mesafe Birimi
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Satır {0}: Saat değeri sıfırdan büyük olmalıdır.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Öğe {1} bağlı Web Sitesi Resmi {0} bulunamıyor
 DocType: Issue,Content Type,İçerik Türü
@@ -7055,7 +7061,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Hesabın için Bankamatik bir bilanço hesabı olmalıdır
 DocType: Asset,Naming Series,Seri Adlandırma
 DocType: Vital Signs,Coated,Kaplanmış
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Satır {0}: Faydalı Ömürden Sonra Beklenen Değer Brüt Alım Tutarından daha az olmalıdır
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Satır {0}: Faydalı Ömürden Sonra Beklenen Değer Brüt Alım Tutarından daha az olmalıdır
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Ayarları
 DocType: Leave Block List,Leave Block List Name,İzin engel listesi adı
 DocType: Certified Consultant,Certification Validity,Belgelendirme geçerliliği
@@ -7131,6 +7137,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Banka Başlığı
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Lab Testlerini Görüntüle
 DocType: Hub Users,Hub Users,Hub Kullanıcıları
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Müşteri&gt; Müşteri Grubu&gt; Bölge
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Bakım Tarih
 DocType: Purchase Invoice Item,Rejected Serial No,Seri No Reddedildi
@@ -7146,7 +7153,7 @@
 DocType: SG Creation Tool Course,Max Strength,Maksimum Güç
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Önayarları yükleme
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH .YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Müşteri için {} dağıtım Notu seçilmedi
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Müşteri için {} dağıtım Notu seçilmedi
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,{0} çalışanının maksimum fayda miktarı yok
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Teslimat Tarihine Göre Öğe Seç
 DocType: Grant Application,Has any past Grant Record,Geçmiş Hibe Kayıtları var mı
@@ -7176,7 +7183,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Müşteri Hizmetleri
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Müşteri Hizmetleri
 DocType: BOM,Thumbnail,Başparmak tırnağı
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,E-posta kimlikleri olan hiç kişi bulunamadı.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,E-posta kimlikleri olan hiç kişi bulunamadı.
 DocType: Item Customer Detail,Item Customer Detail,Ürün Müşteri Detayı
 DocType: Notification Control,Prompt for Email on Submission of,Başvuru üzerine E-posta cevabı
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},{0} çalışanının maksimum fayda miktarı {1} değerini aşıyor
@@ -7462,13 +7469,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,Hesap Türü seçili olduğundan Grup gizli olamaz.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,"{0}, {1} düzenlenmiştir. Lütfen yenileyin."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Kullanıcıların şu günlerde İzin almasını engelle.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Ürün Kodu&gt; Ürün Grubu&gt; Marka
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Sadakat Puanı için sınırsız süre dolduğunda, Son Kullanım Süresini boş veya 0 olarak tutun."
 DocType: Asset Maintenance Team,Maintenance Team Members,Bakım Ekibi Üyeleri
 DocType: Loyalty Point Entry,Purchase Amount,Satın alma miktarı
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Tedarikçi Fiyat Teklifi {0} oluşturuldu
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Yıl Sonu Başlangıç Yıl önce olamaz
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Yıl Sonu Başlangıç Yıl önce olamaz
 DocType: Employee Benefit Application,Employee Benefits,Çalışanlara Sağlanan Faydalar
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},{1} Paketli miktar satır {1} deki Ürün {0} a eşit olmalıdır
 DocType: Work Order,Manufactured Qty,Üretilen Miktar
@@ -7485,6 +7491,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Toplu Numaraları Seç
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,GSTIN&#39;e
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Müşterilere artırılan faturalar
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lütfen İnsan Kaynağında Çalışan Adlandırma Sistemini Kurun&gt; HR Ayarları
 DocType: Healthcare Settings,Invoice Appointments Automatically,Fatura Randevuları Otomatik Olarak
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Proje Kimliği
 DocType: Salary Component,Variable Based On Taxable Salary,Vergilendirilebilir Maaşlara Dayalı Değişken
@@ -7537,7 +7544,7 @@
 DocType: POS Profile,Account for Change Amount,Değişim Miktarı Hesabı
 DocType: QuickBooks Migrator,Connecting to QuickBooks,QuickBooks&#39;a Bağlanma
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Toplam Kazanç / Zarar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Şirket İçi Fatura için Geçersiz Şirket.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Şirket İçi Fatura için Geçersiz Şirket.
 DocType: Purchase Invoice,input service,girdi hizmeti
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Satır {0}: Parti / Hesap ile eşleşmiyor {1} / {2} içinde {3} {4}
 DocType: Employee Promotion,Employee Promotion,Çalışan Tanıtımı
@@ -7677,7 +7684,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Konaklama için Tercih Edilen Alan
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analitikler
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Sepet Boş
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Lütfen Eğitimde Eğitmen Adlandırma Sistemi&gt; Eğitim Ayarları&#39;nı kurun
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Öğe {0} hiçbir Seri Numarası içermez. Sadece serilleşmiş öğeler \ Seri No&#39;ya göre teslimat yapabilir
 DocType: Vehicle,Model,model
@@ -7709,7 +7715,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Değiştirecek bir şey yok
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Bir csv dosyası seçiniz
 DocType: Holiday List,Total Holidays,Toplam Tatiller
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Sevk için e-posta şablonu eksik. Lütfen Teslimat Ayarları&#39;nda bir tane ayarlayın.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Sevk için e-posta şablonu eksik. Lütfen Teslimat Ayarları&#39;nda bir tane ayarlayın.
 DocType: Student Leave Application,Mark as Present,Şimdiki olarak işaretle
 DocType: Supplier Scorecard,Indicator Color,Gösterge Rengi
 DocType: Purchase Order,To Receive and Bill,Teslimat ve Ödeme
@@ -7719,7 +7725,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Tasarımcı
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Şartlar ve Koşullar Şablon
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Şartlar ve Koşullar Şablon
-DocType: Serial No,Delivery Details,Teslim Bilgileri
+DocType: Delivery Trip,Delivery Details,Teslim Bilgileri
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Satır {0} da Vergiler Tablosunda tip {1} için Maliyet Merkezi gereklidir
 DocType: Program,Program Code,Program Kodu
 DocType: Terms and Conditions,Terms and Conditions Help,Şartlar ve Koşullar Yardım
@@ -7744,7 +7750,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Teslim zamanı Günü
 DocType: Cash Flow Mapping,Is Income Tax Expense,Gelir Vergisi Gideridir?
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Siparişiniz teslimat için dışarıda!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Satır # {0}: Tarihi Gönderme satın alma tarihi olarak aynı olmalıdır {1} varlığın {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Satır # {0}: Tarihi Gönderme satın alma tarihi olarak aynı olmalıdır {1} varlığın {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Öğrenci Enstitü Pansiyonunda ikamet ediyorsa bunu kontrol edin.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Yukarıdaki tabloda Satış Siparişleri giriniz
 ,Stock Summary,Stok Özeti
diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv
index 84aeec5..e71fb15 100644
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Період Назва
 DocType: Employee,Salary Mode,Режим виплати
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Реєструйся
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Реєструйся
 DocType: Patient,Divorced,У розлученні
 DocType: Support Settings,Post Route Key,Поштовий ключ маршруту
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Дозволити повторення номенклатурних позицій у операції
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Новий обмінний курс
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Валюта необхідна для Прайс-листа {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Розраховуватиметься у операції
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Постачальник&gt; Тип постачальника
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Контакти з клієнтами
 DocType: Patient Appointment,Check availability,Перевірте наявність
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Показати відкритий
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Серії оновлені успішно
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Перевірити
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} в рядку {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} в рядку {1}
 DocType: Asset Finance Book,Depreciation Start Date,Дата початку амортизації
 DocType: Pricing Rule,Apply On,Віднести до
 DocType: Item Price,Multiple Item prices.,Кілька ціни товару.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Лабораторна рецептура
 ,Delay Days,Затримки днів
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,послуги Expense
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Серійний номер: {0} вже згадується в продажу рахунку: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Серійний номер: {0} вже згадується в продажу рахунку: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Рахунок-фактура
 DocType: Purchase Invoice Item,Item Weight Details,Деталі ваги Деталі
 DocType: Asset Maintenance Log,Periodicity,Періодичність
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Бухгалтер
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Ціновий продаж
 DocType: Patient,Tobacco Current Use,Використання тютюну
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Дата початку та дата завершення збігаються з картою роботи <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Рейтинг продажів
 DocType: Cost Center,Stock User,Складській користувач
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Зв'язані
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,"Дата Відвідуваність не може бути менше, ніж приєднання дати працівника"
 DocType: Grading Scale,Grading Scale Name,Градація шкали Ім&#39;я
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Додайте користувачів до Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Додайте користувачів до Marketplace
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Це корінь рахунку і не можуть бути змінені.
 DocType: Sales Invoice,Company Address,адреса компанії
 DocType: BOM,Operations,Операції
@@ -322,7 +322,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Qty
 DocType: Production Plan,Material Request Detail,Детальний опис матеріалів
 DocType: Selling Settings,Default Quotation Validity Days,Дня довіреності щодо котирувань
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Щоб включити податок у рядку {0} у розмірі Item, податки в рядках {1} повинні бути також включені"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Щоб включити податок у рядку {0} у розмірі Item, податки в рядках {1} повинні бути також включені"
 DocType: SMS Center,SMS Center,SMS-центр
 DocType: Payroll Entry,Validate Attendance,Підтвердити відвідуваність
 DocType: Sales Invoice,Change Amount,Сума змін
@@ -441,7 +441,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Інтервал між рядками для суми прописом
 DocType: Vehicle,Additional Details,додаткові подробиці
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Не введене опис
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Постачальник&gt; Група постачальників
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Запит на покупку.
 DocType: POS Closing Voucher Details,Collected Amount,Зібрана сума
 DocType: Lab Test,Submitted Date,Дата відправлення
@@ -486,7 +485,7 @@
 DocType: Student Admission,Student Admission,прийому студентів
 ,Terretory,Територія
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Пункт {0} скасовується
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Амортизаційна рядок {0}: Дата початку амортизації вводиться як минула дата
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Амортизаційна рядок {0}: Дата початку амортизації вводиться як минула дата
 DocType: Contract Template,Fulfilment Terms and Conditions,Умови та умови виконання
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Замовлення матеріалів
 DocType: Bank Reconciliation,Update Clearance Date,Оновити Clearance дату
@@ -543,6 +542,7 @@
 DocType: Accounts Settings,Settings for Accounts,Налаштування для рахунків
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Номер рахунку постачальника існує у вхідному рахунку {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Управління деревом Відповідальних з продажу.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.","Неможливо обробити маршрут, оскільки налаштування Карт Google вимкнено."
 DocType: Job Applicant,Cover Letter,супровідний лист
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,"""Неочищені"" чеки та депозити"
 DocType: Item,Synced With Hub,Синхронізуються з Hub
@@ -602,7 +602,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Нове значення вартості активів
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Курс, за яким валюта покупця конвертується у базову валюту покупця"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Курс планування Інструмент
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Рядок # {0}: Вхідний рахунок-фактура не може бути зроблений щодо існуючого активу {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Рядок # {0}: Вхідний рахунок-фактура не може бути зроблений щодо існуючого активу {1}
 DocType: Crop Cycle,LInked Analysis,Занурений аналіз
 DocType: POS Closing Voucher,POS Closing Voucher,Закритий ваучер POS
 DocType: Contract,Lapsed,Померло
@@ -637,6 +637,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} не надійшли в курсі {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Ім&#39;я студента:
 DocType: POS Closing Voucher Details,Difference,Різниця
+DocType: Delivery Settings,Delay between Delivery Stops,Затримка між зупинками доставки
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Серійний номер {0} не належить накладній {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Здається, проблема з конфігурацією GoCardless сервера. Не хвилюйтеся, у випадку невдачі сума повернеться на ваш рахунок."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -697,7 +698,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Кількість та ціна
 DocType: Delivery Note,% Installed,% Встановлено
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,"Кабінети / лабораторії і т.д., де лекції можуть бути заплановані."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Облігації компаній обох компаній повинні відповідати операціям &quot;Інтер&quot;.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Облігації компаній обох компаній повинні відповідати операціям &quot;Інтер&quot;.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,"Будь ласка, введіть назву компанії в першу чергу"
 DocType: Travel Itinerary,Non-Vegetarian,Не-вегетаріанець
 DocType: Purchase Invoice,Supplier Name,Назва постачальника
@@ -784,7 +785,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Знятий з дат
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Досить частини для зборки
 DocType: POS Profile User,POS Profile User,Користувач POS Профіль
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Рядок {0}: Дата початку амортизації потрібна
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Рядок {0}: Дата початку амортизації потрібна
 DocType: Purchase Invoice Item,Service Start Date,Дата початку служби
 DocType: Subscription Invoice,Subscription Invoice,Рахунок передплати
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Пряма прибуток
@@ -853,7 +854,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Скорочення вже використовується для іншої компанії
 DocType: Selling Settings,Default Customer Group,Група клієнтів за замовчуванням
 DocType: Employee,IFSC Code,IFSC Code
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Дата початку та дата завершення збігаються з картою роботи <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Якщо відключити, поле ""Заокруглений підсумок' не буде відображатися у жодній операції"
 DocType: BOM,Operating Cost,Експлуатаційні витрати
 DocType: Crop,Produced Items,Вироблені предмети
@@ -905,7 +905,7 @@
 DocType: Supplier,Prevent RFQs,Запобігання тендерних пропозицій
 DocType: Hub User,Hub User,Hub User
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Зробити замовлення на продаж
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},"Сплав заробітної плати, поданий на період з {0} до {1}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},"Сплав заробітної плати, поданий на період з {0} до {1}"
 DocType: Project Task,Project Task,Проект Завдання
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Викуплені окуляри
 ,Lead Id,Lead Id
@@ -1036,7 +1036,7 @@
 DocType: Fee Validity,Max number of visit,Максимальна кількість відвідувань
 ,Hotel Room Occupancy,Приміщення номеру готелю
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Табель робочого часу створено:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},"Будь ласка, встановіть Cash замовчуванням або банківського рахунку в режимі з оплати {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},"Будь ласка, встановіть Cash замовчуванням або банківського рахунку в режимі з оплати {0}"
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,зараховувати
 DocType: GST Settings,GST Settings,налаштування GST
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},"Валюта повинна бути такою ж, як Валюта цін: {0}"
@@ -1090,7 +1090,7 @@
 DocType: Vehicle Log,Service Details,сервіс Детальніше
 DocType: Lab Test Template,Grouped,Групувати
 DocType: Selling Settings,Delivery Note Required,Необхідна накладна
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Подача заробітної плати ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Подача заробітної плати ...
 DocType: Bank Guarantee,Bank Guarantee Number,Банківська гарантія Кількість
 DocType: Bank Guarantee,Bank Guarantee Number,Банківська гарантія Кількість
 DocType: Assessment Criteria,Assessment Criteria,критерії оцінки
@@ -1116,13 +1116,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Оплату вже створено
 DocType: Request for Quotation,Get Suppliers,Отримайте Постачальників
 DocType: Purchase Receipt Item Supplied,Current Stock,Наявність на складі
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Рядок # {0}: Asset {1} не пов&#39;язаний з п {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Рядок # {0}: Asset {1} не пов&#39;язаний з п {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Попередній перегляд Зарплатного розрахунку
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Рахунок {0} був введений кілька разів
 DocType: Account,Expenses Included In Valuation,"Витрати, що включаються в оцінку"
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Ви можете оновити лише якщо членство закінчується протягом 30 днів
 DocType: Shopping Cart Settings,Show Stock Availability,Показати доступність на складі
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Встановити {0} в категорії активів {1} або компанії {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Встановити {0} в категорії активів {1} або компанії {2}
 DocType: Location,Longitude,Довгота
 ,Absent Student Report,Відсутня Student Report
 DocType: Crop,Crop Spacing UOM,Розміщення посіву UOM
@@ -1195,7 +1195,7 @@
 DocType: Soil Texture,Sand,Пісок
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Енергія
 DocType: Opportunity,Opportunity From,Нагода від
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,"Рядок {0}: {1} Серійні номери, необхідні для пункту {2}. Ви надали {3}."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,"Рядок {0}: {1} Серійні номери, необхідні для пункту {2}. Ви надали {3}."
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,"Будь ласка, виберіть таблицю"
 DocType: BOM,Website Specifications,Характеристики веб-сайту
 DocType: Special Test Items,Particulars,Особливості
@@ -1287,7 +1287,7 @@
 DocType: Item,Items with higher weightage will be shown higher,"Елементи з більш високою weightage буде показано вище,"
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Лабораторні тести та життєво важливі ознаки
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Деталі банківської виписки
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Рядок # {0}: Asset {1} повинен бути представлений
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Рядок # {0}: Asset {1} повинен бути представлений
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Жоден працівник не знайдено
 DocType: Item,If subcontracted to a vendor,Якщо підряджено постачальникові
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Студентська група вже була поновлена.
@@ -1342,7 +1342,6 @@
 DocType: Loyalty Program Collection,Tier Name,Рядок Найменування
 DocType: HR Settings,Enter retirement age in years,Введіть вік виходу на пенсію в роках
 DocType: Crop,Target Warehouse,Склад призначення
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Будь-ласка, встановіть серію імен для {0} через Налаштування&gt; Налаштування&gt; Серія імен"
 DocType: Payroll Employee Detail,Payroll Employee Detail,Розрахунок заробітної плати працівника
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,"Будь ласка, виберіть склад"
 DocType: Cheque Print Template,Starting location from left edge,Лівий відступ
@@ -1432,7 +1431,7 @@
 DocType: Work Order,Plan material for sub-assemblies,План матеріал для суб-вузлів
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Торгові партнери та території
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,Документ Норми витрат {0} повинен бути активним
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,"Немає елементів, доступних для передачі"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,"Немає елементів, доступних для передачі"
 DocType: Employee Boarding Activity,Activity Name,Назва активності
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Змінити дату випуску
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Кількість готової продукції <b>{0}</b> та для кількості <b>{1}</b> не може бути іншою
@@ -1662,6 +1661,7 @@
 DocType: Project,First Email,Перша електронна пошта
 DocType: Company,Exception Budget Approver Role,"Виняток роль, що затверджує бюджет"
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date",Після встановлення цей рахунок-фактура буде призупинено до встановленої дати
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Зарезервовано Склад в замовлення клієнта / Склад готової продукції
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Продаж Сума
 DocType: Repayment Schedule,Interest Amount,відсотки Сума
@@ -1673,7 +1673,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Рекорди
 DocType: Asset,Scrapped,знищений
 DocType: Item,Item Defaults,Стандартні значення
-DocType: Purchase Invoice,Returns,Повернення
+DocType: Cashier Closing,Returns,Повернення
 DocType: Job Card,WIP Warehouse,"Склад ""В роботі"""
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Серійний номер {0} на контракті обслуговування  до {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,вербування
@@ -1687,7 +1687,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Тип передачі
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Витрати на збут
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клієнт&gt; Група клієнтів&gt; Територія
 DocType: Diagnosis,Diagnosis,Діагностика
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Стандартний Купівля
 DocType: Attendance Request,Explanation,Пояснення
@@ -1700,7 +1699,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Пункти замовлення на купівлю прострочені
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Поштовий індекс
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Замовлення клієнта {0} {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Виберіть обліковий запис процентних доходів у кредиті {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Виберіть обліковий запис процентних доходів у кредиті {0}
 DocType: Opportunity,Contact Info,Контактна інформація
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Створення Руху ТМЦ
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Неможливо рекламувати працівника зі статусом &quot;ліворуч&quot;
@@ -1712,7 +1711,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Рахунок не може бути зроблено за нульову годину оплати
 DocType: Company,Date of Commencement,Дата початку
 DocType: Sales Person,Select company name first.,Виберіть назву компанії в першу чергу.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},Електронна пошта надіслано {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},Електронна пошта надіслано {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Пропозиції отримані від постачальників
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Замініть BOM та оновіть останню ціну у всіх BOMs
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Для {0} | {1} {2}
@@ -1734,7 +1733,7 @@
 DocType: Asset Movement,From Employee,Від працівника
 DocType: Driver,Cellphone Number,Номер мобільного телефону
 DocType: Project,Monitor Progress,Прогрес монітора
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Увага: Система не перевірятиме overbilling так як суми по позиції {0} в {1} дорівнює нулю
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Увага: Система не перевірятиме overbilling так як суми по позиції {0} в {1} дорівнює нулю
 DocType: Journal Entry,Make Difference Entry,Зробити запис Difference
 DocType: Supplier Quotation,Auto Repeat Section,Автоматична повторна секція
 DocType: Upload Attendance,Attendance From Date,Відвідуваність з дати
@@ -1837,7 +1836,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ряд # {0}: Відхилену к-сть не можна вводити у Повернення постачальнику
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Зміна Групи Клієнтів для обраного Клієнта не допускається.
 ,Purchase Order Items To Be Billed,"Позиції Замовлення на придбання, на які не виставлені рахунки"
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Оновлення очікуваного часу прибуття.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Оновлення очікуваного часу прибуття.
 DocType: Program Enrollment Tool,Enrollment Details,Подробиці про реєстрацію
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Неможливо встановити декілька елементів за промовчанням для компанії.
 DocType: Purchase Invoice Item,Net Rate,Нетто-ставка
@@ -1851,7 +1850,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Залишити тип є мадатографічним
 DocType: Support Settings,Close Issue After Days,Закрити Issue Після днів
 ,Eway Bill,Евей Білл
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Для того, щоб додати користувачів до Marketplace, вам потрібно бути користувачем з Роль менеджера системи та менеджера елементів."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,"Для того, щоб додати користувачів до Marketplace, вам потрібно бути користувачем з Роль менеджера системи та менеджера елементів."
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Залиште порожнім, якщо розглядати для всіх галузей"
 DocType: Job Opening,Staffing Plan,Кадровий план
 DocType: Bank Guarantee,Validity in Days,Термін у днях
@@ -1873,7 +1872,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Дублікат ряд {0} з такою ж {1}
 DocType: Marketplace Settings,Disable Marketplace,Вимкнути Marketplace
 ,Trial Balance,Оборотно-сальдова відомість
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Фінансовий рік {0} не знайдений
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Фінансовий рік {0} не знайдений
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Налаштування працівників
 DocType: Hotel Room Reservation,Hotel Reservation User,Бронювання готелів користувачем
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,"Будь ласка, виберіть префікс в першу чергу"
@@ -1981,7 +1980,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Не вдалося ввійти
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Актив {0} створено
 DocType: Special Test Items,Special Test Items,Спеціальні тестові елементи
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Щоб зареєструватися в Marketplace, вам потрібно бути користувачем з Роль менеджера системи та менеджера елементів."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Щоб зареєструватися в Marketplace, вам потрібно бути користувачем з Роль менеджера системи та менеджера елементів."
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Спосіб платежу
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Відповідно до вашої призначеної структури заробітної плати ви не можете подати заявку на отримання пільг
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Зображення для веб-сайту має бути загальнодоступним файлом або адресою веб-сайту
@@ -1993,7 +1992,7 @@
 DocType: Warehouse,Warehouse Contact Info,Контактні дані складу
 DocType: Payment Entry,Write Off Difference Amount,Списання різниця в
 DocType: Volunteer,Volunteer Name,Ім&#39;я волонтера
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Були виявлені рядки з дубльованими термінами в інших рядках: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Були виявлені рядки з дубльованими термінами в інших рядках: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: Не знайдено електронної пошти працівника, тому e-mail не відправлено"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Структура заробітної плати не призначена працівнику {0} на певну дату {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Правило доставки не застосовується до країни {0}
@@ -2084,6 +2083,7 @@
 DocType: Salary Component,Earning,Дохід
 DocType: Supplier Scorecard,Scoring Criteria,Критерії оцінки
 DocType: Purchase Invoice,Party Account Currency,Валюта рахунку контрагента
+DocType: Delivery Trip,Total Estimated Distance,Загальна приблизна відстань
 ,BOM Browser,Переглядач норм витрат
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,"Будь ласка, оновіть свій статус для цієї навчальної події"
 DocType: Item Barcode,EAN,EAN
@@ -2122,7 +2122,7 @@
 DocType: Activity Cost,Projects,Проекти
 DocType: Payment Request,Transaction Currency,Валюта операції
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},З {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Деякі електронні листи недійсні
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Деякі електронні листи недійсні
 DocType: Work Order Operation,Operation Description,Операція Опис
 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.,Неможливо змінити дату початку та закінчення фінансового року після збереження.
 DocType: Quotation,Shopping Cart,Магазинний кошик
@@ -2146,7 +2146,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Чиста зміна в основних фондів
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Кількість учасників
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Залиште порожнім, якщо для всіх посад"
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Нарахування типу &quot;Актуальні &#39;в рядку {0} не можуть бути включені в п Оцінити
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Нарахування типу &quot;Актуальні &#39;в рядку {0} не можуть бути включені в п Оцінити
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Макс: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,З DateTime
 DocType: Shopify Settings,For Company,За компанію
@@ -2160,7 +2160,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,"Були помилки, створюючи Розклад курсу"
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Перший підтверджувач витрат у списку буде встановлено як затверджувач витрат за замовчуванням.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,не може бути більше ніж 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Щоб зареєструватися в Marketplace, вам потрібно бути іншим користувачем, окрім адміністратора, з Менеджером систем та Ролика."
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,"Щоб зареєструватися в Marketplace, вам потрібно бути іншим користувачем, окрім адміністратора, з Менеджером систем та Ролика."
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Номенклатурна позиція {0} не є інвентарною
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Позапланові
@@ -2189,7 +2189,7 @@
 DocType: HR Settings,Employee Settings,Налаштування співробітників
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Завантаження платіжної системи
 ,Batch-Wise Balance History,Попартійна історія залишків
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Рядок # {0}: неможливо встановити рейтинг, якщо сума є більшою, ніж сума рахунку для пункту {1}."
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"Рядок # {0}: неможливо встановити рейтинг, якщо сума є більшою, ніж сума рахунку для пункту {1}."
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Налаштування друку оновлено у відповідності до формату друку
 DocType: Package Code,Package Code,код пакету
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Учень
@@ -2423,7 +2423,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} вакансій та {1} бюджет на {2} вже заплановані для дочірніх компаній {3}. \ Ви можете планувати лише {4} вакансій і бюджету {5} за планом персоналу {6} для материнської компанії {3}.
 DocType: HR Settings,Stop Birthday Reminders,Стоп нагадування про дні народження
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},"Будь ласка, встановіть за замовчуванням Payroll розрахунковий рахунок в компанії {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},"Будь ласка, встановіть за замовчуванням Payroll розрахунковий рахунок в компанії {0}"
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Отримати фінансовий розрив податків і стягує дані Amazon
 DocType: SMS Center,Receiver List,Список отримувачів
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Пошук товару
@@ -2493,7 +2493,7 @@
 DocType: Vital Signs,Constipated,Запор
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Згідно вхідного рахунку-фактури {0} від {1}
 DocType: Customer,Default Price List,Прайс-лист за замовчуванням
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Рух активів {0} створено
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Рух активів {0} створено
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Немає елементів.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ви не можете видаляти фінансовий рік {0}. Фінансовий рік {0} встановлено за замовчанням в розділі Глобальні параметри
 DocType: Share Transfer,Equity/Liability Account,Обліковий капітал / зобов&#39;язання
@@ -2633,6 +2633,7 @@
 DocType: Blanket Order,Order Type,Тип замовлення
 ,Item-wise Sales Register,Попозиційний реєстр продаж
 DocType: Asset,Gross Purchase Amount,Загальна вартість придбання
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код товару&gt; Група предметів&gt; Бренд
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Відкриття залишків
 DocType: Asset,Depreciation Method,Метод нарахування зносу
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Це податок Включено в базовій ставці?
@@ -2716,7 +2717,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,"Дія, якщо річний бюджет перевищено на ПО"
 DocType: Student Leave Application,Student Leave Application,Студент Залишити заявку
 DocType: Item,Will also apply for variants,Буде також застосовуватися для варіантів
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Asset не може бути скасована, так як вона вже {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Asset не може бути скасована, так як вона вже {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Співробітник {0} на півдня на {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},"Всього тривалість робочого часу не повинна бути більше, ніж максимальний робочий час {0}"
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,на
@@ -2740,6 +2741,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Завантажте дані
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Максимальна дозволена відпустка у вигляді відпустки {0} {1}
 DocType: SMS Center,Create Receiver List,Створити список отримувачів
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Доступна для використання Дата повинна бути після дати придбання
 DocType: Vehicle,Wheels,колеса
 DocType: Packing Slip,To Package No.,Для пакету №
 DocType: Patient Relation,Family,Сім&#39;я
@@ -2753,7 +2755,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Платіжна валюта повинна дорівнювати валюті чи валюті облікового запису партії компанії за умовчанням
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Вказує, що пакет є частиною цієї поставки (тільки проекту)"
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Рядок {0}: Дата закінчення не може бути до дати опублікування
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Рядок {0}: Дата закінчення не може бути до дати опублікування
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Створити Оплату
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},"Кількість для пункту {0} має бути менше, ніж {1}"
 ,Sales Invoice Trends,Динаміка вихідних рахунків
@@ -2826,7 +2828,7 @@
 DocType: Guardian,Guardian Interests,хранителі Інтереси
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Оновити ім&#39;я / номер облікового запису
 DocType: Naming Series,Current Value,Поточна вартість
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Кілька фінансових років існують на дату {0}. Будь ласка, встановіть компанію в фінансовому році"
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Кілька фінансових років існують на дату {0}. Будь ласка, встановіть компанію в фінансовому році"
 DocType: Education Settings,Instructor Records to be created by,"Інструктор записів, які потрібно створити"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} створено
 DocType: GST Account,GST Account,Обліковий запис GST
@@ -2843,7 +2845,7 @@
 DocType: Sales Person,Name and Employee ID,Ім'я та ідентифікатор працівника
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,"Дата ""До"" не може бути менша за дату створення"
 DocType: Website Item Group,Website Item Group,Група об’єктів веб-сайту
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"Жодний звіт про заробітну плату, який не визначено для подання за вказаним вище критерієм, АБО ОГЛЯДНИЙ ОГЛЯД, який вже подано"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,"Жодний звіт про заробітну плату, який не визначено для подання за вказаним вище критерієм, АБО ОГЛЯДНИЙ ОГЛЯД, який вже подано"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Мита і податки
 DocType: Projects Settings,Projects Settings,Налаштування проектів
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,"Будь ласка, введіть дату Reference"
@@ -2852,7 +2854,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Поставлена к-сть
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Позиція Замовлення матеріалів
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,"Будь ласка, спочатку скасуйте квитанцію про закупівлю {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,"Будь ласка, спочатку скасуйте квитанцію про закупівлю {0}"
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Дерево товарні групи.
 DocType: Production Plan,Total Produced Qty,Загальний обсяг випуску
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можна посилатися на номер рядка, що перевищує або рівний поточному для цього типу стягнення"
@@ -2962,6 +2964,7 @@
 ,Vehicle Expenses,Витрати транспортних засобів
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Створіть лабораторні випробування (-и) на рахунку-фактурі для продажу
 DocType: Serial No,Invoice Details,Інформація про рахунки
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Увімкніть налаштування Карт Google для оцінки та оптимізації маршрутів
 DocType: Grant Application,Show on Website,Показати на веб-сайті
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Почніть з
 DocType: Hub Tracked Item,Hub Category,Категорія концентратора
@@ -3002,7 +3005,7 @@
 DocType: Inpatient Record,B Positive,B Позитивний
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Максимальна вигода працівника {0} перевищує {1} сумою {2} попередньої заявленої \ суми
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Рядок # {0}: Кількість повинна бути 1, оскільки елемент є основним засобом. Будь ласка, створюйте декілька рядків, якщо кількість більше 1."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Рядок # {0}: Кількість повинна бути 1, оскільки елемент є основним засобом. Будь ласка, створюйте декілька рядків, якщо кількість більше 1."
 DocType: Leave Block List Allow,Leave Block List Allow,Список блокування відпусток дозволяє
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Абревіатура не може бути пропущена або заповнена пробілами
 DocType: Patient Medical Record,Patient Medical Record,Пацієнтська медична довідка
@@ -3037,7 +3040,7 @@
 DocType: Workstation,Wages per hour,Заробітна плата на годину
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Залишок в партії {0} стане негативним {1} для позиції {2} на складі {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Наступне Замовлення матеріалів буде створено автоматично згідно рівня дозамовлення для даної позиції
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Рахунок {0} є неприпустимим. Валюта рахунку повинні бути {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Рахунок {0} є неприпустимим. Валюта рахунку повинні бути {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Від дати {0} не може бути після звільнення працівника Дата {1}
 DocType: Supplier,Is Internal Supplier,Є внутрішнім постачальником
 DocType: Employee,Create User Permission,Створити праву користувача
@@ -3183,7 +3186,7 @@
 DocType: Account,Fixed Asset,Основних засобів
 DocType: Amazon MWS Settings,After Date,Після дати
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Серійний Інвентар
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Невірний {0} для рахунку компанії &quot;Інтер&quot;.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Невірний {0} для рахунку компанії &quot;Інтер&quot;.
 ,Department Analytics,Департамент аналітики
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Електронна пошта не знайдено у контакті за замовчуванням
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Генерувати таємницю
@@ -3196,7 +3199,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Програма в структурі плати та група студентів {0} відрізняються.
 DocType: Bank Statement Transaction Entry,Receivable Account,Рахунок дебеторки
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Дійсний з дати повинен бути меншим ніж Дійсний до дати.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Рядок # {0}: Asset {1} вже {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Рядок # {0}: Asset {1} вже {2}
 DocType: Quotation Item,Stock Balance,Залишки на складах
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Замовлення клієнта в Оплату
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,генеральний директор
@@ -3238,6 +3241,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Дебет вимагається
 DocType: Clinical Procedure,Inpatient Record,Стаціонарна запис
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets допоможе відстежувати час, вартість і виставлення рахунків для Активності зробленої вашої команди"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Постачальник&gt; Тип постачальника
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Прайс-лист закупівлі
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Дата здійснення операції
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Шаблони постачальників показників змінної.
@@ -3281,7 +3285,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Обмін Прибуток / збиток
 DocType: Opportunity,Lost Reason,Забули Причина
 DocType: Amazon MWS Settings,Enable Amazon,Увімкнути Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Рядок № {0}: рахунок {1} не належить компанії {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Рядок № {0}: рахунок {1} не належить компанії {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Не вдається знайти DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Нова адреса
 DocType: Quality Inspection,Sample Size,Обсяг вибірки
@@ -3393,7 +3397,7 @@
 DocType: Water Analysis,Origin,Походження
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Цей документ знаходиться над межею {0} {1} для елемента {4}. Ви робите інший {3} проти того ж {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,"Будь ласка, встановіть повторювані після збереження"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,Вибрати рахунок для суми змін
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,Вибрати рахунок для суми змін
 DocType: Purchase Invoice,Price List Currency,Валюта прайс-листа
 DocType: Naming Series,User must always select,Користувач завжди повинен вибрати
 DocType: Stock Settings,Allow Negative Stock,Дозволити від'ємні залишки
@@ -3435,7 +3439,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,"Ви впевнені, що хочете скасувати цю зустріч?"
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Пакет бронювання номерів у готелі
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Воронка продаж
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},"Будь ласка, встановіть обліковий запис стандартним записом в компоненті Зарплатний {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},"Будь ласка, встановіть обліковий запис стандартним записом в компоненті Зарплатний {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Обов&#39;язково На
 DocType: Rename Tool,File to Rename,Файл Перейменувати
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Будь ласка, виберіть Норми для елемента в рядку {0}"
@@ -3456,7 +3460,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Вартість куплених виробів
 DocType: Employee Separation,Employee Separation Template,Шаблон розділення співробітників
 DocType: Selling Settings,Sales Order Required,Необхідне Замовлення клієнта
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Стати продавцем
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Стати продавцем
 DocType: Purchase Invoice,Credit To,Кредит на
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Активні Lead-и / Клієнти
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,"Залиште порожнім, щоб використовувати стандартний формат нотатки доставки"
@@ -3498,7 +3502,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Зробити податковий шаблон
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Форум користувачів
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Сировина не може бути порожнім.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Рядок # {0} (таблиця платежів): сума має бути від&#39;ємною
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Рядок # {0} (таблиця платежів): сума має бути від&#39;ємною
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Не вдалося оновити запаси, рахунок-фактура містить позиції прямої доставки."
 DocType: Contract,Fulfilment Status,Статус виконання
 DocType: Lab Test Sample,Lab Test Sample,Лабораторія випробувань зразка
@@ -3638,7 +3642,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Дата документа
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Плата записи Створено - {0}
 DocType: Asset Category Account,Asset Category Account,Категорія активів Рахунок
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Рядок # {0} (таблиця платежів): сума повинна бути позитивною
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Рядок # {0} (таблиця платежів): сума повинна бути позитивною
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете виробляти більше Пункт {0}, ніж кількість продажів Замовити {1}"
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Виберіть значення атрибута
 DocType: Purchase Invoice,Reason For Issuing document,Причина для видачі документа
@@ -3693,7 +3697,7 @@
 DocType: Purchase Receipt,Time at which materials were received,"Час, в якому були отримані матеріали"
 DocType: Products Settings,Products per Page,Продукція на сторінку
 DocType: Stock Ledger Entry,Outgoing Rate,Вихідна ставка
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,або
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,або
 DocType: Sales Order,Billing Status,Статус рахунків
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Повідомити про проблему
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Комунальні витрати
@@ -3721,7 +3725,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Декларація про звільнення від сплати податків працівника
 DocType: Payment Entry,Cheque/Reference Date,Дата Чеку / Посилання
 DocType: Purchase Invoice,Total Taxes and Charges,Податки та збори разом
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Доступна для використання дата вводиться як минула дата
 DocType: Employee,Emergency Contact,Для екстреного зв&#39;язку
 DocType: Bank Reconciliation Detail,Payment Entry,Оплата
 ,sales-browser,переглядач-продажів
@@ -3767,6 +3770,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Повернення (кредитна заборгованість)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Почати роботу
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Серійний номер для активу потрібен {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Будь-ласка, встановіть серію імен для {0} через Налаштування&gt; Налаштування&gt; Серія імен"
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Відключений шаблон не може бути шаблоном за замовчуванням
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Для рядка {0}: введіть заплановане число
 DocType: Account,Income Account,Рахунок доходів
@@ -3780,6 +3784,7 @@
 DocType: Loyalty Program,Help Section,Розділ довідки
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Попередня
 DocType: Appraisal Goal,Key Responsibility Area,Ключ Відповідальність Площа
+DocType: Delivery Trip,Distance UOM,Відстань УОМ
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Студентські Порції допомагають відслідковувати відвідуваність, оцінки та збори для студентів"
 DocType: Payment Entry,Total Allocated Amount,Загальна розподілена сума
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Встановити рахунок товарно-матеріальних запасів за замовчуванням для безперервної інвентаризації
@@ -3821,7 +3826,7 @@
 DocType: Item Supplier,Item Supplier,Пункт Постачальник
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,"Будь ласка, введіть код позиції, щоб отримати номер партії"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},"Будь ласка, виберіть значення для {0} quotation_to {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Немає елементів для переміщення
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Немає елементів для переміщення
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Всі адреси.
 DocType: Company,Stock Settings,Налаштування інвентаря
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Об&#39;єднання можливе тільки, якщо такі властивості однакові в обох звітах. Є група, кореневої тип, компанія"
@@ -4107,7 +4112,7 @@
 DocType: Patient,Personal and Social History,Особиста та суспільна історія
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Користувач {0} створений
 DocType: Fee Schedule,Fee Breakup for each student,Платіжний розрив для кожного студента
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Всього аванс ({0}) за замовленням {1} не може бути більше, ніж загальний підсумок ({2})"
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),"Всього аванс ({0}) за замовленням {1} не може бути більше, ніж загальний підсумок ({2})"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Виберіть щомісячний розподіл до нерівномірно розподілених цілей за місяць.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Змінити код
 DocType: Purchase Invoice Item,Valuation Rate,Собівартість
@@ -4116,7 +4121,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Отримав ITC Cess
 ,Student Monthly Attendance Sheet,Student Щомісячна відвідуваність Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Правило доставки застосовується тільки для продажу
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Рядок амортизації {0}: Далі Датою амортизації не може бути перед датою придбання
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Рядок амортизації {0}: Далі Датою амортизації не може бути перед датою придбання
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Дата початку
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,До
 DocType: Rename Tool,Rename Log,Перейменувати Вхід
@@ -4134,12 +4139,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Як часто слід оновлювати проект та компанію на основі операцій продажу.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Діє до
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Додати студентів
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Будь ласка, видаліть співробітника <a href=""#Form/Employee/{0}"">{0}</a> \ щоб скасувати цей документ"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},"Будь ласка, виберіть {0}"
 DocType: C-Form,C-Form No,С-Форма Немає
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Відстань
+DocType: Delivery Stop,Distance,Відстань
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,"Перелічіть свої товари чи послуги, які ви купуєте або продаєте."
 DocType: Water Analysis,Storage Temperature,Температура зберігання
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4166,7 +4169,7 @@
 DocType: Homepage,Company Description for website homepage,Опис компанії для головної сторінки веб-сайту
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Для зручності клієнтів, ці коди можуть бути використані в друкованих формах, таких, як рахунки-фактури та розхідні накладні"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,ім&#39;я Suplier
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Не вдалося отримати інформацію для {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Не вдалося отримати інформацію для {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Вступний журнал
 DocType: Contract,Fulfilment Terms,Умови виконання
 DocType: Sales Invoice,Time Sheet List,Список табелів робочого часу
@@ -4349,7 +4352,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Вибір студентів вручну для діяльності на основі групи
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Вибір студентів вручну для діяльності на основі групи
 DocType: Journal Entry,User Remark,Зауваження користувача
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Оптимізація маршрутів.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Оптимізація маршрутів.
 DocType: Travel Itinerary,Non Diary,Не Щоденник
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Неможливо створити бонус утримання для залишених співробітників
 DocType: Lead,Market Segment,Сегмент ринку
@@ -4380,7 +4383,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Програма лояльності
 DocType: Student Guardian,Father,батько
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Квитки на підтримку
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,"""Оновити запаси"" не може бути позначено для продажу основних засобів"
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,"""Оновити запаси"" не може бути позначено для продажу основних засобів"
 DocType: Bank Reconciliation,Bank Reconciliation,Звірка з банком
 DocType: Attendance,On Leave,У відпустці
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Підписатись на новини
@@ -4425,7 +4428,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Серійний номер та партія
 DocType: Warranty Claim,From Company,Від компанії
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Сума десятків критеріїв оцінки має бути {0}.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,"Будь ласка, встановіть кількість зарезервованих амортизацій"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,"Будь ласка, встановіть кількість зарезервованих амортизацій"
 DocType: Supplier Scorecard Period,Calculations,Розрахунки
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Значення або Кількість
 DocType: Payment Terms Template,Payment Terms,Терміни оплати
@@ -4445,7 +4448,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Знижка (%) на Прейскурант ставкою з Margin
 DocType: Healthcare Service Unit Type,Rate / UOM,Оцінити / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,всі склади
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Ні {0} знайдено для транзакцій компанії «Інтер».
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Ні {0} знайдено для транзакцій компанії «Інтер».
 DocType: Travel Itinerary,Rented Car,Орендований автомобіль
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Про вашу компанію
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Кредит на рахунку повинен бути баланс рахунку
@@ -4547,6 +4550,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Критерії аналізу стану
 DocType: Cheque Print Template,Cheque Height,Висота чеку
 DocType: Supplier,Supplier Details,Постачальник: Подробиці
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Будь ласка, налаштуйте серію нумерації для участі в Наборі&gt; Нумерована серія"
 DocType: Setup Progress,Setup Progress,Налаштування прогресу
 DocType: Expense Claim,Approval Status,Стан затвердження
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},"З значення має бути менше, ніж значення в рядку в {0}"
@@ -4640,7 +4644,6 @@
 DocType: Travel Request,Fully Sponsored,Повністю спонсорований
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Вступ до зворотного журналу
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Клієнт {0} створено.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Будь ласка, встановіть систему найменування працівників у людських ресурсах&gt; Параметри персоналу"
 DocType: Stock Settings,Limit Percent,граничне Відсоток
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,На даний момент немає запасів на будь-якому складі
 ,Payment Period Based On Invoice Date,Затримка оплати після виставлення рахунку
@@ -4699,7 +4702,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Вихідний склад
 DocType: Installation Note,Installation Date,Дата встановлення
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Поділитись Леджером
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Рядок # {0}: Asset {1} не належить компанії {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Рядок # {0}: Asset {1} не належить компанії {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Рахунок продажу {0} створено
 DocType: Employee,Confirmation Date,Дата підтвердження
 DocType: Inpatient Occupancy,Check Out,Перевірити
@@ -4719,6 +4722,7 @@
 DocType: Production Plan,Sales Orders Detail,Деталі замовлень на продаж
 DocType: Bin,Requested Quantity,Необхідна кількість
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Будь-ласка, встановіть систему іменування інструкторів в освіті&gt; Параметри освіти"
 DocType: Patient,Marital Status,Сімейний стан
 DocType: Stock Settings,Auto Material Request,Авто-Замовлення матеріалів
 DocType: Woocommerce Settings,API consumer secret,API споживчої таємниці
@@ -4771,7 +4775,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Виберіть &quot;Дні&quot;
 DocType: Academic Term,Term Name,термін Ім&#39;я
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Кредит ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Створення заробітної плати ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Створення заробітної плати ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Ви не можете редагувати кореневий вузол.
 DocType: Buying Settings,Purchase Order Required,Необхідне Замовлення на придбання
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Таймер
@@ -4809,7 +4813,7 @@
 DocType: Account,Rate at which this tax is applied,Вартість при якій застосовується цей податок
 DocType: Cash Flow Mapper,Section Name,Назва розділу
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Кількість перезамовлення
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Рента амортизації {0}: очікувана вартість після корисного використання повинна бути більшою або рівною {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Рента амортизації {0}: очікувана вартість після корисного використання повинна бути більшою або рівною {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Поточні вакансії Вакансії
 DocType: Company,Stock Adjustment Account,Рахунок підлаштування інвентаря
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Списувати
@@ -4856,7 +4860,7 @@
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,З Контракту на річне обслуговування
 DocType: Opportunity,Opportunity Amount,Сума можливостей
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Кількість проведених амортизацій не може бути більше за загальну кількість амортизацій
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Кількість проведених амортизацій не може бути більше за загальну кількість амортизацій
 DocType: Purchase Order,Order Confirmation Date,Дата підтвердження замовлення
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Зробити Візит тех. обслуговування
@@ -4898,7 +4902,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Пакет:
 DocType: Volunteer,Afternoon,Вдень
 DocType: Loyalty Program,Loyalty Program Help,Довідка програми лояльності
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' неактивний
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' неактивний
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Встановити як Open
 DocType: Cheque Print Template,Scanned Cheque,Сканований чек
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Відправити автоматичні листи на Контакти Про подання операцій.
@@ -4911,7 +4915,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Предмет і відомості про гарантії
 DocType: Chapter,Chapter Members,Члени групи
 DocType: Sales Team,Contribution (%),Внесок (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примітка: Оплата не буде створена, оскільки не зазаначено ""Готівковий або банківський рахунок"""
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примітка: Оплата не буде створена, оскільки не зазаначено ""Готівковий або банківський рахунок"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Проект {0} вже існує
 DocType: Clinical Procedure,Nursing User,Медичний користувач
 DocType: Employee Benefit Application,Payroll Period,Зарплатний період
@@ -4919,6 +4923,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Серійний номер {0} не належить до партії {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Обов&#39;язки
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Термін дії цієї цитати закінчився.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Будь ласка, видаліть співробітника <a href=""#Form/Employee/{0}"">{0}</a> \ щоб скасувати цей документ"
 DocType: Expense Claim Account,Expense Claim Account,Рахунок Авансового звіту
 DocType: Account,Capital Work in Progress,Капітал Продовжується робота
 DocType: Accounts Settings,Allow Stale Exchange Rates,Дозволити стабільний курс обміну
@@ -5000,7 +5006,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Матеріал Випуск
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,З&#39;єднати Shopify з ERPNext
 DocType: Material Request Item,For Warehouse,Для складу
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Примітки щодо доставки {0} оновлено
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Примітки щодо доставки {0} оновлено
 DocType: Employee,Offer Date,Дата пропозиції
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Пропозиції
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Ви перебуваєте в автономному режимі. Ви не зможете оновити доки не відновите зв’язок.
@@ -5051,7 +5057,7 @@
 DocType: Shipping Rule,Calculate Based On,"Розрахувати, засновані на"
 DocType: Contract,Unfulfilled,Невиконаний
 DocType: Delivery Note Item,From Warehouse,Від Склад
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Немає працівників за вказаними критеріями
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Немає працівників за вказаними критеріями
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Ні предметів з Біллом матеріалів не повинна Manufacture
 DocType: Shopify Settings,Default Customer,За замовчуванням клієнт
 DocType: Sales Stage,Stage Name,Творчий псевдонім
@@ -5094,7 +5100,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Сума податку після скидки Сума
 DocType: Patient,Inpatient Status,Стан стаціонару
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Щоденні Налаштування роботи Резюме
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,У вибраному прайс-листі повинні бути перевірені сфери купівлі та продажу.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,У вибраному прайс-листі повинні бути перевірені сфери купівлі та продажу.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,"Будь ласка, введіть Reqd за датою"
 DocType: Payment Entry,Internal Transfer,внутрішній переказ
 DocType: Asset Maintenance,Maintenance Tasks,Забезпечення завдань
@@ -5131,7 +5137,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Групувати за
 DocType: Guardian,Interests,інтереси
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Включити / відключити валюти.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Не вдалося надіслати деякі Зарплатні Слайди
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Не вдалося надіслати деякі Зарплатні Слайди
 DocType: Exchange Rate Revaluation,Get Entries,Отримати записи
 DocType: Production Plan,Get Material Request,Отримати Замовлення матеріалів
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Поштові витрати
@@ -5218,7 +5224,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Витрати рахунку є обов&#39;язковим для пункту {0}
 DocType: BOM,Website Description,Опис веб-сайту
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Чиста зміна в капіталі
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,"Будь ласка, відмініть спочатку вхідний рахунок {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,"Будь ласка, відмініть спочатку вхідний рахунок {0}"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,"Не дозволено. Будь ласка, вимкніть тип службового блоку"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Адреса електронної пошти повинен бути унікальним, вже існує для {0}"
 DocType: Serial No,AMC Expiry Date,Дата закінчення річного обслуговування
@@ -5258,7 +5264,7 @@
 DocType: Hotel Room,Hotel Room,Кімната в готелі
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Рахунок {0} не належить компанії {1}
 DocType: Leave Type,Rounding,Округлення
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Серійні номери в рядку {0} не збігається з накладною
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Серійні номери в рядку {0} не збігається з накладною
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Розподілена сума (прорахована)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Потім правила ціноутворення відфільтровуються на основі клієнтів, груп клієнтів, територій, постачальників, групи постачальників, кампанії, партнера з продажу та ін."
 DocType: Student,Guardian Details,Детальніше Гардіан
@@ -5313,7 +5319,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},Необхідно вказати склад для номенклатури {0}
 DocType: Leave Allocation,Unused leaves,Невикористані дні відпустки
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Внести рахунок на погашення
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Всі кафедри
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Всі кафедри
 DocType: Healthcare Service Unit,Vacant,Вакантний
 DocType: Patient,Alcohol Past Use,Спиртне минуле використання
 DocType: Fertilizer Content,Fertilizer Content,Вміст добрив
@@ -5324,7 +5330,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,"Замовлення на роботі {0} потрібно скасувати, перш ніж скасовувати цей замовлення на продаж"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Зібрати розібрані норми (у тому числі вузлів)
 DocType: Authorization Rule,Applicable To (Employee),Застосовується до (Співробітник)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Завдяки Дата є обов&#39;язковим
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Завдяки Дата є обов&#39;язковим
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Приріст за атрибут {0} не може бути 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Вид вигоди та сума
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Номери заброньовані
@@ -5471,7 +5477,7 @@
 DocType: Purchase Invoice Item,Total Weight,Загальна вага
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Комісія з продажу
 DocType: Job Offer Term,Value / Description,Значення / Опис
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Рядок # {0}: Asset {1} не може бути представлено, вже {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Рядок # {0}: Asset {1} не може бути представлено, вже {2}"
 DocType: Tax Rule,Billing Country,Країна (оплата)
 DocType: Purchase Order Item,Expected Delivery Date,Очікувана дата поставки
 DocType: Restaurant Order Entry,Restaurant Order Entry,Замовлення ресторану
@@ -5510,12 +5516,13 @@
 DocType: Maintenance Visit,Breakdown,Зламатися
 DocType: Travel Itinerary,Vegetarian,Вегетаріанець
 DocType: Patient Encounter,Encounter Date,Дата зустрічі
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Рахунок: {0} з валютою: {1} не може бути обраний
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Рахунок: {0} з валютою: {1} не може бути обраний
 DocType: Bank Statement Transaction Settings Item,Bank Data,Банківські дані
 DocType: Purchase Receipt Item,Sample Quantity,Обсяг вибірки
 DocType: Bank Guarantee,Name of Beneficiary,Назва Бенефіціара
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Оновити вартість BOM автоматично за допомогою Планувальника, виходячи з останньої норми курсу / цінового списку / останньої ціни закупівлі сировини."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Постачальник&gt; Група постачальників
 DocType: Bank Reconciliation Detail,Cheque Date,Дата чеку
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Рахунок {0}: Батьківський рахунок {1} не належить компанії: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,"Всі операції, пов'язані з цією компанією успішно видалено!"
@@ -5543,7 +5550,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Дочірні вузли можуть бути створені тільки в вузлах типу &quot;Група&quot;
 DocType: Attendance Request,Half Day Date,півдня Дата
 DocType: Academic Year,Academic Year Name,Назва Академічний рік
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,"{0} не дозволено здійснювати трансакції за допомогою {1}. Будь ласка, змініть компанію."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,"{0} не дозволено здійснювати трансакції за допомогою {1}. Будь ласка, змініть компанію."
 DocType: Sales Partner,Contact Desc,Опис Контакту
 DocType: Email Digest,Send regular summary reports via Email.,Відправити регулярні зведені звіти по електронній пошті.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},"Будь-ласка, встановіть рахунок за замовчуванням у Авансових звітах типу {0}"
@@ -5576,7 +5583,7 @@
 DocType: Hotel Room,Hotel Manager,Адміністратор готелю
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Встановіть податкове правило для кошику
 DocType: Purchase Invoice,Taxes and Charges Added,Податки та збори додано
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Рядок амортизації {0}: Далі Датою амортизації не може бути до Дати доступної для використання
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Рядок амортизації {0}: Далі Датою амортизації не може бути до Дати доступної для використання
 ,Sales Funnel,Воронка продажів
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Скорочення є обов'язковим
 DocType: Project,Task Progress,Завдання про хід роботи
@@ -5590,7 +5597,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Всі групи покупців
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,Накопичений в місяць
 DocType: Attendance Request,On Duty,На чергуванні
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} є обов'язковим. Може бути, Обмін валюти запис не створена для {1} до {2}."
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} є обов'язковим. Може бути, Обмін валюти запис не створена для {1} до {2}."
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},План персоналу {0} вже існує для позначення {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Податковий шаблон є обов'язковим
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Рахунок {0}: Батьківський рахунок не існує {1}
@@ -5670,11 +5677,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Принаймні одне склад є обов&#39;язковим
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Налаштуйте поля предметів, такі як UOM, група елементів, опис та кількість годин."
 DocType: Certification Application,Certification Status,Статус сертифікації
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Торговий майданчик
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Торговий майданчик
 DocType: Travel Itinerary,Travel Advance Required,Необхідно подорожувати
 DocType: Subscriber,Subscriber Name,Ім&#39;я абонента
 DocType: Serial No,Out of Warranty,З гарантії
-DocType: Cashier Closing,Cashier-closing-,Каса-закриття
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Змінений тип даних
 DocType: BOM Update Tool,Replace,Замінювати
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Не знайдено продуктів.
@@ -5761,7 +5767,6 @@
 DocType: Quality Inspection,Incoming,Вхідний
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Шаблони податку за замовчуванням для продажу та покупки створені.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Приклад: ABCD. #####. Якщо серія встановлена і пакетний номер не згадується в транзакції, автоматичний номер партії буде створено на основі цієї серії. Якщо ви завжди хочете чітко вказати Batch No для цього елемента, залиште це порожнім. Примітка: цей параметр буде мати пріоритет над префіксом серії імен у розділі Налаштування запасу."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Будь ласка, налаштуйте серію нумерації для участі в Наборі&gt; Нумерована серія"
 DocType: BOM,Materials Required (Exploded),"Матеріалів, необхідних (в розібраному)"
 DocType: Contract,Party User,Партійний користувач
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Будь ласка, встановіть фільтр компанії порожнім, якщо група До є «Компанія»"
@@ -5964,7 +5969,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp граф
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,"Потрібно встановити як початкову, так і кінцеву дату пробного періоду"
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Середня ставка
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Загальна сума платежу у графіку платежів повинна дорівнювати величині / округленому загальному
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Загальна сума платежу у графіку платежів повинна дорівнювати величині / округленому загальному
 DocType: Subscription Plan Detail,Plan,Планувати
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Банк балансовий звіт за Головну книгу
 DocType: Job Applicant,Applicant Name,Заявник Ім&#39;я
@@ -6033,7 +6038,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Мило та миючі засоби
 DocType: BOM,Show Items,Показати товари
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Від часу не може бути більше часу.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Ви хочете повідомити всіх клієнтів електронною поштою?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Ви хочете повідомити всіх клієнтів електронною поштою?
 DocType: Subscription Plan,Billing Interval,Інтервал платежів
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Кіно & Відео
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Замовлено
@@ -6042,9 +6047,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Рядок {0}: {1} має бути більше 0
 DocType: Assessment Criteria,Assessment Criteria Group,Критерії оцінки Група
 DocType: Healthcare Settings,Patient Name By,Ім&#39;я пацієнта по
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Журнал накопичувального журналу про заробітну плату від {0} до {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Журнал накопичувального журналу про заробітну плату від {0} до {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Увімкнути відстрочені доходи
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Накопичений знос на момент відкриття має бути менше або дорівнювати {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Накопичений знос на момент відкриття має бути менше або дорівнювати {0}
 DocType: Warehouse,Warehouse Name,Назва складу
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,"Фактична дата початку повинна бути меншою, ніж фактична дата завершення"
 DocType: Naming Series,Select Transaction,Виберіть операцію
@@ -6196,7 +6201,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Працівник {0} класу {1} не має політики відпустки
 DocType: Salary Detail,Salary Detail,Заробітна плата: Подробиці
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,"Будь ласка, виберіть {0} в першу чергу"
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Додано {0} користувачів
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Додано {0} користувачів
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","У випадку багаторівневої програми, Клієнти будуть автоматично призначені для відповідного рівня відповідно до витрачених ними витрат"
 DocType: Appointment Type,Physician,Лікар
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Партія {0} номенклатурної позиції {1} протермінована.
@@ -6341,7 +6346,7 @@
 DocType: Asset,Custodian,Зберігач
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,POS- Профіль
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} має бути значення від 0 до 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Оплата {0} від {1} до {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Оплата {0} від {1} до {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Незабезпечені кредити
 DocType: Cost Center,Cost Center Name,Назва центру витрат
 DocType: Student,B+,B +
@@ -6373,6 +6378,7 @@
 DocType: Employee,Date of Issue,Дата випуску
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Згідно Настройці Покупки якщо Купівля Reciept Обов&#39;язково == «YES», то для створення рахунку-фактури, користувач необхідний створити квитанцію про покупку першим за пунктом {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Ряд # {0}: Встановити Постачальник по пункту {1}
+DocType: Global Defaults,Default Distance Unit,Одиниця за промовчанням
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Рядок {0}: значення годин має бути більше нуля.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,"Зображення для веб-сайту {0}, долучене до об’єкту {1} не може бути знайдене"
 DocType: Issue,Content Type,Тип вмісту
@@ -6428,7 +6434,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Дебетом рахунка повинні бути баланс рахунку
 DocType: Asset,Naming Series,Іменування серії
 DocType: Vital Signs,Coated,Покритий
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,"Рядок {0}: очікувана вартість після корисної служби повинна бути меншою, ніж сума вашої покупки"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,"Рядок {0}: очікувана вартість після корисної служби повинна бути меншою, ніж сума вашої покупки"
 DocType: GoCardless Settings,GoCardless Settings,Налаштування GoCardless
 DocType: Leave Block List,Leave Block List Name,Назва списку блокування відпусток
 DocType: Certified Consultant,Certification Validity,Сертифікація дійсності
@@ -6497,6 +6503,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Заголовок банку
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Переглянути лабораторні тести
 DocType: Hub Users,Hub Users,Керуючі користувачі
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клієнт&gt; Група клієнтів&gt; Територія
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Дата технічного обслуговування
 DocType: Purchase Invoice Item,Rejected Serial No,Відхилено Серійний номер
@@ -6510,7 +6517,7 @@
 DocType: SG Creation Tool Course,Max Strength,Максимальна міцність
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Встановлення пресетів
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Примітка доставки не вибрана для Клієнта {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Примітка доставки не вибрана для Клієнта {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Працівник {0} не має максимальної суми допомоги
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Виберіть елементи на основі дати доставки
 DocType: Grant Application,Has any past Grant Record,Має будь-яку минулу реєстр грантів
@@ -6538,7 +6545,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Бронювання номеру готелю
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Обслуговування клієнтів
 DocType: BOM,Thumbnail,Мініатюра
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Немає контактів з ідентифікаторами електронної пошти.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Немає контактів з ідентифікаторами електронної пошти.
 DocType: Item Customer Detail,Item Customer Detail,Пункт Подробиці клієнтів
 DocType: Notification Control,Prompt for Email on Submission of,Запитувати Email про подання
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Максимальна сума виплат працівника {0} перевищує {1}
@@ -6798,7 +6805,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,"Не можете приховані в групу, тому що обрано тип рахунку."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,"{0} {1} був змінений. Будь ласка, поновіть."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Завадити користувачам створювати заяви на відпустки на наступні дні.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код товару&gt; Група предметів&gt; Бренд
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Якщо необмежений термін дії балів за лояльність, тривалість терміну дії закінчується порожнім або 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Члени технічного обслуговування
 DocType: Loyalty Point Entry,Purchase Amount,Закупівельна сума
@@ -6806,7 +6812,7 @@
 											to fullfill Sales Order {2}","Неможливо доставити серійний номер {0} пункту {1}, оскільки він зарезервований \ для повного заповнення замовлення на продаж {2}"
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Пропозицію постачальника {0} створено
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Рік закінчення не може бути раніше початку року
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Рік закінчення не може бути раніше початку року
 DocType: Employee Benefit Application,Employee Benefits,Виплати працівникам
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Упакування кількість повинна дорівнювати кількість для пункту {0} в рядку {1}
 DocType: Work Order,Manufactured Qty,Вироблена к-сть
@@ -6822,6 +6828,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Вибір номер партії
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,До ГСТІН
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,"Законопроекти, підняті клієнтам."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Будь ласка, встановіть систему найменування працівників у людських ресурсах&gt; Параметри персоналу"
 DocType: Healthcare Settings,Invoice Appointments Automatically,Автоматичне призначення рахунків-фактур
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Проект Id
 DocType: Salary Component,Variable Based On Taxable Salary,Змінна на основі оподатковуваної заробітної плати
@@ -6870,7 +6877,7 @@
 DocType: POS Profile,Account for Change Amount,Рахунок для суми змін
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Підключення до QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Загальний прибуток / збиток
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Недійсна компанія для рахунків-фактур компанії &quot;Інтер&quot;.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Недійсна компанія для рахунків-фактур компанії &quot;Інтер&quot;.
 DocType: Purchase Invoice,input service,служба введення
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ряд {0}: Партія / рахунку не відповідає {1} / {2} в {3} {4}
 DocType: Employee Promotion,Employee Promotion,Заохочення працівників
@@ -7001,7 +7008,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Пріоритетний район для проживання
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Аналітика
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Кошик Пусто
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Будь-ласка, встановіть систему іменування інструкторів в освіті&gt; Параметри освіти"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No","Пункт {0} не має серійного номера. Тільки serilialized елементи \ можуть мати доставку, засновану на серійний номер"
 DocType: Vehicle,Model,модель
@@ -7031,7 +7037,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Нічого не змінювати
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,"Будь ласка, виберіть файл CSV з"
 DocType: Holiday List,Total Holidays,Всього свят
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Відсутній шаблон електронної пошти для відправлення. Установіть його в налаштуваннях доставки.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Відсутній шаблон електронної пошти для відправлення. Установіть його в налаштуваннях доставки.
 DocType: Student Leave Application,Mark as Present,Повідомити про Present
 DocType: Supplier Scorecard,Indicator Color,Колір індикатора
 DocType: Purchase Order,To Receive and Bill,Отримати та виставити рахунки
@@ -7040,7 +7046,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Виберіть серійний номер
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Дизайнер
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Шаблон положень та умов
-DocType: Serial No,Delivery Details,Деталі доставки
+DocType: Delivery Trip,Delivery Details,Деталі доставки
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Вартість Центр потрібно в рядку {0} в таблиці податків для типу {1}
 DocType: Program,Program Code,програмний код
 DocType: Terms and Conditions,Terms and Conditions Help,Довідка з правил та умов
@@ -7064,7 +7070,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Час на поставку в днях
 DocType: Cash Flow Mapping,Is Income Tax Expense,Витрати з податку на прибуток
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Ваше замовлення на доставку!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"Рядок # {0}: Дата створення повинна бути такою ж, як дата покупки {1} активу {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"Рядок # {0}: Дата створення повинна бути такою ж, як дата покупки {1} активу {2}"
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,"Перевірте це, якщо студент проживає в гуртожитку інституту."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,"Будь ласка, введіть Замовлення клієнтів у наведеній вище таблиці"
 ,Stock Summary,сумарний стік
diff --git a/erpnext/translations/ur.csv b/erpnext/translations/ur.csv
index dfd1f8a..66b2afc 100644
--- a/erpnext/translations/ur.csv
+++ b/erpnext/translations/ur.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,دورانیہ کا نام
 DocType: Employee,Salary Mode,تنخواہ موڈ
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,رجسٹر کریں
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,رجسٹر کریں
 DocType: Patient,Divorced,طلاق
 DocType: Support Settings,Post Route Key,روٹ کو پوسٹ کریں
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,آئٹم کو ایک ٹرانزیکشن میں ایک سے زیادہ بار شامل کیا جا کرنے کی اجازت دیں
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,نیو ایکسچینج کی شرح
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},کرنسی قیمت کی فہرست کے لئے ضروری ہے {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ٹرانزیکشن میں حساب کیا جائے گا.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,سپلائر&gt; سپلائی کی قسم
 DocType: Delivery Trip,MAT-DT-.YYYY.-,میٹ - ڈی ٹی - .YYYY-
 DocType: Purchase Order,Customer Contact,اپرنٹسشپس
 DocType: Patient Appointment,Check availability,دستیابی کی جانچ پڑتال کریں
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,کھلی دکھائیں
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,سیریز کو کامیابی سے حالیہ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,اس کو دیکھو
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} قطار میں {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} قطار میں {1}
 DocType: Asset Finance Book,Depreciation Start Date,قیمت کی قیمت کی قیمت
 DocType: Pricing Rule,Apply On,پر لگائیں
 DocType: Item Price,Multiple Item prices.,ایک سے زیادہ اشیاء کی قیمتوں.
@@ -118,7 +117,7 @@
 DocType: Lab Prescription,Lab Prescription,لیب نسخہ
 ,Delay Days,تاخیر کے دن
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,سروس کے اخراجات
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},سیریل نمبر: {0} نے پہلے ہی فروخت انوائس میں محولہ ہے: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},سیریل نمبر: {0} نے پہلے ہی فروخت انوائس میں محولہ ہے: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,انوائس
 DocType: Purchase Invoice Item,Item Weight Details,آئٹم وزن کی تفصیلات
 DocType: Asset Maintenance Log,Periodicity,مدت
@@ -143,6 +142,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,اکاؤنٹنٹ
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,قیمت کی فہرست فروخت
 DocType: Patient,Tobacco Current Use,تمباکو موجودہ استعمال
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","آغاز کی تاریخ اور اختتام تاریخ نوکری کارڈ کے ساتھ اوورلوپنگ ہے <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,فروخت کی شرح
 DocType: Cost Center,Stock User,اسٹاک صارف
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + MG) / K
@@ -162,7 +162,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,متعلقہ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,حاضری کی تاریخ ملازم کی میں شمولیت کی تاریخ سے کم نہیں ہو سکتا
 DocType: Grading Scale,Grading Scale Name,گریڈنگ پیمانے نام
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,صارفین کو مارکیٹ میں شامل کریں
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,صارفین کو مارکیٹ میں شامل کریں
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,یہ ایک جڑ اکاؤنٹ ہے اور میں ترمیم نہیں کیا جا سکتا.
 DocType: Sales Invoice,Company Address,کمپنی ایڈریس
 DocType: BOM,Operations,آپریشنز
@@ -319,7 +319,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,مختلف مقدار
 DocType: Production Plan,Material Request Detail,مواد کی درخواست کی تفصیل
 DocType: Selling Settings,Default Quotation Validity Days,پہلے سے طے شدہ کوٹمنٹ والوتی دن
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",شے کی درجہ بندی میں صف {0} میں ٹیکس شامل کرنے کے لئے، قطار میں ٹیکس {1} بھی شامل کیا جانا چاہئے
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",شے کی درجہ بندی میں صف {0} میں ٹیکس شامل کرنے کے لئے، قطار میں ٹیکس {1} بھی شامل کیا جانا چاہئے
 DocType: SMS Center,SMS Center,ایس ایم ایس مرکز
 DocType: Payroll Entry,Validate Attendance,حاضری درست کریں
 DocType: Sales Invoice,Change Amount,رقم تبدیل
@@ -438,7 +438,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,الفاظ میں رقم کے لئے سطر میں خالی جگہ
 DocType: Vehicle,Additional Details,ایڈیشنل تفصیلات
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,دی کوئی وضاحت
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,سپلائر&gt; سپلائر گروپ
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,خریداری کے لئے درخواست.
 DocType: POS Closing Voucher Details,Collected Amount,جمع کردہ رقم
 DocType: Lab Test,Submitted Date,پیش کردہ تاریخ
@@ -483,7 +482,7 @@
 DocType: Student Admission,Student Admission,طالب علم داخلہ
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,{0} آئٹم منسوخ کر دیا ہے
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,استحکام صف {0}: استحکام شروع کی تاریخ گزشتہ تاریخ کے طور پر درج کی گئی ہے
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,استحکام صف {0}: استحکام شروع کی تاریخ گزشتہ تاریخ کے طور پر درج کی گئی ہے
 DocType: Contract Template,Fulfilment Terms and Conditions,مکمل شرائط و ضوابط
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,مواد کی درخواست
 DocType: Bank Reconciliation,Update Clearance Date,اپ ڈیٹ کی کلیئرنس تاریخ
@@ -539,6 +538,7 @@
 DocType: Accounts Settings,Settings for Accounts,اکاؤنٹس کے لئے ترتیبات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},خریدار انوائس میں سپلائر انوائس موجود نہیں ہے {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,فروخت شخص درخت کا انتظام کریں.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.",راستے پر عملدرآمد نہیں کر سکتا، کیونکہ Google Maps کی ترتیبات غیر فعال ہیں.
 DocType: Job Applicant,Cover Letter,تعارفی خط
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,بقایا چیک اور صاف کرنے کے لئے جمع
 DocType: Item,Synced With Hub,حب کے ساتھ موافقت پذیر
@@ -597,7 +597,7 @@
 DocType: Asset Value Adjustment,New Asset Value,نیا اثاثہ قیمت
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,کسٹمر کرنسی کسٹمر کی بنیاد کرنسی تبدیل کیا جاتا ہے جس میں شرح
 DocType: Course Scheduling Tool,Course Scheduling Tool,کورس شیڈولنگ کا آلہ
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},صف # {0}: خریداری کی رسید ایک موجودہ اثاثہ کے خلاف بنایا نہیں جا سکتا {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},صف # {0}: خریداری کی رسید ایک موجودہ اثاثہ کے خلاف بنایا نہیں جا سکتا {1}
 DocType: Crop Cycle,LInked Analysis,LInked تجزیہ
 DocType: POS Closing Voucher,POS Closing Voucher,پی او او کا بند واؤچر
 DocType: Contract,Lapsed,غریب
@@ -632,6 +632,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} کورس میں داخل نہیں کیا جاتا ہے {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,طالب علم کا نام:
 DocType: POS Closing Voucher Details,Difference,فرق
+DocType: Delivery Settings,Delay between Delivery Stops,ڈیلیوری اسٹاپ کے درمیان تاخیر
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},سیریل نمبر {0} ترسیل کے نوٹ سے تعلق نہیں ہے {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.",سرور کے GoCardless ترتیب کے ساتھ ایک مسئلہ لگتا ہے. پریشان نہ کریں، ناکامی کی صورت میں، رقم آپ کے اکاؤنٹ میں رقم کی واپسی کی جائے گی.
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext ڈیمو
@@ -690,7 +691,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,مقدار اور شرح
 DocType: Delivery Note,% Installed,٪ نصب
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,کلاس روم / لیبارٹریز وغیرہ جہاں لیکچر شیڈول کر سکتے ہیں.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,دونوں کمپنیوں کی کمپنی کی کرنسیوں کو انٹر کمپنی کے تبادلوں کے لئے ملنا چاہئے.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,دونوں کمپنیوں کی کمپنی کی کرنسیوں کو انٹر کمپنی کے تبادلوں کے لئے ملنا چاہئے.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,پہلی کمپنی کا نام درج کریں
 DocType: Travel Itinerary,Non-Vegetarian,غیر سبزیاں
 DocType: Purchase Invoice,Supplier Name,سپلائر کے نام
@@ -776,7 +777,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,تاریخ سے کرایہ پر
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,بس بہت کچھ حصوں کی تعمیر
 DocType: POS Profile User,POS Profile User,POS پروفائل صارف
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,قطار {0}: استحکام شروع کی تاریخ کی ضرورت ہے
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,قطار {0}: استحکام شروع کی تاریخ کی ضرورت ہے
 DocType: Purchase Invoice Item,Service Start Date,سروس شروع کی تاریخ
 DocType: Subscription Invoice,Subscription Invoice,سبسکرپشن انوائس
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,براہ راست آمدنی
@@ -845,7 +846,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,مخفف پہلے سے ہی ایک اور کمپنی کے لئے استعمال کیا
 DocType: Selling Settings,Default Customer Group,پہلے سے طے شدہ گاہک گروپ
 DocType: Employee,IFSC Code,IFSC کوڈ
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","آغاز کی تاریخ اور اختتام تاریخ نوکری کارڈ کے ساتھ اوورلوپنگ ہے <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",غیر فعال اگر، &#39;گول کل&#39; کے خانے کسی بھی لین دین میں نظر نہیں ہو گا
 DocType: BOM,Operating Cost,آپریٹنگ لاگت
 DocType: Crop,Produced Items,تیار کردہ اشیاء
@@ -897,7 +897,7 @@
 DocType: Supplier,Prevent RFQs,آر ایف پی کی روک تھام
 DocType: Hub User,Hub User,حب صارف
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,سیلز آرڈر بنائیں
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},تنخواہ پرچی {0} سے {1} کی مدت کے لئے پیش کی گئی
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},تنخواہ پرچی {0} سے {1} کی مدت کے لئے پیش کی گئی
 DocType: Project Task,Project Task,پراجیکٹ ٹاسک
 DocType: Loyalty Point Entry Redemption,Redeemed Points,چھوٹا پوائنٹس
 ,Lead Id,لیڈ کی شناخت
@@ -1029,7 +1029,7 @@
 DocType: Fee Validity,Max number of visit,دورے کی زیادہ سے زیادہ تعداد
 ,Hotel Room Occupancy,ہوٹل کمرہ ہستی
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Timesheet پیدا کیا:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},ادائیگی کے موڈ میں پہلے سے طے شدہ نقد یا بینک اکاؤنٹ مقرر کریں {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},ادائیگی کے موڈ میں پہلے سے طے شدہ نقد یا بینک اکاؤنٹ مقرر کریں {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,اندراج کریں
 DocType: GST Settings,GST Settings,GST ترتیبات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},کرنسی قیمت کی قیمت کرنسی کے طور پر ہی ہونا چاہئے: {0}
@@ -1084,7 +1084,7 @@
 DocType: Vehicle Log,Service Details,سروس کی تفصیلات دیکھیں
 DocType: Lab Test Template,Grouped,گروپ
 DocType: Selling Settings,Delivery Note Required,ترسیل کے نوٹ کی ضرورت ہے
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,تنخواہ سلپس جمع کرانے ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,تنخواہ سلپس جمع کرانے ...
 DocType: Bank Guarantee,Bank Guarantee Number,بینک گارنٹی نمبر
 DocType: Bank Guarantee,Bank Guarantee Number,بینک گارنٹی نمبر
 DocType: Assessment Criteria,Assessment Criteria,تشخیص کے معیار
@@ -1110,13 +1110,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,ادائیگی انٹری پہلے ہی تخلیق کیا جاتا ہے
 DocType: Request for Quotation,Get Suppliers,سپلائرز حاصل کریں
 DocType: Purchase Receipt Item Supplied,Current Stock,موجودہ اسٹاک
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},صف # {0}: {1} اثاثہ آئٹم سے منسلک نہیں کرتا {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},صف # {0}: {1} اثاثہ آئٹم سے منسلک نہیں کرتا {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,پیش نظارہ تنخواہ کی پرچی
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,اکاؤنٹ {0} کئی بار داخل کیا گیا ہے
 DocType: Account,Expenses Included In Valuation,اخراجات تشخیص میں شامل
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,اگر آپ کی رکنیت 30 دن کے اندر ختم ہوتی ہے تو آپ صرف تجدید کرسکتے ہیں
 DocType: Shopping Cart Settings,Show Stock Availability,اسٹاک کی دستیابی دکھائیں
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},{0} اثاثہ کی قسم {1} یا کمپنی {2} میں سیٹ کریں
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},{0} اثاثہ کی قسم {1} یا کمپنی {2} میں سیٹ کریں
 DocType: Location,Longitude,لمبائی
 ,Absent Student Report,غائب Student کی رپورٹ
 DocType: Crop,Crop Spacing UOM,فصلوں کی جگہ UOM
@@ -1188,7 +1188,7 @@
 DocType: Soil Texture,Sand,ریت
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,توانائی
 DocType: Opportunity,Opportunity From,سے مواقع
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,قطار {0}: {1} آئٹم {2} کے لئے سیریل نمبر ضروری ہے. آپ نے {3} فراہم کیا ہے.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,قطار {0}: {1} آئٹم {2} کے لئے سیریل نمبر ضروری ہے. آپ نے {3} فراہم کیا ہے.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,براہ کرم میز منتخب کریں
 DocType: BOM,Website Specifications,ویب سائٹ نردجیکرن
 DocType: Special Test Items,Particulars,نصاب
@@ -1280,7 +1280,7 @@
 DocType: Item,Items with higher weightage will be shown higher,اعلی اہمیت کے ساتھ اشیاء زیادہ دکھایا جائے گا
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,لیب ٹیسٹ اور اہم نشانیاں
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,بینک مصالحتی تفصیل
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,صف # {0}: اثاثہ {1} پیش کرنا ضروری ہے
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,صف # {0}: اثاثہ {1} پیش کرنا ضروری ہے
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,کوئی ملازم پایا
 DocType: Item,If subcontracted to a vendor,ایک وینڈر کے ٹھیکے تو
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,طالب علم گروپ پہلے سے ہی اپ ڈیٹ کیا جاتا ہے.
@@ -1335,7 +1335,6 @@
 DocType: Loyalty Program Collection,Tier Name,ٹائر کا نام
 DocType: HR Settings,Enter retirement age in years,سال میں ریٹائرمنٹ کی عمر درج کریں
 DocType: Crop,Target Warehouse,ہدف گودام
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,براہ کرم سیٹ اپ کے ذریعے {0} کے سلسلے میں ناممکن سیریز ترتیب دیں
 DocType: Payroll Employee Detail,Payroll Employee Detail,ملازم کی تفصیل
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,ایک گودام براہ مہربانی منتخب کریں
 DocType: Cheque Print Template,Starting location from left edge,بائیں کنارے سے مقام پر شروع
@@ -1425,7 +1424,7 @@
 DocType: Work Order,Plan material for sub-assemblies,ذیلی اسمبلیوں کے لئے منصوبہ مواد
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,سیلز شراکت دار اور علاقہ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} فعال ہونا ضروری ہے
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,منتقلی کے لئے دستیاب اشیاء نہیں
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,منتقلی کے لئے دستیاب اشیاء نہیں
 DocType: Employee Boarding Activity,Activity Name,سرگرمی کا نام
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,تبدیلی کی تاریخ تبدیل کریں
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,تیار کردہ مصنوعات کی مقدار <b>{0}</b> اور مقدار کے لئے <b>{1}</b> مختلف نہیں ہوسکتا
@@ -1655,6 +1654,7 @@
 DocType: Project,First Email,پہلا ای میل
 DocType: Company,Exception Budget Approver Role,استثنائی بجٹ تقریبا رول
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date",مقرر ہونے کے بعد، مقرر کردہ تاریخ تک یہ انوائس ہولڈنگ ہوگی
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,سیلز آرڈر / ختم سامان گودام میں محفوظ گودام
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,فروخت رقم
 DocType: Repayment Schedule,Interest Amount,سود کی رقم
@@ -1666,7 +1666,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,ریکارڈز
 DocType: Asset,Scrapped,ختم کر دیا
 DocType: Item,Item Defaults,آئٹم کے ڈیفالٹ
-DocType: Purchase Invoice,Returns,واپسی
+DocType: Cashier Closing,Returns,واپسی
 DocType: Job Card,WIP Warehouse,WIP گودام
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},سیریل نمبر {0} تک بحالی کے معاہدہ کے تحت ہے {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,نوکری کے لئے
@@ -1680,7 +1680,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,ٹرانسمیشن کی قسم
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,فروخت کے اخراجات
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,کسٹمر&gt; کسٹمر گروپ&gt; علاقہ
 DocType: Diagnosis,Diagnosis,تشخیص
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,سٹینڈرڈ خرید
 DocType: Attendance Request,Explanation,وضاحت
@@ -1693,7 +1692,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,خریداری کے احکامات کو آگے بڑھانا
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,زپ کوڈ
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},سیلز آرڈر {0} ہے {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},قرض میں دلچسپی آمدنی کا اکاؤنٹ منتخب کریں {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},قرض میں دلچسپی آمدنی کا اکاؤنٹ منتخب کریں {0}
 DocType: Opportunity,Contact Info,رابطے کی معلومات
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,اسٹاک اندراجات کر رہے ہیں
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,اسٹیٹ بائیں کے ساتھ ملازم کو فروغ نہیں دے سکتا
@@ -1705,7 +1704,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,صفر بلنگ گھنٹے کے لئے انوائس نہیں بنایا جا سکتا
 DocType: Company,Date of Commencement,آغاز کی تاریخ
 DocType: Sales Person,Select company name first.,پہلے منتخب کمپنی کا نام.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},{0} کو ای میل بھیج دیا گیا
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},{0} کو ای میل بھیج دیا گیا
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,کوٹیشن سپلائر کی طرف سے موصول.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,بوم تبدیل کریں اور تمام بی ایمز میں تازہ ترین قیمت کو اپ ڈیٹ کریں
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},کرنے کے لئے {0} | {1} {2}
@@ -1727,7 +1726,7 @@
 DocType: Asset Movement,From Employee,ملازم سے
 DocType: Driver,Cellphone Number,موبائل نمبر
 DocType: Project,Monitor Progress,نگرانی کی ترقی
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,انتباہ: نظام آئٹم کے لئے رقم کے بعد overbilling چیک نہیں کریں گے {0} میں {1} صفر ہے
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,انتباہ: نظام آئٹم کے لئے رقم کے بعد overbilling چیک نہیں کریں گے {0} میں {1} صفر ہے
 DocType: Journal Entry,Make Difference Entry,فرق اندراج
 DocType: Supplier Quotation,Auto Repeat Section,خود کار طریقے سے سیکشن
 DocType: Upload Attendance,Attendance From Date,تاریخ سے حاضری
@@ -1829,7 +1828,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,صف # {0}: مقدار خریداری واپس میں داخل نہیں کیا جا سکتا مسترد
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,منتخب کسٹمر کے لئے کسٹمر گروپ کو تبدیل کرنے کی اجازت نہیں ہے.
 ,Purchase Order Items To Be Billed,خریداری کے آرڈر اشیا بل بھیجا جائے کرنے کے لئے
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,متوقع آنے والے اوقات کو اپ ڈیٹ کرنا.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,متوقع آنے والے اوقات کو اپ ڈیٹ کرنا.
 DocType: Program Enrollment Tool,Enrollment Details,اندراج کی تفصیلات
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,ایک کمپنی کے لئے متعدد آئٹم ڈیفالٹ مقرر نہیں کرسکتے ہیں.
 DocType: Purchase Invoice Item,Net Rate,نیٹ کی شرح
@@ -1843,7 +1842,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,قسم چھوڑ دو
 DocType: Support Settings,Close Issue After Days,دن کے بعد مسئلہ بند کریں
 ,Eway Bill,ایو بل
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,صارفین کو مارکیٹ کے مینیجر میں صارفین کو شامل کرنے کے لئے سسٹم مینیجر اور آئٹم مینیجر رول کے ساتھ ایک صارف ہونا ضروری ہے.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,صارفین کو مارکیٹ کے مینیجر میں صارفین کو شامل کرنے کے لئے سسٹم مینیجر اور آئٹم مینیجر رول کے ساتھ ایک صارف ہونا ضروری ہے.
 DocType: Leave Control Panel,Leave blank if considered for all branches,تمام شاخوں کے لئے غور کیا تو خالی چھوڑ دیں
 DocType: Job Opening,Staffing Plan,اسٹافنگ پلان
 DocType: Bank Guarantee,Validity in Days,دن میں جواز
@@ -1865,7 +1864,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},کے ساتھ ڈپلیکیٹ قطار {0} اسی {1}
 DocType: Marketplace Settings,Disable Marketplace,مارکیٹ کی جگہ کو غیر فعال کریں
 ,Trial Balance,مقدمے کی سماعت توازن
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,مالی سال {0} نہیں ملا
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,مالی سال {0} نہیں ملا
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,ملازمین کو مقرر
 DocType: Hotel Room Reservation,Hotel Reservation User,ہوٹل ریزرویشن صارف
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,پہلے سابقہ براہ مہربانی منتخب کریں
@@ -1973,7 +1972,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,لاگ ان کرنے میں ناکام
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,پیدا کردہ {0}
 DocType: Special Test Items,Special Test Items,خصوصی ٹیسٹ اشیا
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,مارکیٹ میں رجسٹر کرنے کے لئے آپ کو سسٹم مینیجر اور آئٹم مینیجر کے کردار کے ساتھ ایک صارف بنانا ہوگا.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,مارکیٹ میں رجسٹر کرنے کے لئے آپ کو سسٹم مینیجر اور آئٹم مینیجر کے کردار کے ساتھ ایک صارف بنانا ہوگا.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,ادائیگی کا طریقہ
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,آپ کے مکلف تنخواہ کی تشکیل کے مطابق آپ فوائد کے لئے درخواست نہیں دے سکتے ہیں
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,ویب سائٹ تصویری ایک عوامی فائل یا ویب سائٹ یو آر ایل ہونا چاہئے
@@ -1985,7 +1984,7 @@
 DocType: Warehouse,Warehouse Contact Info,گودام معلومات رابطہ کریں
 DocType: Payment Entry,Write Off Difference Amount,فرق رقم لکھنے
 DocType: Volunteer,Volunteer Name,رضاکارانہ نام
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},دوسرے صفوں میں ڈپلیکیٹ ہونے والے تاریخوں کے ساتھ ریلوے پایا گیا: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},دوسرے صفوں میں ڈپلیکیٹ ہونے والے تاریخوں کے ساتھ ریلوے پایا گیا: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent",{0}: ملازم کے ای میل نہیں ملا، اس وجہ سے نہیں بھیجے گئے ای میل
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},ملک کے لئے شپنگ ضابطے لاگو نہیں ہے {0}
 DocType: Item,Foreign Trade Details,فارن ٹریڈ کی تفصیلات
@@ -2074,6 +2073,7 @@
 DocType: Salary Component,Earning,کمانے
 DocType: Supplier Scorecard,Scoring Criteria,اسکور معیار
 DocType: Purchase Invoice,Party Account Currency,پارٹی کے اکاؤنٹ کی کرنسی
+DocType: Delivery Trip,Total Estimated Distance,کل متوقع فاصلہ
 ,BOM Browser,BOM براؤزر
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,اس ٹریننگ ایونٹ کیلئے اپنی حیثیت کو اپ ڈیٹ کریں
 DocType: Item Barcode,EAN,ایان
@@ -2112,7 +2112,7 @@
 DocType: Activity Cost,Projects,منصوبوں
 DocType: Payment Request,Transaction Currency,ٹرانزیکشن ست
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},سے {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,کچھ ای میل غلط ہیں
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,کچھ ای میل غلط ہیں
 DocType: Work Order Operation,Operation Description,آپریشن تفصیل
 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.,مالی سال محفوظ کیا جاتا ہے ایک بار مالی سال شروع کرنے کی تاریخ اور مالی سال کے اختتام تاریخ تبدیل نہیں کر سکتے.
 DocType: Quotation,Shopping Cart,خریداری کی ٹوکری
@@ -2136,7 +2136,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,فکسڈ اثاثہ میں خالص تبدیلی
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,رقیہ مقدار
 DocType: Leave Control Panel,Leave blank if considered for all designations,تمام مراتب کے لئے غور کیا تو خالی چھوڑ دیں
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,قسم &#39;اصل&#39; قطار میں کے انچارج {0} شے کی درجہ بندی میں شامل نہیں کیا جا سکتا
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,قسم &#39;اصل&#39; قطار میں کے انچارج {0} شے کی درجہ بندی میں شامل نہیں کیا جا سکتا
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},زیادہ سے زیادہ: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,تریخ ویلہ سے
 DocType: Shopify Settings,For Company,کمپنی کے لئے
@@ -2150,7 +2150,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,کورس شیڈول بنانے میں غلطیاں موجود تھیں
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,اس فہرست میں پہلی اخراجات کا تعین ڈیفالٹ اخراجات کے طور پر مقرر کیا جائے گا.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,زیادہ سے زیادہ 100 سے زائد نہیں ہو سکتا
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,آپ کو ایڈمنسٹریٹر کے مقابلے میں کسی دوسرے صارف کو سسٹم مینیجر اور آئٹم مینیجر کے رول کے ساتھ مارکیٹ میں رجسٹر کرنے کی ضرورت ہے.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,آپ کو ایڈمنسٹریٹر کے مقابلے میں کسی دوسرے صارف کو سسٹم مینیجر اور آئٹم مینیجر کے رول کے ساتھ مارکیٹ میں رجسٹر کرنے کی ضرورت ہے.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,{0} آئٹم اسٹاک شے نہیں ہے
 DocType: Packing Slip,MAT-PAC-.YYYY.-,میٹ - پی اے سی --YYYY-
 DocType: Maintenance Visit,Unscheduled,شیڈول کا اعلان
@@ -2410,7 +2410,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{2} کے خالی خیز اور {1} بجٹ {2} کے پہلے سے ہی {3} کی ماتحت کمپنیوں کیلئے منصوبہ بندی کی گئی ہے. آپ صرف والدین {3} کے لئے عملے کی منصوبہ بندی {6} کے مطابق {4} تشخیص اور بجٹ {5} تک صرف منصوبہ بنا سکتے ہیں.
 DocType: HR Settings,Stop Birthday Reminders,سٹاپ سالگرہ تخسمارک
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},کمپنی میں پہلے سے طے شدہ پے رول قابل ادائیگی اکاؤنٹ سیٹ مہربانی {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},کمپنی میں پہلے سے طے شدہ پے رول قابل ادائیگی اکاؤنٹ سیٹ مہربانی {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,ٹیکس اور ایمیزون کے الزامات کے اعداد و شمار کے مالی بریک اپ حاصل کریں
 DocType: SMS Center,Receiver List,وصول کی فہرست
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,تلاش آئٹم
@@ -2480,7 +2480,7 @@
 DocType: Vital Signs,Constipated,قبضہ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},پردایک خلاف انوائس {0} ء {1}
 DocType: Customer,Default Price List,پہلے سے طے شدہ قیمت کی فہرست
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,اثاثہ تحریک ریکارڈ {0} پیدا
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,اثاثہ تحریک ریکارڈ {0} پیدا
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,کوئی چیز نہیں ملی.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,آپ مالی سال {0} کو حذف نہیں کر سکتے ہیں. مالی سال {0} گلوبل ترتیبات میں ڈیفالٹ کے طور پر مقرر کیا جاتا ہے
 DocType: Share Transfer,Equity/Liability Account,مساوات / ذمہ داری اکاؤنٹ
@@ -2619,6 +2619,7 @@
 DocType: Blanket Order,Order Type,آرڈر کی قسم
 ,Item-wise Sales Register,آئٹم وار سیلز رجسٹر
 DocType: Asset,Gross Purchase Amount,مجموعی خریداری کی رقم
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,آئٹم کوڈ&gt; آئٹم گروپ&gt; برانڈ
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,کھولنے کے بیلنس
 DocType: Asset,Depreciation Method,ہراس کا طریقہ
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,بنیادی شرح میں شامل اس ٹیکس ہے؟
@@ -2697,7 +2698,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,اگر سالانہ بجٹ پی پی سے زیادہ ہو تو عمل
 DocType: Student Leave Application,Student Leave Application,Student کی رخصت کی درخواست
 DocType: Item,Will also apply for variants,بھی مختلف حالتوں کے لئے لاگو ہوں گے
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}",اثاثہ منسوخ نہیں کیا جاسکتا ہے، کیونکہ یہ پہلے سے ہی ہے {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}",اثاثہ منسوخ نہیں کیا جاسکتا ہے، کیونکہ یہ پہلے سے ہی ہے {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},ملازم {0} پر نصف دن پر {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},کل کام کرنے کا گھنٹوں زیادہ سے زیادہ کام کے گھنٹوں سے زیادہ نہیں ہونا چاہئے {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,پر
@@ -2721,6 +2722,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,ڈیٹا لاؤ
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},چھوڑنے کی قسم میں {0} زیادہ سے زیادہ اجازت کی اجازت ہے {1}
 DocType: SMS Center,Create Receiver List,وصول فہرست بنائیں
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,استعمال کے لئے دستیاب تاریخ کی خریداری کی تاریخ کے بعد ہونا چاہئے
 DocType: Vehicle,Wheels,پہیے
 DocType: Packing Slip,To Package No.,نمبر پیکیج
 DocType: Patient Relation,Family,خاندان
@@ -2734,7 +2736,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,بلنگ کی کرنسی کو پہلے ہی ڈیفالٹ کمپنی کی کرنسی یا پارٹی اکاؤنٹ کرنسی کے برابر ہونا ضروری ہے
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),پیکیج اس کی ترسیل (صرف ڈرافٹ) کا ایک حصہ ہے کہ اشارہ کرتا ہے
 DocType: Soil Texture,Loam,لوام
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,صف {0}: تاریخ کی تاریخ تاریخ سے پہلے نہیں ہوسکتی ہے
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,صف {0}: تاریخ کی تاریخ تاریخ سے پہلے نہیں ہوسکتی ہے
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,ادائیگی اندراج
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},شے کے لئے مقدار {0} سے کم ہونا چاہئے {1}
 ,Sales Invoice Trends,فروخت انوائس رجحانات
@@ -2821,7 +2823,7 @@
 DocType: Sales Person,Name and Employee ID,نام اور ملازم ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,کی وجہ سے تاریخ تاریخ پوسٹنگ سے پہلے نہیں ہو سکتا
 DocType: Website Item Group,Website Item Group,ویب سائٹ آئٹم گروپ
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,مندرجہ ذیل منتخب کردہ معیار یا تنخواہ پرچی کے لئے جمع کرنے کے لئے کوئی تنخواہ پرچی نہیں مل سکی
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,مندرجہ ذیل منتخب کردہ معیار یا تنخواہ پرچی کے لئے جمع کرنے کے لئے کوئی تنخواہ پرچی نہیں مل سکی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,ڈیوٹی اور ٹیکس
 DocType: Projects Settings,Projects Settings,منصوبوں کی ترتیبات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,حوالہ کوڈ داخل کریں.
@@ -2830,7 +2832,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,فراہم کی مقدار
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC- CPR-YYYY.-
 DocType: Purchase Order Item,Material Request Item,مواد درخواست آئٹم
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,براہ کرم سب سے پہلے خریداری رسید {0} منسوخ کریں
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,براہ کرم سب سے پہلے خریداری رسید {0} منسوخ کریں
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,آئٹم گروپس کا درخت.
 DocType: Production Plan,Total Produced Qty,کل پیداوار مقدار
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,اس چارج کی قسم کے لئے موجودہ صفیں سے زیادہ یا برابر صفیں رجوع نہیں کر سکتے ہیں
@@ -2940,6 +2942,7 @@
 ,Vehicle Expenses,گاڑیوں کے اخراجات
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,سیلز انوائس جمع کرانے پر لیب ٹیسٹ (ے) بنائیں
 DocType: Serial No,Invoice Details,انوائس کی تفصیلات دیکھیں
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,راستے کا اندازہ اور اصلاح کرنے کیلئے براہ کرم Google Maps ترتیبات کو فعال کریں
 DocType: Grant Application,Show on Website,ویب سائٹ پر دکھائیں
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,شروع کرو
 DocType: Hub Tracked Item,Hub Category,حب زمرہ
@@ -2978,7 +2981,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1797,Get Items from Prescriptions,نسخہ سے اشیا حاصل کریں
 DocType: Patient,Patient Details,مریض کی تفصیلات
 DocType: Inpatient Record,B Positive,بی مثبت
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",صف # {0}: قی، 1 ہونا ضروری شے ایک مقررہ اثاثہ ہے کے طور پر. ایک سے زیادہ مقدار کے لئے علیحدہ صف استعمال کریں.
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",صف # {0}: قی، 1 ہونا ضروری شے ایک مقررہ اثاثہ ہے کے طور پر. ایک سے زیادہ مقدار کے لئے علیحدہ صف استعمال کریں.
 DocType: Leave Block List Allow,Leave Block List Allow,بلاک فہرست اجازت دیں چھوڑ دو
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr خالی یا جگہ نہیں ہو سکتا
 DocType: Patient Medical Record,Patient Medical Record,مریض میڈیکل ریکارڈ
@@ -3013,7 +3016,7 @@
 DocType: Workstation,Wages per hour,فی گھنٹہ اجرت
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},بیچ میں اسٹاک توازن {0} بن جائے گا منفی {1} گودام شے {2} کے لئے {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,مواد درخواست درج ذیل آئٹم کی دوبارہ آرڈر کی سطح کی بنیاد پر خود کار طریقے سے اٹھایا گیا ہے
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},اکاؤنٹ {0} باطل ہے. اکاؤنٹ کی کرنسی ہونا ضروری ہے {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},اکاؤنٹ {0} باطل ہے. اکاؤنٹ کی کرنسی ہونا ضروری ہے {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},تاریخ {0} سے ملازم کی رعایت کی تاریخ {1} کے بعد نہیں ہوسکتا ہے
 DocType: Supplier,Is Internal Supplier,اندرونی سپلائر ہے
 DocType: Employee,Create User Permission,صارف کی اجازت بنائیں
@@ -3159,7 +3162,7 @@
 DocType: Account,Fixed Asset,مستقل اثاثے
 DocType: Amazon MWS Settings,After Date,تاریخ کے بعد
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,serialized کی انوینٹری
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,انٹر کمپنی انوائس کے لئے غلط {0}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,انٹر کمپنی انوائس کے لئے غلط {0}.
 ,Department Analytics,ڈیپارٹمنٹ کے تجزیات
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,پہلے سے طے شدہ رابطہ میں ای میل نہیں مل سکا
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,خفیہ بنائیں
@@ -3172,7 +3175,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,فیس ساخت اور طالب علم گروپ {0} میں پروگرام مختلف ہیں.
 DocType: Bank Statement Transaction Entry,Receivable Account,وصولی اکاؤنٹ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,تاریخ سے درست سے تاریخ تک درست ہونا لازمی ہے.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},قطار # {0}: اثاثہ {1} پہلے سے ہی ہے {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},قطار # {0}: اثاثہ {1} پہلے سے ہی ہے {2}
 DocType: Quotation Item,Stock Balance,اسٹاک توازن
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,ادائیگی سیلز آرڈر
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,سی ای او
@@ -3214,6 +3217,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,ڈیبٹ کرنے کی ضرورت ہے
 DocType: Clinical Procedure,Inpatient Record,بیماری کا ریکارڈ
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",timesheets کو آپ کی ٹیم کی طرف سے کیا سرگرمیوں کے لئے وقت، لاگت اور بلنگ کا ٹریک رکھنے میں مدد
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,سپلائر&gt; سپلائی کی قسم
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,قیمت خرید کی فہرست
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,ٹرانزیکشن کی تاریخ
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,سپلائر سکور کارڈ متغیر کے سانچے.
@@ -3257,7 +3261,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,ایکسچینج گین / نقصان
 DocType: Opportunity,Lost Reason,کھو وجہ
 DocType: Amazon MWS Settings,Enable Amazon,ایمیزون کو فعال کریں
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},قطار # {0}: اکاؤنٹ {1} کمپنی سے تعلق نہیں ہے {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},قطار # {0}: اکاؤنٹ {1} کمپنی سے تعلق نہیں ہے {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},ڈس ٹائپ تلاش کرنے میں ناکام {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,نیا ایڈریس
 DocType: Quality Inspection,Sample Size,نمونہ سائز
@@ -3368,7 +3372,7 @@
 DocType: Water Analysis,Origin,اصل
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,یہ دستاویز کی طرف سے حد سے زیادہ ہے {0} {1} شے کے لئے {4}. آپ کر رہے ہیں ایک اور {3} اسی کے خلاف {2}؟
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,کو بچانے کے بعد بار بار چلنے والی مقرر کریں
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,تبدیلی منتخب رقم اکاؤنٹ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,تبدیلی منتخب رقم اکاؤنٹ
 DocType: Purchase Invoice,Price List Currency,قیمت کی فہرست کرنسی
 DocType: Naming Series,User must always select,صارف نے ہمیشہ منتخب کرنا ضروری ہے
 DocType: Stock Settings,Allow Negative Stock,منفی اسٹاک کی اجازت دیں
@@ -3410,7 +3414,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,کیا آپ واقعی اس مقررہ کو منسوخ کرنا چاہتے ہیں؟
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,ہوٹل کمرہ قیمتوں کا تعین پیکیج
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,فروخت کی پائپ لائن
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},تنخواہ کے اجزاء میں ڈیفالٹ اکاؤنٹ سیٹ مہربانی {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},تنخواہ کے اجزاء میں ڈیفالٹ اکاؤنٹ سیٹ مہربانی {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,مطلوب پر
 DocType: Rename Tool,File to Rename,فائل کا نام تبدیل کرنے
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},براہ کرم بوم میں آئٹم کیلئے صف {0} منتخب کریں.
@@ -3431,7 +3435,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,خریدی اشیاء کی لاگت
 DocType: Employee Separation,Employee Separation Template,ملازم علیحدگی سانچہ
 DocType: Selling Settings,Sales Order Required,سیلز آرڈر کی ضرورت ہے
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,بیچنے والا بن
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,بیچنے والا بن
 DocType: Purchase Invoice,Credit To,کریڈٹ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,ایکٹو لیڈز / گاہکوں
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,معیاری ڈلیوری نوٹ کی شکل کا استعمال کرنے کیلئے خالی چھوڑ دیں
@@ -3473,7 +3477,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,ٹیکس سانچہ بنائیں
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,صارف فورم
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,خام مال خالی نہیں ہو سکتا.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,قطار # {0} (ادائیگی کی میز): رقم منفی ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,قطار # {0} (ادائیگی کی میز): رقم منفی ہونا ضروری ہے
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.",اسٹاک کو اپ ڈیٹ نہیں کیا جا سکا، انوائس ڈراپ شپنگ آئٹم پر مشتمل ہے.
 DocType: Contract,Fulfilment Status,مکمل حیثیت
 DocType: Lab Test Sample,Lab Test Sample,لیب ٹیسٹنگ نمونہ
@@ -3613,7 +3617,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,ڈاکٹر کی تاریخ
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},فیس ریکارڈز کی تشکیل - {0}
 DocType: Asset Category Account,Asset Category Account,ایسیٹ زمرہ اکاؤنٹ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,قطار # {0} (ادائیگی کی میز): رقم مثبت ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,قطار # {0} (ادائیگی کی میز): رقم مثبت ہونا ضروری ہے
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},سیلز آرڈر کی مقدار سے زیادہ آئٹم {0} پیدا نہیں کر سکتے ہیں {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,خصوصیت اقدار منتخب کریں
 DocType: Purchase Invoice,Reason For Issuing document,دستاویز جاری کرنے کے لۓ
@@ -3668,7 +3672,7 @@
 DocType: Purchase Receipt,Time at which materials were received,مواد موصول ہوئیں جس میں وقت
 DocType: Products Settings,Products per Page,فی صفحہ مصنوعات
 DocType: Stock Ledger Entry,Outgoing Rate,سبکدوش ہونے والے کی شرح
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,یا
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,یا
 DocType: Sales Order,Billing Status,بلنگ کی حیثیت
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ایک مسئلہ کی اطلاع دیں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,یوٹیلٹی اخراجات
@@ -3696,7 +3700,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,ملازم ٹیکس چھوٹ اعلامیہ
 DocType: Payment Entry,Cheque/Reference Date,چیک / حوالہ تاریخ
 DocType: Purchase Invoice,Total Taxes and Charges,کل ٹیکس اور الزامات
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,استعمال کے لئے دستیاب تاریخ ماضی کے طور پر داخل ہو گیا ہے
 DocType: Employee,Emergency Contact,ہنگامی رابطے
 DocType: Bank Reconciliation Detail,Payment Entry,ادائیگی انٹری
 ,sales-browser,سیلز براؤزر
@@ -3743,6 +3746,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),کیا واپسی ہے (کریڈٹ نوٹ)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,ملازمت شروع کریں
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},شریعت {0} کے لئے سیریل نمبر کی ضرورت نہیں ہے
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,براہ کرم سیٹ اپ کے ذریعے {0} کے سلسلے میں ناممکن سیریز ترتیب دیں
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,معذور کے سانچے ڈیفالٹ ٹیمپلیٹ نہیں ہونا چاہئے
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,قطار {0} کے لئے: منصوبہ بندی کی مقدار درج کریں
 DocType: Account,Income Account,انکم اکاؤنٹ
@@ -3756,6 +3760,7 @@
 DocType: Loyalty Program,Help Section,مدد سیکشن
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,پچھلا
 DocType: Appraisal Goal,Key Responsibility Area,کلیدی ذمہ داری کے علاقے
+DocType: Delivery Trip,Distance UOM,فاصلہ UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",طالب علم بیچوں آپ کے طالب علموں کے لئے حاضری، جائزوں اور فیس کو ٹریک میں مدد
 DocType: Payment Entry,Total Allocated Amount,کل مختص رقم
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,ہمیشہ کی انوینٹری کے لئے پہلے سے طے شدہ انوینٹری اکاؤنٹ
@@ -3797,7 +3802,7 @@
 DocType: Item Supplier,Item Supplier,آئٹم پردایک
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,بیچ کوئی حاصل کرنے کے لئے آئٹم کوڈ درج کریں
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},{0} quotation_to کے لئے ایک قیمت منتخب کریں {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,منتقلی کے لئے منتخب کردہ کوئی آئٹم نہیں
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,منتقلی کے لئے منتخب کردہ کوئی آئٹم نہیں
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,تمام پتے.
 DocType: Company,Stock Settings,اسٹاک ترتیبات
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",مندرجہ ذیل خصوصیات دونوں کے ریکارڈ میں ایک ہی ہیں تو ولی ہی ممکن ہے. گروپ، جڑ کی قسم، کمپنی ہے
@@ -4082,7 +4087,7 @@
 DocType: Patient,Personal and Social History,ذاتی اور سماجی تاریخ
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,صارف {0} پیدا ہوا
 DocType: Fee Schedule,Fee Breakup for each student,ہر طالب علم کے لئے فیس بریک اپ
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),کل ایڈوانس ({0}) کے خلاف {1} گرینڈ کل سے زیادہ نہیں ہو سکتا ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),کل ایڈوانس ({0}) کے خلاف {1} گرینڈ کل سے زیادہ نہیں ہو سکتا ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,اسمان ماہ میں اہداف تقسیم کرنے ماہانہ تقسیم کریں.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,کوڈ تبدیل کریں
 DocType: Purchase Invoice Item,Valuation Rate,تشخیص کی شرح
@@ -4091,7 +4096,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,آئی ٹی سی سیس کا دورہ
 ,Student Monthly Attendance Sheet,Student کی ماہانہ حاضری شیٹ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,فروخت کے لئے صرف شپنگ اصول لاگو ہوتا ہے
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,استحکام صف {0}: اگلے قیمت کی قیمت کی تاریخ خریداری کی تاریخ سے پہلے نہیں ہوسکتی ہے
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,استحکام صف {0}: اگلے قیمت کی قیمت کی تاریخ خریداری کی تاریخ سے پہلے نہیں ہوسکتی ہے
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,اس منصوبے کے آغاز کی تاریخ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,جب تک
 DocType: Rename Tool,Rename Log,لاگ ان کا نام تبدیل کریں
@@ -4109,12 +4114,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,سیلز ٹرانسمیشن کی بنیاد پر پروجیکٹ اور کمپنی کو اپ ڈیٹ کیا جانا چاہئے.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,اختتامی میعاد
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,طلباء شامل کریں
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","برائے مہربانی اس دستاویز کو منسوخ کرنے کے لئے ملازم <a href=""#Form/Employee/{0}"">{0}</a> کو حذف کریں"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},براہ مہربانی منتخب کریں {0}
 DocType: C-Form,C-Form No,سی فارم نہیں
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,فاصلے
+DocType: Delivery Stop,Distance,فاصلے
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,آپ کی مصنوعات یا خدمات جو آپ خریدتے ہیں یا فروخت کرتے ہیں وہ فہرست کریں.
 DocType: Water Analysis,Storage Temperature,ذخیرہ اندوزی کا درجہ حرارت
 DocType: Sales Order,SAL-ORD-.YYYY.-,سیل- ORD -YYYY-
@@ -4141,7 +4144,7 @@
 DocType: Homepage,Company Description for website homepage,ویب سائٹ کے ہوم پیج کے لئے کمپنی کی تفصیل
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",گاہکوں کی سہولت کے لئے، یہ کوڈ انوائس اور ترسیل نوٹوں کی طرح پرنٹ کی شکل میں استعمال کیا جا سکتا
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier نام
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,{0} کے لئے معلومات کو دوبارہ حاصل نہیں کیا جا سکا.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,{0} کے لئے معلومات کو دوبارہ حاصل نہیں کیا جا سکا.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,کھولیں انٹری جرنل
 DocType: Contract,Fulfilment Terms,مکمل شرائط
 DocType: Sales Invoice,Time Sheet List,وقت شیٹ کی فہرست
@@ -4323,7 +4326,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,سرگرمی کی بنیاد پر گروپ کے لئے دستی طور پر طالب علموں منتخب
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,سرگرمی کی بنیاد پر گروپ کے لئے دستی طور پر طالب علموں منتخب
 DocType: Journal Entry,User Remark,صارف تبصرہ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,اصلاحات کے راستے.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,اصلاحات کے راستے.
 DocType: Travel Itinerary,Non Diary,غیر ڈائری
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,بائیں ملازمتوں کے لئے رکاوٹ بونس نہیں بنا سکتا
 DocType: Lead,Market Segment,مارکیٹ کے علاقے
@@ -4354,7 +4357,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,وفادار پروگرام
 DocType: Student Guardian,Father,فادر
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,معاون ٹکٹ
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;اپ ڈیٹ اسٹاک&#39; فکسڈ اثاثہ کی فروخت کے لئے نہیں کی جانچ پڑتال کی جا سکتی ہے
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;اپ ڈیٹ اسٹاک&#39; فکسڈ اثاثہ کی فروخت کے لئے نہیں کی جانچ پڑتال کی جا سکتی ہے
 DocType: Bank Reconciliation,Bank Reconciliation,بینک مصالحتی
 DocType: Attendance,On Leave,چھٹی پر
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,تازہ ترین معلومات حاصل کریں
@@ -4399,7 +4402,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,سیریل نمبر اور بیچ
 DocType: Warranty Claim,From Company,کمپنی کی طرف سے
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,اسکور کے معیار کے معیار کا مقصد {0} ہونا ضروری ہے.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Depreciations کی تعداد بک مقرر کریں
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Depreciations کی تعداد بک مقرر کریں
 DocType: Supplier Scorecard Period,Calculations,حساب
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,قیمت یا مقدار
 DocType: Payment Terms Template,Payment Terms,ادائیگی کی شرائط
@@ -4418,7 +4421,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,ڈسکاؤنٹ (٪) پر مارجن کے ساتھ قیمت کی فہرست شرح
 DocType: Healthcare Service Unit Type,Rate / UOM,شرح / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,تمام گوداموں
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,انٹر کمپنی کی ٹرانسمیشن کے لئے کوئی {0} نہیں ملا.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,انٹر کمپنی کی ٹرانسمیشن کے لئے کوئی {0} نہیں ملا.
 DocType: Travel Itinerary,Rented Car,کرایہ کار
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,آپ کی کمپنی کے بارے میں
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,اکاؤنٹ کریڈٹ ایک بیلنس شیٹ اکاؤنٹ ہونا ضروری ہے
@@ -4518,6 +4521,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,پلانٹ تجزیہ معیار
 DocType: Cheque Print Template,Cheque Height,چیک اونچائی
 DocType: Supplier,Supplier Details,پردایک تفصیلات
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,سیٹ اپ&gt; نمبر نمبر کے ذریعے حاضری کے لئے براہ کرم سلسلہ نمبر سیٹ کریں
 DocType: Setup Progress,Setup Progress,سیٹ اپ پیش رفت
 DocType: Expense Claim,Approval Status,منظوری کی حیثیت
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},قیمت صف میں قدر سے کم ہونا ضروری ہے سے {0}
@@ -4610,7 +4614,6 @@
 DocType: Travel Request,Fully Sponsored,مکمل طور پر سپانسر
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,ریورس جرنل انٹری
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,کسٹمر {0} پیدا ہوتا ہے.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,براہ کرم انسانی وسائل&gt; HR ترتیبات میں ملازم نامی کا نظام قائم کریں
 DocType: Stock Settings,Limit Percent,حد فیصد
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,فی الحال کوئی اسٹاک کسی بھی گودام میں دستیاب نہیں ہے
 ,Payment Period Based On Invoice Date,انوائس کی تاریخ کی بنیاد پر ادائیگی کی مدت
@@ -4669,7 +4672,7 @@
 DocType: BOM Explosion Item,Source Warehouse,ماخذ گودام
 DocType: Installation Note,Installation Date,تنصیب کی تاریخ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,شریک لیڈر
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},صف # {0}: اثاثہ {1} کی کمپنی سے تعلق نہیں ہے {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},صف # {0}: اثاثہ {1} کی کمپنی سے تعلق نہیں ہے {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,سیلز انوائس {0} نے پیدا کیا
 DocType: Employee,Confirmation Date,توثیق تاریخ
 DocType: Inpatient Occupancy,Check Out,اس کو دیکھو
@@ -4689,6 +4692,7 @@
 DocType: Production Plan,Sales Orders Detail,سیلز آرڈر کی تفصیل
 DocType: Bin,Requested Quantity,درخواست کی مقدار
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FE -YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,براہ کرم تعلیمی&gt; تعلیمی ترتیبات میں انسٹرکٹر نامیاتی نظام قائم کریں
 DocType: Patient,Marital Status,ازدواجی حالت
 DocType: Stock Settings,Auto Material Request,آٹو مواد کی درخواست
 DocType: Woocommerce Settings,API consumer secret,API صارفین کا راز
@@ -4741,7 +4745,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,دن منتخب کریں
 DocType: Academic Term,Term Name,اصطلاح نام
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),کریڈٹ ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,تنخواہ سلپس بنانے ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,تنخواہ سلپس بنانے ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,آپ جڑ نوڈ میں ترمیم نہیں کر سکتے ہیں.
 DocType: Buying Settings,Purchase Order Required,آرڈر کی ضرورت ہے خریدیں
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,ٹائمر
@@ -4778,7 +4782,7 @@
 DocType: Account,Rate at which this tax is applied,اس ٹیکس لاگو کیا جاتا ہے جس میں شرح
 DocType: Cash Flow Mapper,Section Name,سیکشن کا نام
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,ترتیب مقدار
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},استحکام صف {0}: مفید زندگی کے بعد متوقع قدر {1} سے زیادہ یا برابر ہونا ضروری ہے.
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},استحکام صف {0}: مفید زندگی کے بعد متوقع قدر {1} سے زیادہ یا برابر ہونا ضروری ہے.
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,موجودہ کام سوراخ
 DocType: Company,Stock Adjustment Account,اسٹاک ایڈجسٹمنٹ بلنگ
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,لکھ دینا
@@ -4825,7 +4829,7 @@
 DocType: Program Enrollment,School House,سکول ہاؤس
 DocType: Serial No,Out of AMC,اے ایم سی کے باہر
 DocType: Opportunity,Opportunity Amount,موقع کی رقم
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,بک Depreciations کی تعداد کل Depreciations کی تعداد سے زیادہ نہیں ہو سکتی
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,بک Depreciations کی تعداد کل Depreciations کی تعداد سے زیادہ نہیں ہو سکتی
 DocType: Purchase Order,Order Confirmation Date,آرڈر کی توثیق کی تاریخ
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI -YYYY-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,بحالی دورہ
@@ -4866,7 +4870,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,بیچ:
 DocType: Volunteer,Afternoon,دوپہر
 DocType: Loyalty Program,Loyalty Program Help,وفادار پروگرام کی مدد
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} {1} &#39;غیر فعال ہے
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} {1} &#39;غیر فعال ہے
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,کھولنے کے طور پر مقرر کریں
 DocType: Cheque Print Template,Scanned Cheque,سکین شدہ چیک
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,جمع لین دین پر خود کار طریقے سے رابطے ای میلز بھیجیں.
@@ -4879,7 +4883,7 @@
 DocType: Warranty Claim,Item and Warranty Details,آئٹم اور وارنٹی تفصیلات دیکھیں
 DocType: Chapter,Chapter Members,باب ارکان
 DocType: Sales Team,Contribution (%),شراکت (٪)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,نوٹ: ادائیگی کے اندراج کے بعد پیدا ہو گا &#39;نقد یا بینک اکاؤنٹ&#39; وضاحت نہیں کی گئی
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,نوٹ: ادائیگی کے اندراج کے بعد پیدا ہو گا &#39;نقد یا بینک اکاؤنٹ&#39; وضاحت نہیں کی گئی
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,پروجیکٹ {0} پہلے ہی موجود ہے
 DocType: Clinical Procedure,Nursing User,نرسنگ صارف
 DocType: Employee Benefit Application,Payroll Period,ادائیگی کا دورہ
@@ -4887,6 +4891,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},سیریل نمبر {0} بیچ سے تعلق نہیں ہے {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,ذمہ داریاں
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,اس کوٹیشن کی مدت کی مدت ختم ہوگئی ہے.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","برائے مہربانی اس دستاویز کو منسوخ کرنے کے لئے ملازم <a href=""#Form/Employee/{0}"">{0}</a> کو حذف کریں"
 DocType: Expense Claim Account,Expense Claim Account,اخراجات دعوی اکاؤنٹ
 DocType: Account,Capital Work in Progress,پیش رفت میں کیپٹل کام
 DocType: Accounts Settings,Allow Stale Exchange Rates,اسٹیل ایکسچینج کی قیمت کی اجازت دیں
@@ -4968,7 +4974,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,مسئلہ مواد
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,ERPNext کے ساتھ Shopify کو مربوط کریں
 DocType: Material Request Item,For Warehouse,گودام کے لئے
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,ڈلیوری نوٹس {0} اپ ڈیٹ
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,ڈلیوری نوٹس {0} اپ ڈیٹ
 DocType: Employee,Offer Date,پیشکش تاریخ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,کوٹیشن
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,آپ آف لائن موڈ میں ہیں. آپ آپ کو نیٹ ورک ہے جب تک دوبارہ لوڈ کرنے کے قابل نہیں ہو گا.
@@ -5018,7 +5024,7 @@
 DocType: Shipping Rule,Calculate Based On,کی بنیاد پر حساب
 DocType: Contract,Unfulfilled,ناقابل یقین
 DocType: Delivery Note Item,From Warehouse,گودام سے
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,ذکر کردہ معیار کے لئے کوئی ملازم نہیں
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,ذکر کردہ معیار کے لئے کوئی ملازم نہیں
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,تیار کرنے کی مواد کے بل کے ساتھ کوئی شے
 DocType: Shopify Settings,Default Customer,ڈیفالٹ کسٹمر
 DocType: Sales Stage,Stage Name,مرحلے کا نام
@@ -5061,7 +5067,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ڈسکاؤنٹ رقم کے بعد ٹیکس کی رقم
 DocType: Patient,Inpatient Status,بیماری کی حیثیت
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,روز مرہ کے کام کا خلاصہ ترتیبات
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,منتخب شدہ قیمت کی فہرست کو جانچ پڑتال اور فروخت کے شعبوں کو ہونا چاہئے.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,منتخب شدہ قیمت کی فہرست کو جانچ پڑتال اور فروخت کے شعبوں کو ہونا چاہئے.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,براہ مہربانی دوبارہ کوشش کریں
 DocType: Payment Entry,Internal Transfer,اندرونی منتقلی
 DocType: Asset Maintenance,Maintenance Tasks,بحالی کے کام
@@ -5098,7 +5104,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,گروپ سے
 DocType: Guardian,Interests,دلچسپیاں
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,کو فعال / غیر فعال کریں کرنسیاں.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,کچھ تنخواہ سلپس نہیں پیش کی جا سکتی
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,کچھ تنخواہ سلپس نہیں پیش کی جا سکتی
 DocType: Exchange Rate Revaluation,Get Entries,اندراج حاصل کریں
 DocType: Production Plan,Get Material Request,مواد گذارش حاصل کریں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,پوسٹل اخراجات
@@ -5183,7 +5189,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},اخراجات کے اکاؤنٹ شے کے لئے لازمی ہے {0}
 DocType: BOM,Website Description,ویب سائٹ تفصیل
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,ایکوئٹی میں خالص تبدیلی
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,انوائس خریداری {0} منسوخ مہربانی سب سے پہلے
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,انوائس خریداری {0} منسوخ مہربانی سب سے پہلے
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,اجازت نہیں. برائے مہربانی سروس یونٹ کی قسم کو غیر فعال کریں
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",ای میل پتہ منفرد ہونا ضروری ہے، پہلے ہی {0} کے لئے موجود ہے.
 DocType: Serial No,AMC Expiry Date,AMC ختم ہونے کی تاریخ
@@ -5223,7 +5229,7 @@
 DocType: Hotel Room,Hotel Room,ہوٹل کا کمرہ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},اکاؤنٹ {0} کرتا کمپنی سے تعلق رکھتا نہیں {1}
 DocType: Leave Type,Rounding,رائڈنگ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,{0} قطار میں سیریل نمبر ڈلیوری نوٹ کے ساتھ میل نہیں کھاتا
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,{0} قطار میں سیریل نمبر ڈلیوری نوٹ کے ساتھ میل نہیں کھاتا
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),ڈسپنس شدہ رقم (پرو-درجہ بندی)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.",پھر قیمتوں کا تعین کے قوانین کسٹمر، کسٹمر گروپ، علاقہ، سپلائر، سپلائر گروپ، مہم، سیلز پارٹنر وغیرہ کی بنیاد پر فلٹر کیا جاتا ہے.
 DocType: Student,Guardian Details,گارڈین کی تفصیلات دیکھیں
@@ -5278,7 +5284,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},گودام اسٹاک آئٹم کے لئے ضروری {0}
 DocType: Leave Allocation,Unused leaves,غیر استعمال شدہ پتے
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,تنخواہ داخلہ بنائیں
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,تمام محکموں
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,تمام محکموں
 DocType: Healthcare Service Unit,Vacant,خالی
 DocType: Patient,Alcohol Past Use,شراب ماضی کا استعمال
 DocType: Fertilizer Content,Fertilizer Content,ارورائزر مواد
@@ -5289,7 +5295,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,اس سیلز آرڈر کو منسوخ کرنے سے پہلے کام کا آرڈر {0} منسوخ ہونا ضروری ہے
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),(ذیلی اسمبلیوں سمیت) پھٹا BOM آوردہ
 DocType: Authorization Rule,Applicable To (Employee),لاگو (ملازم)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,کی وجہ سے تاریخ لازمی ہے
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,کی وجہ سے تاریخ لازمی ہے
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,وصف کے لئے اضافہ {0} 0 نہیں ہو سکتا
 DocType: Employee Benefit Claim,Benefit Type and Amount,فوائد کی قسم اور رقم
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,کمرے میں کتابیں
@@ -5437,7 +5443,7 @@
 DocType: Purchase Invoice Item,Total Weight,کل وزن
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,فروخت پر کمیشن
 DocType: Job Offer Term,Value / Description,ویلیو / تفصیل
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",قطار # {0}: اثاثہ {1} جمع نہیں کیا جا سکتا، یہ پہلے سے ہی ہے {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",قطار # {0}: اثاثہ {1} جمع نہیں کیا جا سکتا، یہ پہلے سے ہی ہے {2}
 DocType: Tax Rule,Billing Country,بلنگ کا ملک
 DocType: Purchase Order Item,Expected Delivery Date,متوقع تاریخ کی ترسیل
 DocType: Restaurant Order Entry,Restaurant Order Entry,ریسٹورنٹ آرڈر انٹری
@@ -5476,12 +5482,13 @@
 DocType: Maintenance Visit,Breakdown,خرابی
 DocType: Travel Itinerary,Vegetarian,سبزیوں
 DocType: Patient Encounter,Encounter Date,تصادم کی تاریخ
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,اکاؤنٹ: {0} کرنسی: {1} منتخب نہیں کیا جا سکتا
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,اکاؤنٹ: {0} کرنسی: {1} منتخب نہیں کیا جا سکتا
 DocType: Bank Statement Transaction Settings Item,Bank Data,بینک ڈیٹا
 DocType: Purchase Receipt Item,Sample Quantity,نمونہ مقدار
 DocType: Bank Guarantee,Name of Beneficiary,فائدہ مند کا نام
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",تازہ ترین قیمتوں کی شرح / قیمت کی فہرست کی شرح / خام مال کی آخری خریداری کی شرح پر مبنی بوم خود بخود لاگت کریں.
 DocType: Supplier,SUP-.YYYY.-,SUP-YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,سپلائر&gt; سپلائر گروپ
 DocType: Bank Reconciliation Detail,Cheque Date,چیک تاریخ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},اکاؤنٹ {0}: والدین اکاؤنٹ {1} کمپنی سے تعلق نہیں ہے: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,کامیابی کے ساتھ اس کمپنی سے متعلق تمام لین دین کو خارج کر دیا!
@@ -5509,7 +5516,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,بچے نوڈس صرف &#39;گروپ&#39; قسم نوڈس کے تحت پیدا کیا جا سکتا
 DocType: Attendance Request,Half Day Date,آدھا دن تاریخ
 DocType: Academic Year,Academic Year Name,تعلیمی سال کا نام
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{1} {1} کے ساتھ ٹرانسمیشن کرنے کی اجازت نہیں دی گئی. براہ مہربانی کمپنی کو تبدیل کریں.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{1} {1} کے ساتھ ٹرانسمیشن کرنے کی اجازت نہیں دی گئی. براہ مہربانی کمپنی کو تبدیل کریں.
 DocType: Sales Partner,Contact Desc,رابطہ DESC
 DocType: Email Digest,Send regular summary reports via Email.,ای میل کے ذریعے باقاعدہ سمری رپورٹ بھیجنے.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},میں اخراجات دعوی کی قسم ڈیفالٹ اکاؤنٹ سیٹ مہربانی {0}
@@ -5542,7 +5549,7 @@
 DocType: Hotel Room,Hotel Manager,ہوٹل کا مینیجر
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,خریداری کی ٹوکری کے لئے مقرر ٹیکس اصول
 DocType: Purchase Invoice,Taxes and Charges Added,ٹیکس اور الزامات شامل کر دیا گیا
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,استحکام صف {0}: اگلے قیمتوں کا تعین تاریخ دستیاب - استعمال کے لئے تاریخ سے پہلے نہیں ہوسکتا ہے
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,استحکام صف {0}: اگلے قیمتوں کا تعین تاریخ دستیاب - استعمال کے لئے تاریخ سے پہلے نہیں ہوسکتا ہے
 ,Sales Funnel,سیلز قیف
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,مخفف لازمی ہے
 DocType: Project,Task Progress,ٹاسک پیش رفت
@@ -5556,7 +5563,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,تمام کسٹمر گروپوں
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,جمع ماہانہ
 DocType: Attendance Request,On Duty,کام پر
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} لازمی ہے. ہو سکتا ہے کہ کرنسی ایکسچینج ریکارڈ {1} {2} کرنے کے لئے پیدا نہیں کر رہا ہے.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} لازمی ہے. ہو سکتا ہے کہ کرنسی ایکسچینج ریکارڈ {1} {2} کرنے کے لئے پیدا نہیں کر رہا ہے.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},اسٹافنگ منصوبہ {0} پہلے ہی نامزد ہونے کے لئے موجود ہے {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,ٹیکس سانچہ لازمی ہے.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,اکاؤنٹ {0}: والدین اکاؤنٹ {1} موجود نہیں ہے
@@ -5636,11 +5643,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,کم سے کم ایک گودام لازمی ہے
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.",UOM، آئٹم گروپ، تفصیل اور گھنٹوں کی تعداد جیسے آئٹم فیلڈز کو تشکیل دیں.
 DocType: Certification Application,Certification Status,سرٹیفیکیشن کی حیثیت
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,مارکیٹ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,مارکیٹ
 DocType: Travel Itinerary,Travel Advance Required,سفر ایڈورینس کی ضرورت ہے
 DocType: Subscriber,Subscriber Name,سبسکرائب کا نام
 DocType: Serial No,Out of Warranty,وارنٹی سے باہر
-DocType: Cashier Closing,Cashier-closing-,کیشئر-بند -
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,موڈ ڈیٹا کی قسم
 DocType: BOM Update Tool,Replace,بدل دیں
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,نہیں کی مصنوعات مل گیا.
@@ -5726,7 +5732,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,سیلز اور خریداری کے لئے پہلے سے طے شدہ ٹیکس ٹیمپلیٹس بنائے جاتے ہیں.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,تشخیص کا نتیجہ ریکارڈ {0} پہلے ہی موجود ہے.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",مثال: ABCD. #####. اگر سلسلہ سیٹ کیا جاتا ہے اور بیچ ٹرانزیکشنز میں ذکر نہیں کیا جاتا ہے، تو اس سلسلے کی بنیاد پر خود کار طریقے سے بیچ نمبر پیدا کی جائے گی. اگر آپ ہمیشہ اس آئٹم کے لئے بیچ نمبر کا ذکر کرنا چاہتے ہیں، تو اسے خالی چھوڑ دیں. نوٹ: یہ ترتیب اسٹاک کی ترتیبات میں نامنگ سیریز کے سابقہ پریفکس پر ترجیح لے گی.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,سیٹ اپ&gt; نمبر نمبر کے ذریعے حاضری کے لئے براہ کرم سلسلہ نمبر سیٹ کریں
 DocType: BOM,Materials Required (Exploded),مواد (دھماکے) کی ضرورت
 DocType: Contract,Party User,پارٹی کا صارف
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',اگر گروپ سے &#39;کمپنی&#39; ہے کمپنی فلٹر کو خالی مقرر مہربانی
@@ -5929,7 +5934,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,بالمقابل شمار
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,آزمائشی مدت کے دوران شروع کی تاریخ اور آزمائشی مدت کے اختتام کی تاریخ کو مقرر کیا جانا چاہئے
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,اوسط قیمت
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ادائیگی شیڈول میں کل ادائیگی کی رقم گرینڈ / گولڈ کل کے برابر ہونا ضروری ہے
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,ادائیگی شیڈول میں کل ادائیگی کی رقم گرینڈ / گولڈ کل کے برابر ہونا ضروری ہے
 DocType: Subscription Plan Detail,Plan,منصوبہ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,جنرل لیجر کے مطابق بینک کا گوشوارہ توازن
 DocType: Job Applicant,Applicant Name,درخواست گزار کا نام
@@ -5998,7 +6003,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,صابن اور ڈٹرجنٹ
 DocType: BOM,Show Items,اشیا دکھائیں
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,وقت سے وقت سے زیادہ نہیں ہو سکتا.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,کیا آپ ای میل کے ذریعے تمام گاہکوں کو مطلع کرنا چاہتے ہیں؟
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,کیا آپ ای میل کے ذریعے تمام گاہکوں کو مطلع کرنا چاہتے ہیں؟
 DocType: Subscription Plan,Billing Interval,بلنگ کے وقفہ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,موشن پکچر اور ویڈیو
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,کا حکم دیا
@@ -6007,9 +6012,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,صف {0}: {1} 0 سے زیادہ ہونا ضروری ہے
 DocType: Assessment Criteria,Assessment Criteria Group,تشخیص کا معیار گروپ
 DocType: Healthcare Settings,Patient Name By,مریض کا نام
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},{0} سے {1} سے تنخواہ کے لئے اکادری جرنل انٹری
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},{0} سے {1} سے تنخواہ کے لئے اکادری جرنل انٹری
 DocType: Sales Invoice Item,Enable Deferred Revenue,منتقل شدہ آمدنی کو فعال کریں
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},مجموعی قیمتوں کا تعین کھولنے کے برابر {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},مجموعی قیمتوں کا تعین کھولنے کے برابر {0}
 DocType: Warehouse,Warehouse Name,گودام نام
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,اصل آغاز کی تاریخ کو حقیقی اختتامی تاریخ سے کم ہونا ضروری ہے
 DocType: Naming Series,Select Transaction,منتخب ٹرانزیکشن
@@ -6305,7 +6310,7 @@
 DocType: Asset,Custodian,نگران
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,پوائنٹ کے فروخت پروفائل
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} 0 اور 100 کے درمیان ایک قدر ہونا چاہئے
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},{1} سے {1} سے {2} تک ادائیگی
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},{1} سے {1} سے {2} تک ادائیگی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,امائبھوت قرض
 DocType: Cost Center,Cost Center Name,لاگت مرکز نام
 DocType: Student,B+,B +
@@ -6337,6 +6342,7 @@
 DocType: Employee,Date of Issue,تاریخ اجراء
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",خریدنے کی ترتیبات کے مطابق اگر خریداری کی ضرورت ہو تو == &#39;YES&#39;، پھر خریداری انوائس کی تخلیق کے لۓ، صارف کو شے کے لئے سب سے پہلے خریداری رسید بنانے کی ضرورت ہے {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},صف # {0}: شے کے لئے مقرر پردایک {1}
+DocType: Global Defaults,Default Distance Unit,ڈیفالٹ فاصلہ یونٹ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,صف {0}: گھنٹے قدر صفر سے زیادہ ہونا چاہیے.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,ویب سائٹ تصویری {0} آئٹم {1} سے منسلک نہیں مل سکتا
 DocType: Issue,Content Type,مواد کی قسم
@@ -6392,7 +6398,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,اکاؤنٹ ڈیبٹ ایک بیلنس شیٹ اکاؤنٹ ہونا ضروری ہے
 DocType: Asset,Naming Series,نام سیریز
 DocType: Vital Signs,Coated,لیپت
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,قطار {0}: متوقع قدر مفید زندگی کے بعد مجموعی خریداری کی رقم سے کم ہونا ضروری ہے
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,قطار {0}: متوقع قدر مفید زندگی کے بعد مجموعی خریداری کی رقم سے کم ہونا ضروری ہے
 DocType: GoCardless Settings,GoCardless Settings,گوڈورلیس ترتیبات
 DocType: Leave Block List,Leave Block List Name,بلاک کریں فہرست کا نام چھوڑ دو
 DocType: Certified Consultant,Certification Validity,تصدیق تصدیق
@@ -6460,6 +6466,7 @@
 DocType: Bank Statement Settings Item,Bank Header,بینک ہیڈر
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,لیب ٹیسٹ دیکھیں
 DocType: Hub Users,Hub Users,حب صارفین
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,کسٹمر&gt; کسٹمر گروپ&gt; علاقہ
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,بحالی کی تاریخ
 DocType: Purchase Invoice Item,Rejected Serial No,مسترد سیریل نمبر
@@ -6474,7 +6481,7 @@
 DocType: SG Creation Tool Course,Max Strength,زیادہ سے زیادہ طاقت
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,presets انسٹال
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH -YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},کسٹمر {}} کے لئے کوئی ترسیل نوٹ منتخب نہیں کیا گیا
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},کسٹمر {}} کے لئے کوئی ترسیل نوٹ منتخب نہیں کیا گیا
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,ملازم {0} میں زیادہ سے زیادہ فائدہ نہیں ہے
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,ترسیل کی تاریخ پر مبنی اشیاء منتخب کریں
 DocType: Grant Application,Has any past Grant Record,پچھلے گرانٹ ریکارڈ ہے
@@ -6502,7 +6509,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,ہوٹل کمرہ ریزرویشن
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,کسٹمر سروس
 DocType: BOM,Thumbnail,تھمب نیل
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,ای میل کی شناخت کے ساتھ کوئی رابطہ نہیں ملا.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,ای میل کی شناخت کے ساتھ کوئی رابطہ نہیں ملا.
 DocType: Item Customer Detail,Item Customer Detail,آئٹم کسٹمر تفصیل سے
 DocType: Notification Control,Prompt for Email on Submission of,جمع کرانے کے ای میل کے لئے فوری طور پر
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},ملازم {0} زیادہ سے زیادہ فائدہ رقم {1} سے زائد ہے
@@ -6760,13 +6767,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,اکاؤنٹ کی قسم منتخب کیا جاتا ہے کی وجہ سے گروپ کو خفیہ نہیں کر سکتے ہیں.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} نظر ثانی کی گئی ہے. ریفریش کریں.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,مندرجہ ذیل دنوں میں رخصت کی درخواستیں کرنے سے صارفین کو روکنے کے.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,آئٹم کوڈ&gt; آئٹم گروپ&gt; برانڈ
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.",اگر وفادار پوائنٹس کے لئے لامحدود اختتام پذیر ہو تو، اختتامی مدت خالی یا 0 دور رکھیں.
 DocType: Asset Maintenance Team,Maintenance Team Members,بحالی ٹیم کے ارکان
 DocType: Loyalty Point Entry,Purchase Amount,خریداری کی رقم
 DocType: Quotation,SAL-QTN-.YYYY.-,سال- QTN -YYYY-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,پیدا کردہ سپروٹیشن {0}
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,اختتام سال شروع سال سے پہلے نہیں ہو سکتا
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,اختتام سال شروع سال سے پہلے نہیں ہو سکتا
 DocType: Employee Benefit Application,Employee Benefits,ملازم فوائد
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},پیک مقدار قطار میں آئٹم {0} کے لئے مقدار برابر ضروری {1}
 DocType: Work Order,Manufactured Qty,تیار مقدار
@@ -6782,6 +6788,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,منتخب بیچ نمبر
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,GSTIN کرنے کے لئے
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,گاہکوں کو اٹھایا بل.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,براہ کرم انسانی وسائل&gt; HR ترتیبات میں ملازم نامی کا نظام قائم کریں
 DocType: Healthcare Settings,Invoice Appointments Automatically,خود بخود انوائس کی تقرری
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,پروجیکٹ کی شناخت
 DocType: Salary Component,Variable Based On Taxable Salary,ٹیکس قابل تنخواہ پر مبنی متغیر
@@ -6830,7 +6837,7 @@
 DocType: POS Profile,Account for Change Amount,رقم تبدیلی کے لئے اکاؤنٹ
 DocType: QuickBooks Migrator,Connecting to QuickBooks,QuickBooks سے منسلک
 DocType: Exchange Rate Revaluation,Total Gain/Loss,کل حاصل / نقصان
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,انٹر کمپنی انوائس کے لئے غلط کمپنی.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,انٹر کمپنی انوائس کے لئے غلط کمپنی.
 DocType: Purchase Invoice,input service,ان پٹ سروس
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},صف {0}: پارٹی / اکاؤنٹ کے ساتھ میل نہیں کھاتا {1} / {2} میں {3} {4}
 DocType: Employee Promotion,Employee Promotion,ملازم فروغ
@@ -6960,7 +6967,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,چوک کے لئے پسندیدہ ایریا
 apps/erpnext/erpnext/config/selling.py +184,Analytics,تجزیات
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,ٹوکری خالی ہے
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,براہ کرم تعلیمی&gt; تعلیمی ترتیبات میں انسٹرکٹر نامیاتی نظام قائم کریں
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",آئٹم {0} میں کوئی سیریل نمبر نہیں ہے صرف سیریلیلائزڈ اشیاء \ Serial No کی بنیاد پر ترسیل ہوسکتی ہے
 DocType: Vehicle,Model,ماڈل
@@ -6990,7 +6996,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,تبدیل کرنے کے لئے کچھ نہیں
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,ایک CSV فائل منتخب کریں
 DocType: Holiday List,Total Holidays,کل چھٹیاں
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,ڈسپلے کے لئے لاپتہ ای میل سانچے. براہ کرم ترسیل کی ترتیبات میں سے ایک مقرر کریں.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,ڈسپلے کے لئے لاپتہ ای میل سانچے. براہ کرم ترسیل کی ترتیبات میں سے ایک مقرر کریں.
 DocType: Student Leave Application,Mark as Present,تحفے کے طور پر نشان زد کریں
 DocType: Supplier Scorecard,Indicator Color,اشارے رنگ
 DocType: Purchase Order,To Receive and Bill,وصول کرنے اور بل میں
@@ -6999,7 +7005,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,سیریل نمبر منتخب کریں
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,ڈیزائنر
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,شرائط و ضوابط سانچہ
-DocType: Serial No,Delivery Details,ڈلیوری تفصیلات
+DocType: Delivery Trip,Delivery Details,ڈلیوری تفصیلات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},قسم کے لئے سرمایہ کاری مرکز کے صف میں کی ضرورت ہے {0} ٹیکس میں میز {1}
 DocType: Program,Program Code,پروگرام کا کوڈ
 DocType: Terms and Conditions,Terms and Conditions Help,شرائط و ضوابط مدد
@@ -7023,7 +7029,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,وقت دن کی قیادت
 DocType: Cash Flow Mapping,Is Income Tax Expense,آمدنی ٹیک خرچ ہے
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,آپ کا حکم ترسیل کے لئے ہے!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},صف # {0}: تاریخ پوسٹنگ خریداری کی تاریخ کے طور پر ایک ہی ہونا چاہیے {1} اثاثہ کی {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},صف # {0}: تاریخ پوسٹنگ خریداری کی تاریخ کے طور پر ایک ہی ہونا چاہیے {1} اثاثہ کی {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,طالب علم انسٹی ٹیوٹ کے ہاسٹل میں رہائش پذیر ہے تو اس کو چیک کریں.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,مندرجہ بالا جدول میں سیلز آرڈر درج کریں
 ,Stock Summary,اسٹاک کا خلاصہ
diff --git a/erpnext/translations/uz.csv b/erpnext/translations/uz.csv
index dc894d8..a8462c2 100644
--- a/erpnext/translations/uz.csv
+++ b/erpnext/translations/uz.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Davrning nomi
 DocType: Employee,Salary Mode,Ish haqi rejimi
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Ro&#39;yxatdan o&#39;tish
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Ro&#39;yxatdan o&#39;tish
 DocType: Patient,Divorced,Ajrashgan
 DocType: Support Settings,Post Route Key,Post Route Key
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Ob&#39;ektga bir amalda bir necha marta qo&#39;shilishiga ruxsat bering
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Yangi almashinuv kursi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Narxlar ro&#39;yxati uchun valyuta talab qilinadi {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Jurnalda hisoblab chiqiladi.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Yetkazib beruvchi&gt; Yetkazib beruvchi turi
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Mijozlar bilan aloqa
 DocType: Patient Appointment,Check availability,Mavjudligini tekshirib ko&#39;ring
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Ko&#39;rish ochiq
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Series muvaffaqiyatli yangilandi
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Tekshirib ko&#39;rmoq
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} qatorda {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} qatorda {0}
 DocType: Asset Finance Book,Depreciation Start Date,Amortizatsiya boshlanishi sanasi
 DocType: Pricing Rule,Apply On,Ilova
 DocType: Item Price,Multiple Item prices.,Bir nechta mahsulot narxi.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Laboratoriya retsepti
 ,Delay Days,Kechikish kunlari
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Xizmat ketadi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Seriya raqami: {0} savdo faturasında zikr qilingan: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Seriya raqami: {0} savdo faturasında zikr qilingan: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Billing
 DocType: Purchase Invoice Item,Item Weight Details,Og&#39;irligi haqida ma&#39;lumot
 DocType: Asset Maintenance Log,Periodicity,Muntazamlik
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Hisobchi
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Sotuvlar narxlari
 DocType: Patient,Tobacco Current Use,Tamaki foydalanish
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Boshlanish sanasi va tugash sanasi <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Sotish darajasi
 DocType: Cost Center,Stock User,Tayyor foydalanuvchi
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,Bilan bog&#39;liq
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,Davomiylik sanasi xodimning ishtirok etish kunidan kam bo&#39;lmasligi kerak
 DocType: Grading Scale,Grading Scale Name,Baholash o&#39;lchovi nomi
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Foydalanuvchilarni Bozorga qo&#39;shish
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Foydalanuvchilarni Bozorga qo&#39;shish
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Bu ildiz hisob hisoblanadi va tahrirlanmaydi.
 DocType: Sales Invoice,Company Address,Kompaniya manzili
 DocType: BOM,Operations,Operatsiyalar
@@ -321,7 +321,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Sts
 DocType: Production Plan,Material Request Detail,Materiallar bo&#39;yicha batafsil ma&#39;lumot
 DocType: Selling Settings,Default Quotation Validity Days,Standart quotatsiya amal qilish kunlari
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Mavzu kursiga {0} qatoridagi soliqni kiritish uchun qatorlar {1} da soliqlar ham kiritilishi kerak
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Mavzu kursiga {0} qatoridagi soliqni kiritish uchun qatorlar {1} da soliqlar ham kiritilishi kerak
 DocType: SMS Center,SMS Center,SMS markazi
 DocType: Payroll Entry,Validate Attendance,Ishtirokni tasdiqlang
 DocType: Sales Invoice,Change Amount,Miqdorni o&#39;zgartirish
@@ -440,7 +440,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,So&#39;zdagi so&#39;zlar uchun qator oralig&#39;i
 DocType: Vehicle,Additional Details,Qo&#39;shimcha tafsilotlar
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Tavsif berilmagan
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Yetkazib beruvchi&gt; Yetkazib beruvchi guruhi
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Sotib olish talabi.
 DocType: POS Closing Voucher Details,Collected Amount,To&#39;plangan summa
 DocType: Lab Test,Submitted Date,O&#39;tkazilgan sana
@@ -485,7 +484,7 @@
 DocType: Student Admission,Student Admission,Talabalarni qabul qilish
 ,Terretory,Teror
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,{0} mahsuloti bekor qilindi
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Amortizatsiya satrlari {0}: Amortizatsiya boshlanish sanasi o&#39;tgan sana sifatida kiritiladi
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Amortizatsiya satrlari {0}: Amortizatsiya boshlanish sanasi o&#39;tgan sana sifatida kiritiladi
 DocType: Contract Template,Fulfilment Terms and Conditions,Tugatish shartlari va shartlari
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Materiallar talabi
 DocType: Bank Reconciliation,Update Clearance Date,Bo&#39;shatish tarixini yangilash
@@ -542,6 +541,7 @@
 DocType: Accounts Settings,Settings for Accounts,Hisob sozlamalari
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Yetkazib beruvchi hisob-fakturasi yo&#39;q {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Sotuvdagi shaxslar daraxti boshqaruvi.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.",Google Xaritalar Sozlamalari o&#39;chirilganligi sababli marshrutni qayta ishlash mumkin emas.
 DocType: Job Applicant,Cover Letter,Biriktirilgan xat
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Olinadigan chexlar va depozitlar
 DocType: Item,Synced With Hub,Hub bilan sinxronlangan
@@ -599,7 +599,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Yangi qiymat qiymati
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Xaridor valyutasi mijozning asosiy valyutasiga aylantirilgan tarif
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kursni rejalashtirish vositasi
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Xarid-faktura mavjud mavjudotga qarshi {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Xarid-faktura mavjud mavjudotga qarshi {1}
 DocType: Crop Cycle,LInked Analysis,Inked Analiz
 DocType: POS Closing Voucher,POS Closing Voucher,Qalin yopish voucher
 DocType: Contract,Lapsed,O&#39;tgan
@@ -633,6 +633,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} kursi {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Isoning shogirdi ismi:
 DocType: POS Closing Voucher Details,Difference,Farqi
+DocType: Delivery Settings,Delay between Delivery Stops,Etkazib berishni to&#39;xtatib turish muddati
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},No {0} seriyali etkazib berish eslatmasi {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Serverning GoCardless konfiguratsiyasi bilan bog&#39;liq muammodir. Xavotir olmang, mag&#39;lubiyatsiz bo&#39;lsa, hisobingiz hisobingizga qaytariladi."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNekst demo
@@ -691,7 +692,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Miqdor va foiz
 DocType: Delivery Note,% Installed,O&#39;rnatilgan
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,Darslar / laboratoriyalar va boshqalar.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Ham kompaniyaning kompaniyaning valyutalari Inter Company Transactions uchun mos kelishi kerak.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Ham kompaniyaning kompaniyaning valyutalari Inter Company Transactions uchun mos kelishi kerak.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Avval kompaniya nomini kiriting
 DocType: Travel Itinerary,Non-Vegetarian,Non-vegetarianlar
 DocType: Purchase Invoice,Supplier Name,Yetkazib beruvchi nomi
@@ -776,7 +777,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Sana boshlab ijaraga olingan
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Qurilish uchun yetarli qismlar
 DocType: POS Profile User,POS Profile User,Qalin Foydalanuvchining profili
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Row {0}: Amortizatsiya boshlanishi kerak
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Row {0}: Amortizatsiya boshlanishi kerak
 DocType: Purchase Invoice Item,Service Start Date,Xizmat boshlanish sanasi
 DocType: Subscription Invoice,Subscription Invoice,Obuna Billing
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,To&#39;g&#39;ridan-to&#39;g&#39;ri daromad
@@ -843,7 +844,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Qisqartma boshqa kompaniya uchun ishlatilgan
 DocType: Selling Settings,Default Customer Group,Standart xaridorlar guruhi
 DocType: Employee,IFSC Code,IFSC kodi
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Boshlanish sanasi va tugash sanasi <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Agar o&#39;chirib qo&#39;yilsa, &quot;Rounded Total&quot; maydoni hech qanday operatsiyada ko&#39;rinmaydi"
 DocType: BOM,Operating Cost,Operatsion xarajatlar
 DocType: Crop,Produced Items,Ishlab chiqarilgan narsalar
@@ -895,7 +895,7 @@
 DocType: Supplier,Prevent RFQs,RFQlarni oldini olish
 DocType: Hub User,Hub User,Hub foydalanuvchisi
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Savdo buyurtmasini bajaring
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Ish staji {0} dan {1} gacha bo&#39;lgan muddatga taqdim etildi
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Ish staji {0} dan {1} gacha bo&#39;lgan muddatga taqdim etildi
 DocType: Project Task,Project Task,Loyiha vazifasi
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Qabul qilingan ballar
 ,Lead Id,Qurilish no
@@ -1023,7 +1023,7 @@
 DocType: Fee Validity,Max number of visit,Tashrifning maksimal soni
 ,Hotel Room Occupancy,Mehmonxona xonasi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Tuzilish sahifasi:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},"Iltimos, odatdagi Cash yoki Bank hisobini {0} To&#39;lov tartibi rejimida tanlang."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},"Iltimos, odatdagi Cash yoki Bank hisobini {0} To&#39;lov tartibi rejimida tanlang."
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Ro&#39;yxatga olish
 DocType: GST Settings,GST Settings,GST sozlamalari
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Valyuta bir xil bo&#39;lishi kerak Price List Valyuta: {0}
@@ -1077,7 +1077,7 @@
 DocType: Vehicle Log,Service Details,Xizmat haqida ma&#39;lumot
 DocType: Lab Test Template,Grouped,Guruhlangan
 DocType: Selling Settings,Delivery Note Required,Yetkazib berish eslatmasi kerak
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Ish haqi tovarlaringizni ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Ish haqi tovarlaringizni ...
 DocType: Bank Guarantee,Bank Guarantee Number,Bank kafolati raqami
 DocType: Assessment Criteria,Assessment Criteria,Baholash mezonlari
 DocType: BOM Item,Basic Rate (Company Currency),Asosiy nisbat (Kompaniya valyutasi)
@@ -1102,13 +1102,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,To&#39;lov kirish allaqachon yaratilgan
 DocType: Request for Quotation,Get Suppliers,Yetkazuvchilarni qabul qiling
 DocType: Purchase Receipt Item Supplied,Current Stock,Joriy aktsiyalar
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},{0} qator: Asset {1} {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},{0} qator: Asset {1} {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Preview ish haqi slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,{0} hisobi bir necha marta kiritilgan
 DocType: Account,Expenses Included In Valuation,Baholashda ishtirok etish xarajatlari
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Sizning a&#39;zoning 30 kun ichida amal qilish muddati tugaguncha yangilanishi mumkin
 DocType: Shopping Cart Settings,Show Stock Availability,Qimmatli qog&#39;ozlar mavjudligini ko&#39;rsatish
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},{1} guruhidagi {0} yoki kompaniya {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},{1} guruhidagi {0} yoki kompaniya {2}
 DocType: Location,Longitude,Uzunlik
 ,Absent Student Report,Isoning shogirdi hisoboti yo&#39;q
 DocType: Crop,Crop Spacing UOM,O&#39;simliklar oralig&#39;i UOM
@@ -1180,7 +1180,7 @@
 DocType: Soil Texture,Sand,Qum
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Energiya
 DocType: Opportunity,Opportunity From,Imkoniyatdan foydalanish
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Serial raqamlari {2} uchun kerak. Siz {3} ni taqdim qildingiz.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Row {0}: {1} Serial raqamlari {2} uchun kerak. Siz {3} ni taqdim qildingiz.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,"Iltimos, jadval tanlang"
 DocType: BOM,Website Specifications,Veb-saytning texnik xususiyatlari
 DocType: Special Test Items,Particulars,Xususan
@@ -1271,7 +1271,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Yuqori vaznli narsalar yuqoriroq bo&#39;ladi
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Laboratoriya testlari va hayotiy belgilar
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank kelishuvi batafsil
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,# {0} satri: Asset {1} yuborilishi kerak
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,# {0} satri: Asset {1} yuborilishi kerak
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Hech qanday xodim topilmadi
 DocType: Item,If subcontracted to a vendor,Agar sotuvchiga subpudrat berilsa
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Talabalar guruhi allaqachon yangilangan.
@@ -1325,7 +1325,6 @@
 DocType: Loyalty Program Collection,Tier Name,Tizim nomi
 DocType: HR Settings,Enter retirement age in years,Yildan pensiya yoshiga o&#39;ting
 DocType: Crop,Target Warehouse,Nishon ombori
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Iltimos, {0} uchun nomlash seriyasini Sozlamalar&gt; Sozlamalar&gt; Naming Series orqali sozlang"
 DocType: Payroll Employee Detail,Payroll Employee Detail,Bordro bo&#39;yicha mutaxassis batafsil
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,"Iltimos, omborni tanlang"
 DocType: Cheque Print Template,Starting location from left edge,Manzilni chap tomondan boshlash
@@ -1415,7 +1414,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Sub-assemblies uchun rejalashtirilgan material
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Savdo hamkorlari va hududi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} faol bo&#39;lishi kerak
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,O&#39;tkazish uchun hech narsa mavjud emas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,O&#39;tkazish uchun hech narsa mavjud emas
 DocType: Employee Boarding Activity,Activity Name,Faoliyat nomi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Chiqish sanasini o&#39;zgartirish
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Tugallangan mahsulot miqdori <b>{0}</b> va miqdori <b>{1}</b> uchun boshqacha bo&#39;lishi mumkin emas
@@ -1642,6 +1641,7 @@
 DocType: Project,First Email,Birinchi e-pochta
 DocType: Company,Exception Budget Approver Role,Exception Budget Approver roli
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Bir marta o&#39;rnatilgach, ushbu hisob-faktura belgilangan vaqtgacha kutib turiladi"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Savdo Buyurtma va tugagan tovarlar omborida zaxiralangan ombor
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Sotish miqdori
 DocType: Repayment Schedule,Interest Amount,Foiz miqdori
@@ -1653,7 +1653,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Yozuvlar
 DocType: Asset,Scrapped,Chiqindi
 DocType: Item,Item Defaults,Mavzu standarti
-DocType: Purchase Invoice,Returns,Qaytishlar
+DocType: Cashier Closing,Returns,Qaytishlar
 DocType: Job Card,WIP Warehouse,WIP ombori
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},No {0} seriyali parvarish shartnoma bo&#39;yicha {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,Ishga olish
@@ -1667,7 +1667,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Transfer turi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Savdo xarajatlari
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Xaridor&gt; Mijozlar guruhi&gt; Zonasi
 DocType: Diagnosis,Diagnosis,Tashxis
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standart xarid
 DocType: Attendance Request,Explanation,Izoh
@@ -1680,7 +1679,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Buyurtma buyurtma qilish muddati kechiktirilgan
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Pochta indeksi
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Savdo Buyurtma {0} - {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},{0} da kredit foizli daromad hisobini tanlang
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},{0} da kredit foizli daromad hisobini tanlang
 DocType: Opportunity,Contact Info,Aloqa ma&#39;lumotlari
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Aktsiyalarni kiritish
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Ishtirokchi maqomini chapga targ&#39;ib qila olmaydi
@@ -1692,7 +1691,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Hisob-kitob hisobini nol hisob-kitob qilish vaqtida amalga oshirish mumkin emas
 DocType: Company,Date of Commencement,Boshlanish sanasi
 DocType: Sales Person,Select company name first.,Avval kompaniya nomini tanlang.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},{0} ga yuborilgan elektron pochta
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},{0} ga yuborilgan elektron pochta
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ta&#39;minlovchilar tomonidan olingan takliflar.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,BOMni almashtiring va barcha BOM&#39;lardagi eng so&#39;nggi narxni yangilang
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},{0} uchun {1} {2}
@@ -1712,7 +1711,7 @@
 DocType: Asset Movement,From Employee,Ishchidan
 DocType: Driver,Cellphone Number,Mobil telefon raqami
 DocType: Project,Monitor Progress,Monitoring jarayoni
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Ogohlantirish: tizim {1} da {0} uchun pul miqdori nol bo&#39;lgani uchun tizim ortiqcha miqdorda tekshirilmaydi
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Ogohlantirish: tizim {1} da {0} uchun pul miqdori nol bo&#39;lgani uchun tizim ortiqcha miqdorda tekshirilmaydi
 DocType: Journal Entry,Make Difference Entry,Farqlarni kiritish
 DocType: Supplier Quotation,Auto Repeat Section,Avtomatik qayta-qism
 DocType: Upload Attendance,Attendance From Date,Sana boshlab ishtirok etish
@@ -1815,7 +1814,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,# {0} qatori: Rad etilgan Qty Xarid qilishni qaytarib bo&#39;lmaydi
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Tanlangan mijoz uchun xaridorlar guruhini o&#39;zgartirishga ruxsat berilmaydi.
 ,Purchase Order Items To Be Billed,Buyurtma buyurtmalarini sotib olish uchun to&#39;lovlar
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Bashoratli borar vaqtlarini yangilash.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Bashoratli borar vaqtlarini yangilash.
 DocType: Program Enrollment Tool,Enrollment Details,Ro&#39;yxatga olish ma&#39;lumotlari
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Bir kompaniyaga bir nechta elementlar parametrlarini sozlab bo&#39;lmaydi.
 DocType: Purchase Invoice Item,Net Rate,Sof kurs
@@ -1829,7 +1828,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Tugatishni qoldirib ketish
 DocType: Support Settings,Close Issue After Days,Kunlardan keyin muammoni yoping
 ,Eway Bill,Evey Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Foydalanuvchilarni Marketplace&#39;ga qo&#39;shish uchun tizim menejeri va element menejeri vazifalarini bajaradigan foydalanuvchi bo&#39;lishingiz kerak.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Foydalanuvchilarni Marketplace&#39;ga qo&#39;shish uchun tizim menejeri va element menejeri vazifalarini bajaradigan foydalanuvchi bo&#39;lishingiz kerak.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Agar barcha filiallarda ko&#39;rib chiqilsa bo&#39;sh qoldiring
 DocType: Job Opening,Staffing Plan,Xodimlar rejasi
 DocType: Bank Guarantee,Validity in Days,Kunlarning amal qilish muddati
@@ -1849,7 +1848,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Shu {1} bilan {0} qatorini nusxalash
 DocType: Marketplace Settings,Disable Marketplace,Bozorni o&#39;chirib qo&#39;ying
 ,Trial Balance,Sinov balansi
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Moliyaviy yil {0} topilmadi
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Moliyaviy yil {0} topilmadi
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Xodimlarni o&#39;rnatish
 DocType: Hotel Room Reservation,Hotel Reservation User,Mehmonxona Rezervasyoni
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,"Iltimos, avval prefiksni tanlang"
@@ -1955,7 +1954,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Kirish amalga oshmadi
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,{0} obyekti yaratildi
 DocType: Special Test Items,Special Test Items,Maxsus test buyumlari
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Bozorda ro&#39;yxatdan o&#39;tish uchun tizim menejeri va element menejeri vazifalarini bajaradigan foydalanuvchi bo&#39;lishingiz kerak.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Bozorda ro&#39;yxatdan o&#39;tish uchun tizim menejeri va element menejeri vazifalarini bajaradigan foydalanuvchi bo&#39;lishingiz kerak.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,To&#39;lov tartibi
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,Sizning belgilangan Ma&#39;ruza tuzilishiga ko&#39;ra siz nafaqa olish uchun ariza bera olmaysiz
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Veb-sayt rasmiy umumiy fayl yoki veb-sayt URL bo&#39;lishi kerak
@@ -1967,7 +1966,7 @@
 DocType: Warehouse,Warehouse Contact Info,Qoidalarga oid aloqa ma&#39;lumotlari
 DocType: Payment Entry,Write Off Difference Amount,Foiz miqdorini yozing
 DocType: Volunteer,Volunteer Name,Ko&#39;ngilli ism
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Boshqa qatorlardagi takroriy sana bilan atalgan satrlar: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Boshqa qatorlardagi takroriy sana bilan atalgan satrlar: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent","{0}: Xodimlarning elektron pochta manzili topilmadi, shuning uchun elektron pochta orqali yuborilmadi"
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Berilgan sana {1} da Employee {0} uchun ish haqi tuzilishi tayinlangan emas
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},{0} mamlakat uchun yuk qoidalari qo&#39;llanilmaydi
@@ -2056,6 +2055,7 @@
 DocType: Salary Component,Earning,Daromad
 DocType: Supplier Scorecard,Scoring Criteria,Baholash mezonlari
 DocType: Purchase Invoice,Party Account Currency,Partiya pullari valyutasi
+DocType: Delivery Trip,Total Estimated Distance,Jami taxminiy masofa
 ,BOM Browser,BOM brauzeri
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,"Iltimos, ushbu mashg&#39;ulot uchun statusingizni yangilang"
 DocType: Item Barcode,EAN,EAN
@@ -2093,7 +2093,7 @@
 DocType: Activity Cost,Projects,Loyihalar
 DocType: Payment Request,Transaction Currency,Jurnal valyutasi
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},{0} dan {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Ba&#39;zi elektron pochta xabarlari noto&#39;g&#39;ri
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Ba&#39;zi elektron pochta xabarlari noto&#39;g&#39;ri
 DocType: Work Order Operation,Operation Description,Operatsion tavsifi
 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.,Moliyaviy yil saqlanganidan so&#39;ng moliyaviy yil boshlanish sanasi va moliya yili tugash sanasi o&#39;zgartirilmaydi.
 DocType: Quotation,Shopping Cart,Xarid savati
@@ -2117,7 +2117,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Ruxsat etilgan aktivlardagi aniq o&#39;zgarish
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,Barcha belgilar uchun hisobga olingan holda bo&#39;sh qoldiring
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,{0} qatoridagi &quot;Haqiqiy&quot; turidagi to&#39;lovni &quot;Oddiy qiymat&quot; ga qo&#39;shish mumkin emas
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,{0} qatoridagi &quot;Haqiqiy&quot; turidagi to&#39;lovni &quot;Oddiy qiymat&quot; ga qo&#39;shish mumkin emas
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Maks: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Datetime&#39;dan
 DocType: Shopify Settings,For Company,Kompaniya uchun
@@ -2131,7 +2131,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Dars jadvali yaratishda xatolar yuz berdi
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Ro&#39;yxatdagi dastlabki xarajatlarning dastlabki qiymatini tasdiqlash uchun standart Expense Approver deb belgilanadi.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,100 dan ortiq bo&#39;lishi mumkin emas
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Market Manager&#39;da ro&#39;yxatdan o&#39;tish uchun tizim menejeri va element menejeri vazifalarini bajaruvchi Administratordan boshqa foydalanuvchi bo&#39;lishingiz kerak.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Market Manager&#39;da ro&#39;yxatdan o&#39;tish uchun tizim menejeri va element menejeri vazifalarini bajaruvchi Administratordan boshqa foydalanuvchi bo&#39;lishingiz kerak.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,{0} elementi aktsiyalar elementi emas
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Rejalashtirilmagan
@@ -2160,7 +2160,7 @@
 DocType: HR Settings,Employee Settings,Xodimlarning sozlashlari
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,To&#39;lov tizimini o&#39;rnatish
 ,Batch-Wise Balance History,Batch-Wise Balance History
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"# {0} satri: {1} element uchun taqdim etgan summa miqdoridan katta bo&#39;lsa, Rate ni o&#39;rnatib bo&#39;lmaydi."
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,"# {0} satri: {1} element uchun taqdim etgan summa miqdoridan katta bo&#39;lsa, Rate ni o&#39;rnatib bo&#39;lmaydi."
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Chop etish moslamalari tegishli bosib chiqarish formatida yangilanadi
 DocType: Package Code,Package Code,Paket kodi
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Chiragcha
@@ -2460,7 +2460,7 @@
 DocType: Vital Signs,Constipated,Qabirlangan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},{1} {0} etkazib beruvchi hisob-fakturasiga qarshi
 DocType: Customer,Default Price List,Standart narx ro&#39;yxati
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,Aktivlar harakati qaydlari {0} yaratildi
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,Aktivlar harakati qaydlari {0} yaratildi
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Hech qanday mahsulot topilmadi.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Moliyaviy yil {0} ni o&#39;chirib bo&#39;lmaydi. Moliyaviy yil {0} global sozlamalarda sukut o&#39;rnatilgan
 DocType: Share Transfer,Equity/Liability Account,Haqiqiylik / Mas&#39;uliyat hisobi
@@ -2595,6 +2595,7 @@
 DocType: Blanket Order,Order Type,Buyurtma turi
 ,Item-wise Sales Register,Buyurtmalar savdosi
 DocType: Asset,Gross Purchase Amount,Xarid qilishning umumiy miqdori
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Mahsulot kodi&gt; Mahsulot guruhi&gt; Tovar
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Ochilish balanslari
 DocType: Asset,Depreciation Method,Amortizatsiya usuli
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ushbu soliq asosiy narxga kiritilganmi?
@@ -2672,7 +2673,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Yillik byudjetdan tashqari xarajatlar
 DocType: Student Leave Application,Student Leave Application,Talabalar uchun ariza
 DocType: Item,Will also apply for variants,"Shuningdek, variantlar uchun ham qo&#39;llaniladi"
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Aktivni bekor qilish mumkin emas, chunki allaqachon {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Aktivni bekor qilish mumkin emas, chunki allaqachon {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Yarim kun {1} da xizmatdosh {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Umumiy ish soatlari eng ko&#39;p ish vaqti {0} dan ortiq bo&#39;lmasligi kerak
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Yoqilgan
@@ -2696,6 +2697,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Ma&#39;lumotlarni olish
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},{0} turidagi ruxsat etilgan maksimal ruxsatnoma {1}
 DocType: SMS Center,Create Receiver List,Qabul qiluvchining ro&#39;yxatini yaratish
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Foydalanishga tayyor bo&#39;lgan sana xarid tarixidan keyin bo&#39;lishi kerak
 DocType: Vehicle,Wheels,Jantlar
 DocType: Packing Slip,To Package No.,Yo&#39;naltirish uchun.
 DocType: Patient Relation,Family,Oila
@@ -2709,7 +2711,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,To&#39;lov valyutasi odatiy kompaniyaning valyutasiga yoki partiyaning hisobvaraqlariga teng bo&#39;lishi kerak
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Paket ushbu etkazib berishning bir qismi ekanligini ko&#39;rsatadi (faqat loyiha)
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Row {0}: sanasi sanasidan oldin sanasi bo&#39;lmaydi
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Row {0}: sanasi sanasidan oldin sanasi bo&#39;lmaydi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,To&#39;lovni kiritish
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},{0} uchun mahsulot miqdori {1} dan kam bo&#39;lishi kerak
 ,Sales Invoice Trends,Sotuvdagi taqdim etgan tendentsiyalari
@@ -2781,7 +2783,7 @@
 DocType: Guardian,Guardian Interests,Guardian manfaatlari
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Hisob nomi / raqamini yangilang
 DocType: Naming Series,Current Value,Joriy qiymat
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"{0} sana uchun bir necha moliyaviy yillar mavjud. Iltimos, kompaniyani Moliyaviy yilga qo&#39;ying"
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"{0} sana uchun bir necha moliyaviy yillar mavjud. Iltimos, kompaniyani Moliyaviy yilga qo&#39;ying"
 DocType: Education Settings,Instructor Records to be created by,O&#39;qituvchi tomonidan yaratiladigan yozuvlar
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} yaratildi
 DocType: GST Account,GST Account,GST hisobi
@@ -2798,7 +2800,7 @@
 DocType: Sales Person,Name and Employee ID,Ismi va xizmatdoshi identifikatori
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Yetkazish sanasi o&#39;tilganlik sanasi sanasidan oldin bo&#39;la olmaydi
 DocType: Website Item Group,Website Item Group,Veb-sayt elementi guruhi
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Yuqorida ko&#39;rsatilgan tanlangan mezonlarga YoKI ish haqi to`plami topshirilmadi
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Yuqorida ko&#39;rsatilgan tanlangan mezonlarga YoKI ish haqi to`plami topshirilmadi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Vazifalar va soliq
 DocType: Projects Settings,Projects Settings,Loyihalar sozlamalari
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,"Iltimos, arizani kiriting"
@@ -2807,7 +2809,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Olingan son
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR - .YYYY.-
 DocType: Purchase Order Item,Material Request Item,Material-buyurtma so&#39;rovi
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Avval Qabul Qabul qilingani {0} bekor qiling
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Avval Qabul Qabul qilingani {0} bekor qiling
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Mavzu guruhlari daraxti.
 DocType: Production Plan,Total Produced Qty,Jami ishlab chiqarilgan Miqdor
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Ushbu zaryad turi uchun joriy satr raqamidan kattaroq yoki kattaroq satrlarni topib bo&#39;lmaydi
@@ -2915,6 +2917,7 @@
 ,Vehicle Expenses,Avtomobil xarajatlari
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Savdo shkalasi bo&#39;yicha sinov laboratoriyasini yaratish
 DocType: Serial No,Invoice Details,Faktura tafsilotlari
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Marshrutlarni baholash va optimallashtirish uchun Google Xaritalar Sozlamalarini yoqing
 DocType: Grant Application,Show on Website,Saytda ko&#39;rsatish
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Boshlang
 DocType: Hub Tracked Item,Hub Category,Hub-toifa
@@ -2954,7 +2957,7 @@
 DocType: Inpatient Record,B Positive,B ijobiy
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Xodimning {0} maksimal foydani {1} dan oldingi da&#39;vo qilingan miqdorning {2} miqdoridan oshib ketgan
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: element 1 element bo&#39;lishi shart. Iltimos, bir necha qty uchun alohida qatordan foydalaning."
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: element 1 element bo&#39;lishi shart. Iltimos, bir necha qty uchun alohida qatordan foydalaning."
 DocType: Leave Block List Allow,Leave Block List Allow,Bloklashlar ro&#39;yxatini qoldiring
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Abbr bo&#39;sh yoki bo&#39;sh joy bo&#39;la olmaydi
 DocType: Patient Medical Record,Patient Medical Record,Kasal Tibbiy Ro&#39;yxatdan
@@ -2987,7 +2990,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Iltimos, kompaniyadagi valyutani ko&#39;rsating"
 DocType: Workstation,Wages per hour,Bir soatlik ish haqi
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,"Materiallar so&#39;rovlaridan so&#39;ng, Materiallar buyurtma buyurtma darajasi bo&#39;yicha avtomatik ravishda to&#39;ldirildi"
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Hisob {0} yaroqsiz. Hisob valyutasi {1} bo&#39;lishi kerak
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Hisob {0} yaroqsiz. Hisob valyutasi {1} bo&#39;lishi kerak
 DocType: Supplier,Is Internal Supplier,Ichki ta&#39;minotchi
 DocType: Employee,Create User Permission,Foydalanuvchi uchun ruxsat yaratish
 DocType: Employee Benefit Claim,Employee Benefit Claim,Ish beruvchining nafaqasi
@@ -3130,7 +3133,7 @@
 DocType: Account,Fixed Asset,Ruxsat etilgan aktiv
 DocType: Amazon MWS Settings,After Date,Sana so&#39;ng
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Seriyali inventar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Inter kompaniyasi taqdim etgani uchun {0} noto&#39;g&#39;ri.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Inter kompaniyasi taqdim etgani uchun {0} noto&#39;g&#39;ri.
 ,Department Analytics,Bo&#39;lim tahlillari
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,E-pochta manzili standart kontaktda topilmadi
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Yashirin yaratish
@@ -3142,7 +3145,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Ish haqi tarkibi va talabalar guruhi {0} da dastur boshqacha.
 DocType: Bank Statement Transaction Entry,Receivable Account,Oladigan Hisob
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Kiritilgan sana amaldagi Upto DATE dan kamroq bo&#39;lishi kerak.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},# {0} satri: Asset {1} allaqachon {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},# {0} satri: Asset {1} allaqachon {2}
 DocType: Quotation Item,Stock Balance,Kabinetga balansi
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Sotish Buyurtma To&#39;lovi
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,Bosh ijrochi direktor
@@ -3184,6 +3187,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,Debet kerak
 DocType: Clinical Procedure,Inpatient Record,Statsionar qaydnomasi
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","Vaqt jadvallari sizning jamoangiz tomonidan amalga oshiriladigan tadbirlar uchun vaqtni, narxni va hisob-kitoblarni kuzatish imkonini beradi"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Yetkazib beruvchi&gt; Yetkazib beruvchi turi
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Sotib olish narxlari ro&#39;yxati
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,Jurnal tarixi
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Yetkazib beruvchilar kartalari o&#39;zgaruvchilari shabloni.
@@ -3226,7 +3230,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Almashinish / Zarar
 DocType: Opportunity,Lost Reason,Yo&#39;qotilgan sabab
 DocType: Amazon MWS Settings,Enable Amazon,Amazonni yoqish
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},# {0} qatori: Hisob {1} kompaniyaga tegishli emas {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},# {0} qatori: Hisob {1} kompaniyaga tegishli emas {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},DocType {0} topilmadi
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Yangi manzil
 DocType: Quality Inspection,Sample Size,Namuna o&#39;lchami
@@ -3337,7 +3341,7 @@
 DocType: Water Analysis,Origin,Kelib chiqishi
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ushbu hujjat {4} uchun {0} {1} tomonidan cheklangan. {2} ga qarshi yana bitta {3} qilyapsizmi?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Saqlaganingizdan keyin takroriy-ni tanlang
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,O&#39;zgarish miqdorini tanlang
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,O&#39;zgarish miqdorini tanlang
 DocType: Purchase Invoice,Price List Currency,Narxlari valyutasi
 DocType: Naming Series,User must always select,Foydalanuvchiga har doim tanlangan bo&#39;lishi kerak
 DocType: Stock Settings,Allow Negative Stock,Salbiy aksiyaga ruxsat berish
@@ -3378,7 +3382,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Siz ushbu uchrashuvni bekor qilmoqchimisiz?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Mehmonxona Xona narxlash to&#39;plami
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Savdo Quvuri
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},"Iltimos, ish haqi komponentida {0}"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},"Iltimos, ish haqi komponentida {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Majburiy On
 DocType: Rename Tool,File to Rename,Qayta nomlash uchun fayl
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},"Iltimos, Row {0} qatori uchun BOM-ni tanlang"
@@ -3399,7 +3403,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Xarid qilingan buyumlarning narxi
 DocType: Employee Separation,Employee Separation Template,Xodimlarni ajratish shabloni
 DocType: Selling Settings,Sales Order Required,Savdo buyurtmasi kerak
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Sotuvchi bo&#39;l
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Sotuvchi bo&#39;l
 DocType: Purchase Invoice,Credit To,Kredit berish
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Faol yo&#39;riqchilar / mijozlar
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Standard Delivery Note formatini ishlatish uchun bo&#39;sh qoldiring
@@ -3439,7 +3443,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Soliq jadvalini yarating
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Foydalanuvchining forumi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Xom ashyoni bo&#39;sh bo&#39;lishi mumkin emas.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Row # {0} (To&#39;lov jadvali): Miqdori salbiy bo&#39;lishi kerak
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Row # {0} (To&#39;lov jadvali): Miqdori salbiy bo&#39;lishi kerak
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Qimmatli qog&#39;ozlar yangilanib bo&#39;lmadi, hisob-faktura tomchi qoplama mahsulotini o&#39;z ichiga oladi."
 DocType: Contract,Fulfilment Status,Bajarilish holati
 DocType: Lab Test Sample,Lab Test Sample,Laborotoriya namunasi
@@ -3578,7 +3582,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Doc tarixi
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Yaratilgan yozuvlar - {0}
 DocType: Asset Category Account,Asset Category Account,Aktiv turkumidagi hisob
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Row # {0} (To&#39;lov jadvali): Miqdor ijobiy bo&#39;lishi kerak
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Row # {0} (To&#39;lov jadvali): Miqdor ijobiy bo&#39;lishi kerak
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Nitelik qiymatlarini tanlang
 DocType: Purchase Invoice,Reason For Issuing document,Hujjatni berish uchun sabab
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +583,Stock Entry {0} is not submitted,Stock Entry {0} yuborilmadi
@@ -3632,7 +3636,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Materiallar olingan vaqt
 DocType: Products Settings,Products per Page,Har bir sahifa uchun mahsulotlar
 DocType: Stock Ledger Entry,Outgoing Rate,Chiqish darajasi
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,yoki
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,yoki
 DocType: Sales Order,Billing Status,Billing holati
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Muammo haqida xabar bering
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Kommunal xizmat xarajatlari
@@ -3659,7 +3663,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Ish beruvchi soliq imtiyozlari deklaratsiyasi
 DocType: Payment Entry,Cheque/Reference Date,Tekshirish / Ariza sanasi
 DocType: Purchase Invoice,Total Taxes and Charges,Jami soliqlar va yig&#39;imlar
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Foydalanish uchun mavjud bo&#39;lgan sana o&#39;tgan sana sifatida kiritiladi
 DocType: Employee,Emergency Contact,Favqulotda aloqa
 DocType: Bank Reconciliation Detail,Payment Entry,To&#39;lov kiritish
 ,sales-browser,sotuv-brauzer
@@ -3705,6 +3708,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Qaytish (kredit eslatmasi)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Ishni boshlash
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Ob&#39;ekt uchun {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Iltimos, {0} uchun nomlash seriyasini Sozlamalar&gt; Sozlamalar&gt; Naming Series orqali sozlang"
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,Nogironlar shabloni asl shabloni bo&#39;lmasligi kerak
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,{0} qatoriga: rejali qty kiriting
 DocType: Account,Income Account,Daromad hisobvarag&#39;i
@@ -3718,6 +3722,7 @@
 DocType: Loyalty Program,Help Section,Yordam bo&#39;limi
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Oldindan
 DocType: Appraisal Goal,Key Responsibility Area,Asosiy mas&#39;uliyat maydoni
+DocType: Delivery Trip,Distance UOM,UOM masofa
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Talaba to&#39;dalari talabalar uchun tashrif buyurish, baholash va to&#39;lovlarni kuzatishda sizga yordam beradi"
 DocType: Payment Entry,Total Allocated Amount,Jami ajratilgan mablag&#39;lar
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Doimiy ro&#39;yxatga olish uchun odatiy inventarizatsiyadan foydalaning
@@ -3759,7 +3764,7 @@
 DocType: Item Supplier,Item Supplier,Mahsulot etkazib beruvchisi
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,"Iltimos, mahsulot kodini kiriting"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},"Iltimos, {0} uchun kotirovka qiymatini tanlang {1}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,O&#39;tkazish uchun tanlangan ma&#39;lumotlar yo&#39;q
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,O&#39;tkazish uchun tanlangan ma&#39;lumotlar yo&#39;q
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Barcha manzillar.
 DocType: Company,Stock Settings,Kabinetga sozlamalari
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Birlashma faqatgina ikkita yozuvda bir xil xususiyatlar mavjud bo&#39;lganda mumkin. Guruh, Ildiz turi, Kompaniya"
@@ -4043,7 +4048,7 @@
 DocType: Patient,Personal and Social History,Shaxsiy va ijtimoiy tarix
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Foydalanuvchi {0} yaratildi
 DocType: Fee Schedule,Fee Breakup for each student,Har bir talaba uchun to&#39;lovni taqsimlash
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Buyurtma {1} ga nisbatan umumiy oldindan ({0}) Grand Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Buyurtma {1} ga nisbatan umumiy oldindan ({0}) Grand Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Oylar bo&#39;ylab maqsadlarni teng darajada taqsimlash uchun oylik tarqatish-ni tanlang.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Kodni o&#39;zgartirish
 DocType: Purchase Invoice Item,Valuation Rate,Baholash darajasi
@@ -4052,7 +4057,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Qabul qilingan ITC Cess
 ,Student Monthly Attendance Sheet,Talabalar oylik davomiyligi varaqasi
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Yuk tashish qoidasi faqat Sotish uchun amal qiladi
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Amortizatsiya sathi {0}: Keyingi Amortizatsiya tarixi sotib olish sanasidan oldin bo&#39;lishi mumkin emas
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Amortizatsiya sathi {0}: Keyingi Amortizatsiya tarixi sotib olish sanasidan oldin bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Loyiha boshlanish sanasi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,To
 DocType: Rename Tool,Rename Log,Jurnalni qayta nomlash
@@ -4069,12 +4074,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Savdo bitimlari asosida loyiha va kompaniya qanday yangilanishi kerak.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Muddati tugaydi
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Talabalarni qo&#39;shish
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Iltimos, ushbu hujjatni bekor qilish uchun &quot; <a href=""#Form/Employee/{0}"">{0}</a> \&quot; xodimini o&#39;chirib tashlang"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},"Iltimos, {0}"
 DocType: C-Form,C-Form No,S-formasi №
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Masofa
+DocType: Delivery Stop,Distance,Masofa
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Siz sotib olgan yoki sotgan mahsulot va xizmatlarni ro&#39;yxatlang.
 DocType: Water Analysis,Storage Temperature,Saqlash harorati
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4101,7 +4104,7 @@
 DocType: Homepage,Company Description for website homepage,Veb-saytning ota-sahifasi uchun Kompaniya tavsifi
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",Xaridorlar qulayligi uchun bu kodlar Xarajatlarni va etkazib berish eslatmalari kabi bosma formatlarda qo&#39;llanilishi mumkin
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Superial nomi
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,{0} uchun ma&#39;lumot topilmadi.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,{0} uchun ma&#39;lumot topilmadi.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Kirish jurnalini ochish
 DocType: Contract,Fulfilment Terms,Tugatish shartlari
 DocType: Sales Invoice,Time Sheet List,Soat varaqlari ro&#39;yxati
@@ -4278,7 +4281,7 @@
 DocType: Serial No,Warranty / AMC Details,Kafolat / AMC tafsilotlari
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Faoliyatga asoslangan guruh uchun talabalarni qo&#39;lda tanlang
 DocType: Journal Entry,User Remark,Foydalanuvchi eslatmasi
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Yo&#39;nalishni optimallashtirish.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Yo&#39;nalishni optimallashtirish.
 DocType: Travel Itinerary,Non Diary,Non Diary
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Chap xodimlar uchun &quot;Saqlash bonusi&quot; yarata olmadi
 DocType: Lead,Market Segment,Bozor segmenti
@@ -4308,7 +4311,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Sadoqat dasturi
 DocType: Student Guardian,Father,Ota
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Yordam chiptalari
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,&#39;Qimmatli qog&#39;ozlar yangilanishi&#39; moddiy aktivlarni sotish uchun tekshirib bo&#39;lmaydi
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,&#39;Qimmatli qog&#39;ozlar yangilanishi&#39; moddiy aktivlarni sotish uchun tekshirib bo&#39;lmaydi
 DocType: Bank Reconciliation,Bank Reconciliation,Bank bilan kelishuv
 DocType: Attendance,On Leave,Chiqishda
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Yangilanishlarni oling
@@ -4352,7 +4355,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Seriya raqami va to&#39;plami
 DocType: Warranty Claim,From Company,Kompaniyadan
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Ko&#39;rib chiqishlar kriterlarining yig&#39;indisi {0} bo&#39;lishi kerak.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,"Iltimos, ko&#39;rsatilgan Amortizatsiya miqdorini belgilang"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,"Iltimos, ko&#39;rsatilgan Amortizatsiya miqdorini belgilang"
 DocType: Supplier Scorecard Period,Calculations,Hisoblashlar
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Qiymati yoki kattaligi
 DocType: Payment Terms Template,Payment Terms,To&#39;lov shartlari
@@ -4370,7 +4373,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Narh-navo bilan narx-navo bahosi bo&#39;yicha chegirma (%)
 DocType: Healthcare Service Unit Type,Rate / UOM,Rate / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Barcha saqlash
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Inter kompaniyasi operatsiyalari uchun {0} topilmadi.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Inter kompaniyasi operatsiyalari uchun {0} topilmadi.
 DocType: Travel Itinerary,Rented Car,Avtomobil lizing
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Sizning kompaniyangiz haqida
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Hisobga olish uchun Hisob balansi yozuvi bo&#39;lishi kerak
@@ -4470,6 +4473,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,O&#39;simliklarni tahlil qilish mezonlari
 DocType: Cheque Print Template,Cheque Height,Balandligini tekshiring
 DocType: Supplier,Supplier Details,Yetkazib beruvchi ma&#39;lumotlari
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Iltimos, Setup&gt; Numbering Series orqali tomosha qilish uchun raqamlar seriyasini sozlang"
 DocType: Setup Progress,Setup Progress,O&#39;rnatish jarayoni
 DocType: Expense Claim,Approval Status,Tasdiqlash maqomi
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Qiymatdan {0} qatorda qiymatdan kam bo&#39;lishi kerak
@@ -4562,7 +4566,6 @@
 DocType: Travel Request,Fully Sponsored,To&#39;liq homiylik
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Jurnalga teskari qaytish
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Xaridor {0} yaratildi.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Inson resurslari&gt; HR parametrlarini Xodimlar uchun nomlash tizimini sozlang
 DocType: Stock Settings,Limit Percent,Limit ulushi
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Hozirda biron-bir omborda stok yo&#39;q
 ,Payment Period Based On Invoice Date,Hisob-faktura sanasi asosida to&#39;lov davri
@@ -4621,7 +4624,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Resurs ombori
 DocType: Installation Note,Installation Date,O&#39;rnatish sanasi
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Ledgerni ulashing
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},{0} qator: Asset {1} kompaniyaga tegishli emas {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},{0} qator: Asset {1} kompaniyaga tegishli emas {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Savdo shaxsi {0} yaratildi
 DocType: Employee,Confirmation Date,Tasdiqlash sanasi
 DocType: Inpatient Occupancy,Check Out,Tekshirib ko&#39;rmoq
@@ -4641,6 +4644,7 @@
 DocType: Production Plan,Sales Orders Detail,Savdo buyurtma detali
 DocType: Bin,Requested Quantity,Kerakli miqdor
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-YYYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Marhamat, Ta&#39;lim bo&#39;yicha o&#39;qituvchilarni nomlash tizimini sozlash&gt; Ta&#39;lim sozlamalari"
 DocType: Patient,Marital Status,Oilaviy holat
 DocType: Stock Settings,Auto Material Request,Avtomatik material talab
 DocType: Woocommerce Settings,API consumer secret,API iste&#39;molchi sirlari
@@ -4693,7 +4697,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Kunlarni tanlang
 DocType: Academic Term,Term Name,Term nomi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Kredit ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Ish haqi toifalarini yaratish ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Ish haqi toifalarini yaratish ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Ildiz tugunni tahrirlay olmaysiz.
 DocType: Buying Settings,Purchase Order Required,Sotib olish tartibi majburiy
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Taymer
@@ -4729,7 +4733,7 @@
 DocType: Account,Rate at which this tax is applied,Ushbu soliq qo&#39;llaniladigan stavka
 DocType: Cash Flow Mapper,Section Name,Bo&#39;lim nomi
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Miqdorni qayta tartiblashtirish
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Amortizatsiya satri {0}: foydali muddat tugagandan keyin kutilgan qiymat {1} dan katta yoki teng bo&#39;lishi kerak
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Amortizatsiya satri {0}: foydali muddat tugagandan keyin kutilgan qiymat {1} dan katta yoki teng bo&#39;lishi kerak
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Joriy ish o&#39;rinlari
 DocType: Company,Stock Adjustment Account,Qimmatli qog&#39;ozlarni tartibga solish hisobi
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Hisobdan o&#39;chirish
@@ -4776,7 +4780,7 @@
 DocType: Program Enrollment,School House,Maktab uyi
 DocType: Serial No,Out of AMC,AMCdan tashqarida
 DocType: Opportunity,Opportunity Amount,Imkoniyatlar miqdori
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Qayd qilingan amortizatsiya miqdori jami Amortizatsiya miqdoridan ko&#39;p bo&#39;lishi mumkin emas
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Qayd qilingan amortizatsiya miqdori jami Amortizatsiya miqdoridan ko&#39;p bo&#39;lishi mumkin emas
 DocType: Purchase Order,Order Confirmation Date,Buyurtma Tasdiqlash sanasi
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-YYYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Xizmatga tashrif buyurish
@@ -4817,7 +4821,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Partiya:
 DocType: Volunteer,Afternoon,Kunduzi
 DocType: Loyalty Program,Loyalty Program Help,Sadoqat dasturi yordami
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} &#39;{1}&#39; o&#39;chirib qo&#39;yilgan
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} &#39;{1}&#39; o&#39;chirib qo&#39;yilgan
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ochiq qilib belgilang
 DocType: Cheque Print Template,Scanned Cheque,Skaner qilingan tekshiruv
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Jurnallarni yuborish haqida Kontaktlar ga avtomatik elektron pochta xabarlarini yuboring.
@@ -4830,7 +4834,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Mahsulot va Kafolat haqida ma&#39;lumot
 DocType: Chapter,Chapter Members,Bo&#39;lim a&#39;zolari
 DocType: Sales Team,Contribution (%),Miqdori (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Eslatma: &quot;Naqd yoki Bank hisobi&quot; ko&#39;rsatilmagani uchun to&#39;lov kiritish yaratilmaydi
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Eslatma: &quot;Naqd yoki Bank hisobi&quot; ko&#39;rsatilmagani uchun to&#39;lov kiritish yaratilmaydi
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,{0} loyihasi allaqachon mavjud
 DocType: Clinical Procedure,Nursing User,Hemşirelik Foydalanuvchi bilan
 DocType: Employee Benefit Application,Payroll Period,Ish haqi davri
@@ -4838,6 +4842,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},No {0} ketma-ketligi {1} guruhiga tegishli emas
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Mas&#39;uliyat
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Ushbu tirnoqning amal qilish muddati tugadi.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Iltimos, ushbu hujjatni bekor qilish uchun &quot; <a href=""#Form/Employee/{0}"">{0}</a> \&quot; xodimini o&#39;chirib tashlang"
 DocType: Expense Claim Account,Expense Claim Account,Xarajat shikoyati qaydnomasi
 DocType: Account,Capital Work in Progress,Kapital ishlari davom etmoqda
 DocType: Accounts Settings,Allow Stale Exchange Rates,Sovuq valyuta kurslariga ruxsat berish
@@ -4918,7 +4924,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Muammo materiallari
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Shopifyni ERPNext bilan ulang
 DocType: Material Request Item,For Warehouse,QXI uchun
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Yetkazib berish xatlari {0} yangilandi
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Yetkazib berish xatlari {0} yangilandi
 DocType: Employee,Offer Date,Taklif sanasi
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Qo&#39;shtirnoq
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Siz oflayn rejasiz. Tarmoqqa ega bo&#39;lguncha qayta yuklay olmaysiz.
@@ -4968,7 +4974,7 @@
 DocType: Shipping Rule,Calculate Based On,Oddiy qiymatni hisoblash
 DocType: Contract,Unfulfilled,Tugallanmagan
 DocType: Delivery Note Item,From Warehouse,QXIdan
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Ko&#39;rsatilgan mezonlarga xodimlar yo&#39;q
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Ko&#39;rsatilgan mezonlarga xodimlar yo&#39;q
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Ishlab chiqarish uchun materiallar varaqasi yo&#39;q
 DocType: Shopify Settings,Default Customer,Standart mijoz
 DocType: Sales Stage,Stage Name,Staj nomi
@@ -5010,7 +5016,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Chegirma summasi bo&#39;yicha soliq summasi
 DocType: Patient,Inpatient Status,Statsionar ahvoli
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Kundalik ish sarlavhalari sozlamalari
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Tanlangan narxlari ro&#39;yxatida sotib olish va sotish joylari tekshirilishi kerak.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Tanlangan narxlari ro&#39;yxatida sotib olish va sotish joylari tekshirilishi kerak.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Iltimos sanasi bo&#39;yicha Reqd kiriting
 DocType: Payment Entry,Internal Transfer,Ichki pul o&#39;tkazish
 DocType: Asset Maintenance,Maintenance Tasks,Xizmat vazifalari
@@ -5046,7 +5052,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Guruh tomonidan
 DocType: Guardian,Interests,Qiziqishlar
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Pullarni yoqish / o&#39;chirish.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Ish haqi toifalarini topshirib bo&#39;lmadi
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Ish haqi toifalarini topshirib bo&#39;lmadi
 DocType: Exchange Rate Revaluation,Get Entries,Yozib oling
 DocType: Production Plan,Get Material Request,Moddiy talablarni oling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Pochta xarajatlari
@@ -5130,7 +5136,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Xarajat hisobi {0} elementi uchun majburiydir.
 DocType: BOM,Website Description,Veb-sayt ta&#39;rifi
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Özkaynakta aniq o&#39;zgarishlar
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Avval xaridlar fakturasini {0} bekor qiling
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Avval xaridlar fakturasini {0} bekor qiling
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Ruxsat berilmaydi. Xizmat birligi turini o&#39;chirib qo&#39;ying
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-pochta manzili noyob bo&#39;lishi kerak, {0} uchun allaqachon mavjud"
 DocType: Serial No,AMC Expiry Date,AMC tugash sanasi
@@ -5168,7 +5174,7 @@
 DocType: Hotel Room,Hotel Room,Mehmonxona xonasi
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Hisob {0} kompaniya {1} ga tegishli emas
 DocType: Leave Type,Rounding,Rounding
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,{0} qatoridagi ketma-ket raqamlar etkazib berish eslatmasiga mos kelmaydi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,{0} qatoridagi ketma-ket raqamlar etkazib berish eslatmasiga mos kelmaydi
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Tarqatilgan miqdor (Pro-rated)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Keyin narxlash qoidalari xaridorlar, xaridorlar guruhi, hududi, yetkazib beruvchisi, yetkazib beruvchi guruhi, aksiya, savdo bo&#39;yicha hamkor va boshqalar asosida filtrlanadi."
 DocType: Student,Guardian Details,Guardian tafsilotlari
@@ -5223,7 +5229,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},{0} uchun kabinetga ombori kerak
 DocType: Leave Allocation,Unused leaves,Foydalanilmagan barglar
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,To&#39;lovni to&#39;lashni amalga oshiring
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Barcha bo&#39;limlar
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Barcha bo&#39;limlar
 DocType: Healthcare Service Unit,Vacant,Bo&#39;sh
 DocType: Patient,Alcohol Past Use,Spirtli ichimliklarni o&#39;tmishda ishlatish
 DocType: Fertilizer Content,Fertilizer Content,Go&#39;ng tarkibi
@@ -5233,7 +5239,7 @@
 DocType: Share Transfer,Transfer,Transfer
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),"Fetch portlash qilingan BOM (sub-assemblies, shu jumladan)"
 DocType: Authorization Rule,Applicable To (Employee),Qo&#39;llanilishi mumkin (xodim)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,To&#39;lov sanasi majburiydir
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,To&#39;lov sanasi majburiydir
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,{0} xususiyati uchun ortish 0 bo&#39;lishi mumkin emas
 DocType: Employee Benefit Claim,Benefit Type and Amount,Foyda turi va miqdori
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Xonalar rezervasyonu
@@ -5376,7 +5382,7 @@
 DocType: Purchase Invoice Item,Total Weight,Jami Og&#39;irligi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Savdo bo&#39;yicha komissiya
 DocType: Job Offer Term,Value / Description,Qiymati / ta&#39;rifi
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","# {0} qatori: Asset {1} yuborib bo&#39;lolmaydi, allaqachon {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","# {0} qatori: Asset {1} yuborib bo&#39;lolmaydi, allaqachon {2}"
 DocType: Tax Rule,Billing Country,Billing davlati
 DocType: Purchase Order Item,Expected Delivery Date,Kutilayotgan etkazib berish sanasi
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restoran Buyurtma yozuvi
@@ -5415,12 +5421,13 @@
 DocType: Maintenance Visit,Breakdown,Buzilmoq
 DocType: Travel Itinerary,Vegetarian,Vejetaryen
 DocType: Patient Encounter,Encounter Date,Uchrashuv sanalari
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Hisob: {0} valyutaga: {1} tanlanmaydi
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Hisob: {0} valyutaga: {1} tanlanmaydi
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bank ma&#39;lumotlari
 DocType: Purchase Receipt Item,Sample Quantity,Namuna miqdori
 DocType: Bank Guarantee,Name of Beneficiary,Benefisiarning nomi
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",Tez-tez yangilanadigan narxlarni / narx ro&#39;yxatining nisbati / xom ashyoning so&#39;nggi sotib olish nisbati asosida Scheduler orqali BOM narxini avtomatik ravishda yangilang.
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Yetkazib beruvchi&gt; Yetkazib beruvchi guruhi
 DocType: Bank Reconciliation Detail,Cheque Date,Tekshirish sanasi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Hisob {0}: Ota-hisob {1} kompaniyaga tegishli emas: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Ushbu kompaniya bilan bog&#39;liq barcha operatsiyalar muvaffaqiyatli o&#39;chirildi!
@@ -5448,7 +5455,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Bolalar tugunlari faqat &quot;Guruh&quot; tipidagi tugunlar ostida yaratilishi mumkin
 DocType: Attendance Request,Half Day Date,Yarim kunlik sana
 DocType: Academic Year,Academic Year Name,O&#39;quv yili nomi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,"{0} {1} bilan ishlashga ruxsat berilmadi. Iltimos, kompaniyani o&#39;zgartiring."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,"{0} {1} bilan ishlashga ruxsat berilmadi. Iltimos, kompaniyani o&#39;zgartiring."
 DocType: Sales Partner,Contact Desc,Bilan aloqa Desc
 DocType: Email Digest,Send regular summary reports via Email.,Elektron pochta orqali muntazam abstrakt hisobotlar yuboring.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},"Iltimos, xarajat shikoyati toifasiga kiritilgan standart hisobni tanlang {0}"
@@ -5481,7 +5488,7 @@
 DocType: Hotel Room,Hotel Manager,Mehmonxona menejeri
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Xarid qilish vositasi uchun Soliq qoidasini o&#39;rnating
 DocType: Purchase Invoice,Taxes and Charges Added,Soliqlar va to&#39;lovlar qo&#39;shildi
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Amortizatsiya sathi {0}: Keyingi Amortizatsiya tarixi foydalanish uchun tayyor bo&#39;lgan sanadan oldin bo&#39;lishi mumkin emas
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Amortizatsiya sathi {0}: Keyingi Amortizatsiya tarixi foydalanish uchun tayyor bo&#39;lgan sanadan oldin bo&#39;lishi mumkin emas
 ,Sales Funnel,Savdo huni
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Qisqartirish majburiydir
 DocType: Project,Task Progress,Vazifa muvaffaqiyati
@@ -5495,7 +5502,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Barcha xaridorlar guruhlari
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,Yil olingan oy
 DocType: Attendance Request,On Duty,Hizmatda
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} majburiydir. Ehtimol, valyuta ayirboshlash yozuvi {1} - {2} uchun yaratilmagan."
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} majburiydir. Ehtimol, valyuta ayirboshlash yozuvi {1} - {2} uchun yaratilmagan."
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},{0} Xodimlar rejasi {1} uchun mavjud.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Soliq namunasi majburiydir.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Hisob {0}: Ota-hisob {1} mavjud emas
@@ -5574,11 +5581,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Eng kamida bir omborxona majburiydir
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","UOM, Mavzu guruhi, tavsifi va soatning yo&#39;qligi kabi ob&#39;ektlarni sozlash."
 DocType: Certification Application,Certification Status,Sertifikatlash holati
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Bozori
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Bozori
 DocType: Travel Itinerary,Travel Advance Required,Sayohat kengaytmasi talab qilinadi
 DocType: Subscriber,Subscriber Name,Obunachi nomi
 DocType: Serial No,Out of Warranty,Kafolatli emas
-DocType: Cashier Closing,Cashier-closing-,Kassir-yopiladigan-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Maplangan ma&#39;lumotlar turi
 DocType: BOM Update Tool,Replace,O&#39;zgartiring
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Hech qanday mahsulot topilmadi.
@@ -5665,7 +5671,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Savdo va xarid uchun odatiy soliq namunalari yaratilgan.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Baholash natijasi {0} allaqachon mavjud.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Misol: ABCD. #####. Jarayonlarda seriya o&#39;rnatilgan bo&#39;lsa va Batch No ko&#39;rsatilgan bo&#39;lsa, bu ketma-ketlik asosida avtomatik partiya raqami yaratiladi. Agar siz doimo bu element uchun &quot;Partiya No&quot; ni aniq ko&#39;rsatishni istasangiz, bo&#39;sh qoldiring. Eslatma: Ushbu sozlama Stok Sozlamalarida Nominal Seriya Prefiksidan ustunlik qiladi."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Iltimos, Setup&gt; Numbering Series orqali tomosha qilish uchun raqamlar seriyasini sozlang"
 DocType: BOM,Materials Required (Exploded),Zarur bo&#39;lgan materiallar (portlatilgan)
 DocType: Contract,Party User,Partiya foydalanuvchisi
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',"Guruh tomonidan &quot;Kompaniya&quot; bo&#39;lsa, Kompaniya filtrini bo&#39;sh qoldiring."
@@ -5866,7 +5871,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Sinov muddati boshlanish sanasi va Sinov muddati tugashi kerak
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,O&#39;rtacha narx
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,To&#39;lov tarifidagi umumiy to&#39;lov miqdori Grand / Rounded Totalga teng bo&#39;lishi kerak
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,To&#39;lov tarifidagi umumiy to&#39;lov miqdori Grand / Rounded Totalga teng bo&#39;lishi kerak
 DocType: Subscription Plan Detail,Plan,Reja
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bank Bosh balansidagi balans balansi
 DocType: Job Applicant,Applicant Name,Ariza beruvchi nomi
@@ -5935,7 +5940,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Sovun va detarjen
 DocType: BOM,Show Items,Ma&#39;lumotlar ko&#39;rsatish
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Vaqtdan Vaqtga qaraganda Kattaroq bo&#39;la olmaydi.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Barcha mijozlarni elektron pochta orqali xabardor qilishni xohlaysizmi?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Barcha mijozlarni elektron pochta orqali xabardor qilishni xohlaysizmi?
 DocType: Subscription Plan,Billing Interval,Billing oralig&#39;i
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Buyurtma qilingan
@@ -5944,9 +5949,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Row {0}: {1} 0 dan katta bo&#39;lishi kerak
 DocType: Assessment Criteria,Assessment Criteria Group,Baholash mezonlari guruhi
 DocType: Healthcare Settings,Patient Name By,Bemor nomi
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Accrual Journal {0} dan {1} ga qadar oylik maosh uchun
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Accrual Journal {0} dan {1} ga qadar oylik maosh uchun
 DocType: Sales Invoice Item,Enable Deferred Revenue,Ertelenmiş daromadni yoqish
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Yig&#39;ilgan Amortizatsiyani ochish {0} ga teng bo&#39;lishi kerak.
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Yig&#39;ilgan Amortizatsiyani ochish {0} ga teng bo&#39;lishi kerak.
 DocType: Warehouse,Warehouse Name,Ombor nomi
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Haqiqiy boshlanish sanasi haqiqiy tugatish sanasidan kam bo&#39;lishi kerak
 DocType: Naming Series,Select Transaction,Jurnalni tanlang
@@ -6097,7 +6102,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,{1} sinfidagi xodimlar {0} standart ta&#39;til siyosatiga ega emas
 DocType: Salary Detail,Salary Detail,Ish haqi bo&#39;yicha batafsil
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Avval {0} ni tanlang
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,{0} foydalanuvchi qo&#39;shilgan
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,{0} foydalanuvchi qo&#39;shilgan
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",Ko&#39;p qatlamli dasturda mijozlar o&#39;zlari sarflagan xarajatlariga muvofiq tegishli darajaga avtomatik tarzda topshiriladi
 DocType: Appointment Type,Physician,Shifokor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,{1} banddagi {0} guruhining amal qilish muddati tugadi.
@@ -6240,7 +6245,7 @@
 DocType: Asset,Custodian,Saqlanuvchi
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Sotuv nuqtasi profili
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} 0 dan 100 orasida qiymat bo&#39;lishi kerak
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},{1} dan {2} gacha {0} to&#39;lovi
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},{1} dan {2} gacha {0} to&#39;lovi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Ta&#39;minlanmagan kreditlar
 DocType: Cost Center,Cost Center Name,Xarajat markazi nomi
 DocType: Student,B+,B +
@@ -6272,6 +6277,7 @@
 DocType: Employee,Date of Issue,Berilgan sana
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","Xarid qilish sozlamalari kerak bo&#39;lsa == &quot;YES&quot; ni xarid qilsangiz, u holda Xarid-fakturani yaratish uchun foydalanuvchi oldin {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},{0} qator: Ta&#39;minlovchini {1} elementiga sozlang
+DocType: Global Defaults,Default Distance Unit,Standart masofaviy birlik
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Row {0}: soat qiymati noldan katta bo&#39;lishi kerak.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Veb-sayt {1} mahsulotiga biriktirilgan {0} rasm topilmadi
 DocType: Issue,Content Type,Kontent turi
@@ -6326,7 +6332,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,Debet Hisobni balans hisoboti bo&#39;lishi kerak
 DocType: Asset,Naming Series,Namunaviy qator
 DocType: Vital Signs,Coated,Yopilgan
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Row {0}: Foydali Hayotdan keyin kutilgan qiymat Brüt Xarid Qabul qilingan miqdordan kam bo&#39;lishi kerak
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Row {0}: Foydali Hayotdan keyin kutilgan qiymat Brüt Xarid Qabul qilingan miqdordan kam bo&#39;lishi kerak
 DocType: GoCardless Settings,GoCardless Settings,GoCardsiz Sozlamalar
 DocType: Leave Block List,Leave Block List Name,Blok ro&#39;yxati nomini qoldiring
 DocType: Certified Consultant,Certification Validity,Sertifikatning amal qilish muddati
@@ -6393,6 +6399,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Bank boshi
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Lab sinovlarini ko&#39;rish
 DocType: Hub Users,Hub Users,Hub foydalanuvchilar
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Xaridor&gt; Mijozlar guruhi&gt; Zonasi
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Xizmat sanasi
 DocType: Purchase Invoice Item,Rejected Serial No,Rad etilgan seriya raqami
@@ -6407,7 +6414,7 @@
 DocType: SG Creation Tool Course,Max Strength,Maks kuch
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Oldindan o&#39;rnatish
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-YYYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Buyurtmachilar uchun {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Buyurtmachilar uchun {}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Etkazib berish sanasi asosida narsalarni tanlang
 DocType: Grant Application,Has any past Grant Record,O&#39;tgan Grantlar rekordi mavjud
 ,Sales Analytics,Savdo tahlillari
@@ -6433,7 +6440,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Mehmonxona xonalari uchun rezervasyon
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Mijozlarga hizmat
 DocType: BOM,Thumbnail,Kichik rasm
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,E-pochta identifikatorlari mavjud bo&#39;lgan kontaktlar topilmadi.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,E-pochta identifikatorlari mavjud bo&#39;lgan kontaktlar topilmadi.
 DocType: Item Customer Detail,Item Customer Detail,Xaridorlar uchun batafsil ma&#39;lumot
 DocType: Notification Control,Prompt for Email on Submission of,E-pochtani topshirish haqida so&#39;rov
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Xodimning {0} maksimal foyda miqdori {1}
@@ -6688,7 +6695,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,Hisob turi tanlanganligi sababli guruhga yashirin bo&#39;lmaydi.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,"{0} {1} o&#39;zgartirilgan. Iltimos, yangilang."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Foydalanuvchilarni foydalanuvchilarga qo&#39;yishni keyingi kunlarda to&#39;xtatib turish.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Mahsulot kodi&gt; Mahsulot guruhi&gt; Tovar
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Sodiqlik ballari uchun cheksiz muddat tugagandan so&#39;ng, muddat tugashini bo&#39;sh yoki 0 ushlab turing."
 DocType: Asset Maintenance Team,Maintenance Team Members,Xizmat jamoasi a&#39;zolari
 DocType: Loyalty Point Entry,Purchase Amount,Xarid miqdori
@@ -6696,7 +6702,7 @@
 											to fullfill Sales Order {2}","{1} mahsulotining yo&#39;q {0} seriyasini sotish mumkin emas, chunki Savdo Buyurtmani to&#39;liq to&#39;ldirish uchun {2}"
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Yetkazib beruvchi quo {0} yaratildi
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,End Year Year Year oldin bo&#39;lishi mumkin emas
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,End Year Year Year oldin bo&#39;lishi mumkin emas
 DocType: Employee Benefit Application,Employee Benefits,Ishchilarning nafaqalari
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},To&#39;ldirilgan miqdor {1} qatorda {0} uchun teng miqdorga ega bo&#39;lishi kerak
 DocType: Work Order,Manufactured Qty,Ishlab chiqarilgan Miqdor
@@ -6712,6 +6718,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Partiya raqamlarini tanlang
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,GSTINga
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Xarajatlar mijozlarga yetkazildi.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Inson resurslari&gt; HR parametrlarini Xodimlar uchun nomlash tizimini sozlang
 DocType: Healthcare Settings,Invoice Appointments Automatically,Billingni avtomatik tarzda belgilash
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Loyiha Id
 DocType: Salary Component,Variable Based On Taxable Salary,Soliqqa tortiladigan maoshga asoslangan o&#39;zgaruvchi
@@ -6760,7 +6767,7 @@
 DocType: POS Profile,Account for Change Amount,O&#39;zgarish miqdorini hisobga olish
 DocType: QuickBooks Migrator,Connecting to QuickBooks,QuickBooks-ga ulanish
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Jami daromad / zararlar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Inter kompaniyasi hisob-fakturasi uchun noto&#39;g&#39;ri Kompaniya.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Inter kompaniyasi hisob-fakturasi uchun noto&#39;g&#39;ri Kompaniya.
 DocType: Purchase Invoice,input service,kirish xizmati
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partiya / Hisob {3} {4} da {1} / {2}
 DocType: Employee Promotion,Employee Promotion,Ishchilarni rag&#39;batlantirish
@@ -6886,7 +6893,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Turar joy uchun turar joy
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Tahlillar
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Savat bo&#39;sh
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,"Marhamat, Ta&#39;lim bo&#39;yicha o&#39;qituvchilarni nomlash tizimini sozlash&gt; Ta&#39;lim sozlamalari"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",{0} mahsulotida Seriya raqami yo&#39;q. Faqat serilallangan elementlar \ seriya raqami asosida etkazib berishi mumkin
 DocType: Vehicle,Model,Model
@@ -6916,7 +6922,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,O&#39;zgarishga hech narsa yo&#39;q
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,CSV faylini tanlang
 DocType: Holiday List,Total Holidays,Jami dam olish kunlari
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,"Yuborish uchun e-pochta shablonini yo&#39;q. Iltimos, etkazib berish sozlamalarini tanlang."
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,"Yuborish uchun e-pochta shablonini yo&#39;q. Iltimos, etkazib berish sozlamalarini tanlang."
 DocType: Student Leave Application,Mark as Present,Mavjud deb belgilash
 DocType: Supplier Scorecard,Indicator Color,Ko&#39;rsatkich rangi
 DocType: Purchase Order,To Receive and Bill,Qabul qilish va tasdiqlash uchun
@@ -6925,7 +6931,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Seriya raqami-ni tanlang
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Dizayner
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Shartlar va shartlar shabloni
-DocType: Serial No,Delivery Details,Yetkazib berish haqida ma&#39;lumot
+DocType: Delivery Trip,Delivery Details,Yetkazib berish haqida ma&#39;lumot
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Narxlar markazi {1} qatoridagi Vergiler jadvalidagi {0} qatorida talab qilinadi
 DocType: Program,Program Code,Dastur kodi
 DocType: Terms and Conditions,Terms and Conditions Help,Shartlar va shartlar Yordam
@@ -6949,7 +6955,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Uchrashuv vaqtlari
 DocType: Cash Flow Mapping,Is Income Tax Expense,Daromad solig&#39;i tushumi
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Buyurtma yetkazib berish uchun tayyor!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},# {0} qatori: joylashtirish sanasi {1} aktivining {1} sotib olish sanasi bilan bir xil bo&#39;lishi kerak
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},# {0} qatori: joylashtirish sanasi {1} aktivining {1} sotib olish sanasi bilan bir xil bo&#39;lishi kerak
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Talabaning Institut Pansionida istiqomat qilishini tekshiring.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Yuqoridagi jadvalda Savdo buyurtmalarini kiriting
 ,Stock Summary,Qisqacha tavsifi
diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv
index 2882315..ec03510 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,Tên kỳ
 DocType: Employee,Salary Mode,Chế độ tiền lương
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,Ghi danh
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,Ghi danh
 DocType: Patient,Divorced,Đa ly dị
 DocType: Support Settings,Post Route Key,Khóa tuyến đường bưu chính
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Cho phép hàng để được thêm nhiều lần trong một giao dịch
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,Tỷ giá hối đoái mới
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},Tiền tệ là cần thiết cho Danh sách Price {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sẽ được tính toán trong giao dịch.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Nhà cung cấp&gt; Loại nhà cung cấp
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Liên hệ Khách hàng
 DocType: Patient Appointment,Check availability,Sẵn sàng kiểm tra
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,Hiện mở
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,Loạt Cập nhật thành công
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,Kiểm tra
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{0} trong hàng {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{0} trong hàng {1}
 DocType: Asset Finance Book,Depreciation Start Date,Ngày bắt đầu khấu hao
 DocType: Pricing Rule,Apply On,Áp dụng trên
 DocType: Item Price,Multiple Item prices.,Nhiều giá mẫu hàng.
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,Lab Prescription
 ,Delay Days,Delay Days
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Chi phí dịch vụ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},Số sê-ri: {0} đã được tham chiếu trong Hóa đơn bán hàng: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},Số sê-ri: {0} đã được tham chiếu trong Hóa đơn bán hàng: {1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,Hóa đơn
 DocType: Purchase Invoice Item,Item Weight Details,Chi tiết Trọng lượng Chi tiết
 DocType: Asset Maintenance Log,Periodicity,Tính tuần hoàn
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,Kế toán viên
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,Bảng giá bán
 DocType: Patient,Tobacco Current Use,Sử dụng thuốc lá
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Ngày bắt đầu và ngày kết thúc trùng lặp với thẻ công việc <a href=""#Form/Job Card/{0}"">{1}</a>"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,Giá bán
 DocType: Cost Center,Stock User,Cổ khoản
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,có liên quan
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,ngày tham dự không thể ít hơn ngày tham gia của người lao động
 DocType: Grading Scale,Grading Scale Name,Phân loại khoảng tên
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,Thêm người dùng vào Marketplace
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,Thêm người dùng vào Marketplace
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,Đây là một tài khoản gốc và không thể được chỉnh sửa.
 DocType: Sales Invoice,Company Address,Địa chỉ công ty
 DocType: BOM,Operations,Tác vụ
@@ -322,7 +322,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,Diff Qty
 DocType: Production Plan,Material Request Detail,Yêu cầu Tài liệu Chi tiết
 DocType: Selling Settings,Default Quotation Validity Days,Các ngày hiệu lực mặc định
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Bao gồm thuế hàng {0} trong tỷ lệ khoản, các loại thuế tại hàng {1} cũng phải được thêm vào"
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Bao gồm thuế hàng {0} trong tỷ lệ khoản, các loại thuế tại hàng {1} cũng phải được thêm vào"
 DocType: SMS Center,SMS Center,Trung tâm nhắn tin
 DocType: Payroll Entry,Validate Attendance,Xác thực tham dự
 DocType: Sales Invoice,Change Amount,thay đổi Số tiền
@@ -441,7 +441,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Khoảng cách dòng cho số tiền bằng chữ
 DocType: Vehicle,Additional Details,Chi tiết bổ sung
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Không có mô tả có sẵn
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Nhà cung cấp&gt; Nhà cung cấp nhóm
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Yêu cầu để mua hàng.
 DocType: POS Closing Voucher Details,Collected Amount,Số tiền đã thu
 DocType: Lab Test,Submitted Date,Ngày nộp đơn
@@ -486,7 +485,7 @@
 DocType: Student Admission,Student Admission,Nhập học sinh viên
 ,Terretory,Khu vực
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,Mục {0} bị hủy bỏ
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,Hàng khấu hao {0}: Ngày bắt đầu khấu hao được nhập vào ngày hôm qua
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,Hàng khấu hao {0}: Ngày bắt đầu khấu hao được nhập vào ngày hôm qua
 DocType: Contract Template,Fulfilment Terms and Conditions,Điều khoản và điều kiện thực hiện
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,Yêu cầu nguyên liệu
 DocType: Bank Reconciliation,Update Clearance Date,Cập nhật thông quan ngày
@@ -543,6 +542,7 @@
 DocType: Accounts Settings,Settings for Accounts,Cài đặt cho tài khoản
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},Nhà cung cấp hóa đơn Không tồn tại trong hóa đơn mua hàng {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Quản lý cây người bán hàng
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.",Không thể xử lý tuyến đường vì Cài đặt Google Maps bị tắt.
 DocType: Job Applicant,Cover Letter,Thư xin việc
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Séc đặc biệt và tiền gửi để xóa
 DocType: Item,Synced With Hub,Đồng bộ hóa Với Hub
@@ -602,7 +602,7 @@
 DocType: Asset Value Adjustment,New Asset Value,Giá trị nội dung mới
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tỷ Giá được quy đổi từ tỷ giá của khách hàng về tỷ giá khách hàng chung
 DocType: Course Scheduling Tool,Course Scheduling Tool,Khóa học Lập kế hoạch cụ
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Hàng # {0}: Mua hóa đơn không thể được thực hiện đối với một tài sản hiện có {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Hàng # {0}: Mua hóa đơn không thể được thực hiện đối với một tài sản hiện có {1}
 DocType: Crop Cycle,LInked Analysis,Phân tích LInked
 DocType: POS Closing Voucher,POS Closing Voucher,Phiếu đóng POS
 DocType: Contract,Lapsed,Hết hạn
@@ -637,6 +637,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0} - {1} không được ghi danh vào Khóa học {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,Tên học sinh:
 DocType: POS Closing Voucher Details,Difference,Sự khác biệt
+DocType: Delivery Settings,Delay between Delivery Stops,Trì hoãn giữa các điểm dừng giao hàng
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Không nối tiếp {0} không thuộc về Giao hàng tận nơi Lưu ý {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.","Có vẻ như có vấn đề với cấu hình GoCardless của máy chủ. Đừng lo lắng, trong trường hợp thất bại, số tiền sẽ được hoàn lại vào tài khoản của bạn."
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
@@ -696,7 +697,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Số lượng và tỷ giá
 DocType: Delivery Note,% Installed,% Đã cài
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,Phòng học / phòng thí nghiệm vv nơi bài giảng có thể được sắp xếp.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,Tiền công ty của cả hai công ty phải khớp với Giao dịch của Công ty Liên doanh.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,Tiền công ty của cả hai công ty phải khớp với Giao dịch của Công ty Liên doanh.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,Vui lòng nhập tên công ty đầu tiên
 DocType: Travel Itinerary,Non-Vegetarian,Người không ăn chay
 DocType: Purchase Invoice,Supplier Name,Tên nhà cung cấp
@@ -783,7 +784,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,Cho thuê từ ngày
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,Phần đủ để xây dựng
 DocType: POS Profile User,POS Profile User,Người dùng Hồ sơ POS
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,Hàng {0}: Ngày bắt đầu khấu hao là bắt buộc
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,Hàng {0}: Ngày bắt đầu khấu hao là bắt buộc
 DocType: Purchase Invoice Item,Service Start Date,Ngày bắt đầu dịch vụ
 DocType: Subscription Invoice,Subscription Invoice,Hóa đơn đăng ký
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,Thu nhập trực tiếp
@@ -852,7 +853,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,Bản rút gọn đã được sử dụng cho một công ty khác
 DocType: Selling Settings,Default Customer Group,Nhóm khách hàng mặc định
 DocType: Employee,IFSC Code,Mã IFSC
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","Ngày bắt đầu và ngày kết thúc trùng lặp với thẻ công việc <a href=""#Form/Job Card/{0}"">{1}</a>"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Nếu vô hiệu hóa, trường ""Rounded Total"" sẽ không được hiển thị trong bất kỳ giao dịch"
 DocType: BOM,Operating Cost,Chi phí hoạt động
 DocType: Crop,Produced Items,Sản phẩm Sản phẩm
@@ -904,7 +904,7 @@
 DocType: Supplier,Prevent RFQs,Ngăn chặn RFQs
 DocType: Hub User,Hub User,Người dùng trung tâm
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,Thực hiện bán hàng đặt hàng
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},Phiếu lương đã được gửi cho khoảng thời gian từ {0} đến {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},Phiếu lương đã được gửi cho khoảng thời gian từ {0} đến {1}
 DocType: Project Task,Project Task,Dự án công tác
 DocType: Loyalty Point Entry Redemption,Redeemed Points,Điểm đã đổi
 ,Lead Id,ID Tiềm năng
@@ -1036,7 +1036,7 @@
 DocType: Fee Validity,Max number of visit,Số lần truy cập tối đa
 ,Hotel Room Occupancy,Phòng khách sạn
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,Thời gian biểu  đã tạo:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},Xin vui lòng thiết lập mặc định hoặc tiền trong tài khoản ngân hàng Phương thức thanh toán {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},Xin vui lòng thiết lập mặc định hoặc tiền trong tài khoản ngân hàng Phương thức thanh toán {0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,Ghi danh
 DocType: GST Settings,GST Settings,Cài đặt GST
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},Tiền tệ phải giống như Bảng giá Tiền tệ: {0}
@@ -1091,7 +1091,7 @@
 DocType: Vehicle Log,Service Details,Chi tiết dịch vụ
 DocType: Lab Test Template,Grouped,Nhóm
 DocType: Selling Settings,Delivery Note Required,Phải có Phiếu giao hàng
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,Gửi phiếu lương ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,Gửi phiếu lương ...
 DocType: Bank Guarantee,Bank Guarantee Number,Số bảo lãnh ngân hàng
 DocType: Bank Guarantee,Bank Guarantee Number,Số bảo lãnh ngân hàng
 DocType: Assessment Criteria,Assessment Criteria,Tiêu chí đánh giá
@@ -1117,13 +1117,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,Bút toán thanh toán đã được tạo ra
 DocType: Request for Quotation,Get Suppliers,Nhận nhà cung cấp
 DocType: Purchase Receipt Item Supplied,Current Stock,Tồn kho hiện tại
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},Dòng #{0}: Tài sản {1} không liên kết với mục {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},Dòng #{0}: Tài sản {1} không liên kết với mục {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,Xem trước bảng lương
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,Tài khoản {0} đã được nhập nhiều lần
 DocType: Account,Expenses Included In Valuation,Chi phí bao gồm trong định giá
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,Bạn chỉ có thể gia hạn nếu hội viên của bạn hết hạn trong vòng 30 ngày
 DocType: Shopping Cart Settings,Show Stock Availability,Hiển thị tình trạng sẵn có
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},Đặt {0} trong danh mục nội dung {1} hoặc công ty {2}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},Đặt {0} trong danh mục nội dung {1} hoặc công ty {2}
 DocType: Location,Longitude,Kinh độ
 ,Absent Student Report,Báo cáo Sinh viên vắng mặt
 DocType: Crop,Crop Spacing UOM,Khoảng cách cây trồng UOM
@@ -1196,7 +1196,7 @@
 DocType: Soil Texture,Sand,Cát
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,Năng lượng
 DocType: Opportunity,Opportunity From,CƠ hội từ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Hàng {0}: {1} Số sêri cần có cho mục {2}. Bạn đã cung cấp {3}.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,Hàng {0}: {1} Số sêri cần có cho mục {2}. Bạn đã cung cấp {3}.
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,Vui lòng chọn một bảng
 DocType: BOM,Website Specifications,Thông số kỹ thuật website
 DocType: Special Test Items,Particulars,Các chi tiết
@@ -1288,7 +1288,7 @@
 DocType: Item,Items with higher weightage will be shown higher,Mẫu vật với trọng lượng lớn hơn sẽ được hiển thị ở chỗ cao hơn
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,Lab thử nghiệm và dấu hiệu quan trọng
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Chi tiết Bảng đối chiếu tài khoản ngân hàng
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,Hàng # {0}: {1} tài sản phải nộp
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,Hàng # {0}: {1} tài sản phải nộp
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Không có nhân viên được tìm thấy
 DocType: Item,If subcontracted to a vendor,Nếu hợp đồng phụ với một nhà cung cấp
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,Nhóm sinh viên đã được cập nhật.
@@ -1343,7 +1343,6 @@
 DocType: Loyalty Program Collection,Tier Name,Tên tầng
 DocType: HR Settings,Enter retirement age in years,Nhập tuổi nghỉ hưu trong năm
 DocType: Crop,Target Warehouse,Mục tiêu kho
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vui lòng đặt Hàng loạt Đặt tên cho {0} thông qua Thiết lập&gt; Cài đặt&gt; Hàng loạt Đặt tên
 DocType: Payroll Employee Detail,Payroll Employee Detail,Chi tiết Nhân viên Chi trả
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,Vui lòng chọn kho
 DocType: Cheque Print Template,Starting location from left edge,Bắt đầu từ vị trí từ cạnh trái
@@ -1433,7 +1432,7 @@
 DocType: Work Order,Plan material for sub-assemblies,Lên nguyên liệu cho các lần lắp ráp phụ
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Đại lý bán hàng và địa bàn
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0} phải hoạt động
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,Không có mục nào để chuyển
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,Không có mục nào để chuyển
 DocType: Employee Boarding Activity,Activity Name,Tên hoạt động
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,Thay đổi ngày phát hành
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,Số lượng sản phẩm hoàn thành <b>{0}</b> và Số lượng <b>{1}</b> không thể khác nhau
@@ -1663,6 +1662,7 @@
 DocType: Project,First Email,Email đầu tiên
 DocType: Company,Exception Budget Approver Role,Vai trò phê duyệt ngân sách ngoại lệ
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date","Sau khi được đặt, hóa đơn này sẽ bị giữ cho đến ngày đặt"
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,tồn kho dự trữ cho đơn hàng / SP hoàn thành
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Số tiền bán
 DocType: Repayment Schedule,Interest Amount,Số tiền lãi
@@ -1674,7 +1674,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,Hồ sơ
 DocType: Asset,Scrapped,Loại bỏ
 DocType: Item,Item Defaults,Mục mặc định
-DocType: Purchase Invoice,Returns,Các lần trả lại
+DocType: Cashier Closing,Returns,Các lần trả lại
 DocType: Job Card,WIP Warehouse,WIP kho
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Không nối tiếp {0} là theo hợp đồng bảo trì tối đa {1}
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,tuyển dụng
@@ -1688,7 +1688,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,Loại Chuyển
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,Chi phí bán hàng
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Khách hàng&gt; Nhóm khách hàng&gt; Lãnh thổ
 DocType: Diagnosis,Diagnosis,Chẩn đoán
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Mua hàng mặc định
 DocType: Attendance Request,Explanation,Giải trình
@@ -1701,7 +1700,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,Các đơn hàng mua hàng quá hạn
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,Mã Bưu Chính
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},Đơn hàng {0} là {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},Chọn tài khoản thu nhập lãi suất trong khoản vay {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},Chọn tài khoản thu nhập lãi suất trong khoản vay {0}
 DocType: Opportunity,Contact Info,Thông tin Liên hệ
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,Làm Bút toán tồn kho
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,Không thể quảng bá Nhân viên có trạng thái Trái
@@ -1713,7 +1712,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,Không thể lập hoá đơn cho giờ thanh toán bằng không
 DocType: Company,Date of Commencement,Ngày bắt đầu
 DocType: Sales Person,Select company name first.,Chọn tên công ty đầu tiên.
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},Email gửi đến {0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},Email gửi đến {0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Báo giá nhận được từ nhà cung cấp.
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,Thay thế Hội đồng quản trị và cập nhật giá mới nhất trong tất cả các BOMs
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},Để {0} | {1} {2}
@@ -1735,7 +1734,7 @@
 DocType: Asset Movement,From Employee,Từ nhân viên
 DocType: Driver,Cellphone Number,Số điện thoại di động
 DocType: Project,Monitor Progress,Theo dõi tiến độ
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Cảnh báo: Hệ thống sẽ không kiểm tra quá hạn với số tiền = 0 cho vật tư {0} trong {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Cảnh báo: Hệ thống sẽ không kiểm tra quá hạn với số tiền = 0 cho vật tư {0} trong {1}
 DocType: Journal Entry,Make Difference Entry,Tạo bút toán khác biệt
 DocType: Supplier Quotation,Auto Repeat Section,Phần lặp lại tự động
 DocType: Upload Attendance,Attendance From Date,Có mặt Từ ngày
@@ -1838,7 +1837,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,Hàng # {0}: Bị từ chối Số lượng không thể được nhập vào Hàng trả lại
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,Thay đổi Nhóm Khách hàng cho Khách hàng đã Chọn không được phép.
 ,Purchase Order Items To Be Billed,Các mẫu hóa đơn mua hàng được lập hóa đơn
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,Đang cập nhật thời gian đến dự kiến.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,Đang cập nhật thời gian đến dự kiến.
 DocType: Program Enrollment Tool,Enrollment Details,Chi tiết đăng ký
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,Không thể đặt nhiều Giá trị Mặc định cho một công ty.
 DocType: Purchase Invoice Item,Net Rate,Tỷ giá thuần
@@ -1852,7 +1851,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,Loại bỏ là điên rồ
 DocType: Support Settings,Close Issue After Days,Đóng Issue Sau ngày
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Bạn cần phải là người dùng có vai trò Quản lý hệ thống và Trình quản lý mục để thêm người dùng vào Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,Bạn cần phải là người dùng có vai trò Quản lý hệ thống và Trình quản lý mục để thêm người dùng vào Marketplace.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Để trống nếu xem xét tất cả các ngành
 DocType: Job Opening,Staffing Plan,Kế hoạch nhân lực
 DocType: Bank Guarantee,Validity in Days,Hiệu lực trong Ngày
@@ -1874,7 +1873,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},Hàng trùng lặp {0} với cùng {1}
 DocType: Marketplace Settings,Disable Marketplace,Vô hiệu hóa Marketplace
 ,Trial Balance,số dư thử nghiệm
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,Năm tài chính {0} không tìm thấy
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,Năm tài chính {0} không tìm thấy
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,Thiết lập Nhân viên
 DocType: Hotel Room Reservation,Hotel Reservation User,Khách đặt phòng khách sạn
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,Vui lòng chọn tiền tố đầu tiên
@@ -1982,7 +1981,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,Đăng nhập thất bại
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,Đã tạo nội dung {0}
 DocType: Special Test Items,Special Test Items,Các bài kiểm tra đặc biệt
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Bạn cần phải là người dùng có vai trò Quản lý hệ thống và Trình quản lý mặt hàng để đăng ký trên Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Bạn cần phải là người dùng có vai trò Quản lý hệ thống và Trình quản lý mặt hàng để đăng ký trên Marketplace.
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,Hình thức thanh toán
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,"Theo Cơ cấu tiền lương được chỉ định của bạn, bạn không thể nộp đơn xin trợ cấp"
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,Hình ảnh website phải là một tập tin công cộng hoặc URL của trang web
@@ -1994,7 +1993,7 @@
 DocType: Warehouse,Warehouse Contact Info,Kho Thông tin Liên hệ
 DocType: Payment Entry,Write Off Difference Amount,Viết Tắt Chênh lệch Số tiền
 DocType: Volunteer,Volunteer Name,Tên tình nguyện viên
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},Hàng có ngày hoàn thành trùng lặp trong các hàng khác đã được tìm thấy: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},Hàng có ngày hoàn thành trùng lặp trong các hàng khác đã được tìm thấy: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent",{0}: không tìm thấy email của nhân viên. do đó không gửi được email
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},Không có cấu trúc lương nào được giao cho nhân viên {0} vào ngày cụ thể {1}
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},Quy tắc gửi hàng không áp dụng cho quốc gia {0}
@@ -2085,6 +2084,7 @@
 DocType: Salary Component,Earning,Thu nhập
 DocType: Supplier Scorecard,Scoring Criteria,Tiêu chí chấm điểm
 DocType: Purchase Invoice,Party Account Currency,Tài khoản tiền tệ của đối tác
+DocType: Delivery Trip,Total Estimated Distance,Tổng khoảng cách ước tính
 ,BOM Browser,Trình duyệt BOM
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,Vui lòng cập nhật trạng thái của bạn cho sự kiện đào tạo này
 DocType: Item Barcode,EAN,EAN
@@ -2123,7 +2123,7 @@
 DocType: Activity Cost,Projects,Dự án
 DocType: Payment Request,Transaction Currency,giao dịch tiền tệ
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},Từ {0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,Một số email không hợp lệ
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,Một số email không hợp lệ
 DocType: Work Order Operation,Operation Description,Mô tả hoạt động
 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.,Không thể thay đổi ngày bắt đầu năm tài chính  và ngày kết thúc năm tài chính khi năm tài chính đã được lưu.
 DocType: Quotation,Shopping Cart,Giỏ hàng
@@ -2147,7 +2147,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,Chênh lệch giá tịnh  trong Tài sản cố định
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,Reqd Qty
 DocType: Leave Control Panel,Leave blank if considered for all designations,Để trống nếu xem xét tất cả các chỉ định
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Phí của loại 'thực tế' {0} hàng không có thể được bao gồm trong mục Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Phí của loại 'thực tế' {0} hàng không có thể được bao gồm trong mục Rate
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},Tối đa: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Từ Datetime
 DocType: Shopify Settings,For Company,Đối với công ty
@@ -2161,7 +2161,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,Có lỗi khi tạo Lịch học
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,Người phê duyệt chi phí đầu tiên trong danh sách sẽ được đặt làm Công cụ phê duyệt chi phí mặc định.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,không có thể lớn hơn 100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Bạn cần phải là người dùng không phải là Quản trị viên có vai trò Quản lý hệ thống và Trình quản lý mặt hàng để đăng ký trên Marketplace.
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,Bạn cần phải là người dùng không phải là Quản trị viên có vai trò Quản lý hệ thống và Trình quản lý mặt hàng để đăng ký trên Marketplace.
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,Mục {0} không phải là một cổ phiếu hàng
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,Đột xuất
@@ -2190,7 +2190,7 @@
 DocType: HR Settings,Employee Settings,Thiết lập nhân viên
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,Đang nạp hệ thống thanh toán
 ,Batch-Wise Balance History,lịch sử số dư theo từng đợt
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Hàng # {0}: Không thể đặt Tỷ lệ nếu số tiền lớn hơn số tiền được lập hóa đơn cho Mục {1}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,Hàng # {0}: Không thể đặt Tỷ lệ nếu số tiền lớn hơn số tiền được lập hóa đơn cho Mục {1}.
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,cài đặt máy in được cập nhật trong định dạng in tương ứng
 DocType: Package Code,Package Code,Mã gói
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,Người học việc
@@ -2427,7 +2427,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} vị trí tuyển dụng và {1} ngân sách cho {2} đã được lên kế hoạch cho các công ty con {3}. \ Bạn chỉ có thể lập kế hoạch cho tối đa {4} vị trí tuyển dụng và ngân sách {5} theo kế hoạch nhân sự {6} cho công ty mẹ {3}.
 DocType: HR Settings,Stop Birthday Reminders,Ngừng nhắc nhở ngày sinh nhật
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},Hãy thiết lập mặc định Account Payable lương tại Công ty {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},Hãy thiết lập mặc định Account Payable lương tại Công ty {0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,Nhận phân tích tài chính về thuế và phí dữ liệu của Amazon
 DocType: SMS Center,Receiver List,Danh sách người nhận
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,Tìm hàng
@@ -2497,7 +2497,7 @@
 DocType: Vital Signs,Constipated,Bị ràng buộc
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},Gắn với hóa đơn NCC {0} ngày {1}
 DocType: Customer,Default Price List,Mặc định Giá liệt kê
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,kỷ lục Phong trào Asset {0} đã tạo
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,kỷ lục Phong trào Asset {0} đã tạo
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,Không tìm thấy vật nào.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Bạn không thể xóa năm tài chính {0}. Năm tài chính {0} được thiết lập mặc định như trong Global Settings
 DocType: Share Transfer,Equity/Liability Account,Vốn chủ sở hữu / Tài khoản trách nhiệm pháp lý
@@ -2637,6 +2637,7 @@
 DocType: Blanket Order,Order Type,Loại đặt hàng
 ,Item-wise Sales Register,Mẫu hàng - Đăng ký mua hàng thông minh
 DocType: Asset,Gross Purchase Amount,Tổng Chi phí mua hàng
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Mã mục&gt; Nhóm sản phẩm&gt; Thương hiệu
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,Số dư mở
 DocType: Asset,Depreciation Method,Phương pháp Khấu hao
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Thuế này đã gồm trong giá gốc?
@@ -2720,7 +2721,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,Hành động nếu ngân sách hàng năm vượt quá PO
 DocType: Student Leave Application,Student Leave Application,Ứng dụng Để lại Sinh viên
 DocType: Item,Will also apply for variants,Cũng sẽ được áp dụng cho các biến thể
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}","Tài sản không thể được hủy bỏ, vì nó đã được {0}"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}","Tài sản không thể được hủy bỏ, vì nó đã được {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},Employee {0} vào ngày nửa trên {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},Tổng số giờ làm việc không nên lớn hơn so với giờ làm việc tối đa {0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Bật
@@ -2744,6 +2745,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,Tìm nạp dữ liệu
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},Thời gian nghỉ tối đa được phép trong loại nghỉ {0} là {1}
 DocType: SMS Center,Create Receiver List,Tạo ra nhận Danh sách
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,Ngày có sẵn để sử dụng phải sau ngày mua
 DocType: Vehicle,Wheels,Các bánh xe
 DocType: Packing Slip,To Package No.,Để Gói số
 DocType: Patient Relation,Family,Gia đình
@@ -2757,7 +2759,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,Đơn vị tiền tệ thanh toán phải bằng đơn vị tiền tệ của công ty mặc định hoặc tiền của tài khoản của bên thứ ba
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Chỉ ra rằng gói này một phần của việc phân phối (Chỉ bản nháp)
 DocType: Soil Texture,Loam,Tiếng ồn
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,Hàng {0}: Ngày hết hạn không thể trước ngày đăng
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,Hàng {0}: Ngày hết hạn không thể trước ngày đăng
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,Thực hiện thanh toán nhập
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},Số lượng cho hàng {0} phải nhỏ hơn {1}
 ,Sales Invoice Trends,Hóa đơn bán hàng Xu hướng
@@ -2830,7 +2832,7 @@
 DocType: Guardian,Guardian Interests,người giám hộ Sở thích
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,Cập nhật tên / số tài khoản
 DocType: Naming Series,Current Value,Giá trị hiện tại
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Nhiều năm tài chính tồn tại cho ngày {0}. Hãy thiết lập công ty trong năm tài chính
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Nhiều năm tài chính tồn tại cho ngày {0}. Hãy thiết lập công ty trong năm tài chính
 DocType: Education Settings,Instructor Records to be created by,Tài liệu hướng dẫn được tạo ra bởi
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0} được tạo ra
 DocType: GST Account,GST Account,Tài khoản GST
@@ -2848,7 +2850,7 @@
 DocType: Sales Person,Name and Employee ID,Tên và ID nhân viên
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,Ngày đến hạn không thể trước ngày ghi sổ
 DocType: Website Item Group,Website Item Group,Nhóm các mục Website
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Không tìm thấy phiếu lương cho các tiêu chí đã chọn ở trên hoặc phiếu lương đã nộp
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,Không tìm thấy phiếu lương cho các tiêu chí đã chọn ở trên hoặc phiếu lương đã nộp
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,Nhiệm vụ và thuế
 DocType: Projects Settings,Projects Settings,Cài đặt Dự án
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,Vui lòng nhập ngày tham khảo
@@ -2857,7 +2859,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Đã cung cấp Số lượng
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,Mẫu hàng yêu cầu tài liệu
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,Vui lòng hủy Biên lai mua hàng {0} trước
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,Vui lòng hủy Biên lai mua hàng {0} trước
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Cây biểu thị Các nhóm mẫu hàng
 DocType: Production Plan,Total Produced Qty,Tổng số lượng sản xuất
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,Không có thể tham khảo số lượng hàng lớn hơn hoặc bằng số lượng hàng hiện tại cho loại phí này
@@ -2968,6 +2970,7 @@
 ,Vehicle Expenses,Chi phí phương tiện
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,Tạo (các) Bài kiểm tra Lab trên Hóa đơn bán hàng
 DocType: Serial No,Invoice Details,Chi tiết hóa đơn
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,Vui lòng bật Cài đặt Google Maps để ước tính và tối ưu hóa tuyến đường
 DocType: Grant Application,Show on Website,Hiển thị trên trang web
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Bắt đầu vào
 DocType: Hub Tracked Item,Hub Category,Danh mục Trung tâm
@@ -3008,7 +3011,7 @@
 DocType: Inpatient Record,B Positive,B dương tính
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",Lợi ích tối đa của nhân viên {0} vượt quá {1} bằng tổng {2} số tiền được xác nhận trước đó \ số tiền
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Hàng  # {0}: Số lượng phải là 1, mục là một tài sản cố định. Vui lòng sử dụng hàng riêng biệt cho đa dạng số lượng"
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Hàng  # {0}: Số lượng phải là 1, mục là một tài sản cố định. Vui lòng sử dụng hàng riêng biệt cho đa dạng số lượng"
 DocType: Leave Block List Allow,Leave Block List Allow,Để lại danh sách chặn cho phép
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,Viết tắt ko được để trống
 DocType: Patient Medical Record,Patient Medical Record,Hồ sơ Y khoa Bệnh nhân
@@ -3043,7 +3046,7 @@
 DocType: Workstation,Wages per hour,Tiền lương mỗi giờ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Số tồn kho in Batch {0} sẽ bị âm {1} cho khoản mục {2} tại Kho {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Các yêu cầu về chất liệu dưới đây đã được nâng lên tự động dựa trên mức độ sắp xếp lại danh mục của
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},Tài khoản của {0} là không hợp lệ. Tài khoản ngắn hạn phải là {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},Tài khoản của {0} là không hợp lệ. Tài khoản ngắn hạn phải là {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},Từ ngày {0} không thể sau ngày giảm lương của nhân viên {1}
 DocType: Supplier,Is Internal Supplier,Nhà cung cấp nội bộ
 DocType: Employee,Create User Permission,Tạo phép người dùng
@@ -3189,7 +3192,7 @@
 DocType: Account,Fixed Asset,Tài sản cố định
 DocType: Amazon MWS Settings,After Date,Sau ngày
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,Hàng tồn kho được tuần tự
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,{0} không hợp lệ cho Hóa đơn của công ty liên kết.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,{0} không hợp lệ cho Hóa đơn của công ty liên kết.
 ,Department Analytics,Phân tích phòng ban
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,Không tìm thấy email trong liên hệ mặc định
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,Tạo bí mật
@@ -3202,7 +3205,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,Chương trình trong Cấu trúc Phí và Nhóm Sinh viên {0} khác.
 DocType: Bank Statement Transaction Entry,Receivable Account,Tài khoản phải thu
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,Ngày hợp lệ từ ngày phải nhỏ hơn Ngày hết hạn hợp lệ.
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},Hàng# {0}: Tài sản {1}  đã {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},Hàng# {0}: Tài sản {1}  đã {2}
 DocType: Quotation Item,Stock Balance,Số tồn kho
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,Đặt hàng bán hàng để thanh toán
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,CEO
@@ -3244,6 +3247,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,nợ được yêu cầu
 DocType: Clinical Procedure,Inpatient Record,Hồ sơ nội trú
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team","các bảng thời gian biểu giúp theo dõi thời gian, chi phí và thanh toán cho các hoạt động được thực hiện bởi nhóm của bạn"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,Nhà cung cấp&gt; Loại nhà cung cấp
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,Danh sách mua Giá
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,ngày giao dịch
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Mẫu của các biến thẻ điểm của nhà cung cấp.
@@ -3287,7 +3291,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,Trao đổi Lãi / lỗ
 DocType: Opportunity,Lost Reason,Lý do bị mất
 DocType: Amazon MWS Settings,Enable Amazon,Bật Amazon
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},Hàng # {0}: Tài khoản {1} không thuộc về công ty {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},Hàng # {0}: Tài khoản {1} không thuộc về công ty {2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},Không thể tìm thấy DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,Địa chỉ mới
 DocType: Quality Inspection,Sample Size,Kích thước mẫu
@@ -3399,7 +3403,7 @@
 DocType: Water Analysis,Origin,Gốc
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tài liệu này bị quá giới hạn bởi {0} {1} cho mục {4}. bạn đang làm cho một {3} so với cùng {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,Xin hãy thiết lập định kỳ sau khi tiết kiệm
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,tài khoản số lượng Chọn thay đổi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,tài khoản số lượng Chọn thay đổi
 DocType: Purchase Invoice,Price List Currency,Danh sách giá ngoại tệ
 DocType: Naming Series,User must always select,Người sử dụng phải luôn luôn chọn
 DocType: Stock Settings,Allow Negative Stock,Cho phép tồn kho âm
@@ -3441,7 +3445,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,Bạn có chắc chắn muốn hủy cuộc hẹn này không?
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,Gói giá phòng khách sạn
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,Đường ống dẫn bán hàng
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},Hãy thiết lập tài khoản mặc định trong phần Lương {0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},Hãy thiết lập tài khoản mặc định trong phần Lương {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Đã yêu cầu với
 DocType: Rename Tool,File to Rename,Đổi tên tệp tin
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},Vui lòng chọn BOM cho Item trong Row {0}
@@ -3462,7 +3466,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Chi phí Mua Items
 DocType: Employee Separation,Employee Separation Template,Mẫu tách nhân viên
 DocType: Selling Settings,Sales Order Required,Đơn đặt hàng đã yêu cầu
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,Trở thành người bán
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,Trở thành người bán
 DocType: Purchase Invoice,Credit To,Để tín dụng
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,Đầu mối kinh doanh / Khách hàng
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,Để trống để sử dụng định dạng Ghi chú phân phối bình thường
@@ -3504,7 +3508,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,Tạo mẫu thuế
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Diễn đàn người dùng
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,Nguyên liệu thô không thể để trống.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,Hàng # {0} (Bảng thanh toán): Số tiền phải âm
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,Hàng # {0} (Bảng thanh toán): Số tiền phải âm
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.","Không thể cập nhật tồn kho, hóa đơn chứa vật tư vận chuyển tận nơi."
 DocType: Contract,Fulfilment Status,Trạng thái thực hiện
 DocType: Lab Test Sample,Lab Test Sample,Mẫu thử nghiệm phòng thí nghiệm
@@ -3644,7 +3648,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Ngày tài liệu
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},Hồ sơ Phí Tạo - {0}
 DocType: Asset Category Account,Asset Category Account,Loại tài khoản tài sản
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,Hàng # {0} (Bảng Thanh toán): Số tiền phải là số dương
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,Hàng # {0} (Bảng Thanh toán): Số tiền phải là số dương
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},Không thể sản xuất {0} nhiều hơn số lượng trên đơn đặt hàng {1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,Chọn Giá trị Thuộc tính
 DocType: Purchase Invoice,Reason For Issuing document,Lý do phát hành tài liệu
@@ -3699,7 +3703,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Thời gian mà các tài liệu đã nhận được
 DocType: Products Settings,Products per Page,Sản phẩm trên mỗi trang
 DocType: Stock Ledger Entry,Outgoing Rate,Tỷ giá đầu ra
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,hoặc
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,hoặc
 DocType: Sales Order,Billing Status,Tình trạng thanh toán
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Báo lỗi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,Chi phí tiện ích
@@ -3727,7 +3731,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,Tuyên bố miễn thuế nhân viên
 DocType: Payment Entry,Cheque/Reference Date,Séc / Ngày tham chiếu
 DocType: Purchase Invoice,Total Taxes and Charges,Tổng số thuế và phí
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,Ngày có sẵn để sử dụng được nhập như ngày trước
 DocType: Employee,Emergency Contact,Liên hệ Trường hợp Khẩn cấp
 DocType: Bank Reconciliation Detail,Payment Entry,Bút toán thanh toán
 ,sales-browser,bán hàng trình duyệt
@@ -3774,6 +3777,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),Trở lại (Ghi chú tín dụng)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,Bắt đầu công việc
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},Không cần số sê-ri cho nội dung {0}
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vui lòng đặt Hàng loạt Đặt tên cho {0} thông qua Thiết lập&gt; Cài đặt&gt; Hàng loạt Đặt tên
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,mẫu đã vô hiệu hóa không phải là mẫu mặc định
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,Đối với hàng {0}: Nhập số lượng dự kiến
 DocType: Account,Income Account,Tài khoản thu nhập
@@ -3787,6 +3791,7 @@
 DocType: Loyalty Program,Help Section,Phần trợ giúp
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,Trước đó
 DocType: Appraisal Goal,Key Responsibility Area,Trách nhiệm chính
+DocType: Delivery Trip,Distance UOM,Khoảng cách UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students","Các đợt sinh viên giúp bạn theo dõi chuyên cần, đánh giá và lệ phí cho sinh viên"
 DocType: Payment Entry,Total Allocated Amount,Tổng số tiền phân bổ
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,Thiết lập tài khoản kho mặc định cho kho vĩnh viễn
@@ -3828,7 +3833,7 @@
 DocType: Item Supplier,Item Supplier,Mục Nhà cung cấp
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,Vui lòng nhập Item Code để có được hàng loạt không
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},Vui lòng chọn một giá trị cho {0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,Không có mục nào được chọn để chuyển
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,Không có mục nào được chọn để chuyển
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Tất cả các địa chỉ.
 DocType: Company,Stock Settings,Thiết lập thông số hàng tồn kho
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Kết hợp chỉ có hiệu lực nếu các tài sản dưới đây giống nhau trong cả hai bản ghi. Là nhóm, kiểu gốc, Công ty"
@@ -4126,7 +4131,7 @@
 DocType: Patient,Personal and Social History,Lịch sử cá nhân và xã hội
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,Người dùng {0} đã tạo
 DocType: Fee Schedule,Fee Breakup for each student,Phí phân chia cho mỗi học sinh
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Tổng số trước ({0}) chống lại thứ tự {1} không thể lớn hơn Tổng cộng ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Tổng số trước ({0}) chống lại thứ tự {1} không thể lớn hơn Tổng cộng ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Chọn phân phối không đồng đều hàng tháng để phân phối các mục tiêu ở tháng.
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,Thay đổi Mã
 DocType: Purchase Invoice Item,Valuation Rate,Định giá
@@ -4135,7 +4140,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,Có sẵn ITC Cess
 ,Student Monthly Attendance Sheet,Sinh viên tham dự hàng tháng Bảng
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,Quy tắc vận chuyển chỉ áp dụng cho Bán hàng
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Hàng khấu hao {0}: Ngày khấu hao tiếp theo không thể trước ngày mua hàng
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Hàng khấu hao {0}: Ngày khấu hao tiếp theo không thể trước ngày mua hàng
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Dự án Ngày bắt đầu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,Cho đến khi
 DocType: Rename Tool,Rename Log,Đổi tên Đăng nhập
@@ -4153,12 +4158,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,Mức độ thường xuyên nên dự án và công ty được cập nhật dựa trên Giao dịch bán hàng.
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Hết hạn vào
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,Thêm sinh viên
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Vui lòng xóa nhân viên <a href=""#Form/Employee/{0}"">{0}</a> \ để hủy tài liệu này"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},Vui lòng chọn {0}
 DocType: C-Form,C-Form No,C-Form số
 DocType: BOM,Exploded_items,mẫu hàng _ dễ nổ
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,Khoảng cách
+DocType: Delivery Stop,Distance,Khoảng cách
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,Liệt kê các sản phẩm hoặc dịch vụ bạn mua hoặc bán.
 DocType: Water Analysis,Storage Temperature,Nhiệt độ lưu trữ
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4185,7 +4188,7 @@
 DocType: Homepage,Company Description for website homepage,Công ty Mô tả cho trang chủ của trang web
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Để thuận tiện cho khách hàng, các mã này có thể được sử dụng trong các định dạng in hóa đơn và biên bản giao hàng"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Tên suplier
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,Không thể truy xuất thông tin cho {0}.
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,Không thể truy xuất thông tin cho {0}.
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,Tạp chí mở đầu
 DocType: Contract,Fulfilment Terms,Điều khoản thực hiện
 DocType: Sales Invoice,Time Sheet List,Danh sách thời gian biểu
@@ -4368,7 +4371,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Chọn sinh viên theo cách thủ công cho nhóm dựa trên hoạt động
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,Chọn sinh viên theo cách thủ công cho Nhóm dựa trên hoạt động
 DocType: Journal Entry,User Remark,Lưu ý người dùng
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,Tối ưu hóa tuyến đường.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,Tối ưu hóa tuyến đường.
 DocType: Travel Itinerary,Non Diary,Non Diary
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,Không thể tạo Tiền thưởng giữ chân cho Nhân viên còn lại
 DocType: Lead,Market Segment,Phân khúc thị trường
@@ -4399,7 +4402,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,Chương trình khách hàng thân thiết
 DocType: Student Guardian,Father,Cha
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,Vé hỗ trợ
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,'Cập Nhật kho hàng' không thể được kiểm tra  việc buôn bán tài sản cố định
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,'Cập Nhật kho hàng' không thể được kiểm tra  việc buôn bán tài sản cố định
 DocType: Bank Reconciliation,Bank Reconciliation,Bảng đối chiếu tài khoản ngân hàng
 DocType: Attendance,On Leave,Nghỉ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Nhận thông tin cập nhật
@@ -4444,7 +4447,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Số thứ tự và hàng loạt
 DocType: Warranty Claim,From Company,Từ Công ty
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,Sum của Điểm của tiêu chí đánh giá cần {0} được.
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,Hãy thiết lập Số khấu hao Thẻ vàng
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,Hãy thiết lập Số khấu hao Thẻ vàng
 DocType: Supplier Scorecard Period,Calculations,Tính toán
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,Giá trị hoặc lượng
 DocType: Payment Terms Template,Payment Terms,Điều khoản thanh toán
@@ -4464,7 +4467,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Giảm giá (%) trên Bảng Giá Giá với giá lề
 DocType: Healthcare Service Unit Type,Rate / UOM,Tỷ lệ / UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,Tất cả các kho hàng
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Không tìm thấy {0} nào cho Giao dịch của Công ty Inter.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Không tìm thấy {0} nào cho Giao dịch của Công ty Inter.
 DocType: Travel Itinerary,Rented Car,Xe thuê
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,Giới thiệu về công ty của bạn
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,Để tín dụng tài khoản phải có một tài khoản Cân đối kế toán
@@ -4566,6 +4569,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,Tiêu chí Phân tích Thực vật
 DocType: Cheque Print Template,Cheque Height,Chiều cao Séc
 DocType: Supplier,Supplier Details,Thông tin chi tiết nhà cung cấp
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vui lòng thiết lập chuỗi đánh số để tham dự qua Thiết lập&gt; Chuỗi đánh số
 DocType: Setup Progress,Setup Progress,Tiến trình thiết lập
 DocType: Expense Claim,Approval Status,Tình trạng chính
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},Từ giá trị phải nhỏ hơn giá trị trong hàng {0}
@@ -4659,7 +4663,6 @@
 DocType: Travel Request,Fully Sponsored,Hoàn toàn được tài trợ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,Đã tạo {0} khách hàng.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vui lòng thiết lập Hệ thống đặt tên nhân viên trong nguồn nhân lực&gt; Cài đặt nhân sự
 DocType: Stock Settings,Limit Percent,phần trăm giới hạn
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,Hiện tại không có hàng hóa dự trữ nào trong nhà kho
 ,Payment Period Based On Invoice Date,Thời hạn thanh toán Dựa trên hóa đơn ngày
@@ -4718,7 +4721,7 @@
 DocType: BOM Explosion Item,Source Warehouse,Kho nguồn
 DocType: Installation Note,Installation Date,Cài đặt ngày
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Chia sẻ sổ cái
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},Hàng # {0}: {1} tài sản không thuộc về công ty {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},Hàng # {0}: {1} tài sản không thuộc về công ty {2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,Hóa đơn bán hàng {0} đã được tạo
 DocType: Employee,Confirmation Date,Ngày Xác nhận
 DocType: Inpatient Occupancy,Check Out,Kiểm tra
@@ -4738,6 +4741,7 @@
 DocType: Production Plan,Sales Orders Detail,Chi tiết đơn đặt hàng bán hàng
 DocType: Bin,Requested Quantity,yêu cầu Số lượng
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-FEE-.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Vui lòng thiết lập Hệ thống Đặt tên Hướng dẫn trong Giáo dục&gt; Cài đặt Giáo dục
 DocType: Patient,Marital Status,Tình trạng hôn nhân
 DocType: Stock Settings,Auto Material Request,Vật liệu tự động Yêu cầu
 DocType: Woocommerce Settings,API consumer secret,Bí mật người tiêu dùng API
@@ -4790,7 +4794,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,Chọn Ngày
 DocType: Academic Term,Term Name,Tên kỳ hạn
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),Tín dụng ({0})
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,Đang tạo phiếu lương ...
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,Đang tạo phiếu lương ...
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,Bạn không thể chỉnh sửa nút gốc.
 DocType: Buying Settings,Purchase Order Required,Mua hàng yêu cầu
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,Hẹn giờ
@@ -4828,7 +4832,7 @@
 DocType: Account,Rate at which this tax is applied,Tỷ giá ở mức thuế này được áp dụng
 DocType: Cash Flow Mapper,Section Name,Tên phần
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,Sắp xếp lại Qty
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Hàng khấu hao {0}: Giá trị kỳ vọng sau khi sử dụng hữu ích phải lớn hơn hoặc bằng {1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},Hàng khấu hao {0}: Giá trị kỳ vọng sau khi sử dụng hữu ích phải lớn hơn hoặc bằng {1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,Hiện tại Hở Job
 DocType: Company,Stock Adjustment Account,Tài khoản Điều chỉnh Hàng tồn kho
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Viết tắt
@@ -4875,7 +4879,7 @@
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Của AMC
 DocType: Opportunity,Opportunity Amount,Số tiền cơ hội
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Số khấu hao Thẻ vàng không thể lớn hơn Tổng số khấu hao
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Số khấu hao Thẻ vàng không thể lớn hơn Tổng số khấu hao
 DocType: Purchase Order,Order Confirmation Date,Ngày Xác nhận Đơn hàng
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Thực hiện bảo trì đăng nhập
@@ -4916,7 +4920,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,Hàng loạt:
 DocType: Volunteer,Afternoon,Buổi chiều
 DocType: Loyalty Program,Loyalty Program Help,Trợ giúp Chương trình khách hàng thân thiết
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0} '{1}' bị vô hiệu hóa
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0} '{1}' bị vô hiệu hóa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Đặt làm mở
 DocType: Cheque Print Template,Scanned Cheque,quét Séc
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Gửi email tự động tới các Liên hệ khi Đệ trình các giao dịch.
@@ -4929,7 +4933,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Hàng và bảo hành chi tiết
 DocType: Chapter,Chapter Members,Thành viên của Chương
 DocType: Sales Team,Contribution (%),Đóng góp (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Lưu ý: Bút toán thanh toán sẽ không được tạo ra từ 'tiền mặt hoặc tài khoản ngân hàng' không được xác định
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Lưu ý: Bút toán thanh toán sẽ không được tạo ra từ 'tiền mặt hoặc tài khoản ngân hàng' không được xác định
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,Dự án {0} đã tồn tại
 DocType: Clinical Procedure,Nursing User,Người điều dưỡng
 DocType: Employee Benefit Application,Payroll Period,Kỳ tính lương
@@ -4937,6 +4941,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},Số sê-ri {0} không thuộc về Lô {1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,Trách nhiệm
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,Thời hạn hiệu lực của báo giá này đã kết thúc.
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Vui lòng xóa nhân viên <a href=""#Form/Employee/{0}"">{0}</a> \ để hủy tài liệu này"
 DocType: Expense Claim Account,Expense Claim Account,Tài khoản chi phí khiếu nại
 DocType: Account,Capital Work in Progress,Vốn đang tiến hành
 DocType: Accounts Settings,Allow Stale Exchange Rates,Cho phép tỷ giá hối đoái cũ
@@ -5018,7 +5024,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,Vấn đề liệu
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,Kết nối Shopify với ERPNext
 DocType: Material Request Item,For Warehouse,Cho kho hàng
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,Ghi chú giao hàng {0} được cập nhật
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,Ghi chú giao hàng {0} được cập nhật
 DocType: Employee,Offer Date,Kỳ hạn Yêu cầu
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,Các bản dự kê giá
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,Bạn đang ở chế độ offline. Bạn sẽ không thể để lại cho đến khi bạn có mạng.
@@ -5069,7 +5075,7 @@
 DocType: Shipping Rule,Calculate Based On,Tính toán dựa trên
 DocType: Contract,Unfulfilled,Chưa hoàn thành
 DocType: Delivery Note Item,From Warehouse,Từ kho
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,Không có nhân viên nào cho các tiêu chí đã đề cập
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,Không có nhân viên nào cho các tiêu chí đã đề cập
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,Không có mẫu hàng với hóa đơn nguyên liệu để sản xuất
 DocType: Shopify Settings,Default Customer,Khách hàng Mặc định
 DocType: Sales Stage,Stage Name,Tên giai đoạn
@@ -5112,7 +5118,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Tiền thuế sau khi chiết khấu
 DocType: Patient,Inpatient Status,Tình trạng nội trú
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Cài đặt Tóm tắt công việc hàng ngày
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,Danh sách giá đã chọn phải có các trường mua và bán được chọn.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,Danh sách giá đã chọn phải có các trường mua và bán được chọn.
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,Vui lòng nhập Reqd theo ngày
 DocType: Payment Entry,Internal Transfer,Chuyển nội bộ
 DocType: Asset Maintenance,Maintenance Tasks,Công việc bảo trì
@@ -5149,7 +5155,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,Nhóm theo
 DocType: Guardian,Interests,Sở thích
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,Cho phép / vô hiệu hóa tiền tệ.
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,Không thể gửi một số phiếu lương
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,Không thể gửi một số phiếu lương
 DocType: Exchange Rate Revaluation,Get Entries,Nhận mục nhập
 DocType: Production Plan,Get Material Request,Nhận Chất liệu Yêu cầu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,Chi phí bưu điện
@@ -5236,7 +5242,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},Tài khoản chi phí là bắt buộc đối với mục {0}
 DocType: BOM,Website Description,Mô tả Website
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,Chênh lệch giá tịnh trong vốn sở hữu
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,Hãy hủy hóa đơn mua hàng {0} đầu tiên
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,Hãy hủy hóa đơn mua hàng {0} đầu tiên
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,Không được phép. Vui lòng tắt Loại Đơn vị Dịch vụ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Địa chỉ email phải là duy nhất, đã tồn tại cho {0}"
 DocType: Serial No,AMC Expiry Date,Ngày hết hạn hợp đồng bảo hành (AMC)
@@ -5276,7 +5282,7 @@
 DocType: Hotel Room,Hotel Room,Phòng khách sạn
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},Tài khoản {0} không thuộc về công ty {1}
 DocType: Leave Type,Rounding,Làm tròn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,Số sê-ri trong hàng {0} không khớp với Lưu lượng giao hàng
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,Số sê-ri trong hàng {0} không khớp với Lưu lượng giao hàng
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),Số tiền được phân phối (Được xếp hạng theo tỷ lệ)
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.","Sau đó, Quy tắc đặt giá được lọc ra dựa trên Khách hàng, Nhóm khách hàng, Lãnh thổ, Nhà cung cấp, Nhóm nhà cung cấp, Chiến dịch, Đối tác bán hàng, v.v."
 DocType: Student,Guardian Details,Chi tiết người giám hộ
@@ -5331,7 +5337,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},phải có kho cho vật tư {0}
 DocType: Leave Allocation,Unused leaves,Quyền nghỉ phép chưa sử dụng
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,Thực hiện mục trả nợ
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,Tất cả bộ ngành
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,Tất cả bộ ngành
 DocType: Healthcare Service Unit,Vacant,Trống
 DocType: Patient,Alcohol Past Use,Uống rượu quá khứ
 DocType: Fertilizer Content,Fertilizer Content,Nội dung Phân bón
@@ -5342,7 +5348,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,Đơn hàng công việc {0} phải được hủy bỏ trước khi hủy Lệnh bán hàng này
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),Lấy BOM nổ (bao gồm các cụm chi tiết)
 DocType: Authorization Rule,Applicable To (Employee),Để áp dụng (nhân viên)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,Ngày đến hạn là bắt buộc
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,Ngày đến hạn là bắt buộc
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,Tăng cho thuộc tính  {0} không thể là 0
 DocType: Employee Benefit Claim,Benefit Type and Amount,Loại lợi ích và số tiền
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,Phòng Đặt Phòng
@@ -5490,7 +5496,7 @@
 DocType: Purchase Invoice Item,Total Weight,Tổng khối lượng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,Hoa hồng trên doanh thu
 DocType: Job Offer Term,Value / Description,Giá trị / Mô tả
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Hàng # {0}: {1} tài sản không thể gửi, nó đã được {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Hàng # {0}: {1} tài sản không thể gửi, nó đã được {2}"
 DocType: Tax Rule,Billing Country,Quốc gia thanh toán
 DocType: Purchase Order Item,Expected Delivery Date,Ngày Dự kiến giao hàng
 DocType: Restaurant Order Entry,Restaurant Order Entry,Đăng nhập
@@ -5529,12 +5535,13 @@
 DocType: Maintenance Visit,Breakdown,Hỏng
 DocType: Travel Itinerary,Vegetarian,Ăn chay
 DocType: Patient Encounter,Encounter Date,Ngày gặp
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,Không thể chọn được Tài khoản: {0} với loại tiền tệ: {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,Không thể chọn được Tài khoản: {0} với loại tiền tệ: {1}
 DocType: Bank Statement Transaction Settings Item,Bank Data,Dữ liệu ngân hàng
 DocType: Purchase Receipt Item,Sample Quantity,Số mẫu
 DocType: Bank Guarantee,Name of Beneficiary,Tên của người thụ hưởng
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.","Cập nhật BOM tự động thông qua Scheduler, dựa trên tỷ lệ định giá mới nhất / tỷ giá / tỷ lệ mua cuối cùng của nguyên vật liệu."
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,Nhà cung cấp&gt; Nhà cung cấp nhóm
 DocType: Bank Reconciliation Detail,Cheque Date,Séc ngày
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},Tài khoản {0}: tài khoản mẹ {1} không thuộc về công ty: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,Xóa thành công tất cả các giao dịch liên quan đến công ty này!
@@ -5562,7 +5569,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,nút con chỉ có thể được tạo ra dưới &#39;Nhóm&#39; nút loại
 DocType: Attendance Request,Half Day Date,Kỳ hạn nửa ngày
 DocType: Academic Year,Academic Year Name,Tên Năm học
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,{0} không được phép giao dịch với {1}. Vui lòng thay đổi Công ty.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,{0} không được phép giao dịch với {1}. Vui lòng thay đổi Công ty.
 DocType: Sales Partner,Contact Desc,Mô tả Liên hệ
 DocType: Email Digest,Send regular summary reports via Email.,Gửi báo cáo tóm tắt thường xuyên qua Email.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},Hãy thiết lập tài khoản mặc định trong Loại Chi phí khiếu nại {0}
@@ -5595,7 +5602,7 @@
 DocType: Hotel Room,Hotel Manager,Quản lý khách sạn
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,Đặt Rule thuế cho giỏ hàng
 DocType: Purchase Invoice,Taxes and Charges Added,Thuế và phí bổ sung
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Hàng khấu hao {0}: Ngày khấu hao tiếp theo không được trước ngày có sẵn để sử dụng
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Hàng khấu hao {0}: Ngày khấu hao tiếp theo không được trước ngày có sẵn để sử dụng
 ,Sales Funnel,Kênh bán hàng
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,Tên viết tắt là bắt buộc
 DocType: Project,Task Progress,Tiến độ công việc
@@ -5609,7 +5616,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,Tất cả các nhóm khách hàng
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,tích lũy hàng tháng
 DocType: Attendance Request,On Duty,Đang thi hành công vụ
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} là bắt buộc. Bản ghi thu đổi ngoại tệ có thể không được tạo ra cho {1} tới {2}.
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} là bắt buộc. Bản ghi thu đổi ngoại tệ có thể không được tạo ra cho {1} tới {2}.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},Kế hoạch nhân sự {0} đã tồn tại để chỉ định {1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,Mẫu thuế là bắt buộc
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,Tài khoản {0}: tài khoản mẹ {1} không tồn tại
@@ -5689,11 +5696,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,Ít nhất một kho là bắt buộc
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.","Định cấu hình các trường mục như UOM, Nhóm mặt hàng, Mô tả và Không có giờ."
 DocType: Certification Application,Certification Status,Trạng thái chứng nhận
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,Thương trường
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,Thương trường
 DocType: Travel Itinerary,Travel Advance Required,Yêu cầu trước chuyến đi
 DocType: Subscriber,Subscriber Name,Tên người đăng ký
 DocType: Serial No,Out of Warranty,Ra khỏi bảo hành
-DocType: Cashier Closing,Cashier-closing-,Thu ngân đóng
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,Loại dữ liệu được ánh xạ
 DocType: BOM Update Tool,Replace,Thay thế
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,Không sản phẩm nào được tìm thấy
@@ -5781,7 +5787,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,Mẫu thuế mặc định cho bán hàng và mua hàng được tạo.
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,Bản ghi kết quả đánh giá {0} đã tồn tại.
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.","Ví dụ: ABCD. #####. Nếu chuỗi được đặt và Số lô không được đề cập trong giao dịch, thì số lô tự động sẽ được tạo dựa trên chuỗi này. Nếu bạn luôn muốn đề cập rõ ràng Lô hàng cho mục này, hãy để trống trường này. Lưu ý: cài đặt này sẽ được ưu tiên hơn Tiền tố Series đặt tên trong Cài đặt chứng khoán."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vui lòng thiết lập chuỗi đánh số để tham dự qua Thiết lập&gt; Chuỗi đánh số
 DocType: BOM,Materials Required (Exploded),Vật liệu bắt buộc (phát nổ)
 DocType: Contract,Party User,Người dùng bên
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',Vui lòng đặt Bộ lọc của Công ty trống nếu Nhóm theo là &#39;Công ty&#39;
@@ -5984,7 +5989,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Đếm ngược
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,Cả ngày bắt đầu giai đoạn dùng thử và ngày kết thúc giai đoạn dùng thử phải được đặt
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,Tỷ lệ trung bình
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Tổng số tiền thanh toán trong lịch thanh toán phải bằng tổng số tiền lớn / tròn
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,Tổng số tiền thanh toán trong lịch thanh toán phải bằng tổng số tiền lớn / tròn
 DocType: Subscription Plan Detail,Plan,Kế hoạch
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Báo cáo số dư ngân hàng theo Sổ cái tổng
 DocType: Job Applicant,Applicant Name,Tên đơn
@@ -6053,7 +6058,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,Xà phòng và chất tẩy rửa
 DocType: BOM,Show Items,Hiện Items
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,Từ Thời gian không thể lớn hơn  Tới thời gian
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,Bạn có muốn thông báo cho tất cả khách hàng bằng email?
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,Bạn có muốn thông báo cho tất cả khách hàng bằng email?
 DocType: Subscription Plan,Billing Interval,Khoảng thời gian thanh toán
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,Điện ảnh & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ra lệnh
@@ -6062,9 +6067,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,Hàng {0}: {1} phải lớn hơn 0
 DocType: Assessment Criteria,Assessment Criteria Group,Các tiêu chí đánh giá Nhóm
 DocType: Healthcare Settings,Patient Name By,Tên bệnh nhân theo
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},Tạp chí Accrual cho các khoản tiền lương từ {0} đến {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},Tạp chí Accrual cho các khoản tiền lương từ {0} đến {1}
 DocType: Sales Invoice Item,Enable Deferred Revenue,Bật doanh thu hoãn lại
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},Mở Khấu hao lũy kế phải nhỏ hơn bằng {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},Mở Khấu hao lũy kế phải nhỏ hơn bằng {0}
 DocType: Warehouse,Warehouse Name,Tên kho
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,Ngày bắt đầu thực tế phải nhỏ hơn ngày kết thúc thực tế
 DocType: Naming Series,Select Transaction,Chọn giao dịch
@@ -6216,7 +6221,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,Nhân viên {0} cấp lớp {1} không có chính sách nghỉ mặc định
 DocType: Salary Detail,Salary Detail,Chi tiết lương
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,Vui lòng chọn {0} đầu tiên
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,Đã thêm {0} người dùng
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,Đã thêm {0} người dùng
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","Trong trường hợp chương trình nhiều tầng, Khách hàng sẽ được tự động chỉ định cho cấp có liên quan theo mức chi tiêu của họ"
 DocType: Appointment Type,Physician,Bác sĩ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,Lô {0} của mục {1} đã hết hạn.
@@ -6361,7 +6366,7 @@
 DocType: Asset,Custodian,Người giám hộ
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,Point-of-Sale hồ sơ
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0} phải là một giá trị từ 0 đến 100
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},Thanh toán {0} từ {1} đến {2}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},Thanh toán {0} từ {1} đến {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,Các khoản cho vay không có bảo đảm
 DocType: Cost Center,Cost Center Name,Tên bộ phận chi phí
 DocType: Student,B+,B +
@@ -6393,6 +6398,7 @@
 DocType: Employee,Date of Issue,Ngày phát hành
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","THeo các cài đặt mua bán, nếu biên lai đặt hàng đã yêu cầu == 'CÓ', với việc tạo lập hóa đơn mua hàng, người dùng cần phải tạo lập biên lai mua hàng đầu tiên cho danh mục {0}"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},Hàng # {0}: Thiết lập Nhà cung cấp cho mặt hàng {1}
+DocType: Global Defaults,Default Distance Unit,Đơn vị khoảng cách mặc định
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Hàng{0}: Giá trị giờ phải lớn hơn không.
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,Hình ảnh website {0} đính kèm vào mục {1} không tìm thấy
 DocType: Issue,Content Type,Loại nội dung
@@ -6448,7 +6454,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,nợ tài khoản phải khớp với giấy tờ
 DocType: Asset,Naming Series,Đặt tên series
 DocType: Vital Signs,Coated,Tráng
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Hàng {0}: Giá trị mong đợi sau khi Cuộc sống hữu ích phải nhỏ hơn Tổng số tiền mua
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Hàng {0}: Giá trị mong đợi sau khi Cuộc sống hữu ích phải nhỏ hơn Tổng số tiền mua
 DocType: GoCardless Settings,GoCardless Settings,Cài đặt GoCard
 DocType: Leave Block List,Leave Block List Name,Để lại tên danh sách chặn
 DocType: Certified Consultant,Certification Validity,Hiệu lực chứng nhận
@@ -6517,6 +6523,7 @@
 DocType: Bank Statement Settings Item,Bank Header,Tiêu đề ngân hàng
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,Xem bài kiểm tra của phòng thí nghiệm
 DocType: Hub Users,Hub Users,Người dùng Trung tâm
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Khách hàng&gt; Nhóm khách hàng&gt; Lãnh thổ
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,Bảo trì ngày
 DocType: Purchase Invoice Item,Rejected Serial No,Dãy sê ri bị từ chối số
@@ -6532,7 +6539,7 @@
 DocType: SG Creation Tool Course,Max Strength,Sức tối đa
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,Cài đặt các giá trị cài sẵn
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},Không có Lưu ý Phân phối nào được Chọn cho Khách hàng {}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},Không có Lưu ý Phân phối nào được Chọn cho Khách hàng {}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,Nhân viên {0} không có số tiền trợ cấp tối đa
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,Chọn các mục dựa trên ngày giao hàng
 DocType: Grant Application,Has any past Grant Record,Có bất kỳ hồ sơ tài trợ nào trong quá khứ
@@ -6560,7 +6567,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,Đặt phòng khách sạn
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,Dịch vụ chăm sóc khách hàng
 DocType: BOM,Thumbnail,Hình đại diện
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,Không tìm thấy địa chỉ liên hệ nào có ID email.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,Không tìm thấy địa chỉ liên hệ nào có ID email.
 DocType: Item Customer Detail,Item Customer Detail,Mục chi tiết khách hàng
 DocType: Notification Control,Prompt for Email on Submission of,Nhắc nhở cho Email trên thông tin của
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},Số tiền lợi ích tối đa của nhân viên {0} vượt quá {1}
@@ -6821,7 +6828,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,Không thể bí mật với đoàn vì Loại tài khoản được chọn.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} đã được sửa đổi. Xin vui lòng làm mới.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Ngăn chặn người dùng từ việc để lai ứng dụng vào những ngày sau.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Mã mục&gt; Nhóm sản phẩm&gt; Thương hiệu
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.","Nếu hết hạn không giới hạn cho Điểm trung thành, hãy giữ khoảng thời gian hết hạn trống hoặc 0."
 DocType: Asset Maintenance Team,Maintenance Team Members,Thành viên Nhóm Bảo trì
 DocType: Loyalty Point Entry,Purchase Amount,Chi phí mua hàng
@@ -6829,7 +6835,7 @@
 											to fullfill Sales Order {2}",Không thể phân phối Số sê-ri {0} của mặt hàng {1} vì nó đã được đặt trước \ để hoàn thành Đơn đặt hàng {2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,Báo giá của Nhà cung cấp {0} đã tạo
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,Cuối năm không thể được trước khi bắt đầu năm
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,Cuối năm không thể được trước khi bắt đầu năm
 DocType: Employee Benefit Application,Employee Benefits,Lợi ích của nhân viên
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},Số lượng đóng gói phải bằng số lượng cho hàng {0} trong hàng {1}
 DocType: Work Order,Manufactured Qty,Số lượng sản xuất
@@ -6845,6 +6851,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,Chọn Batch Numbers
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,Tới GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Hóa đơn đã đưa khách hàng
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vui lòng thiết lập Hệ thống đặt tên nhân viên trong nguồn nhân lực&gt; Cài đặt nhân sự
 DocType: Healthcare Settings,Invoice Appointments Automatically,Các cuộc hẹn hóa đơn tự động
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id dự án
 DocType: Salary Component,Variable Based On Taxable Salary,Biến dựa trên mức lương chịu thuế
@@ -6893,7 +6900,7 @@
 DocType: POS Profile,Account for Change Amount,Tài khoản giao dịch số Tiền
 DocType: QuickBooks Migrator,Connecting to QuickBooks,Kết nối với QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,Tổng lãi / lỗ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,Công ty không hợp lệ cho hóa đơn công ty liên công ty.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,Công ty không hợp lệ cho hóa đơn công ty liên công ty.
 DocType: Purchase Invoice,input service,dịch vụ đầu vào
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Hàng {0}: Đối tác / tài khoản không khớp với {1} / {2} trong {3} {4}
 DocType: Employee Promotion,Employee Promotion,Khuyến mãi nhân viên
@@ -7024,7 +7031,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,Khu vực ưa thích cho nhà nghỉ
 apps/erpnext/erpnext/config/selling.py +184,Analytics,phân tích
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,Giỏ hàng rỗng
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,Vui lòng thiết lập Hệ thống Đặt tên Hướng dẫn trong Giáo dục&gt; Cài đặt Giáo dục
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",Mục {0} không có số sê-ri Chỉ các mục được serilialized \ có thể có giao hàng dựa trên số sê-ri
 DocType: Vehicle,Model,Mô hình
@@ -7054,7 +7060,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,Không có gì để thay đổi
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,Vui lòng chọn một tập tin csv
 DocType: Holiday List,Total Holidays,Tổng số ngày lễ
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,Thiếu mẫu email để gửi đi. Vui lòng đặt một trong Cài đặt phân phối.
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,Thiếu mẫu email để gửi đi. Vui lòng đặt một trong Cài đặt phân phối.
 DocType: Student Leave Application,Mark as Present,Đánh dấu như hiện tại
 DocType: Supplier Scorecard,Indicator Color,Màu chỉ thị
 DocType: Purchase Order,To Receive and Bill,Nhận và thanh toán
@@ -7063,7 +7069,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,Chọn số sê-ri
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,Nhà thiết kế
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Điều khoản và Điều kiện mẫu
-DocType: Serial No,Delivery Details,Chi tiết giao hàng
+DocType: Delivery Trip,Delivery Details,Chi tiết giao hàng
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},Phải có Chi phí bộ phận ở hàng {0} trong bảng Thuế cho loại {1}
 DocType: Program,Program Code,Mã chương trình
 DocType: Terms and Conditions,Terms and Conditions Help,Điều khoản và điều kiện giúp
@@ -7087,7 +7093,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Các ngày Tiềm năng
 DocType: Cash Flow Mapping,Is Income Tax Expense,Chi phí Thuế Thu nhập
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,Đơn đặt hàng của bạn đã hết để giao hàng!
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Hàng # {0}: Đăng ngày phải giống như ngày mua {1} tài sản {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Hàng # {0}: Đăng ngày phải giống như ngày mua {1} tài sản {2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,Kiểm tra điều này nếu Sinh viên đang cư trú tại Nhà nghỉ của Viện.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,Vui lòng nhập hàng đơn đặt hàng trong bảng trên
 ,Stock Summary,Tóm tắt cổ phiếu
diff --git a/erpnext/translations/zh-TW.csv b/erpnext/translations/zh-TW.csv
index b294760..bd40d1e 100644
--- a/erpnext/translations/zh-TW.csv
+++ b/erpnext/translations/zh-TW.csv
@@ -33,7 +33,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,新匯率
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},價格表{0}需填入貨幣種類
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,*將被計算在該交易。
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,供應商&gt;供應商類型
 DocType: Purchase Order,Customer Contact,客戶聯絡
 DocType: Patient Appointment,Check availability,檢查可用性
 DocType: Retention Bonus,Bonus Payment Date,獎金支付日期
@@ -106,7 +105,7 @@
 DocType: Lab Prescription,Lab Prescription,實驗室處方
 ,Delay Days,延遲天數
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,服務費用
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},序號：{0}已在銷售發票中引用：{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},序號：{0}已在銷售發票中引用：{1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,發票
 DocType: Purchase Invoice Item,Item Weight Details,項目重量細節
 DocType: Asset Maintenance Log,Periodicity,週期性
@@ -127,6 +126,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,會計人員
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,賣價格表
 DocType: Patient,Tobacco Current Use,煙草當前使用
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","開始日期和結束日期與作業卡<a href=""#Form/Job Card/{0}"">{1}</a>重疊"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,賣出率
 DocType: Cost Center,Stock User,庫存用戶
 DocType: Soil Analysis,(Ca+Mg)/K,（鈣+鎂）/ K
@@ -143,7 +143,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,有關
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,考勤日期不得少於員工的加盟日期
 DocType: Grading Scale,Grading Scale Name,分級標準名稱
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,將用戶添加到市場
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,將用戶添加到市場
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,這是一個 root 帳戶，不能被編輯。
 DocType: BOM,Operations,作業
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},不能在折扣的基礎上設置授權{0}
@@ -284,7 +284,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,差異數量
 DocType: Production Plan,Material Request Detail,材料請求詳情
 DocType: Selling Settings,Default Quotation Validity Days,默認報價有效天數
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括稅款，行{0}項率，稅收行{1}也必須包括在內
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括稅款，行{0}項率，稅收行{1}也必須包括在內
 DocType: Payroll Entry,Validate Attendance,驗證出席
 DocType: Sales Invoice,Change Amount,漲跌額
 DocType: Party Tax Withholding Config,Certificate Received,已收到證書
@@ -396,7 +396,6 @@
 DocType: POS Customer Group,POS Customer Group,POS客戶群
 DocType: Healthcare Practitioner,Practitioner Schedules,從業者時間表
 DocType: Vehicle,Additional Details,額外細節
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,供應商&gt;供應商組
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,請求您的報價。
 DocType: POS Closing Voucher Details,Collected Amount,收集金額
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,這是基於對這個項目產生的考勤表
@@ -437,7 +436,7 @@
 DocType: Student Admission,Student Admission,學生入學
 ,Terretory,Terretory
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,項{0}將被取消
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,折舊行{0}：折舊開始日期作為過去的日期輸入
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,折舊行{0}：折舊開始日期作為過去的日期輸入
 DocType: Contract Template,Fulfilment Terms and Conditions,履行條款和條件
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,物料需求
 DocType: Bank Reconciliation,Update Clearance Date,更新日期間隙
@@ -486,6 +485,7 @@
 DocType: Accounts Settings,Settings for Accounts,設置帳戶
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},供應商發票不存在採購發票{0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,管理銷售人員樹。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.",由於禁用了Google地圖設置，因此無法處理路線。
 DocType: Job Applicant,Cover Letter,求職信
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,傑出的支票及存款清除
 DocType: Item,Synced With Hub,同步轂
@@ -537,7 +537,7 @@
 DocType: Asset Value Adjustment,New Asset Value,新資產價值
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,公司貨幣被換算成客戶基礎貨幣的匯率
 DocType: Course Scheduling Tool,Course Scheduling Tool,排課工具
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：採購發票不能對現有資產進行{1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：採購發票不能對現有資產進行{1}
 DocType: Crop Cycle,LInked Analysis,LInked分析
 DocType: POS Closing Voucher,POS Closing Voucher,POS關閉憑證
 DocType: Contract,Lapsed,失效
@@ -570,6 +570,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0}  -  {1} 未在課程中註冊 {2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,學生姓名：
 DocType: POS Closing Voucher Details,Difference,區別
+DocType: Delivery Settings,Delay between Delivery Stops,交貨停止之間的延遲
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},序列號{0}不屬於送貨單{1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.",服務器的GoCardless配置似乎存在問題。別擔心，如果失敗，這筆款項將退還給您的帳戶。
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,添加項目
@@ -624,7 +625,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,數量和速率
 DocType: Delivery Note,% Installed,％已安裝
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,教室/實驗室等在那裡的演講可以預定。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,兩家公司的公司貨幣應該符合Inter公司交易。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,兩家公司的公司貨幣應該符合Inter公司交易。
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,請先輸入公司名稱
 DocType: Travel Itinerary,Non-Vegetarian,非素食主義者
 DocType: Purchase Invoice,Supplier Name,供應商名稱
@@ -707,7 +708,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,從日期租用
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,足夠的配件組裝
 DocType: POS Profile User,POS Profile User,POS配置文件用戶
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,行{0}：折舊開始日期是必需的
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,行{0}：折舊開始日期是必需的
 DocType: Purchase Invoice Item,Service Start Date,服務開始日期
 DocType: Subscription Invoice,Subscription Invoice,訂閱發票
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,直接收入
@@ -773,7 +774,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,另一家公司已使用此縮寫
 DocType: Selling Settings,Default Customer Group,預設客戶群組
 DocType: Employee,IFSC Code,IFSC代碼
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","開始日期和結束日期與作業卡<a href=""#Form/Job Card/{0}"">{1}</a>重疊"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",如果禁用，“圓角總計”字段將不可見的任何交易
 DocType: BOM,Operating Cost,營業成本
 DocType: Crop,Produced Items,生產物品
@@ -819,7 +819,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,POS Profile中需要領域
 DocType: Hub User,Hub User,中心用戶
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,製作銷售訂單
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},從{0}到{1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},從{0}到{1}
 DocType: Project Task,Project Task,項目任務
 DocType: Loyalty Point Entry Redemption,Redeemed Points,兌換積分
 ,Lead Id,潛在客戶標識
@@ -935,7 +935,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +56,Select Property,選擇屬性
 DocType: Fee Validity,Max number of visit,最大訪問次數
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,創建時間表：
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,註冊
 DocType: GST Settings,GST Settings,GST設置
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},貨幣應與價目表貨幣相同：{0}
@@ -987,7 +987,7 @@
 DocType: Vehicle Log,Service Details,服務細節
 DocType: Lab Test Template,Grouped,分組
 DocType: Selling Settings,Delivery Note Required,要求送貨單
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,提交工資單......
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,提交工資單......
 DocType: Bank Guarantee,Bank Guarantee Number,銀行擔保編號
 DocType: Bank Guarantee,Bank Guarantee Number,銀行擔保編號
 DocType: Assessment Criteria,Assessment Criteria,評估標準
@@ -1011,13 +1011,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,已創建付款輸入
 DocType: Request for Quotation,Get Suppliers,獲取供應商
 DocType: Purchase Receipt Item Supplied,Current Stock,當前庫存
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：資產{1}不掛項目{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：資產{1}不掛項目{2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,預覽工資單
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,帳戶{0}已多次輸入
 DocType: Account,Expenses Included In Valuation,支出計入估值
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,如果您的會員資格在30天內到期，您只能續訂
 DocType: Shopping Cart Settings,Show Stock Availability,顯示股票可用性
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},在資產類別{1}或公司{2}中設置{0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},在資產類別{1}或公司{2}中設置{0}
 DocType: Location,Longitude,經度
 ,Absent Student Report,缺席學生報告
 DocType: Crop,Crop Spacing UOM,裁剪間隔UOM
@@ -1080,7 +1080,7 @@
 DocType: Employee Benefit Application Detail,Max Benefit Amount,最大福利金額
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,預留製造
 DocType: Opportunity,Opportunity From,機會從
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}：{1}項目{2}所需的序列號。你已經提供{3}。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}：{1}項目{2}所需的序列號。你已經提供{3}。
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,請選擇一張桌子
 DocType: BOM,Website Specifications,網站規格
 DocType: Special Test Items,Particulars,細節
@@ -1187,7 +1187,7 @@
 DocType: Item,Items with higher weightage will be shown higher,具有較高權重的項目將顯示更高的可
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,實驗室測試和重要標誌
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,銀行對帳詳細
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,行＃{0}：資產{1}必須提交
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,行＃{0}：資產{1}必須提交
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,無發現任何員工
 DocType: Item,If subcontracted to a vendor,如果分包給供應商
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,學生組已經更新。
@@ -1240,7 +1240,6 @@
 DocType: Loyalty Program Collection,Tier Name,等級名稱
 DocType: HR Settings,Enter retirement age in years,在年內進入退休年齡
 DocType: Crop,Target Warehouse,目標倉庫
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,請通過設置&gt;設置&gt;命名系列為{0}設置命名系列
 DocType: Payroll Employee Detail,Payroll Employee Detail,薪資員工詳細信息
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,請選擇一個倉庫
 DocType: Cheque Print Template,Starting location from left edge,從左邊起始位置
@@ -1321,7 +1320,7 @@
 DocType: Work Order,Plan material for sub-assemblies,計劃材料為子組件
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,銷售合作夥伴和地區
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,BOM {0}必須是積極的
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,沒有可用於傳輸的項目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,沒有可用於傳輸的項目
 DocType: Employee Boarding Activity,Activity Name,活動名稱
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,更改發布日期
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,成品數量<b>{0}</b>和數量<b>{1}</b>不能不同
@@ -1543,7 +1542,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,記錄
 DocType: Asset,Scrapped,報廢
 DocType: Item,Item Defaults,項目默認值
-DocType: Purchase Invoice,Returns,返回
+DocType: Cashier Closing,Returns,返回
 DocType: Job Card,WIP Warehouse,WIP倉庫
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},序列號{0}在維護合約期間內直到{1}
 DocType: Lead,Organization Name,組織名稱
@@ -1555,7 +1554,6 @@
 DocType: Student,A-,一個-
 DocType: Share Transfer,Transfer Type,轉移類型
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,銷售費用
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,客戶&gt;客戶群&gt;地區
 DocType: Diagnosis,Diagnosis,診斷
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,標準採購
 DocType: Attendance Request,Explanation,說明
@@ -1568,7 +1566,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,採購訂單項目逾期
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,郵政編碼
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},銷售訂單{0} {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},選擇貸款{0}中的利息收入帳戶
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},選擇貸款{0}中的利息收入帳戶
 DocType: Opportunity,Contact Info,聯絡方式
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,製作Stock條目
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,無法提升狀態為Left的員工
@@ -1580,7 +1578,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,在零計費時間內無法開具發票
 DocType: Company,Date of Commencement,開始日期
 DocType: Sales Person,Select company name first.,先選擇公司名稱。
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},電子郵件發送到{0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},電子郵件發送到{0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,從供應商收到的報價。
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,更換BOM並更新所有BOM中的最新價格
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js +13,This is a root supplier group and cannot be edited.,這是一個根源供應商組，無法編輯。
@@ -1600,7 +1598,7 @@
 DocType: Asset Movement,From Employee,從員工
 DocType: Driver,Cellphone Number,手機號碼
 DocType: Project,Monitor Progress,監視進度
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： {0} {1}為零，系統將不檢查超收因為金額項目
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： {0} {1}為零，系統將不檢查超收因為金額項目
 DocType: Journal Entry,Make Difference Entry,使不同入口
 DocType: Supplier Quotation,Auto Repeat Section,自動重複部分
 DocType: Appraisal Template Goal,Key Performance Area,關鍵績效區
@@ -1695,7 +1693,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：駁回採購退貨數量不能進入
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,不允許更改所選客戶的客戶組。
 ,Purchase Order Items To Be Billed,欲付款的採購訂單品項
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,更新預計到達時間。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,更新預計到達時間。
 DocType: Program Enrollment Tool,Enrollment Details,註冊詳情
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,無法為公司設置多個項目默認值。
 DocType: Purchase Invoice Item,Net Rate,淨費率
@@ -1708,7 +1706,7 @@
 DocType: Holiday,Holiday,節日
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,離開類型是瘋狂的
 DocType: Support Settings,Close Issue After Days,關閉問題天后
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,您需要是具有System Manager和Item Manager角色的用戶才能將用戶添加到Marketplace。
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,您需要是具有System Manager和Item Manager角色的用戶才能將用戶添加到Marketplace。
 DocType: Leave Control Panel,Leave blank if considered for all branches,保持空白如果考慮到全部分支機構
 DocType: Job Opening,Staffing Plan,人員配備計劃
 DocType: Bank Guarantee,Validity in Days,天數有效
@@ -1730,7 +1728,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},重複的行{0}同{1}
 DocType: Marketplace Settings,Disable Marketplace,禁用市場
 ,Trial Balance,試算表
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,會計年度{0}未找到
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,會計年度{0}未找到
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,建立職工
 DocType: Hotel Room Reservation,Hotel Reservation User,酒店預訂用戶
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,請先選擇前綴稱號
@@ -1825,7 +1823,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,登錄失敗
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,資產{0}已創建
 DocType: Special Test Items,Special Test Items,特殊測試項目
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,您需要是具有System Manager和Item Manager角色的用戶才能在Marketplace上註冊。
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,您需要是具有System Manager和Item Manager角色的用戶才能在Marketplace上註冊。
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,根據您指定的薪資結構，您無法申請福利
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,網站形象應該是一個公共文件或網站網址
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +71,This is a root item group and cannot be edited.,這是個根項目群組，且無法被編輯。
@@ -1835,7 +1833,7 @@
 DocType: Warehouse,Warehouse Contact Info,倉庫聯絡方式
 DocType: Payment Entry,Write Off Difference Amount,核銷金額差異
 DocType: Volunteer,Volunteer Name,志願者姓名
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},發現其他行中具有重複截止日期的行：{0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},發現其他行中具有重複截止日期的行：{0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent",{0}：未發現員工的電子郵件，因此，電子郵件未發
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},給定日期{1}的員工{0}沒有分配薪金結構
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},運費規則不適用於國家/地區{0}
@@ -1920,6 +1918,7 @@
 DocType: Salary Component,Earning,盈利
 DocType: Supplier Scorecard,Scoring Criteria,評分標準
 DocType: Purchase Invoice,Party Account Currency,黨的賬戶幣種
+DocType: Delivery Trip,Total Estimated Distance,總估計距離
 ,BOM Browser,BOM瀏覽器
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,請更新此培訓活動的狀態
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +148,Overlapping conditions found between:,存在重疊的條件：
@@ -1953,7 +1952,7 @@
 DocType: Activity Cost,Projects,專案
 DocType: Payment Request,Transaction Currency,交易貨幣
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},從{0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,有些電子郵件無效
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,有些電子郵件無效
 DocType: Work Order Operation,Operation Description,操作說明
 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.,不能更改財政年度開始日期和財政年度結束日期，一旦會計年度被保存。
 DocType: Quotation,Shopping Cart,購物車
@@ -1976,7 +1975,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,在固定資產淨變動
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,需要數量
 DocType: Leave Control Panel,Leave blank if considered for all designations,離開，如果考慮所有指定空白
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費，不能被包含在項目單價
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費，不能被包含在項目單價
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},最大數量：{0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,從日期時間
 DocType: Shopify Settings,For Company,對於公司
@@ -1989,7 +1988,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,創建課程表時出現錯誤
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,列表中的第一個費用審批人將被設置為默認的費用審批人。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,不能大於100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,您需要是具有System Manager和Item Manager角色的Administrator以外的用戶才能在Marketplace上註冊。
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,您需要是具有System Manager和Item Manager角色的Administrator以外的用戶才能在Marketplace上註冊。
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,項{0}不是缺貨登記
 DocType: Maintenance Visit,Unscheduled,計劃外
 DocType: Employee,Owned,擁有的
@@ -2014,7 +2013,7 @@
 DocType: HR Settings,Employee Settings,員工設置
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,加載支付系統
 ,Batch-Wise Balance History,間歇式平衡歷史
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,行＃{0}：如果金額大於項目{1}的開帳單金額，則無法設置費率。
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,行＃{0}：如果金額大於項目{1}的開帳單金額，則無法設置費率。
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,打印設置在相應的打印格式更新
 DocType: Package Code,Package Code,封裝代碼
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,學徒
@@ -2224,7 +2223,7 @@
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,嘗試提前X天規劃作業。
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",已為{3}的子公司計劃{2}的{0}空缺和{1}預算。 \根據母公司{3}的員工計劃{6}，您只能計劃最多{4}個職位空缺和預算{5}。
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},請公司設定默認應付職工薪酬帳戶{0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},請公司設定默認應付職工薪酬帳戶{0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,通過亞馬遜獲取稅收和收費數據的財務分解
 DocType: SMS Center,Receiver List,收受方列表
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,搜索項目
@@ -2285,7 +2284,7 @@
 DocType: Vital Signs,Constipated,大便乾燥
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},對供應商發票{0}日期{1}
 DocType: Customer,Default Price List,預設價格表
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,資產運動記錄{0}創建
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,資產運動記錄{0}創建
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,未找到任何項目。
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,您不能刪除會計年度{0}。會計年度{0}設置為默認的全局設置
 DocType: Share Transfer,Equity/Liability Account,股票/負債賬戶
@@ -2416,6 +2415,7 @@
 DocType: Blanket Order,Order Type,訂單類型
 ,Item-wise Sales Register,項目明智的銷售登記
 DocType: Asset,Gross Purchase Amount,總購買金額
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,商品代碼&gt;商品分組&gt;品牌
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,期初餘額
 DocType: Asset,Depreciation Method,折舊方法
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,包括在基本速率此稅？
@@ -2492,7 +2492,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,年度預算超出採購訂單時採取的行動
 DocType: Student Leave Application,Student Leave Application,學生請假申請
 DocType: Item,Will also apply for variants,同時將申請變種
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}",資產不能被取消，因為它已經是{0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}",資產不能被取消，因為它已經是{0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},員工{0}上半天{1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},總的工作時間不應超過最高工時更大{0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,開啟
@@ -2516,6 +2516,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,獲取數據
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},假期類型{0}允許的最大休假是{1}
 DocType: SMS Center,Create Receiver List,創建接收器列表
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,可供使用的日期應在購買日期之後
 DocType: Vehicle,Wheels,車輪
 DocType: Packing Slip,To Package No.,以包號
 DocType: Sales Invoice Item,Deferred Revenue Account,遞延收入帳戶
@@ -2527,7 +2528,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +52,Telecommunications,電信
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,帳單貨幣必須等於默認公司的貨幣或帳戶幣種
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),表示該包是這個交付的一部分（僅草案）
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,行{0}：到期日期不能在發布日期之前
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,行{0}：到期日期不能在發布日期之前
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,製作付款分錄
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},項目{0}的數量必須小於{1}
 ,Sales Invoice Trends,銷售發票趨勢
@@ -2596,7 +2597,7 @@
 DocType: Guardian,Guardian Interests,守護興趣
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,更新帳戶名稱/號碼
 DocType: Naming Series,Current Value,當前值
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,多個會計年度的日期{0}存在。請設置公司財年
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,多個會計年度的日期{0}存在。請設置公司財年
 DocType: Education Settings,Instructor Records to be created by,導師記錄由
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0}已新增
 DocType: GST Account,GST Account,GST帳戶
@@ -2613,7 +2614,7 @@
 DocType: Sales Person,Name and Employee ID,姓名和僱員ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,到期日不能在寄發日期之前
 DocType: Website Item Group,Website Item Group,網站項目群組
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,沒有發現提交上述選定標准或已提交工資單的工資單
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,沒有發現提交上述選定標准或已提交工資單的工資單
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,關稅和稅款
 DocType: Projects Settings,Projects Settings,項目設置
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,參考日期請輸入
@@ -2621,7 +2622,7 @@
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,表項，將在網站顯示出來
 DocType: Purchase Order Item Supplied,Supplied Qty,附送數量
 DocType: Purchase Order Item,Material Request Item,物料需求項目
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,請先取消購買收據{0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,請先取消購買收據{0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,項目群組樹。
 DocType: Production Plan,Total Produced Qty,總生產數量
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,不能引用的行號大於或等於當前行號碼提供給充電式
@@ -2723,6 +2724,7 @@
 ,Vehicle Expenses,車輛費用
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,在銷售發票上創建實驗室測試提交
 DocType: Serial No,Invoice Details,發票明細
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,請啟用Google地圖設置以估算和優化路線
 DocType: Grant Application,Show on Website,在網站上顯示
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,開始
 DocType: Hub Tracked Item,Hub Category,中心類別
@@ -2759,7 +2761,7 @@
 DocType: Inpatient Record,B Positive,B積極
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",員工{0}的最大權益超過{1}，前面聲明的金額\金額為{2}
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：訂購數量必須是1，因為項目是固定資產。請使用單獨的行多數量。
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：訂購數量必須是1，因為項目是固定資產。請使用單獨的行多數量。
 DocType: Leave Block List Allow,Leave Block List Allow,休假區塊清單准許
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,縮寫不能為空白或輸入空白鍵
 DocType: Patient Medical Record,Patient Medical Record,病人醫療記錄
@@ -2793,7 +2795,7 @@
 DocType: Workstation,Wages per hour,時薪
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},在批量庫存餘額{0}將成為負{1}的在倉庫項目{2} {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,下列資料的要求已自動根據項目的重新排序水平的提高
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},帳戶{0}是無效的。帳戶貨幣必須是{1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},帳戶{0}是無效的。帳戶貨幣必須是{1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},起始日期{0}不能在員工解除日期之後{1}
 DocType: Supplier,Is Internal Supplier,是內部供應商
 DocType: Employee,Create User Permission,創建用戶權限
@@ -2927,7 +2929,7 @@
 DocType: Account,Fixed Asset,固定資產
 DocType: Amazon MWS Settings,After Date,日期之後
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,序列化庫存
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Inter公司發票無效的{0}。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Inter公司發票無效的{0}。
 ,Department Analytics,部門分析
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,在默認聯繫人中找不到電子郵件
 DocType: Loan,Account Info,帳戶信息
@@ -2938,7 +2940,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,費用結構和學生組{0}中的課程是不同的。
 DocType: Bank Statement Transaction Entry,Receivable Account,應收賬款
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,有效起始日期必須小於有效起始日期。
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},行＃{0}：資產{1}已經是{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},行＃{0}：資產{1}已經是{2}
 DocType: Quotation Item,Stock Balance,庫存餘額
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,銷售訂單到付款
 DocType: Purchase Invoice,With Payment of Tax,繳納稅款
@@ -2977,6 +2979,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,借方是必填項
 DocType: Clinical Procedure,Inpatient Record,住院病歷
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",時間表幫助追踪的時間，費用和結算由你的團隊做activites
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,供應商&gt;供應商類型
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,採購價格表
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,供應商記分卡變數模板。
 DocType: Job Offer Term,Offer Term,要約期限
@@ -3018,7 +3021,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,兌換收益/損失
 DocType: Opportunity,Lost Reason,失落的原因
 DocType: Amazon MWS Settings,Enable Amazon,啟用亞馬遜
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},行＃{0}：帳戶{1}不屬於公司{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},行＃{0}：帳戶{1}不屬於公司{2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},無法找到DocType {0}
 DocType: Quality Inspection,Sample Size,樣本大小
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,請輸入收據憑證
@@ -3116,7 +3119,7 @@
 DocType: Travel Request,Any other details,任何其他細節
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,這份文件是超過限制，通過{0} {1}項{4}。你在做另一個{3}對同一{2}？
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,請設置保存後復發
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,選擇變化量賬戶
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,選擇變化量賬戶
 DocType: Purchase Invoice,Price List Currency,價格表之貨幣
 DocType: Naming Series,User must always select,用戶必須始終選擇
 DocType: Stock Settings,Allow Negative Stock,允許負庫存
@@ -3155,7 +3158,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,你確定要取消這個預約嗎？
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,酒店房間價格套餐
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,銷售渠道
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},請薪酬部分設置默認帳戶{0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},請薪酬部分設置默認帳戶{0}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},請行選擇BOM為項目{0}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,獲取訂閱更新
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},帳戶{0}與帳戶模式{2}中的公司{1}不符
@@ -3172,7 +3175,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,購買的物品成本
 DocType: Employee Separation,Employee Separation Template,員工分離模板
 DocType: Selling Settings,Sales Order Required,銷售訂單需求
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,成為賣家
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,成為賣家
 DocType: Purchase Invoice,Credit To,信貸
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,有效訊息/客戶
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,留空以使用標準的交貨單格式
@@ -3213,7 +3216,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,使稅收模板
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,用戶論壇
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,原材料不能為空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,行＃{0}（付款表）：金額必須為負數
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,行＃{0}（付款表）：金額必須為負數
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.",無法更新庫存，發票包含下降航運項目。
 DocType: Contract,Fulfilment Status,履行狀態
 DocType: Lab Test Sample,Lab Test Sample,實驗室測試樣品
@@ -3364,7 +3367,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,到貨數量
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},費紀錄創造 -  {0}
 DocType: Asset Category Account,Asset Category Account,資產類別的帳戶
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,行＃{0}（付款表）：金額必須為正值
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,行＃{0}（付款表）：金額必須為正值
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},無法產生更多的項目{0}不是銷售訂單數量{1}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,選擇屬性值
 DocType: Purchase Invoice,Reason For Issuing document,簽發文件的原因
@@ -3437,7 +3440,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,僱員免稅聲明
 DocType: Payment Entry,Cheque/Reference Date,支票/參考日期
 DocType: Purchase Invoice,Total Taxes and Charges,總營業稅金及費用
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,可供使用的日期是作為過去的日期輸入的
 DocType: Employee,Emergency Contact,緊急聯絡人
 DocType: Bank Reconciliation Detail,Payment Entry,付款輸入
 ,sales-browser,銷售瀏覽器
@@ -3483,6 +3485,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),是退貨（信用票據）
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,開始工作
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},資產{0}需要序列號
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,請通過設置&gt;設置&gt;命名系列為{0}設置命名系列
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,殘疾人模板必須不能默認模板
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,對於行{0}：輸入計劃的數量
 DocType: Account,Income Account,收入帳戶
@@ -3495,6 +3498,7 @@
 DocType: Loyalty Program,Help Section,幫助科
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,上一頁
 DocType: Appraisal Goal,Key Responsibility Area,關鍵責任區
+DocType: Delivery Trip,Distance UOM,距離UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",學生批幫助您跟踪學生的出勤，評估和費用
 DocType: Payment Entry,Total Allocated Amount,總撥款額
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,設置永久庫存的默認庫存帳戶
@@ -3533,7 +3537,7 @@
 DocType: Item Supplier,Item Supplier,產品供應商
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,請輸入產品編號，以取得批號
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},請選擇一個值{0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,沒有選擇轉移項目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,沒有選擇轉移項目
 DocType: Company,Stock Settings,庫存設定
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合併是唯一可能的，如果以下屬性中均有記載相同。是集團，根型，公司
 DocType: Vehicle,Electric,電動
@@ -3809,7 +3813,7 @@
 DocType: Patient,Personal and Social History,個人和社會史
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,用戶{0}已創建
 DocType: Fee Schedule,Fee Breakup for each student,每名學生的費用分手
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),總的超前（{0}）對二階{1}不能大於總計（{2}）
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),總的超前（{0}）對二階{1}不能大於總計（{2}）
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,選擇按月分佈橫跨幾個月不均勻分佈的目標。
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,更改代碼
 DocType: Purchase Invoice Item,Valuation Rate,估值率
@@ -3818,7 +3822,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,採用ITC Cess
 ,Student Monthly Attendance Sheet,學生每月考勤表
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,運費規則僅適用於銷售
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,折舊行{0}：下一個折舊日期不能在購買日期之前
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,折舊行{0}：下一個折舊日期不能在購買日期之前
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,專案開始日期
 DocType: Rename Tool,Rename Log,重命名日誌
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,學生組或課程表是強制性的
@@ -3834,12 +3838,10 @@
 DocType: Assessment Result Tool,Result HTML,結果HTML
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,項目和公司應根據銷售交易多久更新一次。
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,新增學生
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","請刪除員工<a href=""#Form/Employee/{0}"">{0}</a> \以取消此文檔"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},請選擇{0}
 DocType: C-Form,C-Form No,C-表格編號
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,距離
+DocType: Delivery Stop,Distance,距離
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,列出您所購買或出售的產品或服務。
 DocType: Water Analysis,Storage Temperature,儲存溫度
 DocType: Employee Attendance Tool,Unmarked Attendance,無標記考勤
@@ -3865,7 +3867,7 @@
 DocType: Homepage,Company Description for website homepage,公司介紹了網站的首頁
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",為方便客戶，這些代碼可以在列印格式，如發票和送貨單使用
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier名稱
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,無法檢索{0}的信息。
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,無法檢索{0}的信息。
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,開幕詞報
 DocType: Contract,Fulfilment Terms,履行條款
 DocType: Sales Invoice,Time Sheet List,時間表列表
@@ -4034,7 +4036,7 @@
 DocType: Serial No,Warranty / AMC Details,保修/ AMC詳情
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,為基於活動的組手動選擇學生
 DocType: Journal Entry,User Remark,用戶備註
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,優化路線。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,優化路線。
 DocType: Travel Itinerary,Non Diary,非日記
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,無法為左員工創建保留獎金
 DocType: Lead,Market Segment,市場分類
@@ -4063,7 +4065,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,忠誠計劃
 DocType: Student Guardian,Father,父親
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,支持門票
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,"""更新庫存"" 無法檢查固定資產銷售"
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,"""更新庫存"" 無法檢查固定資產銷售"
 DocType: Bank Reconciliation,Bank Reconciliation,銀行對帳
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,獲取更新
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}帳戶{2}不屬於公司{3}
@@ -4104,7 +4106,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,序列號和批次
 DocType: Warranty Claim,From Company,從公司
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,評估標準的得分之和必須是{0}。
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,請設置折舊數預訂
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,請設置折舊數預訂
 DocType: Supplier Scorecard Period,Calculations,計算
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,價值或數量
 DocType: Payment Terms Template,Payment Terms,付款條件
@@ -4124,7 +4126,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,價格上漲率與貼現率的折扣（％）
 DocType: Healthcare Service Unit Type,Rate / UOM,費率/ UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,所有倉庫
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Inter公司沒有找到{0}。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Inter公司沒有找到{0}。
 DocType: Travel Itinerary,Rented Car,租車
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,關於貴公司
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,信用帳戶必須是資產負債表科目
@@ -4220,6 +4222,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",即使有更高優先級的多個定價規則，然後按照內部優先級應用：
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,植物分析標準
 DocType: Supplier,Supplier Details,供應商詳細資訊
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,請通過設置&gt;編號系列設置出席編號系列
 DocType: Setup Progress,Setup Progress,設置進度
 DocType: Expense Claim,Approval Status,審批狀態
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},來源值必須小於列{0}的值
@@ -4310,7 +4313,6 @@
 DocType: Travel Request,Fully Sponsored,完全贊助
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,反向日記帳分錄
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,客戶{0}已創建。
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,請在人力資源&gt;人力資源設置中設置員工命名系統
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,目前任何倉庫沒有庫存
 ,Payment Period Based On Invoice Date,基於發票日的付款期
 DocType: Sample Collection,No. of print,打印數量
@@ -4361,7 +4363,7 @@
 DocType: Appointment Type,Default Duration,默認時長
 DocType: BOM Explosion Item,Source Warehouse,來源倉庫
 DocType: Installation Note,Installation Date,安裝日期
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},行＃{0}：資產{1}不屬於公司{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},行＃{0}：資產{1}不屬於公司{2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,已創建銷售發票{0}
 DocType: Employee,Confirmation Date,確認日期
 DocType: Inpatient Occupancy,Check Out,查看
@@ -4377,6 +4379,7 @@
 DocType: Production Plan,Sales Orders Detail,銷售訂單明細
 DocType: Bin,Requested Quantity,要求的數量
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-收費.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,請在教育&gt;教育設置中設置教師命名系統
 DocType: Patient,Marital Status,婚姻狀況
 DocType: Stock Settings,Auto Material Request,自動物料需求
 DocType: Woocommerce Settings,API consumer secret,API消費者秘密
@@ -4424,7 +4427,7 @@
 DocType: Purchase Invoice,Terms,條款
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,選擇天數
 DocType: Academic Term,Term Name,術語名稱
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,創建工資單......
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,創建工資單......
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,您不能編輯根節點。
 DocType: Buying Settings,Purchase Order Required,採購訂單為必要項
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,計時器
@@ -4462,7 +4465,7 @@
 DocType: Account,Rate at which this tax is applied,此稅適用的匯率
 DocType: Cash Flow Mapper,Section Name,部分名稱
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,再訂購數量
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},折舊行{0}：使用壽命後的預期值必須大於或等於{1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},折舊行{0}：使用壽命後的預期值必須大於或等於{1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,當前職位空缺
 DocType: Company,Stock Adjustment Account,庫存調整帳戶
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,註銷項款
@@ -4506,7 +4509,7 @@
 DocType: Program Enrollment,School House,學校議院
 DocType: Serial No,Out of AMC,出資產管理公司
 DocType: Opportunity,Opportunity Amount,機會金額
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,預訂折舊數不能超過折舊總數更大
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,預訂折舊數不能超過折舊總數更大
 DocType: Purchase Order,Order Confirmation Date,訂單確認日期
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,使維護訪問
 DocType: Employee Transfer,Employee Transfer Details,員工轉移詳情
@@ -4556,7 +4559,7 @@
 DocType: Warranty Claim,Item and Warranty Details,項目和保修細節
 DocType: Chapter,Chapter Members,章節成員
 DocType: Sales Team,Contribution (%),貢獻（％）
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：付款項將不會被創建因為“現金或銀行帳戶”未指定
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：付款項將不會被創建因為“現金或銀行帳戶”未指定
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,項目{0}已經存在
 DocType: Clinical Procedure,Nursing User,護理用戶
 DocType: Employee Benefit Application,Payroll Period,工資期
@@ -4564,6 +4567,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},序列號{0}不屬於批次{1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,職責
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,此報價的有效期已經結束。
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","請刪除員工<a href=""#Form/Employee/{0}"">{0}</a> \以取消此文檔"
 DocType: Expense Claim Account,Expense Claim Account,報銷賬戶
 DocType: Account,Capital Work in Progress,資本工作正在進行中
 DocType: Accounts Settings,Allow Stale Exchange Rates,允許陳舊的匯率
@@ -4639,7 +4644,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,發行材料
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,將Shopify與ERPNext連接
 DocType: Material Request Item,For Warehouse,對於倉庫
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,已更新交貨單{0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,已更新交貨單{0}
 DocType: Employee,Offer Date,到職日期
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,語錄
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,您在離線模式。您將無法重新加載，直到你有網絡。
@@ -4690,7 +4695,7 @@
 DocType: Shipping Rule,Calculate Based On,計算的基礎上
 DocType: Contract,Unfulfilled,秕
 DocType: Delivery Note Item,From Warehouse,從倉庫
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,沒有僱員提到的標準
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,沒有僱員提到的標準
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,不與物料清單的項目，以製造
 DocType: Shopify Settings,Default Customer,默認客戶
 DocType: Sales Stage,Stage Name,藝名
@@ -4730,7 +4735,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,稅額折後金額
 DocType: Patient,Inpatient Status,住院狀況
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,每日工作總結設置
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,選定價目表應該有買入和賣出的字段。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,選定價目表應該有買入和賣出的字段。
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,請輸入按日期請求
 DocType: Payment Entry,Internal Transfer,內部轉賬
 DocType: Asset Maintenance,Maintenance Tasks,維護任務
@@ -4764,7 +4769,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,集團通過
 DocType: Guardian,Interests,興趣
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,啟用／禁用的貨幣。
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,無法提交一些薪資單
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,無法提交一些薪資單
 DocType: Exchange Rate Revaluation,Get Entries,獲取條目
 DocType: Production Plan,Get Material Request,獲取材質要求
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,郵政費用
@@ -4843,7 +4848,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},交際費是強制性的項目{0}
 DocType: BOM,Website Description,網站簡介
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,在淨資產收益變化
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,請取消採購發票{0}第一
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,請取消採購發票{0}第一
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,不允許。請禁用服務單位類型
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",電子郵件地址必須是唯一的，已經存在了{0}
 DocType: Serial No,AMC Expiry Date,AMC到期時間
@@ -4883,7 +4888,7 @@
 DocType: Hotel Room,Hotel Room,旅館房間
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},帳戶{0}不屬於公司{1}
 DocType: Leave Type,Rounding,四捨五入
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列號與交貨單不匹配
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列號與交貨單不匹配
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),分配金額（按比例分配）
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.",然後根據客戶，客戶組，地區，供應商，供應商組織，市場活動，銷售合作夥伴等篩選定價規則。
 DocType: Student,Guardian Details,衛詳細
@@ -4934,7 +4939,7 @@
 apps/erpnext/erpnext/public/js/hub/hub_call.js +46,Marketplace Error,市場錯誤
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,進行還款分錄
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,所有部門
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,所有部門
 DocType: Patient,Alcohol Past Use,酒精過去使用
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +248,Cr,鉻
 DocType: Project Update,Problematic/Stuck,問題/卡住
@@ -4943,7 +4948,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,在取消此銷售訂單之前，必須先取消工單{0}
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM（包括子組件）
 DocType: Authorization Rule,Applicable To (Employee),適用於（員工）
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,截止日期是強制性的
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,截止日期是強制性的
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,增量屬性{0}不能為0
 DocType: Employee Benefit Claim,Benefit Type and Amount,福利類型和金額
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,客房預訂
@@ -5076,7 +5081,7 @@
 DocType: Purchase Invoice Item,Total Weight,總重量
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,銷售佣金
 DocType: Job Offer Term,Value / Description,值/說明
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：資產{1}無法提交，這已經是{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：資產{1}無法提交，這已經是{2}
 DocType: Tax Rule,Billing Country,結算國家
 DocType: Purchase Order Item,Expected Delivery Date,預計交貨日期
 DocType: Restaurant Order Entry,Restaurant Order Entry,餐廳訂單錄入
@@ -5113,10 +5118,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Travel Expenses,差旅費
 DocType: Maintenance Visit,Breakdown,展開
 DocType: Travel Itinerary,Vegetarian,素
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,帳號：{0}幣種：{1}不能選擇
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,帳號：{0}幣種：{1}不能選擇
 DocType: Bank Statement Transaction Settings Item,Bank Data,銀行數據
 DocType: Purchase Receipt Item,Sample Quantity,樣品數量
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",根據最新的估值/價格清單率/最近的原材料採購率，通過計劃程序自動更新BOM成本。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,供應商&gt;供應商組
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},帳戶{0}：父帳戶{1}不屬於公司：{2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,成功刪除與該公司相關的所有交易！
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +39,As on Date,隨著對日
@@ -5140,7 +5146,7 @@
 DocType: Journal Entry,Cash Entry,現金分錄
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,子節點可以在&#39;集團&#39;類型的節點上創建
 DocType: Academic Year,Academic Year Name,學年名稱
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,不允許{0}與{1}進行交易。請更改公司。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,不允許{0}與{1}進行交易。請更改公司。
 DocType: Sales Partner,Contact Desc,聯絡倒序
 DocType: Email Digest,Send regular summary reports via Email.,使用電子郵件發送定期匯總報告。
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},請報銷類型設置默認帳戶{0}
@@ -5171,7 +5177,7 @@
 DocType: Hotel Room,Hotel Manager,酒店經理
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,購物車稅收規則設定
 DocType: Purchase Invoice,Taxes and Charges Added,稅費上架
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,折舊行{0}：下一個折舊日期不能在可供使用的日期之前
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,折舊行{0}：下一個折舊日期不能在可供使用的日期之前
 ,Sales Funnel,銷售漏斗
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,縮寫是強制性的
 DocType: Project,Task Progress,任務進度
@@ -5183,7 +5189,7 @@
 ,Territory Target Variance Item Group-Wise,地域內跨項目群組間的目標差異
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,所有客戶群組
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,每月累計
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是強制性的。也許外幣兌換記錄為{1}到{2}尚未建立。
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是強制性的。也許外幣兌換記錄為{1}到{2}尚未建立。
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},已存在人員配置計劃{0}以用於指定{1}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,稅務模板是強制性的。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,帳戶{0}：父帳戶{1}不存在
@@ -5261,7 +5267,6 @@
 DocType: Certification Application,Certification Status,認證狀態
 DocType: Travel Itinerary,Travel Advance Required,需要旅行預付款
 DocType: Subscriber,Subscriber Name,訂戶名稱
-DocType: Cashier Closing,Cashier-closing-,收銀員閉合體
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,映射數據類型
 DocType: BOM Update Tool,Replace,更換
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,找不到產品。
@@ -5346,7 +5351,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,銷售和採購的默認稅收模板被創建。
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,評估結果記錄{0}已經存在。
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",例如：ABCD。#####。如果系列已設置且交易中未提及批號，則將根據此系列創建自動批號。如果您始終想要明確提及此料品的批號，請將此留為空白。注意：此設置將優先於庫存設置中的命名系列前綴。
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,請通過設置&gt;編號系列設置出席編號系列
 DocType: BOM,Materials Required (Exploded),所需材料（分解）
 DocType: Contract,Party User,派對用戶
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',如果Group By是“Company”，請設置公司過濾器空白
@@ -5532,7 +5536,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,必須設置試用期開始日期和試用期結束日期
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,支付計劃中的總付款金額必須等於大/圓
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,支付計劃中的總付款金額必須等於大/圓
 DocType: Subscription Plan Detail,Plan,計劃
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,銀行對賬單餘額按總帳
 DocType: Job Applicant,Applicant Name,申請人名稱
@@ -5598,7 +5602,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,肥皂和洗滌劑
 DocType: BOM,Show Items,顯示項目
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,從時間不能超過結束時間大。
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,你想通過電子郵件通知所有的客戶？
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,你想通過電子郵件通知所有的客戶？
 DocType: Subscription Plan,Billing Interval,計費間隔
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,電影和視頻
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,已訂購
@@ -5606,9 +5610,9 @@
 DocType: Salary Detail,Component,零件
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,行{0}：{1}必須大於0
 DocType: Assessment Criteria,Assessment Criteria Group,評估標準組
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},從{0}到{1}的薪金的應計日記帳分錄
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},從{0}到{1}的薪金的應計日記帳分錄
 DocType: Sales Invoice Item,Enable Deferred Revenue,啟用延期收入
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},打開累計折舊必須小於等於{0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},打開累計折舊必須小於等於{0}
 DocType: Warehouse,Warehouse Name,倉庫名稱
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,實際開始日期必須小於實際結束日期
 DocType: Naming Series,Select Transaction,選擇交易
@@ -5750,7 +5754,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,{1}級員工{0}沒有默認離開政策
 DocType: Salary Detail,Salary Detail,薪酬詳細
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,請先選擇{0}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,添加了{0}個用戶
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,添加了{0}個用戶
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",在多層程序的情況下，客戶將根據其花費自動分配到相關層
 DocType: Appointment Type,Physician,醫師
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,一批項目的{0} {1}已過期。
@@ -5879,7 +5883,7 @@
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,供應商重複
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,簡介銷售點的
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0}應該是0到100之間的一個值
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},從{1}到{2}的{0}付款
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},從{1}到{2}的{0}付款
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,無抵押貸款
 DocType: Cost Center,Cost Center Name,成本中心名稱
 DocType: HR Settings,Max working hours against Timesheet,最大工作時間針對時間表
@@ -5908,6 +5912,7 @@
 DocType: Employee,Date of Issue,發行日期
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",根據購買設置，如果需要購買記錄==“是”，則為了創建採購發票，用戶需要首先為項目{0}創建採購憑證
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},行＃{0}：設置供應商項目{1}
+DocType: Global Defaults,Default Distance Unit,默認距離單位
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,行{0}：小時值必須大於零。
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,網站圖像{0}附加到物品{1}無法找到
 DocType: Issue,Content Type,內容類型
@@ -5959,7 +5964,7 @@
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,天自上次訂購
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,借方帳戶必須是資產負債表科目
 DocType: Vital Signs,Coated,塗
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,行{0}：使用壽命後的預期值必須小於總採購額
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,行{0}：使用壽命後的預期值必須小於總採購額
 DocType: GoCardless Settings,GoCardless Settings,GoCardless設置
 DocType: Leave Block List,Leave Block List Name,休假區塊清單名稱
 DocType: Certified Consultant,Certification Validity,認證有效性
@@ -6024,6 +6029,7 @@
 DocType: Bank Statement Settings Item,Bank Header,銀行標題
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,查看實驗室測試
 DocType: Hub Users,Hub Users,Hub用戶
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,客戶&gt;客戶群&gt;地區
 DocType: Purchase Invoice,Y,ÿ
 DocType: Maintenance Visit,Maintenance Date,維修日期
 DocType: Purchase Invoice Item,Rejected Serial No,拒絕序列號
@@ -6037,7 +6043,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +640,BOM and Manufacturing Quantity are required,BOM和生產量是必需的
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +62,Ageing Range 2,老齡範圍2
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,安裝預置
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},沒有為客戶{}選擇送貨單
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},沒有為客戶{}選擇送貨單
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,員工{0}沒有最大福利金額
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,根據交付日期選擇項目
 DocType: Grant Application,Has any past Grant Record,有過去的贈款記錄嗎？
@@ -6063,7 +6069,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,酒店房間預訂
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,顧客服務
 DocType: BOM,Thumbnail,縮略圖
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,找不到與電子郵件ID的聯繫人。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,找不到與電子郵件ID的聯繫人。
 DocType: Item Customer Detail,Item Customer Detail,項目客戶詳細
 DocType: Notification Control,Prompt for Email on Submission of,提示電子郵件的提交
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},員工{0}的最高福利金額超過{1}
@@ -6305,14 +6311,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,不能隱蔽到組，因為帳戶類型選擇的。
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1} 已修改。請更新。
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,停止用戶在下面日期提出休假申請。
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,商品代碼&gt;商品分組&gt;品牌
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.",如果忠誠度積分無限期到期，請將到期時間保持為空或0。
 DocType: Asset Maintenance Team,Maintenance Team Members,維護團隊成員
 DocType: Loyalty Point Entry,Purchase Amount,購買金額
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +251,"Cannot deliver Serial No {0} of item {1} as it is reserved \
 											to fullfill Sales Order {2}",無法交付項目{1}的序列號{0}，因為它已保留\以滿足銷售訂單{2}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,供應商報價{0}創建
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,結束年份不能啟動年前
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,結束年份不能啟動年前
 DocType: Employee Benefit Application,Employee Benefits,員工福利
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},盒裝數量必須等於{1}列品項{0}的數量
 DocType: Work Order,Manufactured Qty,生產數量
@@ -6325,6 +6330,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +302,Please set a default Holiday List for Employee {0} or Company {1},請設置一個默認的假日列表為員工{0}或公司{1}
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,選擇批號
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,客戶提出的賬單。
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,請在人力資源&gt;人力資源設置中設置員工命名系統
 DocType: Healthcare Settings,Invoice Appointments Automatically,自動發票約會
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,項目編號
 DocType: Salary Component,Variable Based On Taxable Salary,基於應納稅工資的變量
@@ -6370,7 +6376,7 @@
 DocType: POS Profile,Account for Change Amount,帳戶漲跌額
 DocType: QuickBooks Migrator,Connecting to QuickBooks,連接到QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,總收益/損失
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,公司發票無效公司。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,公司發票無效公司。
 DocType: Purchase Invoice,input service,輸入服務
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：甲方/客戶不與匹配{1} / {2} {3} {4}
 DocType: Employee Promotion,Employee Promotion,員工晉升
@@ -6487,7 +6493,6 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +156,"Payment Type must be one of Receive, Pay and Internal Transfer",付款方式必須是接收之一，收費和內部轉賬
 DocType: Travel Itinerary,Preferred Area for Lodging,住宿的首選地區
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,車是空的
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,請在教育&gt;教育設置中設置教師命名系統
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",項目{0}沒有序列號只有serilialized items \可以根據序列號進行交付
 DocType: Work Order,Actual Operating Cost,實際運行成本
@@ -6513,7 +6518,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,沒什麼可改變的
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,請選擇一個csv文件
 DocType: Holiday List,Total Holidays,總假期
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,缺少發送的電子郵件模板。請在“傳遞設置”中設置一個。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,缺少發送的電子郵件模板。請在“傳遞設置”中設置一個。
 DocType: Student Leave Application,Mark as Present,標記為現
 DocType: Supplier Scorecard,Indicator Color,指示燈顏色
 DocType: Purchase Order,To Receive and Bill,準備收料及接收發票
@@ -6522,7 +6527,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,選擇序列號
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,設計師
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,條款及細則範本
-DocType: Serial No,Delivery Details,交貨細節
+DocType: Delivery Trip,Delivery Details,交貨細節
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},成本中心是必需的行{0}稅表型{1}
 DocType: Program,Program Code,程序代碼
 DocType: Terms and Conditions,Terms and Conditions Help,條款和條件幫助
@@ -6545,7 +6550,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交貨期天
 DocType: Cash Flow Mapping,Is Income Tax Expense,是所得稅費用
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,您的訂單已發貨！
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行＃{0}：過帳日期必須是相同的購買日期{1}資產的{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行＃{0}：過帳日期必須是相同的購買日期{1}資產的{2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,如果學生住在學院的旅館，請檢查。
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,請在上表中輸入銷售訂單
 ,Stock Summary,股票摘要
diff --git a/erpnext/translations/zh.csv b/erpnext/translations/zh.csv
index 20dcd35..68409a0 100644
--- a/erpnext/translations/zh.csv
+++ b/erpnext/translations/zh.csv
@@ -1,6 +1,6 @@
 DocType: Accounting Period,Period Name,期间名称
 DocType: Employee,Salary Mode,工资发放方式
-apps/erpnext/erpnext/public/js/hub/marketplace.js +109,Register,寄存器
+apps/erpnext/erpnext/public/js/hub/marketplace.js +108,Register,寄存器
 DocType: Patient,Divorced,离异
 DocType: Support Settings,Post Route Key,邮政路线密钥
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,允许一个交易中存在相同物料
@@ -36,7 +36,6 @@
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,新汇率
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +38,Currency is required for Price List {0},价格清单{0}需要设定货币
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,*将被计算在该交易内。
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,供应商&gt;供应商类型
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,客户联系
 DocType: Patient Appointment,Check availability,检查可用性
@@ -72,7 +71,7 @@
 apps/erpnext/erpnext/templates/pages/projects.js +66,Show open,公开显示
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +163,Series Updated Successfully,系列已成功更新
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,退出
-apps/erpnext/erpnext/controllers/accounts_controller.py +772,{0} in row {1},{1}行中的{0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +779,{0} in row {1},{1}行中的{0}
 DocType: Asset Finance Book,Depreciation Start Date,折旧开始日期
 DocType: Pricing Rule,Apply On,应用于
 DocType: Item Price,Multiple Item prices.,多个物料的价格。
@@ -120,7 +119,7 @@
 DocType: Lab Prescription,Lab Prescription,实验室处方
 ,Delay Days,延迟天数
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,服务费用
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1012,Serial Number: {0} is already referenced in Sales Invoice: {1},序号：{0}已在销售发票中引用：{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1009,Serial Number: {0} is already referenced in Sales Invoice: {1},序号：{0}已在销售发票中引用：{1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,发票
 DocType: Purchase Invoice Item,Item Weight Details,物料重量
 DocType: Asset Maintenance Log,Periodicity,周期性
@@ -145,6 +144,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,会计
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +61,Selling Price List,销售价格清单
 DocType: Patient,Tobacco Current Use,烟草当前使用
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","开始日期和结束日期与作业卡<a href=""#Form/Job Card/{0}"">{1}</a>重叠"
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +68,Selling Rate,销售价
 DocType: Cost Center,Stock User,库存用户
 DocType: Soil Analysis,(Ca+Mg)/K,（钙+镁）/ K
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,有关
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,考勤日期不得早于员工入职日期
 DocType: Grading Scale,Grading Scale Name,分级标准名称
-apps/erpnext/erpnext/public/js/hub/marketplace.js +148,Add Users to Marketplace,将用户添加到市场
+apps/erpnext/erpnext/public/js/hub/marketplace.js +147,Add Users to Marketplace,将用户添加到市场
 apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,这是一个顶层（根）科目，不能被编辑。
 DocType: Sales Invoice,Company Address,公司地址
 DocType: BOM,Operations,操作
@@ -322,7 +322,7 @@
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,差异数量
 DocType: Production Plan,Material Request Detail,材料申请信息
 DocType: Selling Settings,Default Quotation Validity Days,默认报价有效天数
-apps/erpnext/erpnext/controllers/accounts_controller.py +870,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括税款，行{0}项率，税收行{1}也必须包括在内
+apps/erpnext/erpnext/controllers/accounts_controller.py +877,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括税款，行{0}项率，税收行{1}也必须包括在内
 DocType: SMS Center,SMS Center,短信中心
 DocType: Payroll Entry,Validate Attendance,验证考勤
 DocType: Sales Invoice,Change Amount,找零
@@ -441,7 +441,6 @@
 DocType: Cheque Print Template,Line spacing for amount in words,行距文字量
 DocType: Vehicle,Additional Details,额外细节
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,未提供描述
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,供应商&gt;供应商组
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,请求您的报价。
 DocType: POS Closing Voucher Details,Collected Amount,收集金额
 DocType: Lab Test,Submitted Date,提交日期
@@ -486,7 +485,7 @@
 DocType: Student Admission,Student Admission,学生入学
 ,Terretory,区域
 apps/erpnext/erpnext/stock/doctype/item/item.py +827,Item {0} is cancelled,物料{0}已取消
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +206,Depreciation Row {0}: Depreciation Start Date is entered as past date,折旧行{0}：折旧开始日期作为过去的日期输入
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +215,Depreciation Row {0}: Depreciation Start Date is entered as past date,折旧行{0}：折旧开始日期作为过去的日期输入
 DocType: Contract Template,Fulfilment Terms and Conditions,履行条款和条件
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1130,Material Request,材料申请
 DocType: Bank Reconciliation,Update Clearance Date,更新清算日期
@@ -543,6 +542,7 @@
 DocType: Accounts Settings,Settings for Accounts,科目设置
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +800,Supplier Invoice No exists in Purchase Invoice {0},供应商发票不存在采购发票{0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,管理销售人员。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +84,"Cannot process route, since Google Maps Settings is disabled.",由于禁用了Google地图设置，因此无法处理路线。
 DocType: Job Applicant,Cover Letter,附函
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,待清帐支票及存款
 DocType: Item,Synced With Hub,与Hub同步
@@ -602,7 +602,7 @@
 DocType: Asset Value Adjustment,New Asset Value,新资产价值
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,客户货币转换为客户的本币后的单价
 DocType: Course Scheduling Tool,Course Scheduling Tool,排课工具
-apps/erpnext/erpnext/controllers/accounts_controller.py +682,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：采购发票不能对现有资产进行{1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +689,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：采购发票不能对现有资产进行{1}
 DocType: Crop Cycle,LInked Analysis,链接的分析
 DocType: POS Closing Voucher,POS Closing Voucher,销售终端关闭凭证
 DocType: Contract,Lapsed,间隔
@@ -637,6 +637,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0}  -  {1}未加入课程{2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,学生姓名：
 DocType: POS Closing Voucher Details,Difference,区别
+DocType: Delivery Settings,Delay between Delivery Stops,交货停止之间的延迟
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},序列号{0}不属于销售出货单{1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.",服务器的GoCardless配置似乎存在问题。别担心，如果失败，这笔款项将退还给您的科目。
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext演示
@@ -697,7 +698,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,数量和价格
 DocType: Delivery Note,% Installed,％已安装
 apps/erpnext/erpnext/utilities/user_progress.py +230,Classrooms/ Laboratories etc where lectures can be scheduled.,教室/实验室等在那里的演讲可以预定。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1311,Company currencies of both the companies should match for Inter Company Transactions.,两家公司的公司货币应该符合Inter公司交易。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1308,Company currencies of both the companies should match for Inter Company Transactions.,两家公司的公司货币应该符合Inter公司交易。
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +95,Please enter company name first,请先输入公司名称
 DocType: Travel Itinerary,Non-Vegetarian,非素食主义者
 DocType: Purchase Invoice,Supplier Name,供应商名称
@@ -784,7 +785,7 @@
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,从日期租用
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +23,Enough Parts to Build,足够的配件组装
 DocType: POS Profile User,POS Profile User,POS配置文件用户
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +185,Row {0}: Depreciation Start Date is required,行{0}：折旧开始日期是必需的
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +194,Row {0}: Depreciation Start Date is required,行{0}：折旧开始日期是必需的
 DocType: Purchase Invoice Item,Service Start Date,服务开始日期
 DocType: Subscription Invoice,Subscription Invoice,订阅发票
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Direct Income,直接收益
@@ -853,7 +854,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,缩写已用于另一家公司
 DocType: Selling Settings,Default Customer Group,默认客户群组
 DocType: Employee,IFSC Code,IFSC代码
-apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +39,"Start date and end date is overlapping with the job card <a href=""#Form/Job Card/{0}"">{1}</a>","开始日期和结束日期与作业卡<a href=""#Form/Job Card/{0}"">{1}</a>重叠"
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",如果禁用，“圆整后金额”字段将不在任何交易中显示
 DocType: BOM,Operating Cost,营业成本
 DocType: Crop,Produced Items,生产物料
@@ -905,7 +905,7 @@
 DocType: Supplier,Prevent RFQs,防止RFQ
 DocType: Hub User,Hub User,集线器用户
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,创建销售订单
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Salary Slip submitted for period from {0} to {1},从{0}到{1}期间的工资单已提交
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +541,Salary Slip submitted for period from {0} to {1},从{0}到{1}期间的工资单已提交
 DocType: Project Task,Project Task,工程任务
 DocType: Loyalty Point Entry Redemption,Redeemed Points,兑换积分
 ,Lead Id,商机ID
@@ -1036,7 +1036,7 @@
 DocType: Fee Validity,Max number of visit,最大访问次数
 ,Hotel Room Occupancy,酒店客房入住率
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +339,Timesheet created:,创建时间表：
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1216,Please set default Cash or Bank account in Mode of Payment {0},请为付款方式{0}设置默认的现金或银行科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1213,Please set default Cash or Bank account in Mode of Payment {0},请为付款方式{0}设置默认的现金或银行科目
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,注册
 DocType: GST Settings,GST Settings,GST设置
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},货币应与价格清单货币相同：{0}
@@ -1091,7 +1091,7 @@
 DocType: Vehicle Log,Service Details,服务细节
 DocType: Lab Test Template,Grouped,分组
 DocType: Selling Settings,Delivery Note Required,销售出货单是必须项
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,Submitting Salary Slips...,提交工资单......
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +537,Submitting Salary Slips...,提交工资单......
 DocType: Bank Guarantee,Bank Guarantee Number,银行担保编号
 DocType: Bank Guarantee,Bank Guarantee Number,银行担保编号
 DocType: Assessment Criteria,Assessment Criteria,评估标准
@@ -1117,13 +1117,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +348,Payment Entry is already created,付款凭证已创建
 DocType: Request for Quotation,Get Suppliers,获取供应商
 DocType: Purchase Receipt Item Supplied,Current Stock,当前库存
-apps/erpnext/erpnext/controllers/accounts_controller.py +665,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：资产{1}不挂项目{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +672,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：资产{1}不挂项目{2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +408,Preview Salary Slip,预览工资单
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +64,Account {0} has been entered multiple times,科目{0}已多次输入
 DocType: Account,Expenses Included In Valuation,计入库存评估价的费用科目
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +38,You can only renew if your membership expires within 30 days,如果您的会员资格在30天内到期，您只能续订
 DocType: Shopping Cart Settings,Show Stock Availability,显示库存可用性
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},在资产类别{1}或公司{2}中设置{0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +519,Set {0} in asset category {1} or company {2},在资产类别{1}或公司{2}中设置{0}
 DocType: Location,Longitude,经度
 ,Absent Student Report,缺勤学生报表
 DocType: Crop,Crop Spacing UOM,裁剪间隔UOM
@@ -1196,7 +1196,7 @@
 DocType: Soil Texture,Sand,砂
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,能源
 DocType: Opportunity,Opportunity From,机会来源
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1000,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{1}请为第{0}行的物料{2}指定序列号。你已经提供{3}。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{1}请为第{0}行的物料{2}指定序列号。你已经提供{3}。
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,请选择一张桌子
 DocType: BOM,Website Specifications,网站规格
 DocType: Special Test Items,Particulars,细节
@@ -1299,7 +1299,7 @@
 DocType: Item,Items with higher weightage will be shown higher,具有较高权重的物料会优先显示在清单的上面
 apps/erpnext/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py +12,Lab Tests and Vital Signs,实验室测试和重要标志
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,银行对帐信息
-apps/erpnext/erpnext/controllers/accounts_controller.py +669,Row #{0}: Asset {1} must be submitted,行＃{0}：资产{1}必须提交
+apps/erpnext/erpnext/controllers/accounts_controller.py +676,Row #{0}: Asset {1} must be submitted,行＃{0}：资产{1}必须提交
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,未找到任何员工
 DocType: Item,If subcontracted to a vendor,针对外包给供应商的情况
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,学生组已经更新。
@@ -1354,7 +1354,6 @@
 DocType: Loyalty Program Collection,Tier Name,等级名称
 DocType: HR Settings,Enter retirement age in years,输入退休年龄
 DocType: Crop,Target Warehouse,目标仓库
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请通过设置&gt;设置&gt;命名系列为{0}设置命名系列
 DocType: Payroll Employee Detail,Payroll Employee Detail,薪资员工详细信息
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,请选择一个仓库
 DocType: Cheque Print Template,Starting location from left edge,从左边起始位置
@@ -1444,7 +1443,7 @@
 DocType: Work Order,Plan material for sub-assemblies,计划材料为子组件
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,销售合作伙伴和地区
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +623,BOM {0} must be active,物料清单{0}必须处于激活状态
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +427,No Items available for transfer,无可移转物料
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +430,No Items available for transfer,无可移转物料
 DocType: Employee Boarding Activity,Activity Name,活动名称
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +860,Change Release Date,更改审批日期
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +214,Finished product quantity <b>{0}</b> and For Quantity <b>{1}</b> cannot be different,成品数量<b>{0}</b>和数量<b>{1}</b>不能不同
@@ -1673,6 +1672,7 @@
 DocType: Project,First Email,第一封邮件
 DocType: Company,Exception Budget Approver Role,例外预算审批人角色
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date",一旦设置，该发票将被保留至设定的日期
+DocType: Cashier Closing,POS-CLO-,POS-CLO-
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,在销售订单/成品仓库项下的保留仓库
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,销售金额
 DocType: Repayment Schedule,Interest Amount,利息总额
@@ -1684,7 +1684,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py +11,Records,记录
 DocType: Asset,Scrapped,报废
 DocType: Item,Item Defaults,物料默认值
-DocType: Purchase Invoice,Returns,退货
+DocType: Cashier Closing,Returns,退货
 DocType: Job Card,WIP Warehouse,在制品仓库
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},序列号{0}截至至{1}之前在年度保养合同内。
 apps/erpnext/erpnext/config/hr.py +231,Recruitment,招聘
@@ -1698,7 +1698,6 @@
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,转移类型
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,销售费用
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,客户&gt;客户群&gt;地区
 DocType: Diagnosis,Diagnosis,诊断
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,标准采购
 DocType: Attendance Request,Explanation,说明
@@ -1711,7 +1710,7 @@
 DocType: Email Digest,Purchase Orders Items Overdue,采购订单项目逾期
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1638,ZIP Code,邮编
 apps/erpnext/erpnext/controllers/selling_controller.py +262,Sales Order {0} is {1},销售订单{0} {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +256,Select interest income account in loan {0},选择贷款{0}中的利息收入科目
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +260,Select interest income account in loan {0},选择贷款{0}中的利息收入科目
 DocType: Opportunity,Contact Info,联系方式
 apps/erpnext/erpnext/config/stock.py +322,Making Stock Entries,创建手工入库
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,状态为已离职的员工不能晋升
@@ -1723,7 +1722,7 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +250,Invoice can't be made for zero billing hour,在零计费时间内无法开具发票
 DocType: Company,Date of Commencement,开始日期
 DocType: Sales Person,Select company name first.,请先选择公司名称。
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +204,Email sent to {0},邮件已发送到{0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +359,Email sent to {0},邮件已发送到{0}
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,从供应商收到的报价。
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace BOM and update latest price in all BOMs,更换BOM并更新所有BOM中的最新价格
 apps/erpnext/erpnext/controllers/selling_controller.py +28,To {0} | {1} {2},{0} | {1} {2}
@@ -1745,7 +1744,7 @@
 DocType: Asset Movement,From Employee,来自员工
 DocType: Driver,Cellphone Number,手机号码
 DocType: Project,Monitor Progress,监控进度
-apps/erpnext/erpnext/controllers/accounts_controller.py +529,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： 因为{1}中的物料{0}为零，系统将不会检查超额
+apps/erpnext/erpnext/controllers/accounts_controller.py +536,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： 因为{1}中的物料{0}为零，系统将不会检查超额
 DocType: Journal Entry,Make Difference Entry,创建差异分录
 DocType: Supplier Quotation,Auto Repeat Section,自动重复部分
 DocType: Upload Attendance,Attendance From Date,考勤起始日期
@@ -1848,7 +1847,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +393,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：拒收数量不能包含在采购退货数量中
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,不允许更改所选客户的客户组。
 ,Purchase Order Items To Be Billed,待开票采购订单项
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,更新预计到达时间。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +75,Updating estimated arrival times.,更新预计到达时间。
 DocType: Program Enrollment Tool,Enrollment Details,注册信息
 apps/erpnext/erpnext/stock/doctype/item/item.py +671,Cannot set multiple Item Defaults for a company.,无法为公司设置多个项目默认值。
 DocType: Purchase Invoice Item,Net Rate,净单价
@@ -1862,7 +1861,7 @@
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,休假类型必填
 DocType: Support Settings,Close Issue After Days,关闭问题天后
 ,Eway Bill,Eway Bill
-apps/erpnext/erpnext/public/js/hub/marketplace.js +139,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,您需要是具有System Manager和Item Manager角色的用户才能将用户添加到Marketplace。
+apps/erpnext/erpnext/public/js/hub/marketplace.js +138,You need to be a user with System Manager and Item Manager roles to add users to Marketplace.,您需要是具有System Manager和Item Manager角色的用户才能将用户添加到Marketplace。
 DocType: Leave Control Panel,Leave blank if considered for all branches,如果针对所有分支机构请留空
 DocType: Job Opening,Staffing Plan,人力需求计划
 DocType: Bank Guarantee,Validity in Days,天数有效
@@ -1884,7 +1883,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +97,Duplicate row {0} with same {1},重复的行{0}同{1}
 DocType: Marketplace Settings,Disable Marketplace,禁用市场
 ,Trial Balance,试算平衡表
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +463,Fiscal Year {0} not found,会计年度{0}未找到
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +467,Fiscal Year {0} not found,会计年度{0}未找到
 apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,建立员工
 DocType: Hotel Room Reservation,Hotel Reservation User,酒店预订用户
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +165,Please select prefix first,请先选择前缀
@@ -1992,7 +1991,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +15,Failed to login,登录失败
 apps/erpnext/erpnext/controllers/buying_controller.py +617,Asset {0} created,资产{0}已创建
 DocType: Special Test Items,Special Test Items,特殊测试项目
-apps/erpnext/erpnext/public/js/hub/marketplace.js +102,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,您需要是具有System Manager和Item Manager角色的用户才能在Marketplace上注册。
+apps/erpnext/erpnext/public/js/hub/marketplace.js +101,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,您需要是具有System Manager和Item Manager角色的用户才能在Marketplace上注册。
 DocType: Bank Statement Transaction Payment Item,Mode of Payment,付款方式
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +25,As per your assigned Salary Structure you cannot apply for benefits,根据您指定的薪资结构，您无法申请福利
 apps/erpnext/erpnext/stock/doctype/item/item.py +218,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
@@ -2004,7 +2003,7 @@
 DocType: Warehouse,Warehouse Contact Info,仓库联系方式
 DocType: Payment Entry,Write Off Difference Amount,销帐差异金额
 DocType: Volunteer,Volunteer Name,志愿者姓名
-apps/erpnext/erpnext/controllers/accounts_controller.py +777,Rows with duplicate due dates in other rows were found: {0},发现其他行中具有重复截止日期的行：{0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +784,Rows with duplicate due dates in other rows were found: {0},发现其他行中具有重复截止日期的行：{0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +535,"{0}: Employee email not found, hence email not sent",{0}：未发现员工的电子邮件，因此，电子邮件未发
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +55,No Salary Structure assigned for Employee {0} on given date {1},给定日期{1}的员工{0}没有分配薪金结构
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},运费规则不适用于国家/地区{0}
@@ -2095,6 +2094,7 @@
 DocType: Salary Component,Earning,收入
 DocType: Supplier Scorecard,Scoring Criteria,评分标准
 DocType: Purchase Invoice,Party Account Currency,往来单位科目币种
+DocType: Delivery Trip,Total Estimated Distance,总估计距离
 ,BOM Browser,物料清单浏览器
 apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,请更新你在此培训的状态
 DocType: Item Barcode,EAN,EAN
@@ -2133,7 +2133,7 @@
 DocType: Activity Cost,Projects,工程
 DocType: Payment Request,Transaction Currency,交易货币
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},来自{0} | {1} {2}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +164,Some emails are invalid,有些电子邮件无效
+apps/erpnext/erpnext/public/js/hub/marketplace.js +163,Some emails are invalid,有些电子邮件无效
 DocType: Work Order Operation,Operation Description,操作说明
 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.,财年保存后便不能更改财年开始日期和结束日期
 DocType: Quotation,Shopping Cart,购物车
@@ -2157,7 +2157,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,固定资产净变动
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,需要数量
 DocType: Leave Control Panel,Leave blank if considered for all designations,如果针对所有 职位请留空
-apps/erpnext/erpnext/controllers/accounts_controller.py +876,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能包含在“物料税率”
+apps/erpnext/erpnext/controllers/accounts_controller.py +883,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能包含在“物料税率”
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +531,Max: {0},最大值：{0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,起始时间日期
 DocType: Shopify Settings,For Company,对公司
@@ -2171,7 +2171,7 @@
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,创建课程表时曾出现错误
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,列表中的第一个费用审批人将被设置为默认的费用审批人。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +611,cannot be greater than 100,不能大于100
-apps/erpnext/erpnext/public/js/hub/marketplace.js +97,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,您需要是Administrator以外的System Manager和Item Manager角色的用户才能在Marketplace上注册。
+apps/erpnext/erpnext/public/js/hub/marketplace.js +96,You need to be a user other than Administrator with System Manager and Item Manager roles to register on Marketplace.,您需要是Administrator以外的System Manager和Item Manager角色的用户才能在Marketplace上注册。
 apps/erpnext/erpnext/stock/doctype/item/item.py +817,Item {0} is not a stock Item,物料{0}不是库存物料
 DocType: Packing Slip,MAT-PAC-.YYYY.-,MAT-PAC-.YYYY.-
 DocType: Maintenance Visit,Unscheduled,计划外
@@ -2200,7 +2200,7 @@
 DocType: HR Settings,Employee Settings,员工设置
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,加载支付系统
 ,Batch-Wise Balance History,物料批号结余数量历史记录
-apps/erpnext/erpnext/controllers/accounts_controller.py +1064,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,行＃{0}：如果金额大于项目{1}的开帐单金额，则无法设置费率。
+apps/erpnext/erpnext/controllers/accounts_controller.py +1071,Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}.,行＃{0}：如果金额大于项目{1}的开帐单金额，则无法设置费率。
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,打印设置在相应的打印格式更新
 DocType: Package Code,Package Code,包装代码
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,学徒
@@ -2434,7 +2434,7 @@
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",已为{3}的子公司计划{2}了{0}空缺和{1}预算。 \你只能根据母公司{3}的员工计划{6}，最多{4}个职位空缺和预算{5}。
 DocType: HR Settings,Stop Birthday Reminders,停止生日提醒
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +203,Please set Default Payroll Payable Account in Company {0},请公司设定默认应付职工薪资科目{0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +207,Please set Default Payroll Payable Account in Company {0},请公司设定默认应付职工薪资科目{0}
 DocType: Amazon MWS Settings,Get financial breakup of Taxes and charges data by Amazon ,获取亚马逊的税收和收费数据的财务细分
 DocType: SMS Center,Receiver List,接收人列表
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1108,Search Item,搜索物料
@@ -2504,7 +2504,7 @@
 DocType: Vital Signs,Constipated,便秘
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Against Supplier Invoice {0} dated {1},针对的日期为{1}的供应商发票{0}
 DocType: Customer,Default Price List,默认价格清单
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,资产移动记录{0}创建
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +492,Asset Movement record {0} created,资产移动记录{0}创建
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,未找到任何项目。
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,您不能删除会计年度{0}。会计年度{0}被设置为默认的全局设置
 DocType: Share Transfer,Equity/Liability Account,权益/负债科目
@@ -2644,6 +2644,7 @@
 DocType: Blanket Order,Order Type,订单类型
 ,Item-wise Sales Register,物料销售台帐
 DocType: Asset,Gross Purchase Amount,总采购金额
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,商品代码&gt;商品分组&gt;品牌
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,期初余额
 DocType: Asset,Depreciation Method,折旧方法
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,此税项是否包含在基本价格中？
@@ -2726,7 +2727,7 @@
 DocType: Budget,Action if Annual Budget Exceeded on PO,年度预算超出采购订单时采取的行动
 DocType: Student Leave Application,Student Leave Application,学生请假申请
 DocType: Item,Will also apply for variants,会同时应用于变体
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +288,"Asset cannot be cancelled, as it is already {0}",资产不能被取消，因为它已经是{0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +297,"Asset cannot be cancelled, as it is already {0}",资产不能被取消，因为它已经是{0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +31,Employee {0} on Half day on {1},员工{0}上半天{1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,Total working hours should not be greater than max working hours {0},总的工作时间不应超过最高工时更大{0}
 apps/erpnext/erpnext/templates/pages/task_info.html +90,On,于
@@ -2750,6 +2751,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js +50,Fetch Data,获取数据
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},假期类型{0}允许的最大休假是{1}
 DocType: SMS Center,Create Receiver List,创建接收人列表
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +98,Available-for-use Date should be after purchase date,可供使用的日期应在购买日期之后
 DocType: Vehicle,Wheels,车轮
 DocType: Packing Slip,To Package No.,以包号
 DocType: Patient Relation,Family,家庭
@@ -2763,7 +2765,7 @@
 apps/erpnext/erpnext/accounts/party.py +292,Billing currency must be equal to either default company's currency or party account currency,帐单货币必须等于默认公司的货币或科目币种
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),表示该打包是这个交付的一部分（仅草稿）
 DocType: Soil Texture,Loam,壤土
-apps/erpnext/erpnext/controllers/accounts_controller.py +770,Row {0}: Due Date cannot be before posting date,行{0}：到期日不能在记帐日之前
+apps/erpnext/erpnext/controllers/accounts_controller.py +777,Row {0}: Due Date cannot be before posting date,行{0}：到期日不能在记帐日之前
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +37,Make Payment Entry,创建付款分录
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},物料{0}的数量必须小于{1}
 ,Sales Invoice Trends,销售发票趋势
@@ -2836,7 +2838,7 @@
 DocType: Guardian,Guardian Interests,监护人利益
 apps/erpnext/erpnext/accounts/doctype/account/account.js +45,Update Account Name / Number,更新帐户名称/号码
 DocType: Naming Series,Current Value,当前值
-apps/erpnext/erpnext/controllers/accounts_controller.py +321,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,多个会计年度的日期{0}存在。请设置公司财年
+apps/erpnext/erpnext/controllers/accounts_controller.py +328,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,多个会计年度的日期{0}存在。请设置公司财年
 DocType: Education Settings,Instructor Records to be created by,导师记录由
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0}已创建
 DocType: GST Account,GST Account,GST科目
@@ -2854,7 +2856,7 @@
 DocType: Sales Person,Name and Employee ID,姓名和员工ID
 apps/erpnext/erpnext/accounts/party.py +338,Due Date cannot be before Posting Date,到期日不能前于过账日期
 DocType: Website Item Group,Website Item Group,网站物料组
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +546,No salary slip found to submit for the above selected criteria OR salary slip already submitted,按以上选择的条件没有发现需提交的工资单或工资单已提交
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +550,No salary slip found to submit for the above selected criteria OR salary slip already submitted,按以上选择的条件没有发现需提交的工资单或工资单已提交
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,关税与税项
 DocType: Projects Settings,Projects Settings,工程设置
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +392,Please enter Reference date,参考日期请输入
@@ -2863,7 +2865,7 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,供应的数量
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Purchase Order Item,Material Request Item,材料申请项目
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,请先取消采购收货{0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +303,Please cancel Purchase Receipt {0} first,请先取消采购收货{0}
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,物料群组树。
 DocType: Production Plan,Total Produced Qty,总生产数量
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +190,Cannot refer row number greater than or equal to current row number for this Charge type,此收取类型不能引用大于或等于本行的数据。
@@ -2974,6 +2976,7 @@
 ,Vehicle Expenses,车辆费用
 DocType: Healthcare Settings,Create Lab Test(s) on Sales Invoice Submit,在销售发票上创建实验室测试提交
 DocType: Serial No,Invoice Details,发票信息
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +70,Please enable Google Maps Settings to estimate and optimize routes,请启用Google地图设置以估算和优化路线
 DocType: Grant Application,Show on Website,在网站上显示
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,开始
 DocType: Hub Tracked Item,Hub Category,集线器类别
@@ -3014,7 +3017,7 @@
 DocType: Inpatient Record,B Positive,B积极
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",员工{0}的最大权益超过{1}，前面声明的金额\金额为{2}
-apps/erpnext/erpnext/controllers/accounts_controller.py +655,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",第{0}行是固定资产类物料，其采购数量必须是1，如须采购多个，请拆分成多行。
+apps/erpnext/erpnext/controllers/accounts_controller.py +662,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",第{0}行是固定资产类物料，其采购数量必须是1，如须采购多个，请拆分成多行。
 DocType: Leave Block List Allow,Leave Block List Allow,例外用户
 apps/erpnext/erpnext/setup/doctype/company/company.py +349,Abbr can not be blank or space,缩写不能为空或空格
 DocType: Patient Medical Record,Patient Medical Record,病人医疗记录
@@ -3049,7 +3052,7 @@
 DocType: Workstation,Wages per hour,时薪
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},批次{0}中，仓库{3}中物料{2}的库存余额将变为{1}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,以下物料需求数量已自动根据重订货水平相应增加了
-apps/erpnext/erpnext/controllers/accounts_controller.py +361,Account {0} is invalid. Account Currency must be {1},科目{0}状态为非激活。科目货币必须是{1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +368,Account {0} is invalid. Account Currency must be {1},科目{0}状态为非激活。科目货币必须是{1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},起始日期{0}不能在员工离职日期之后{1}
 DocType: Supplier,Is Internal Supplier,是内部供应商
 DocType: Employee,Create User Permission,创建用户权限
@@ -3195,7 +3198,7 @@
 DocType: Account,Fixed Asset,固定资产
 DocType: Amazon MWS Settings,After Date,日期之后
 apps/erpnext/erpnext/config/stock.py +327,Serialized Inventory,序列化库存
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1176,Invalid {0} for Inter Company Invoice.,Inter公司发票无效的{0}。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1173,Invalid {0} for Inter Company Invoice.,Inter公司发票无效的{0}。
 ,Department Analytics,部门分析
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,在默认联系人中找不到电子邮件
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,生成秘密
@@ -3208,7 +3211,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +50,Program in the Fee Structure and Student Group {0} are different.,费用结构和学生组{0}中的课程是不同的。
 DocType: Bank Statement Transaction Entry,Receivable Account,应收账款
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +31,Valid From Date must be lesser than Valid Upto Date.,有效起始日期必须小于有效起始日期。
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Row #{0}: Asset {1} is already {2},行＃{0}：资产{1}已经是{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +680,Row #{0}: Asset {1} is already {2},行＃{0}：资产{1}已经是{2}
 DocType: Quotation Item,Stock Balance,库存余额
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,销售订单到付款
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,CEO
@@ -3250,6 +3253,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Debit To is required,借记是必需的
 DocType: Clinical Procedure,Inpatient Record,住院病历
 apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",工时单帮助追踪记录你的团队完成的时间，费用和活动的账单
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +181,Supplier &gt; Supplier Type,供应商&gt;供应商类型
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +41,Purchase Price List,采购价格清单
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py +164,Date of Transaction,交易日期
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,供应商记分卡变数模板。
@@ -3293,7 +3297,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,汇兑损益
 DocType: Opportunity,Lost Reason,遗失的原因
 DocType: Amazon MWS Settings,Enable Amazon,启用亚马逊
-apps/erpnext/erpnext/controllers/accounts_controller.py +312,Row #{0}: Account {1} does not belong to company {2},行＃{0}：科目{1}不属于公司{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +319,Row #{0}: Account {1} does not belong to company {2},行＃{0}：科目{1}不属于公司{2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},无法找到DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,新地址
 DocType: Quality Inspection,Sample Size,样本大小
@@ -3405,7 +3409,7 @@
 DocType: Water Analysis,Origin,起源
 apps/erpnext/erpnext/controllers/status_updater.py +207,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,这份文件超过对于项{4}的{0} {1}的限制。你在做针对同一的{2}另一个{3}？
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1216,Please set recurring after saving,请设置保存后复发
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +877,Select change amount account,选择零钱科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +874,Select change amount account,选择零钱科目
 DocType: Purchase Invoice,Price List Currency,价格清单货币
 DocType: Naming Series,User must always select,用户必须始终选择
 DocType: Stock Settings,Allow Negative Stock,允许负库存
@@ -3447,7 +3451,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +327,Are you sure you want to cancel this appointment?,你确定要取消这个预约吗？
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,酒店房间价格套餐
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js +42,Sales Pipeline,销售渠道
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +163,Please set default account in Salary Component {0},请在薪资组件设置默认科目{0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +167,Please set default account in Salary Component {0},请在薪资组件设置默认科目{0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,要求在
 DocType: Rename Tool,File to Rename,文件重命名
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},请为第{0}行的物料指定物料清单
@@ -3468,7 +3472,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,采购物料成本
 DocType: Employee Separation,Employee Separation Template,员工离职模板
 DocType: Selling Settings,Sales Order Required,销售订单为必须项
-apps/erpnext/erpnext/public/js/hub/marketplace.js +107,Become a Seller,成为卖家
+apps/erpnext/erpnext/public/js/hub/marketplace.js +106,Become a Seller,成为卖家
 DocType: Purchase Invoice,Credit To,贷记
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Active Leads / Customers,活动信息/客户
 DocType: Delivery Settings,Leave blank to use the standard Delivery Note format,留空以使用标准的交货单格式
@@ -3509,7 +3513,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,创建税收模板
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,用户论坛
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +328,Raw Materials cannot be blank.,原材料不能为空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1032,Row #{0} (Payment Table): Amount must be negative,行＃{0}（付款表）：金额必须为负数
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1029,Row #{0} (Payment Table): Amount must be negative,行＃{0}（付款表）：金额必须为负数
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +570,"Could not update stock, invoice contains drop shipping item.",无法更新库存，发票包含由供应商交货（直接发运）项目。
 DocType: Contract,Fulfilment Status,履行状态
 DocType: Lab Test Sample,Lab Test Sample,实验室测试样品
@@ -3661,7 +3665,7 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +170,Doc Date,Doc Date
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +64,Fee Records Created - {0},费纪录已建立 -  {0}
 DocType: Asset Category Account,Asset Category Account,资产类别的科目
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1027,Row #{0} (Payment Table): Amount must be positive,行＃{0}（付款表）：金额必须为正值
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1024,Row #{0} (Payment Table): Amount must be positive,行＃{0}（付款表）：金额必须为正值
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +137,Cannot produce more Item {0} than Sales Order quantity {1},不能生产超过销售订单数量{1}的物料{0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +440,Select Attribute Values,选择属性值
 DocType: Purchase Invoice,Reason For Issuing document,签发文件的原因
@@ -3716,7 +3720,7 @@
 DocType: Purchase Receipt,Time at which materials were received,收到物料的时间
 DocType: Products Settings,Products per Page,每页产品
 DocType: Stock Ledger Entry,Outgoing Rate,出库库存评估价
-apps/erpnext/erpnext/controllers/accounts_controller.py +362, or ,或
+apps/erpnext/erpnext/controllers/accounts_controller.py +369, or ,或
 DocType: Sales Order,Billing Status,账单状态
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,报表问题
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +127,Utility Expenses,基础设施费用
@@ -3744,7 +3748,6 @@
 DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,员工免税声明
 DocType: Payment Entry,Cheque/Reference Date,支票/参考日期
 DocType: Purchase Invoice,Total Taxes and Charges,总税/费
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,可供使用的日期是作为过去的日期输入的
 DocType: Employee,Emergency Contact,紧急联络人
 DocType: Bank Reconciliation Detail,Payment Entry,付款凭证
 ,sales-browser,销售浏览器
@@ -3791,6 +3794,7 @@
 DocType: Sales Invoice,Is Return (Credit Note),是退货？（退款单）
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js +26,Start Job,开始工作
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},资产{0}需要序列号
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +212,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请通过设置&gt;设置&gt;命名系列为{0}设置命名系列
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,被禁用模板不能设为默认模板
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,对于行{0}：输入计划的数量
 DocType: Account,Income Account,收入科目
@@ -3804,6 +3808,7 @@
 DocType: Loyalty Program,Help Section,帮助部分
 apps/erpnext/erpnext/templates/generators/item_group.html +26,Prev,上一页
 DocType: Appraisal Goal,Key Responsibility Area,关键责任范围
+DocType: Delivery Trip,Distance UOM,距离UOM
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",学生批次帮助您跟踪学生的出勤，评估和费用
 DocType: Payment Entry,Total Allocated Amount,总已分配金额
 apps/erpnext/erpnext/setup/doctype/company/company.py +163,Set default inventory account for perpetual inventory,设置永续库存模式下的默认库存科目
@@ -3845,7 +3850,7 @@
 DocType: Item Supplier,Item Supplier,物料供应商
 apps/erpnext/erpnext/public/js/controllers/transaction.js +1317,Please enter Item Code to get batch no,请输入物料代码，以获得批号
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +928,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +432,No Items selected for transfer,请选择物料
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +435,No Items selected for transfer,请选择物料
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,所有地址。
 DocType: Company,Stock Settings,库存设置
 apps/erpnext/erpnext/accounts/doctype/account/account.py +244,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合并只能在以下属性中在两个记录中相同。是群组，根类型，公司
@@ -4131,7 +4136,7 @@
 DocType: Patient,Personal and Social History,个人和社会史
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py +51,User {0} created,用户{0}已创建
 DocType: Fee Schedule,Fee Breakup for each student,每名学生的费用细分
-apps/erpnext/erpnext/controllers/accounts_controller.py +601,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),对订单{1}的合计的预付款（{0}）不能大于总计（{2}）
+apps/erpnext/erpnext/controllers/accounts_controller.py +608,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),对订单{1}的合计的预付款（{0}）不能大于总计（{2}）
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,如果要不规则的按月分配，请选择“月度分布”。
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,更改代码
 DocType: Purchase Invoice Item,Valuation Rate,库存评估价
@@ -4140,7 +4145,7 @@
 DocType: Purchase Invoice,Availed ITC Cess,有效的ITC 地方税
 ,Student Monthly Attendance Sheet,学生每月考勤表
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,运费规则仅适用于销售
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,折旧行{0}：下一个折旧日期不能在采购日期之前
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +219,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,折旧行{0}：下一个折旧日期不能在采购日期之前
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,工程开始日期
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +36,Until,直到
 DocType: Rename Tool,Rename Log,重命名日志
@@ -4158,12 +4163,10 @@
 DocType: Selling Settings,How often should project and company be updated based on Sales Transactions.,工程和公司应根据销售交易多久更新一次。
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,到期
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,新增学生
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","请删除员工<a href=""#Form/Employee/{0}"">{0}</a> \以取消此文档"
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},请选择{0}
 DocType: C-Form,C-Form No,C-表编号
 DocType: BOM,Exploded_items,展开物料
-apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +346,Distance,距离
+DocType: Delivery Stop,Distance,距离
 apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,列出您所采购或出售的产品或服务。
 DocType: Water Analysis,Storage Temperature,储存温度
 DocType: Sales Order,SAL-ORD-.YYYY.-,SAL-ORD-.YYYY.-
@@ -4190,7 +4193,7 @@
 DocType: Homepage,Company Description for website homepage,在网站的首页公司介绍
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",为方便客户，这些代码可以在打印格式(如发票和销售出货单)中使用
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,供应商名称
-apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,无法检索{0}的信息。
+apps/erpnext/erpnext/accounts/report/financial_statements.py +177,Could not retrieve information for {0}.,无法检索{0}的信息。
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +141,Opening Entry Journal,开帐凭证
 DocType: Contract,Fulfilment Terms,履行条款
 DocType: Sales Invoice,Time Sheet List,时间表列表
@@ -4372,7 +4375,7 @@
 DocType: Serial No,Warranty / AMC Details,保修/ 年度保养合同信息
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,为基于活动的组手动选择学生
 DocType: Journal Entry,User Remark,用户备注
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +85,Optimizing routes.,优化路线。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +95,Optimizing routes.,优化路线。
 DocType: Travel Itinerary,Non Diary,非日记
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,无法为已离职员工创建持续服务奖
 DocType: Lead,Market Segment,市场分类
@@ -4402,7 +4405,7 @@
 DocType: Loyalty Point Entry,Loyalty Program,忠诚计划
 DocType: Student Guardian,Father,父亲
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py +59,Support Tickets,支持门票
-apps/erpnext/erpnext/controllers/accounts_controller.py +687,'Update Stock' cannot be checked for fixed asset sale,固定资产销售不能选择“更新库存”
+apps/erpnext/erpnext/controllers/accounts_controller.py +694,'Update Stock' cannot be checked for fixed asset sale,固定资产销售不能选择“更新库存”
 DocType: Bank Reconciliation,Bank Reconciliation,银行对帐
 DocType: Attendance,On Leave,休假
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,获取更新
@@ -4447,7 +4450,7 @@
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,序列号和批次
 DocType: Warranty Claim,From Company,源公司
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +40,Sum of Scores of Assessment Criteria needs to be {0}.,评估标准的得分之和必须是{0}。
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +198,Please set Number of Depreciations Booked,请设置折旧数预订
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +207,Please set Number of Depreciations Booked,请设置折旧数预订
 DocType: Supplier Scorecard Period,Calculations,计算
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,价值或数量
 DocType: Payment Terms Template,Payment Terms,付款条件
@@ -4467,7 +4470,7 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,价格上涨率与贴现率的折扣（％）
 DocType: Healthcare Service Unit Type,Rate / UOM,费率/ UOM
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,所有仓库
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1306,No {0} found for Inter Company Transactions.,Inter公司没有找到{0}。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1303,No {0} found for Inter Company Transactions.,Inter公司没有找到{0}。
 DocType: Travel Itinerary,Rented Car,租车
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js +15,About your Company,关于贵公司
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +144,Credit To account must be a Balance Sheet account,信用科目必须是资产负债表科目
@@ -4569,6 +4572,7 @@
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,植物分析标准
 DocType: Cheque Print Template,Cheque Height,支票高度
 DocType: Supplier,Supplier Details,供应商信息
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请通过设置&gt;编号系列设置出席编号系列
 DocType: Setup Progress,Setup Progress,设置进度
 DocType: Expense Claim,Approval Status,审批状态
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},行{0}的起始值必须小于去值
@@ -4662,7 +4666,6 @@
 DocType: Travel Request,Fully Sponsored,完全赞助
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,反向手工凭证
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,客户{0}已创建。
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,请在人力资源&gt;人力资源设置中设置员工命名系统
 DocType: Stock Settings,Limit Percent,限制百分比
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,目前没有任何仓库可用的库存
 ,Payment Period Based On Invoice Date,付款期间基于发票日
@@ -4721,7 +4724,7 @@
 DocType: BOM Explosion Item,Source Warehouse,源仓库
 DocType: Installation Note,Installation Date,安装日期
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js +30,Share Ledger,Share Ledger
-apps/erpnext/erpnext/controllers/accounts_controller.py +661,Row #{0}: Asset {1} does not belong to company {2},行＃{0}：资产{1}不属于公司{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +668,Row #{0}: Asset {1} does not belong to company {2},行＃{0}：资产{1}不属于公司{2}
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +114,Sales Invoice {0} created,已创建销售发票{0}
 DocType: Employee,Confirmation Date,确认日期
 DocType: Inpatient Occupancy,Check Out,退出
@@ -4741,6 +4744,7 @@
 DocType: Production Plan,Sales Orders Detail,销售订单信息
 DocType: Bin,Requested Quantity,需求数量
 DocType: Fees,EDU-FEE-.YYYY.-,EDU-收费.YYYY.-
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,请在教育&gt;教育设置中设置教师命名系统
 DocType: Patient,Marital Status,婚姻状况
 DocType: Stock Settings,Auto Material Request,自动材料需求
 DocType: Woocommerce Settings,API consumer secret,应用程序界面消费者秘密
@@ -4793,7 +4797,7 @@
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js +10,Select Days,选择天数
 DocType: Academic Term,Term Name,术语名称
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +365,Credit ({0}),信用（{0}）
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +499,Creating Salary Slips...,创建工资单......
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +503,Creating Salary Slips...,创建工资单......
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,您不能编辑根节点。
 DocType: Buying Settings,Purchase Order Required,需要采购订单
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,计时器
@@ -4831,7 +4835,7 @@
 DocType: Account,Rate at which this tax is applied,应用此税率的单价
 DocType: Cash Flow Mapper,Section Name,部分名称
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +92,Reorder Qty,再订购数量
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},折旧行{0}：使用寿命后的预期值必须大于或等于{1}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +292,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},折旧行{0}：使用寿命后的预期值必须大于或等于{1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,当前职位空缺
 DocType: Company,Stock Adjustment Account,库存调整科目
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,内部销账
@@ -4878,7 +4882,7 @@
 DocType: Program Enrollment,School House,学校议院
 DocType: Serial No,Out of AMC,出资产管理公司
 DocType: Opportunity,Opportunity Amount,机会金额
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,预订折旧数不能超过折旧总数
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +212,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,预订折旧数不能超过折旧总数
 DocType: Purchase Order,Order Confirmation Date,订单确认日期
 DocType: Driver,HR-DRI-.YYYY.-,HR-DRI-.YYYY.-
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,创建维护访问
@@ -4919,7 +4923,7 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,批次：
 DocType: Volunteer,Afternoon,下午
 DocType: Loyalty Program,Loyalty Program Help,忠诚度计划帮助
-apps/erpnext/erpnext/controllers/accounts_controller.py +305,{0} '{1}' is disabled,{0}“{1}”被禁用
+apps/erpnext/erpnext/controllers/accounts_controller.py +312,{0} '{1}' is disabled,{0}“{1}”被禁用
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,设置为打开
 DocType: Cheque Print Template,Scanned Cheque,支票扫描
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,交易提交时自动向联系人发送电子邮件。
@@ -4932,7 +4936,7 @@
 DocType: Warranty Claim,Item and Warranty Details,物料和保修
 DocType: Chapter,Chapter Members,章节成员
 DocType: Sales Team,Contribution (%),贡献（％）
-apps/erpnext/erpnext/controllers/accounts_controller.py +133,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注意：“现金或银行科目”未指定，付款凭证不会创建
+apps/erpnext/erpnext/controllers/accounts_controller.py +140,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注意：“现金或银行科目”未指定，付款凭证不会创建
 apps/erpnext/erpnext/projects/doctype/project/project.py +79,Project {0} already exists,工程{0}已经存在
 DocType: Clinical Procedure,Nursing User,护理用户
 DocType: Employee Benefit Application,Payroll Period,工资期间
@@ -4940,6 +4944,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +239,Serial No {0} does not belong to Batch {1},序列号{0}不属于批次{1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,职责
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,此报价的有效期已经结束。
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","请删除员工<a href=""#Form/Employee/{0}"">{0}</a> \以取消此文档"
 DocType: Expense Claim Account,Expense Claim Account,费用报销科目
 DocType: Account,Capital Work in Progress,在途资本
 DocType: Accounts Settings,Allow Stale Exchange Rates,允许使用历史汇率
@@ -5021,7 +5027,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +878,Issue Material,发料
 apps/erpnext/erpnext/config/integrations.py +32,Connect Shopify with ERPNext,将Shopify与ERPNext连接
 DocType: Material Request Item,For Warehouse,仓库
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +45,Delivery Notes {0} updated,已更新交货单{0}
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +71,Delivery Notes {0} updated,已更新交货单{0}
 DocType: Employee,Offer Date,录用日期
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +35,Quotations,报价
 apps/erpnext/erpnext/accounts/page/pos/pos.js +742,You are in offline mode. You will not be able to reload until you have network.,您在离线模式。您将无法重新加载，直到你有网络。
@@ -5072,7 +5078,7 @@
 DocType: Shipping Rule,Calculate Based On,基于...的计算
 DocType: Contract,Unfulfilled,未完成的
 DocType: Delivery Note Item,From Warehouse,源仓库
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +64,No employees for the mentioned criteria,没有员工提到的标准
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +68,No employees for the mentioned criteria,没有员工提到的标准
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1030,No Items with Bill of Materials to Manufacture,待生产物料没有物料清单
 DocType: Shopify Settings,Default Customer,默认客户
 DocType: Sales Stage,Stage Name,艺名
@@ -5115,7 +5121,7 @@
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,税额折后金额
 DocType: Patient,Inpatient Status,住院状况
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,每日工作总结设置
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1301,Selected Price List should have buying and selling fields checked.,选定价格清单应该有买入和卖出的字段。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1298,Selected Price List should have buying and selling fields checked.,选定价格清单应该有买入和卖出的字段。
 apps/erpnext/erpnext/controllers/buying_controller.py +681,Please enter Reqd by Date,请输入按日期请求
 DocType: Payment Entry,Internal Transfer,内部转账
 DocType: Asset Maintenance,Maintenance Tasks,维护任务
@@ -5152,7 +5158,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +197,Group By,分组基于
 DocType: Guardian,Interests,兴趣
 apps/erpnext/erpnext/config/accounts.py +336,Enable / disable currencies.,启用/禁用货币。
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +549,Could not submit some Salary Slips,无法提交一些薪资单
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +553,Could not submit some Salary Slips,无法提交一些薪资单
 DocType: Exchange Rate Revaluation,Get Entries,获取条目
 DocType: Production Plan,Get Material Request,获取物料需求
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,邮政费用
@@ -5239,7 +5245,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,Expense account is mandatory for item {0},必须为物料{0}指定费用科目
 DocType: BOM,Website Description,显示在网站商的详细说明，可文字，图文，多媒体混排
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,净资产收益变化
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,请先取消采购发票{0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +300,Please cancel Purchase Invoice {0} first,请先取消采购发票{0}
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +25,Not permitted. Please disable the Service Unit Type,不允许。请禁用服务单位类型
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",电子邮件地址必须是唯一的，已经存在了{0}
 DocType: Serial No,AMC Expiry Date,AMC到期时间
@@ -5279,7 +5285,7 @@
 DocType: Hotel Room,Hotel Room,旅馆房间
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +57,Account {0} does not belongs to company {1},科目{0}不属于公司{1}
 DocType: Leave Type,Rounding,四舍五入
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +997,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列号与交货单不匹配
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +994,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列号与交货单不匹配
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),分配金额（按比例分配）
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Group, Campaign, Sales Partner etc.",然后根据客户，客户组，地区，供应商，供应商组织，市场活动，销售合作伙伴等筛选定价规则。
 DocType: Student,Guardian Details,监护人详细信息
@@ -5334,7 +5340,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +534,Warehouse required for stock Item {0},物料{0}需要指定仓库
 DocType: Leave Allocation,Unused leaves,未使用的休假
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,进行还款分录
-apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,所有部门
+apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +10,All Departments,所有部门
 DocType: Healthcare Service Unit,Vacant,空的
 DocType: Patient,Alcohol Past Use,酒精过去使用
 DocType: Fertilizer Content,Fertilizer Content,肥料含量
@@ -5345,7 +5351,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +262,Work Order {0} must be cancelled before cancelling this Sales Order,在取消此销售订单之前，必须先取消工单{0}
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +995,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子物料）
 DocType: Authorization Rule,Applicable To (Employee),适用于(员工)
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,Due Date is mandatory,截止日期字段必填
+apps/erpnext/erpnext/controllers/accounts_controller.py +177,Due Date is mandatory,截止日期字段必填
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,增量属性{0}不能为0
 DocType: Employee Benefit Claim,Benefit Type and Amount,福利类型和金额
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,客房预订
@@ -5493,7 +5499,7 @@
 DocType: Purchase Invoice Item,Total Weight,总重量
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,销售佣金
 DocType: Job Offer Term,Value / Description,值/说明
-apps/erpnext/erpnext/controllers/accounts_controller.py +690,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：资产{1}无法提交，这已经是{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +697,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：资产{1}无法提交，这已经是{2}
 DocType: Tax Rule,Billing Country,结算国家
 DocType: Purchase Order Item,Expected Delivery Date,预计交货日期
 DocType: Restaurant Order Entry,Restaurant Order Entry,餐厅订单录入
@@ -5532,12 +5538,13 @@
 DocType: Maintenance Visit,Breakdown,细目
 DocType: Travel Itinerary,Vegetarian,素食者
 DocType: Patient Encounter,Encounter Date,遇到日期
-apps/erpnext/erpnext/controllers/accounts_controller.py +891,Account: {0} with currency: {1} can not be selected,帐号：{0}币种：{1}不能选择
+apps/erpnext/erpnext/controllers/accounts_controller.py +898,Account: {0} with currency: {1} can not be selected,帐号：{0}币种：{1}不能选择
 DocType: Bank Statement Transaction Settings Item,Bank Data,银行数据
 DocType: Purchase Receipt Item,Sample Quantity,样品数量
 DocType: Bank Guarantee,Name of Beneficiary,受益人姓名
 DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",通过后台排程程序基于最新的存货评估价/价格清单单价/最近的原材料采购单价自动更新BOM成本。
 DocType: Supplier,SUP-.YYYY.-,SUP-.YYYY.-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,供应商&gt;供应商组
 DocType: Bank Reconciliation Detail,Cheque Date,支票日期
 apps/erpnext/erpnext/accounts/doctype/account/account.py +57,Account {0}: Parent account {1} does not belong to company: {2},科目{0}的上级科目{1}不属于公司{2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,成功删除与该公司相关的所有交易！
@@ -5565,7 +5572,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,子节点只可创建在群组类节点下
 DocType: Attendance Request,Half Day Date,半天日期
 DocType: Academic Year,Academic Year Name,学年名称
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1185,{0} not allowed to transact with {1}. Please change the Company.,不允许{0}与{1}进行交易。请更改公司。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1182,{0} not allowed to transact with {1}. Please change the Company.,不允许{0}与{1}进行交易。请更改公司。
 DocType: Sales Partner,Contact Desc,联系人倒序
 DocType: Email Digest,Send regular summary reports via Email.,通过电子邮件发送定期汇总报表。
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +289,Please set default account in Expense Claim Type {0},请在报销申请类型设置默认科目{0}
@@ -5598,7 +5605,7 @@
 DocType: Hotel Room,Hotel Manager,酒店经理
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +64,Set Tax Rule for shopping cart,为购物车设置税收规则
 DocType: Purchase Invoice,Taxes and Charges Added,已添加的税费
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,折旧行{0}：下一个折旧日期不能在可供使用的日期之前
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +223,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,折旧行{0}：下一个折旧日期不能在可供使用的日期之前
 ,Sales Funnel,销售漏斗
 apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,缩写字段必填
 DocType: Project,Task Progress,任务进度
@@ -5612,7 +5619,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,All Customer Groups,所有客户群组
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +155,Accumulated Monthly,每月累计
 DocType: Attendance Request,On Duty,值班
-apps/erpnext/erpnext/controllers/accounts_controller.py +848,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必填项。{1}和{2}的货币转换记录可能还未生成。
+apps/erpnext/erpnext/controllers/accounts_controller.py +855,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必填项。{1}和{2}的货币转换记录可能还未生成。
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},委派{1}的人员配置计划{0}已存在
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,税务模板字段必填。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: Parent account {1} does not exist,科目{0}的上级科目{1}不存在
@@ -5692,11 +5699,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +240,Atleast one warehouse is mandatory,必须选择至少一个仓库
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py +14,"Configure Item Fields like UOM, Item Group, Description and No of Hours.",配置项目字段，如UOM，项目组，描述和小时数。
 DocType: Certification Application,Certification Status,认证状态
-apps/erpnext/erpnext/public/js/hub/marketplace.js +45,Marketplace,市井
+apps/erpnext/erpnext/public/js/hub/marketplace.js +44,Marketplace,市井
 DocType: Travel Itinerary,Travel Advance Required,需预支出差费用
 DocType: Subscriber,Subscriber Name,订户名称
 DocType: Serial No,Out of Warranty,超出保修期
-DocType: Cashier Closing,Cashier-closing-,收银员-关闭-
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,已映射数据类型
 DocType: BOM Update Tool,Replace,更换
 apps/erpnext/erpnext/templates/includes/product_list.js +42,No products found.,找不到产品。
@@ -5784,7 +5790,6 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,销售和采购的默认税收模板被创建。
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +44,Assessment Result record {0} already exists.,评估结果记录{0}已经存在。
 DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",例如：ABCD。#####。如果系列已设置且交易中未输入批号，则将根据此系列创建自动批号。如果您始终想要明确提及此料品的批号，请将此留为空白。注意：此设置将优先于库存设置中的命名系列前缀。
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +89,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请通过设置&gt;编号系列设置出席编号系列
 DocType: BOM,Materials Required (Exploded),所需物料（正展开）
 DocType: Contract,Party User,往来单位用户
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',如果按什么分组是“Company”，请设置公司过滤器空白
@@ -5987,7 +5992,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,商机计数
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +218,Both Trial Period Start Date and Trial Period End Date must be set,必须设置试用期开始日期和试用期结束日期
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,平均率
-apps/erpnext/erpnext/controllers/accounts_controller.py +792,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,支付计划中的总付款金额必须等于总计/圆整的总计
+apps/erpnext/erpnext/controllers/accounts_controller.py +799,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,支付计划中的总付款金额必须等于总计/圆整的总计
 DocType: Subscription Plan Detail,Plan,计划
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,基于总帐的银行对账单余额
 DocType: Job Applicant,Applicant Name,申请人姓名
@@ -6056,7 +6061,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,肥皂和洗涤剂
 DocType: BOM,Show Items,显示物料
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,从时间不能超过结束时间大。
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,Do you want to notify all the customers by email?,你想通过电子邮件通知所有的客户？
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +123,Do you want to notify all the customers by email?,你想通过电子邮件通知所有的客户？
 DocType: Subscription Plan,Billing Interval,计费间隔
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,影视业
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,已下单
@@ -6065,9 +6070,9 @@
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,行{0}：{1}必须大于0
 DocType: Assessment Criteria,Assessment Criteria Group,评估标准组
 DocType: Healthcare Settings,Patient Name By,病人姓名By
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +220,Accrual Journal Entry for salaries from {0} to {1},从{0}到{1}的薪金的应计手工凭证
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +224,Accrual Journal Entry for salaries from {0} to {1},从{0}到{1}的薪金的应计手工凭证
 DocType: Sales Invoice Item,Enable Deferred Revenue,启用延期收入
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},期初累计折旧必须小于等于{0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +202,Opening Accumulated Depreciation must be less than equal to {0},期初累计折旧必须小于等于{0}
 DocType: Warehouse,Warehouse Name,仓库名称
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py +20,Actual start date must be less than actual end date,实际开始日期必须小于实际结束日期
 DocType: Naming Series,Select Transaction,选择交易
@@ -6219,7 +6224,7 @@
 apps/erpnext/erpnext/hr/utils.py +212,Employee {0} of grade {1} have no default leave policy,{1}职级员工{0}没有默认休假政策
 DocType: Salary Detail,Salary Detail,薪资详细
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1103,Please select {0} first,请先选择{0}
-apps/erpnext/erpnext/public/js/hub/marketplace.js +177,Added {0} users,添加了{0}个用户
+apps/erpnext/erpnext/public/js/hub/marketplace.js +176,Added {0} users,添加了{0}个用户
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",在多层程序的情况下，客户将根据其花费自动分配到相关层
 DocType: Appointment Type,Physician,医师
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1072,Batch {0} of Item {1} has expired.,物料{1}的批号{0} 已过期。
@@ -6364,7 +6369,7 @@
 DocType: Asset,Custodian,保管人
 apps/erpnext/erpnext/config/accounts.py +356,Point-of-Sale Profile,POS配置
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0}应该是0到100之间的一个值
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +319,Payment of {0} from {1} to {2},从{1}到{2}的{0}付款
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +323,Payment of {0} from {1} to {2},从{1}到{2}的{0}付款
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,无担保贷款
 DocType: Cost Center,Cost Center Name,成本中心名称
 DocType: Student,B+,B +
@@ -6396,6 +6401,7 @@
 DocType: Employee,Date of Issue,签发日期
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +252,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",根据采购设置，如果需要采购记录==“是”，则为了创建采购发票，用户需要首先为项目{0}创建采购凭证
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +172,Row #{0}: Set Supplier for item {1},行＃{0}：设置供应商项目{1}
+DocType: Global Defaults,Default Distance Unit,默认距离单位
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,行{0}：小时值必须大于零。
 apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物料{1}无法找到
 DocType: Issue,Content Type,内容类型
@@ -6451,7 +6457,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Debit To account must be a Balance Sheet account,借记科目必须是资产负债表科目
 DocType: Asset,Naming Series,命名系列
 DocType: Vital Signs,Coated,有涂层的
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,行{0}：使用寿命后的预期值必须小于总采购额
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +190,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,行{0}：使用寿命后的预期值必须小于总采购额
 DocType: GoCardless Settings,GoCardless Settings,GoCardless设置
 DocType: Leave Block List,Leave Block List Name,禁离日列表名称
 DocType: Certified Consultant,Certification Validity,认证有效性
@@ -6520,6 +6526,7 @@
 DocType: Bank Statement Settings Item,Bank Header,银行标题
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,查看实验室测试
 DocType: Hub Users,Hub Users,集线器用户
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,客户&gt;客户群&gt;地区
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,维护日期
 DocType: Purchase Invoice Item,Rejected Serial No,拒收序列号
@@ -6535,7 +6542,7 @@
 DocType: SG Creation Tool Course,Max Strength,最大力量
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,安装预置
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +99,No Delivery Note selected for Customer {},没有为客户{}选择销售出货单
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +111,No Delivery Note selected for Customer {},没有为客户{}选择销售出货单
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,员工{0}没有最大福利金额
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1128,Select Items based on Delivery Date,根据交货日期选择物料
 DocType: Grant Application,Has any past Grant Record,有过去的赠款记录吗？
@@ -6563,7 +6570,7 @@
 DocType: Hotel Room Reservation,Hotel Room Reservation,酒店房间预订
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +357,Customer Service,顾客服务
 DocType: BOM,Thumbnail,缩略图
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +207,No contacts with email IDs found.,找不到与电子邮件ID的联系人。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +362,No contacts with email IDs found.,找不到与电子邮件ID的联系人。
 DocType: Item Customer Detail,Item Customer Detail,物料客户信息
 DocType: Notification Control,Prompt for Email on Submission of,提示电子邮件的提交
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},员工{0}的最高福利金额超过{1}
@@ -6824,7 +6831,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Cannot covert to Group because Account Type is selected.,不能转换到组，因为已选择账户类型。
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +270,{0} {1} has been modified. Please refresh.,{0} {1}已被修改过，请刷新。
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,禁止用户在以下日期提交假期申请。
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,商品代码&gt;商品分组&gt;品牌
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.",如果忠诚度积分无限期到期，请将到期时间保持为空或0。
 DocType: Asset Maintenance Team,Maintenance Team Members,维护团队成员
 DocType: Loyalty Point Entry,Purchase Amount,采购金额
@@ -6832,7 +6838,7 @@
 											to fullfill Sales Order {2}",无法交付项目{1}的序列号{0}，因为它已保留\以满足销售订单{2}
 DocType: Quotation,SAL-QTN-.YYYY.-,SAL-QTN-.YYYY.-
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,供应商报价{0}创建
-apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,结束年份不能启动年前
+apps/erpnext/erpnext/accounts/report/financial_statements.py +106,End Year cannot be before Start Year,结束年份不能启动年前
 DocType: Employee Benefit Application,Employee Benefits,员工福利
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},第{1}行的打包数量必须等于物料{0}数量
 DocType: Work Order,Manufactured Qty,已生产数量
@@ -6848,6 +6854,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Batch Numbers,选择批号
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py +231,To GSTIN,到GSTIN
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,对客户开出的账单。
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,请在人力资源&gt;人力资源设置中设置员工命名系统
 DocType: Healthcare Settings,Invoice Appointments Automatically,发票自动约定
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,工程编号
 DocType: Salary Component,Variable Based On Taxable Salary,基于应纳税工资的变量
@@ -6896,7 +6903,7 @@
 DocType: POS Profile,Account for Change Amount,零钱科目
 DocType: QuickBooks Migrator,Connecting to QuickBooks,连接到QuickBooks
 DocType: Exchange Rate Revaluation,Total Gain/Loss,总收益/损失
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1178,Invalid Company for Inter Company Invoice.,公司发票无效公司。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1175,Invalid Company for Inter Company Invoice.,公司发票无效公司。
 DocType: Purchase Invoice,input service,输入服务
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：往来单位/科目{1} / {2}与{3} {4}不匹配
 DocType: Employee Promotion,Employee Promotion,员工晋升
@@ -7027,7 +7034,6 @@
 DocType: Travel Itinerary,Preferred Area for Lodging,住宿的首选地区
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analytics（分析）
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,购物车是空的
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in Education &gt; Education Settings,请在教育&gt;教育设置中设置教师命名系统
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +416,"Item {0} has no Serial No. Only serilialized items \
 						can have delivery based on Serial No",物料{0}没有序列号。只有有序列号的物料 \可以根据序列号进行交付
 DocType: Vehicle,Model,模型
@@ -7057,7 +7063,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,没什么可改变的
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +104,Please select a csv file,请选择一个csv文件
 DocType: Holiday List,Total Holidays,总假期
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +109,Missing email template for dispatch. Please set one in Delivery Settings.,缺少发送的电子邮件模板。请在“发送设置”中设置一个。
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +121,Missing email template for dispatch. Please set one in Delivery Settings.,缺少发送的电子邮件模板。请在“发送设置”中设置一个。
 DocType: Student Leave Application,Mark as Present,标记为现
 DocType: Supplier Scorecard,Indicator Color,指示灯颜色
 DocType: Purchase Order,To Receive and Bill,待收货与开票
@@ -7066,7 +7072,7 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +384,Select Serial No,选择序列号
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Designer,设计师
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,条款和条件模板
-DocType: Serial No,Delivery Details,交货细节
+DocType: Delivery Trip,Delivery Details,交货细节
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +618,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
 DocType: Program,Program Code,程序代码
 DocType: Terms and Conditions,Terms and Conditions Help,条款和条件帮助
@@ -7090,7 +7096,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交货天数
 DocType: Cash Flow Mapping,Is Income Tax Expense,是所得税费用？
 apps/erpnext/erpnext/patches/v11_0/add_default_dispatch_notification_template.py +19,Your order is out for delivery!,您的订单已发货！
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行＃{0}：过帐日期必须是相同的采购日期{1}资产的{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +684,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行＃{0}：过帐日期必须是相同的采购日期{1}资产的{2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,如果学生住在学院的旅馆，勾选此项。
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,请在上表中输入销售订单
 ,Stock Summary,库存摘要