[Translation] Updated Translations (#12212)

diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index fa48354..f12d640 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -3,12 +3,12 @@
 DocType: Patient,Divorced,Divorciat
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permetre article a afegir diverses vegades en una transacció
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancel·la material Visita {0} abans de cancel·lar aquest reclam de garantia
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Productes de Consum
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,Productes de Consum
 DocType: Purchase Receipt,Subscription Detail,Detall de la subscripció
 DocType: Supplier Scorecard,Notify Supplier,Notifica el proveïdor
 DocType: Item,Customer Items,Articles de clients
 DocType: Project,Costing and Billing,Càlcul de costos i facturació
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Compte {0}: compte pare {1} no pot ser un llibre de comptabilitat
+apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} can not be a ledger,Compte {0}: compte pare {1} no pot ser un llibre de comptabilitat
 DocType: Item,Publish Item to hub.erpnext.com,Publicar article a hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Notificacions per correu electrònic
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +26,Evaluation,avaluació
@@ -20,10 +20,9 @@
 DocType: Restaurant Order Entry,Click Enter To Add,Feu clic a Intro per afegir
 DocType: Employee,Rented,Llogat
 DocType: Purchase Order,PO-,PO-
-DocType: POS Profile,Applicable for User,Aplicable per a l'usuari
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +196,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Detingut ordre de producció no es pot cancel·lar, unstop primer per cancel·lar"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +216,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Detingut ordre de producció no es pot cancel·lar, unstop primer per cancel·lar"
 DocType: Vehicle Service,Mileage,quilometratge
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +220,Do you really want to scrap this asset?,De veres voleu rebutjar aquest actiu?
+apps/erpnext/erpnext/assets/doctype/asset/asset.js +240,Do you really want to scrap this asset?,De veres voleu rebutjar aquest actiu?
 DocType: Drug Prescription,Update Schedule,Actualitza la programació
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Tria un proveïdor predeterminat
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Informa de la divisa pera la Llista de preus {0}
@@ -32,8 +31,8 @@
 DocType: Patient Appointment,Check availability,Comprova disponibilitat
 DocType: Job Applicant,Job Applicant,Job Applicant
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Això es basa en transaccions amb aquest proveïdor. Veure cronologia avall per saber més
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Legal
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Actual type tax cannot be included in Item rate in row {0},Impost de tipus real no pot ser inclòs en el preu de l'article a la fila {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +120,Legal,Legal
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +191,Actual type tax cannot be included in Item rate in row {0},Impost de tipus real no pot ser inclòs en el preu de l'article a la fila {0}
 DocType: Bank Guarantee,Customer,Client
 DocType: Purchase Receipt Item,Required By,Requerit per
 DocType: Delivery Note,Return Against Delivery Note,Retorn Contra lliurament Nota
@@ -41,79 +40,91 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Tipus de canvi ha de ser el mateix que {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nom del client
 DocType: Vehicle,Natural Gas,Gas Natural
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Bank account cannot be named as {0},Compte bancari no pot ser nomenat com {0}
+apps/erpnext/erpnext/setup/setup_wizard/operations/company_setup.py +64,Bank account cannot be named as {0},Compte bancari no pot ser nomenat com {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Capçaleres (o grups) contra els quals es mantenen els assentaments comptables i els saldos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Excedent per {0} no pot ser menor que zero ({1})
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +357,There are no submitted Salary Slips to process.,No hi ha enviaments salaris enviats per processar.
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +343,There are no submitted Salary Slips to process.,No hi ha enviaments salaris enviats per processar.
 DocType: Manufacturing Settings,Default 10 mins,Per defecte 10 minuts
 DocType: Leave Type,Leave Type Name,Deixa Tipus Nom
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Mostra oberts
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +8,It is necessary to take this action today itself for the above mentioned recurring,És necessari prendre aquesta acció avui mateix per a l'esmentat recurrent
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +151,Series Updated Successfully,Sèrie actualitzat correctament
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,caixa
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Accural Journal Entry Submitted,Accural entrada de diari Enviat
 DocType: Pricing Rule,Apply On,Aplicar a
 DocType: Item Price,Multiple Item prices.,Múltiples Preus d'articles
 ,Purchase Order Items To Be Received,Articles a rebre de l'ordre de compra
 DocType: SMS Center,All Supplier Contact,Contacte de Tot el Proveïdor
 DocType: Support Settings,Support Settings,Configuració de respatller
-apps/erpnext/erpnext/projects/doctype/project/project.py +70,Expected End Date can not be less than Expected Start Date,Esperat Data de finalització no pot ser inferior a Data prevista d'inici
+apps/erpnext/erpnext/projects/doctype/project/project.py +72,Expected End Date can not be less than Expected Start Date,Esperat Data de finalització no pot ser inferior a Data prevista d'inici
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Taxa ha de ser el mateix que {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Nova aplicació Deixar
 ,Batch Item Expiry Status,Lots article Estat de caducitat
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Bank Draft,Lletra bancària
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +184,Bank Draft,Lletra bancària
+DocType: Membership,membership validaty section,secció validació de membres
 DocType: Mode of Payment Account,Mode of Payment Account,Mode de Compte de Pagament
 DocType: Consultation,Consultation,Consulta
-apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,Vendes i devolucions
+DocType: Accounts Settings,Show Payment Schedule in Print,Mostra el calendari de pagaments a la impressió
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +19,Sales and Returns,Vendes i devolucions
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Mostra variants
 DocType: Academic Term,Academic Term,període acadèmic
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,material
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +670,Quantity,Quantitat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,La taula de comptes no pot estar en blanc.
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +66,Making website,Fent lloc web
+DocType: Opening Invoice Creation Tool Item,Quantity,Quantitat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +544,Accounts table cannot be blank.,La taula de comptes no pot estar en blanc.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Loans (Liabilities),Préstecs (passius)
 DocType: Employee Education,Year of Passing,Any de defunció
 DocType: Item,Country of Origin,País d'origen
+DocType: Soil Texture,Soil Texture Criteria,Criteris de textura del sòl
 apps/erpnext/erpnext/templates/includes/product_page.js +24,In Stock,En estoc
+apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,Detalls de contacte primaris
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,qüestions obertes
 DocType: Production Plan Item,Production Plan Item,Pla de Producció d'articles
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},L'usuari {0} ja està assignat a l'Empleat {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +149,User {0} is already assigned to Employee {1},L'usuari {0} ja està assignat a l'Empleat {1}
 DocType: Lab Test Groups,Add new line,Afegeix una nova línia
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sanitari
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,Sanitari
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Retard en el pagament (dies)
+DocType: Payment Terms Template Detail,Payment Terms Template Detail,Detall de plantilla de termes de pagament
 DocType: Lab Prescription,Lab Prescription,Prescripció del laboratori
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +185,Sort by Price,Ordena per Preu
 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 +888,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/buying/doctype/purchase_order/purchase_order.js +849,Invoice,Factura
-DocType: Maintenance Schedule Item,Periodicity,Periodicitat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +893,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/buying/doctype/purchase_order/purchase_order.js +874,Invoice,Factura
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +109,Make Retention Stock Entry,Feu l'entrada d'existències de retenció
+DocType: Purchase Invoice Item,Item Weight Details,Detalls del pes de l'element
+DocType: Asset Maintenance Log,Periodicity,Periodicitat
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Any fiscal {0} és necessari
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
+DocType: Crop Cycle,The minimum distance between rows of plants for optimum growth,La distància mínima entre files de plantes per a un creixement òptim
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +21,Defense,Defensa
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Puntuació (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincideix amb {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +223,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincideix amb {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Fila # {0}:
 DocType: Timesheet,Total Costing Amount,Suma càlcul del cost total
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Client> Grup de clients> Territori
 DocType: Delivery Note,Vehicle No,Vehicle n
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +160,Please select Price List,Seleccionla llista de preus
 DocType: Accounts Settings,Currency Exchange Settings,Configuració de canvi de divises
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Fila # {0}: No es requereix document de pagament per completar la trasaction
 DocType: Production Order Operation,Work In Progress,Treball en curs
-apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Si us plau seleccioni la data
+apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,Si us plau seleccioni la data
 DocType: Employee,Holiday List,Llista de vacances
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +123,Accountant,Accountant
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +127,Accountant,Accountant
 DocType: Hub Settings,Selling Price List,Llista de preus de venda
 DocType: Patient,Tobacco Current Use,Ús del corrent del tabac
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +21,Selling Rate,Velocitat de venda
 DocType: Cost Center,Stock User,Fotografia de l'usuari
+DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Company,Phone No,Telèfon No
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Calendari de cursos creats:
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +237,New {0}: #{1},Nou {0}: # {1}
+DocType: Delivery Trip,Initial Email Notification Sent,Notificació de correu electrònic inicial enviada
 ,Sales Partners Commission,Comissió dels revenedors
+DocType: Soil Texture,Sandy Clay Loam,Sandy Clay Loam
 DocType: Purchase Invoice,Rounding Adjustment,Ajust de redondeig
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation cannot have more than 5 characters,Abreviatura no pot tenir més de 5 caràcters
 DocType: Physician Schedule Time Slot,Physician Schedule Time Slot,Metge horari de tragamonedas
 DocType: Payment Request,Payment Request,Sol·licitud de Pagament
 DocType: Asset,Value After Depreciation,Valor després de la depreciació
-DocType: Employee,O+,O +
+DocType: Student,O+,O +
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +18,Related,connex
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,data de l'assistència no pot ser inferior a la data d'unir-se als empleats
 DocType: Grading Scale,Grading Scale Name,Nom Escala de classificació
@@ -126,150 +137,154 @@
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} no en qualsevol any fiscal activa.
 DocType: Packed Item,Parent Detail docname,Docname Detall de Pares
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referència: {0}, Codi de l'article: {1} i el Client: {2}"
-apps/erpnext/erpnext/utilities/user_progress.py +125,Kg,Kg
+apps/erpnext/erpnext/utilities/user_progress.py +143,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,L'obertura per a una ocupació.
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +147,{0} Result submittted,{0} Resultat enviat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +103,BOM is not specified for subcontracting item {0} at row {1},La BOM no està especificada per subcontractar l'element {0} a la fila {1}
+apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +149,{0} Result submittted,{0} Resultat enviat
 DocType: Item Attribute,Increment,Increment
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +61,Timespan,Lapse de temps
 apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Seleccioneu Magatzem ...
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicitat
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +6,Advertising,Publicitat
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Igual Company s'introdueix més d'una vegada
 DocType: Patient,Married,Casat
 apps/erpnext/erpnext/accounts/party.py +44,Not permitted for {0},No està permès per {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +568,Get items from,Obtenir articles de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Stock cannot be updated against Delivery Note {0},L'estoc no es pot actualitzar contra la Nota de Lliurament {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +593,Get items from,Obtenir articles de
+DocType: Price List,Price Not UOM Dependant,Preu no dependent de l'UOM
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Stock cannot be updated against Delivery Note {0},L'estoc no es pot actualitzar contra la Nota de Lliurament {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Producte {0}
 apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,No hi ha elements que s'enumeren
+DocType: Asset Repair,Error Description,Descripció de l'error
 DocType: Payment Reconciliation,Reconcile,Conciliar
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Botiga
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,Botiga
 DocType: Quality Inspection Reading,Reading 1,Lectura 1
-DocType: Process Payroll,Make Bank Entry,Feu entrada del banc
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fons de Pensions
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Següent Depreciació La data no pot ser anterior a la data de compra
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,Fons de Pensions
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Següent Depreciació La data no pot ser anterior a la data de compra
+DocType: Crop,Perennial,Perenne
 DocType: Consultation,Consultation Date,Data de consulta
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +131,Product listing and discovery for ERPNext users,Llistat de productes i descobriment per als usuaris d'ERPNext
 DocType: SMS Center,All Sales Person,Tot el personal de vendes
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ** Distribució mensual ajuda a distribuir el pressupost / Target a través de mesos si té l'estacionalitat del seu negoci.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1727,Not items found,No articles trobats
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1742,Not items found,No articles trobats
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +183,Salary Structure Missing,Falta Estructura salarial
 DocType: Lead,Person Name,Nom de la Persona
 DocType: Sales Invoice Item,Sales Invoice Item,Factura Sales Item
 DocType: Account,Credit,Crèdit
 DocType: POS Profile,Write Off Cost Center,Escriu Off Centre de Cost
-apps/erpnext/erpnext/public/js/setup_wizard.js +114,"e.g. ""Primary School"" or ""University""","per exemple, "escola primària" o "Universitat""
-apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Informes d'arxiu
+apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""","per exemple, "escola primària" o "Universitat""
+apps/erpnext/erpnext/config/stock.py +28,Stock Reports,Informes d'arxiu
 DocType: Warehouse,Warehouse Detail,Detall Magatzem
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +164,Credit limit has been crossed for customer {0} {1}/{2},Límit de crèdit s'ha creuat pel client {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"La data final de durada no pot ser posterior a la data de cap d'any de l'any acadèmic a què està vinculat el terme (any acadèmic {}). Si us plau, corregeixi les dates i torna a intentar-ho."
-apps/erpnext/erpnext/stock/doctype/item/item.py +479,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""És actiu fix"" no pot estar sense marcar, ja que hi ha registre d'actius contra l'element"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +192,Credit limit has been crossed for customer {0} {1}/{2},Límit de crèdit s'ha creuat pel client {0} {1} / {2}
+apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"La data final de durada no pot ser posterior a la data de cap d'any de l'any acadèmic a què està vinculat el terme (any acadèmic {}). Si us plau, corregeixi les dates i torna a intentar-ho."
+apps/erpnext/erpnext/stock/doctype/item/item.py +258,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""És actiu fix"" no pot estar sense marcar, ja que hi ha registre d'actius contra l'element"
+DocType: Delivery Trip,Departure Time,Hora de sortida
 DocType: Vehicle Service,Brake Oil,oli dels frens
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer > Customer Group > Territory,Client> Grup de clients> Territori
 DocType: Tax Rule,Tax Type,Tipus d'Impostos
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +555,Taxable Amount,base imposable
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +561,Taxable Amount,base imposable
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},No té permisos per afegir o actualitzar les entrades abans de {0}
 DocType: BOM,Item Image (if not slideshow),Imatge de l'article (si no hi ha presentació de diapositives)
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hora Tarifa / 60) * Temps real de l'Operació
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1050,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Fila # {0}: el tipus de document de referència ha de ser un de reclam de despeses o d'entrada de diari
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +917,Select BOM,Seleccioneu la llista de materials
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1076,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,Fila # {0}: el tipus de document de referència ha de ser un de reclam de despeses o d'entrada de diari
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +964,Select BOM,Seleccioneu la llista de materials
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Cost dels articles lliurats
+apps/erpnext/erpnext/config/hr.py +127,Manage advance amount given to the Employee,Gestioneu l'import anticipat que es dóna a l'empleat
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,El dia de festa en {0} no és entre De la data i Fins a la data
 DocType: Student Log,Student Log,Inicia estudiant
 DocType: Quality Inspection,Get Specification Details,Obtenir Detalls d'Especificacions
 apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,Plantilles de classificació dels proveïdors.
 DocType: Lead,Interested,Interessat
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +171,Opening,Obertura
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},Des {0} a {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +219,Opening,Obertura
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +29,From {0} to {1},Des {0} a {1}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,No s'ha pogut configurar els impostos
 DocType: Item,Copy From Item Group,Copiar del Grup d'Articles
+DocType: Delivery Trip,Delivery Notification,Notificació de lliurament
 DocType: Journal Entry,Opening Entry,Entrada Obertura
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Només compte de pagament
 DocType: Employee Loan,Repay Over Number of Periods,Retornar al llarg Nombre de períodes
 DocType: Stock Entry,Additional Costs,Despeses addicionals
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Compta amb la transacció existent no es pot convertir en grup.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Account with existing transaction can not be converted to group.,Compta amb la transacció existent no es pot convertir en grup.
 DocType: Lead,Product Enquiry,Consulta de producte
-DocType: Academic Term,Schools,escoles
-DocType: School Settings,Validate Batch for Students in Student Group,Validar lots per a estudiants en grup d'alumnes
+DocType: Education Settings,Validate Batch for Students in Student Group,Validar lots per a estudiants en grup d'alumnes
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},No hi ha registre de vacances trobats per als empleats {0} de {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Si us plau ingressi empresa primer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +358,Please select Company first,Si us plau seleccioneu l'empresa primer
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +366,Please select Company first,Si us plau seleccioneu l'empresa primer
 DocType: Employee Education,Under Graduate,Baix de Postgrau
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Cost total
+DocType: Soil Analysis,Ca/K,Ca / K
 DocType: Journal Entry Account,Employee Loan,préstec empleat
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +108,Activity Log:,Registre d'activitat:
 DocType: Fee Schedule,Send Payment Request Email,Enviar correu electrònic de sol·licitud de pagament
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +256,Item {0} does not exist in the system or has expired,L'Article {0} no existeix en el sistema o ha caducat
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +259,Item {0} does not exist in the system or has expired,L'Article {0} no existeix en el sistema o ha caducat
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +1,Statement of Account,Estat de compte
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmacèutics
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +41,Pharmaceuticals,Farmacèutics
 DocType: Purchase Invoice Item,Is Fixed Asset,És actiu fix
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +234,"Available qty is {0}, you need {1}","Quantitats disponibles és {0}, necessita {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +251,"Available qty is {0}, you need {1}","Quantitats disponibles és {0}, necessita {1}"
 DocType: Expense Claim Detail,Claim Amount,Reclamació Import
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +51,Duplicate customer group found in the cutomer group table,Duplicar grup de clients que es troba a la taula de grups cutomer
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +56,Duplicate customer group found in the cutomer group table,Duplicar grup de clients que es troba a la taula de grups cutomer
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Tipus de Proveïdor / distribuïdor
 DocType: Naming Series,Prefix,Prefix
 apps/erpnext/erpnext/hr/email_alert/training_scheduled/training_scheduled.html +7,Event Location,Ubicació de l'esdeveniment
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Consumable,Consumible
-DocType: Employee,B-,B-
-DocType: Upload Attendance,Import Log,Importa registre
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +68,Consumable,Consumible
+DocType: Student,B-,B-
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Tire Sol·licitud de materials de tipus Fabricació en base als criteris anteriors
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +100,Successfully unregistered.,S'ha registrat sense èxit.
-DocType: Training Result Employee,Grade,grau
+DocType: Assessment Result,Grade,grau
 DocType: Restaurant Table,No of Seats,No de seients
 DocType: Subscription,"To add dynamic subject, use jinja tags like
 
 <div><pre><code>New {{ doc.doctype }} #{{ doc.name }}</code></pre></div>","Per afegir un tema dinàmic, utilitzeu etiquetes com ara jinja <div><pre> <code>New {{ doc.doctype }} #{{ doc.name }}</code> </pre> </div>"
 DocType: Sales Invoice Item,Delivered By Supplier,Lliurat per proveïdor
+DocType: Asset Maintenance Task,Asset Maintenance Task,Tasca de manteniment d&#39;actius
 DocType: SMS Center,All Contact,Tots els contactes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +905,Production Order already created for all items with BOM,Ordre de producció ja s&#39;ha creat per a tots els elements amb la llista de materials
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +220,Annual Salary,Salari Anual
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +952,Production Order already created for all items with BOM,Ordre de producció ja s&#39;ha creat per a tots els elements amb la llista de materials
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +230,Annual Salary,Salari Anual
 DocType: Daily Work Summary,Daily Work Summary,Resum diari de Treball
 DocType: Period Closing Voucher,Closing Fiscal Year,Tancant l'Any Fiscal
-apps/erpnext/erpnext/accounts/party.py +368,{0} {1} is frozen,{0} {1} està congelat
-apps/erpnext/erpnext/setup/doctype/company/company.py +132,Please select Existing Company for creating Chart of Accounts,Seleccioneu empresa ja existent per a la creació del pla de comptes
+apps/erpnext/erpnext/accounts/party.py +380,{0} {1} is frozen,{0} {1} està congelat
+apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Seleccioneu empresa ja existent per a la creació del pla de comptes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +80,Stock Expenses,Despeses d'estoc
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +96,Select Target Warehouse,Selecciona una destinació de dipòsit
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +103,Select Target Warehouse,Selecciona una destinació de dipòsit
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Si us plau, introdueixi preferit del contacte de correu electrònic"
-DocType: Program Enrollment,School Bus,Autobús escolar
 DocType: Journal Entry,Contra Entry,Entrada Contra
 DocType: Journal Entry Account,Credit in Company Currency,Crèdit en moneda Companyia
 DocType: Lab Test UOM,Lab Test UOM,Prova de laboratori UOM
 DocType: Delivery Note,Installation Status,Estat d'instal·lació
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +135,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +135,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Vols actualitzar l'assistència? <br> Present: {0} \ <br> Absents: {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +325,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ Acceptat Rebutjat Quantitat ha de ser igual a la quantitat rebuda per article {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +326,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ Acceptat Rebutjat Quantitat ha de ser igual a la quantitat rebuda per article {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Materials Subministrament primeres per a la Compra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +149,At least one mode of payment is required for POS invoice.,Es requereix com a mínim una manera de pagament de la factura POS.
+DocType: Agriculture Analysis Criteria,Fertilizer,Fertilitzant
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +150,At least one mode of payment is required for POS invoice.,Es requereix com a mínim una manera de pagament de la factura POS.
 DocType: Products Settings,Show Products as a List,Mostrar els productes en forma de llista
-DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
-All dates and employee combination in the selected period will come in the template, with existing attendance records","Descarregueu la plantilla, omplir les dades adequades i adjuntar l'arxiu modificat.
- Totes les dates i empleat combinació en el període seleccionat vindrà a la plantilla, amb els registres d'assistència existents"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +482,Item {0} is not active or end of life has been reached,L'article {0} no està actiu o ha arribat al final de la seva vida
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +507,Item {0} is not active or end of life has been reached,L'article {0} no està actiu o ha arribat al final de la seva vida
 DocType: Student Admission Program,Minimum Age,Edat mínima
-apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Basic Mathematics,Exemple: Matemàtiques Bàsiques
-apps/erpnext/erpnext/controllers/accounts_controller.py +657,"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/config/hr.py +218,Settings for HR Module,Ajustaments per al Mòdul de Recursos Humans
+apps/erpnext/erpnext/utilities/user_progress.py +187,Example: Basic Mathematics,Exemple: Matemàtiques Bàsiques
+apps/erpnext/erpnext/controllers/accounts_controller.py +769,"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/config/hr.py +223,Settings for HR Module,Ajustaments per al Mòdul de Recursos Humans
 DocType: SMS Center,SMS Center,Centre d'SMS
 DocType: Sales Invoice,Change Amount,Import de canvi
 DocType: BOM Update Tool,New BOM,Nova llista de materials
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +117,Please enter Delivery Date,Introduïu la data de lliurament
+DocType: Driver,Driving License Categories,Categories de llicències de conducció
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +118,Please enter Delivery Date,Introduïu la data de lliurament
 DocType: Depreciation Schedule,Make Depreciation Entry,Fer l&#39;entrada de Depreciació
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Tipus de sol·licitud
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,fer Empleat
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Radiodifusió
-apps/erpnext/erpnext/config/accounts.py +321,Setup mode of POS (Online / Offline),Mode de configuració de TPV (en línia o fora de línia)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +187,Execution,Execució
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,Radiodifusió
+apps/erpnext/erpnext/config/accounts.py +313,Setup mode of POS (Online / Offline),Mode de configuració de TPV (en línia o fora de línia)
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +191,Execution,Execució
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Els detalls de les operacions realitzades.
-DocType: Serial No,Maintenance Status,Estat de manteniment
+DocType: Asset Maintenance Log,Maintenance Status,Estat de manteniment
+apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,Detalls de membres
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: es requereix Proveïdor contra el compte per pagar {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Articles i preus
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Total hores: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},A partir de la data ha de ser dins de l'any fiscal. Suposant De Data = {0}
 DocType: Drug Prescription,Interval,Interval
-DocType: Customer,Individual,Individual
-DocType: Interest,Academics User,acadèmics usuari
+DocType: Grant Application,Individual,Individual
+DocType: Academic Term,Academics User,acadèmics usuari
 DocType: Cheque Print Template,Amount In Figure,A la Figura quantitat
 DocType: Employee Loan Application,Loan Info,Informació sobre préstecs
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Pla de visites de manteniment.
@@ -282,17 +297,19 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Llista de preus ha de ser aplicable per comprar o vendre
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Data d'instal·lació no pot ser abans de la data de lliurament d'article {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Descompte Preu de llista Taxa (%)
-apps/erpnext/erpnext/healthcare/setup.py +214,Biochemistry,Bioquímica
+apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,Plantilla d&#39;elements
+apps/erpnext/erpnext/healthcare/setup.py +215,Biochemistry,Bioquímica
 DocType: Offer Letter,Select Terms and Conditions,Selecciona Termes i Condicions
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +60,Out Value,valor fora
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Out Value,valor fora
 DocType: Production Planning Tool,Sales Orders,Ordres de venda
 DocType: Purchase Taxes and Charges,Valuation,Valoració
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +373,Set as Default,Estableix com a predeterminat
 ,Purchase Order Trends,Compra Tendències Sol·licitar
 apps/erpnext/erpnext/utilities/user_progress.py +75,Go to Customers,Aneu als clients
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,La sol·licitud de cotització es pot accedir fent clic al següent enllaç
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Assignar fulles per a l'any.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Curs eina de creació
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +236,Insufficient Stock,insuficient Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +253,Insufficient Stock,insuficient Stock
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Planificació de la capacitat Desactivar i seguiment de temps
 DocType: Email Digest,New Sales Orders,Noves ordres de venda
 DocType: Bank Guarantee,Bank Account,Compte Bancari
@@ -300,67 +317,69 @@
 apps/erpnext/erpnext/projects/doctype/project_type/project_type.py +13,You cannot delete Project Type 'External',No es pot eliminar el tipus de projecte &#39;Extern&#39;
 DocType: Employee,Create User,crear usuari
 DocType: Selling Settings,Default Territory,Territori per defecte
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisió
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,Televisió
 DocType: Production Order Operation,Updated via 'Time Log',Actualitzat a través de 'Hora de registre'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +427,Advance amount cannot be greater than {0} {1},quantitat d&#39;avanç no pot ser més gran que {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +428,Advance amount cannot be greater than {0} {1},quantitat d&#39;avanç no pot ser més gran que {0} {1}
 DocType: Naming Series,Series List for this Transaction,Llista de Sèries per a aquesta transacció
 DocType: Company,Enable Perpetual Inventory,Habilitar Inventari Permanent
 DocType: Company,Default Payroll Payable Account,La nòmina per defecte del compte per pagar
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +51,Update Email Group,Grup alerta per correu electrònic
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,Grup alerta per correu electrònic
 DocType: Sales Invoice,Is Opening Entry,És assentament d'obertura
 DocType: Lab Test Template,"If unchecked, the item wont be appear in Sales Invoice, but can be used in group test creation. ","Si no està seleccionat, l&#39;element no apareixerà a Factura de vendes, però es pot utilitzar en la creació de proves en grup."
 DocType: Customer Group,Mention if non-standard receivable account applicable,Esmenteu si compta per cobrar no estàndard aplicable
 DocType: Course Schedule,Instructor Name,nom instructor
 DocType: Supplier Scorecard,Criteria Setup,Configuració de criteris
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +179,For Warehouse is required before Submit,Cal informar del magatzem destí abans de presentar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +199,For Warehouse is required before Submit,Cal informar del magatzem destí abans de presentar
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Rebuda el
 DocType: Sales Partner,Reseller,Revenedor
 DocType: Codification Table,Medical Code,Codi mèdic
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Si se selecciona, s&#39;inclouran productes no estan en estoc en les sol·licituds de materials."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,Si us plau entra l'Empresa
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra la factura de venda d'articles
+DocType: Agriculture Analysis Criteria,Linked Doctype,Doctype enllaçat
 ,Production Orders in Progress,Ordres de producció en Construcció
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Efectiu net de Finançament
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2313,"LocalStorage is full , did not save","LocalStorage està ple, no va salvar"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2332,"LocalStorage is full , did not save","LocalStorage està ple, no va salvar"
 DocType: Lead,Address & Contact,Direcció i Contacte
 DocType: Leave Allocation,Add unused leaves from previous allocations,Afegir les fulles no utilitzats de les assignacions anteriors
 DocType: Sales Partner,Partner website,lloc web de col·laboradors
 DocType: Restaurant Order Entry,Add Item,Afegeix element
 DocType: Lab Test,Custom Result,Resultat personalitzat
-apps/erpnext/erpnext/utilities/user_progress.py +71,Contact Name,Nom de Contacte
+DocType: Delivery Stop,Contact Name,Nom de Contacte
 DocType: Course Assessment Criteria,Course Assessment Criteria,Criteris d&#39;avaluació del curs
-DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea nòmina per als criteris abans esmentats.
 DocType: POS Customer Group,POS Customer Group,POS Grup de Clients
+DocType: Land Unit,Land Unit describing various land assets,Unitat de terrenys que descriu diversos actius de la terra
 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/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Assessment Plan: ,Pla d&#39;avaluació:
+apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Assessment Plan: ,Pla d&#39;avaluació:
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Cap descripció donada
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Sol·licitud de venda.
 DocType: Lab Test,Submitted Date,Data enviada
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Això es basa en la taula de temps creats en contra d&#39;aquest projecte
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +390,Net Pay cannot be less than 0,Pay Net no pot ser menor que 0
+DocType: Payment Term,Credit Months,Mesos de Crèdit
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +409,Net Pay cannot be less than 0,Pay Net no pot ser menor que 0
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,"To stop sending repetitive error notifications from the system, we have checked Disabled field in the subscription","Per deixar d&#39;enviar notificacions de errors repetitives del sistema, hem marcat el camp Desactivat a la subscripció"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Només l'aprovador d'absències seleccionat pot presentar aquesta sol·licitud
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Alleujar data ha de ser major que la data de Unir
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +228,Leaves per Year,Deixa per any
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Fila {0}: Si us plau, vegeu ""És Avanç 'contra el Compte {1} si es tracta d'una entrada amb antelació."
-apps/erpnext/erpnext/stock/utils.py +212,Warehouse {0} does not belong to company {1},Magatzem {0} no pertany a l'empresa {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +121,Relieving Date must be greater than Date of Joining,Alleujar data ha de ser major que la data de Unir
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +238,Leaves per Year,Deixa per any
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Fila {0}: Si us plau, vegeu ""És Avanç 'contra el Compte {1} si es tracta d'una entrada amb antelació."
+apps/erpnext/erpnext/stock/utils.py +217,Warehouse {0} does not belong to company {1},Magatzem {0} no pertany a l'empresa {1}
 DocType: Email Digest,Profit & Loss,D&#39;pèrdues i guanys
-apps/erpnext/erpnext/utilities/user_progress.py +126,Litre,litre
+apps/erpnext/erpnext/utilities/user_progress.py +144,Litre,litre
 DocType: Task,Total Costing Amount (via Time Sheet),Càlcul del cost total Monto (a través de fulla d&#39;hores)
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.py +63,Please setup Students under Student Groups,Configureu els estudiants sota grups d&#39;estudiants
+apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +69,Please setup Students under Student Groups,Configureu els estudiants sota grups d&#39;estudiants
 DocType: Item Website Specification,Item Website Specification,Especificacions d'article al Web
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Absència bloquejada
-apps/erpnext/erpnext/stock/doctype/item/item.py +723,Item {0} has reached its end of life on {1},Article {0} ha arribat a la seva fi de vida del {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +88,Bank Entries,entrades bancàries
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Anual
+apps/erpnext/erpnext/stock/doctype/item/item.py +709,Item {0} has reached its end of life on {1},Article {0} ha arribat a la seva fi de vida del {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Bank Entries,entrades bancàries
+DocType: Crop,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Estoc Reconciliació article
 DocType: Stock Entry,Sales Invoice No,Factura No
 DocType: Material Request Item,Min Order Qty,Quantitat de comanda mínima
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Curs eina de creació de grup d&#39;alumnes
 DocType: Lead,Do Not Contact,No entri en contacte
-apps/erpnext/erpnext/utilities/user_progress.py +189,People who teach at your organisation,Les persones que ensenyen en la seva organització
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +131,Software Developer,Desenvolupador de Programari
+apps/erpnext/erpnext/utilities/user_progress.py +207,People who teach at your organisation,Les persones que ensenyen en la seva organització
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Software Developer,Desenvolupador de Programari
 DocType: Item,Minimum Order Qty,Quantitat de comanda mínima
 DocType: Pricing Rule,Supplier Type,Tipus de Proveïdor
 DocType: Course Scheduling Tool,Course Start Date,Curs Data d&#39;Inici
@@ -369,58 +388,64 @@
 DocType: Item,Publish in Hub,Publicar en el Hub
 DocType: Student Admission,Student Admission,Admissió d&#39;Estudiants
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +743,Item {0} is cancelled,L'article {0} està cancel·lat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +923,Material Request,Sol·licitud de materials
+apps/erpnext/erpnext/stock/doctype/item/item.py +729,Item {0} is cancelled,L'article {0} està cancel·lat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +948,Material Request,Sol·licitud de materials
 DocType: Bank Reconciliation,Update Clearance Date,Actualització Data Liquidació
 DocType: Item,Purchase Details,Informació de compra
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Article {0} no es troba en &#39;matèries primeres subministrades&#39; taula en l&#39;Ordre de Compra {1}
-DocType: Patient Relation,Relation,Relació
-DocType: Shipping Rule,Worldwide Shipping,Enviament mundial
-DocType: Patient Relation,Mother,Mare
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Article {0} no es troba en &#39;matèries primeres subministrades&#39; taula en l&#39;Ordre de Compra {1}
+DocType: Salary Slip,Total Principal Amount,Import total principal
+DocType: Student Guardian,Relation,Relació
+DocType: Student Guardian,Mother,Mare
 DocType: Restaurant Reservation,Reservation End Time,Hora de finalització de la reserva
+DocType: Crop,Biennial,Biennal
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Comandes en ferm dels clients.
 DocType: Purchase Receipt Item,Rejected Quantity,Quantitat Rebutjada
-apps/erpnext/erpnext/schools/doctype/fees/fees.py +80,Payment request {0} created,S&#39;ha creat la {0} sol·licitud de pagament
-apps/erpnext/erpnext/healthcare/setup.py +254,Low Sensitivity,Baixa sensibilitat
+apps/erpnext/erpnext/education/doctype/fees/fees.py +80,Payment request {0} created,S&#39;ha creat la {0} sol·licitud de pagament
+apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +72,Open Orders,Comandes obertes
+apps/erpnext/erpnext/healthcare/setup.py +255,Low Sensitivity,Baixa sensibilitat
 DocType: Notification Control,Notification Control,Control de Notificació
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,Confirmeu una vegada hagueu completat la vostra formació
 DocType: Lead,Suggestions,Suggeriments
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Pressupostos Set-Group savi article sobre aquest territori. També pot incloure l'estacionalitat mitjançant l'establiment de la Distribució.
+DocType: Payment Term,Payment Term Name,Nom del terme de pagament
 DocType: Healthcare Settings,Create documents for sample collection,Crea documents per a la recollida de mostres
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +276,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagament contra {0} {1} no pot ser més gran que Destacat Suma {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +274,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagament contra {0} {1} no pot ser més gran que Destacat Suma {2}
 DocType: Supplier,Address HTML,Adreça HTML
 DocType: Lead,Mobile No.,No mòbil
 DocType: Maintenance Schedule,Generate Schedule,Generar Calendari
 DocType: Purchase Invoice Item,Expense Head,Cap de despeses
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Please select Charge Type first,Seleccioneu Tipus de Càrrec primer
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,Please select Charge Type first,Seleccioneu Tipus de Càrrec primer
+DocType: Crop,"You can define all the tasks which need to carried out for this crop here. The day field is used to mention the day on which the task needs to be carried out, 1 being the 1st day, etc.. ","Podeu definir totes les tasques que cal dur a terme aquí. El camp del dia s&#39;utilitza per esmentar el dia en què s&#39;ha de dur a terme la tasca, 1 és el primer dia, etc."
 DocType: Student Group Student,Student Group Student,Estudiant grup d&#39;alumnes
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Més recent
+DocType: Asset Maintenance Task,2 Yearly,2 Anual
+DocType: Education Settings,Education Settings,Configuració educativa
 DocType: Vehicle Service,Inspection,inspecció
 DocType: Supplier Scorecard Scoring Standing,Max Grade,Grau màxim
 DocType: Email Digest,New Quotations,Noves Cites
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Els correus electrònics de lliscament salarial als empleats basades en el correu electrònic preferit seleccionat en Empleat
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer aprovadorde d'absències de la llista s'establirà com a predeterminat
 DocType: Tax Rule,Shipping County,Comtat d&#39;enviament
-apps/erpnext/erpnext/config/desktop.py +159,Learn,Aprendre
+apps/erpnext/erpnext/config/desktop.py +167,Learn,Aprendre
 DocType: Asset,Next Depreciation Date,Següent Depreciació Data
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Cost Activitat per Empleat
 DocType: Accounts Settings,Settings for Accounts,Ajustaments de Comptes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +663,Supplier Invoice No exists in Purchase Invoice {0},Proveïdor de factura no existeix en la factura de la compra {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +667,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
 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
-DocType: Vehicle,Fleet Manager,Fleet Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +517,Row #{0}: {1} can not be negative for item {2},Fila # {0}: {1} no pot ser negatiu per a l&#39;element {2}
+DocType: Driver,Fleet Manager,Fleet Manager
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +542,Row #{0}: {1} can not be negative for item {2},Fila # {0}: {1} no pot ser negatiu per a l&#39;element {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Wrong Password,Contrasenya Incorrecta
 DocType: Item,Variant Of,Variant de
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Completat Quantitat no pot ser major que 'Cant de Fabricació'
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Completed Qty can not be greater than 'Qty to Manufacture',Completat Quantitat no pot ser major que 'Cant de Fabricació'
 DocType: Period Closing Voucher,Closing Account Head,Tancant el Compte principal
 DocType: Employee,External Work History,Historial de treball extern
 DocType: Physician,Time per Appointment,Temps per cita
 apps/erpnext/erpnext/projects/doctype/task/task.py +110,Circular Reference Error,Referència Circular Error
 DocType: Appointment Type,Is Inpatient,És internat
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,nom Guardian1
+apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,nom Guardian1
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,En paraules (exportació) seran visibles quan es desi l'albarà de lliurament.
 DocType: Cheque Print Template,Distance from left edge,Distància des la vora esquerra
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} unitats de [{1}] (# Formulari / article / {1}) que es troba en [{2}] (# Formulari / Magatzem / {2})
@@ -429,20 +454,22 @@
 DocType: BOM Item,Rate & Amount,Preu i quantitat
 apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,Això es basa en operacions contra aquesta empresa. Vegeu la línia de temps a continuació per obtenir detalls
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificació per correu electrònic a la creació de la Sol·licitud de materials automàtica
-apps/erpnext/erpnext/healthcare/setup.py +258,Resistant,Resistent
+apps/erpnext/erpnext/healthcare/setup.py +259,Resistant,Resistent
 DocType: Journal Entry,Multi Currency,Multi moneda
-DocType: Payment Reconciliation Invoice,Invoice Type,Tipus de Factura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +865,Delivery Note,Nota de lliurament
+DocType: Opening Invoice Creation Tool,Invoice Type,Tipus de Factura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +933,Delivery Note,Nota de lliurament
 DocType: Consultation,Encounter Impression,Impressió de trobada
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Configuració d&#39;Impostos
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Cost d&#39;actiu venut
-apps/erpnext/erpnext/accounts/utils.py +345,Payment Entry has been modified after you pulled it. Please pull it again.,"Entrada de pagament ha estat modificat després es va tirar d'ell. Si us plau, tiri d'ella de nou."
-apps/erpnext/erpnext/stock/doctype/item/item.py +448,{0} entered twice in Item Tax,{0} entrat dues vegades en l'Impost d'article
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +134,Cost of Sold Asset,Cost d&#39;actiu venut
+DocType: Volunteer,Morning,Al matí
+apps/erpnext/erpnext/accounts/utils.py +347,Payment Entry has been modified after you pulled it. Please pull it again.,"Entrada de pagament ha estat modificat després es va tirar d'ell. Si us plau, tiri d'ella de nou."
+apps/erpnext/erpnext/stock/doctype/item/item.py +464,{0} entered twice in Item Tax,{0} entrat dues vegades en l'Impost d'article
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,Summary for this week and pending activities,Resum per a aquesta setmana i activitats pendents
 DocType: Student Applicant,Admitted,acceptat
 DocType: Workstation,Rent Cost,Cost de lloguer
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Després quantitat Depreciació
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Calendari d&#39;Esdeveniments Pròxims
+apps/erpnext/erpnext/public/js/templates/item_quick_entry.html +1,Variant Attributes,Atributs Variant
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +85,Please select month and year,Selecciona el mes i l'any
 DocType: Employee,Company Email,Email de l'empresa
 DocType: GL Entry,Debit Amount in Account Currency,Suma Dèbit en Compte moneda
@@ -451,33 +478,35 @@
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Operacions bancàries / efectiu contra la part que pertanyin a
 DocType: Shipping Rule,Valid for Countries,Vàlid per als Països
 apps/erpnext/erpnext/stock/doctype/item/item.js +55,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,Aquest article és una plantilla i no es pot utilitzar en les transaccions. Atributs article es copiaran en les variants menys que s'estableix 'No Copy'
+DocType: Grant Application,Grant Application,Sol·licitud de subvenció
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total de la comanda Considerat
-apps/erpnext/erpnext/config/hr.py +238,"Employee designation (e.g. CEO, Director etc.).","Designació de l'empleat (per exemple, director general, director, etc.)."
+apps/erpnext/erpnext/config/hr.py +243,"Employee designation (e.g. CEO, Director etc.).","Designació de l'empleat (per exemple, director general, director, etc.)."
 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 +558,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 +602,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/accounts/doctype/subscription/subscription.py +255,[Urgent] Error while creating recurring %s for %s,[Urgent] S&#39;ha produït un error en crear% s per a% s recurrents
+DocType: Land Unit,LInked Analysis,Anàlisi lliscada
 DocType: Item Tax,Tax Rate,Tax Rate
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ja assignat a empleat {1} per al període {2} a {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +890,Select Item,Seleccioneu Producte
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +915,Select Item,Seleccioneu Producte
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +140,Purchase Invoice {0} is already submitted,La Factura de compra {0} ja està Presentada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lot No ha de ser igual a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convertir la no-Group
-apps/erpnext/erpnext/config/stock.py +127,Batch (lot) of an Item.,Lots (lot) d'un element.
 DocType: C-Form Invoice Detail,Invoice Date,Data de la factura
 DocType: GL Entry,Debit Amount,Suma Dèbit
-apps/erpnext/erpnext/accounts/party.py +253,There can only be 1 Account per Company in {0} {1},Només pot haver 1 compte per l&#39;empresa en {0} {1}
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +407,Please see attachment,"Si us plau, vegeu el document adjunt"
+apps/erpnext/erpnext/accounts/party.py +251,There can only be 1 Account per Company in {0} {1},Només pot haver 1 compte per l&#39;empresa en {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +426,Please see attachment,"Si us plau, vegeu el document adjunt"
 DocType: Purchase Order,% Received,% Rebut
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Crear grups d&#39;estudiants
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Configuració acabada !!
+apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Crear grups d&#39;estudiants
+DocType: Volunteer,Weekends,Caps de setmana
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Credit Note Amount,Nota de Crèdit Monto
 DocType: Setup Progress Action,Action Document,Document d&#39;Acció
+DocType: Chapter Member,Website URL,URL del lloc web
 ,Finished Goods,Béns Acabats
 DocType: Delivery Note,Instructions,Instruccions
 DocType: Quality Inspection,Inspected By,Inspeccionat per
-DocType: Maintenance Visit,Maintenance Type,Tipus de Manteniment
-apps/erpnext/erpnext/schools/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}
+DocType: Asset Maintenance Log,Maintenance Type,Tipus de Manteniment
+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/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/templates/pages/demo.html +47,ERPNext Demo,demostració ERPNext
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,Afegir els articles
@@ -488,31 +517,33 @@
 DocType: Packed Item,Packed Item,Article amb embalatge
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Ajustos predeterminats per a transaccions de compra.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Hi Cost Activitat d&#39;Empleat {0} contra el Tipus d&#39;Activitat - {1}
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory field - Get Students From,Camp obligatori - Obtenir estudiants de
+apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory field - Get Students From,Camp obligatori - Obtenir estudiants de
 DocType: Program Enrollment,Enrolled courses,cursos matriculats
 DocType: Currency Exchange,Currency Exchange,Valor de Canvi de divisa
-DocType: Asset,Item Name,Nom de l'article
+DocType: Opening Invoice Creation Tool Item,Item Name,Nom de l'article
 DocType: Authorization Rule,Approving User  (above authorized value),L&#39;aprovació de l&#39;usuari (per sobre del valor autoritzat)
 DocType: Email Digest,Credit Balance,Saldo creditor
 DocType: Employee,Widowed,Vidu
 DocType: Request for Quotation,Request for Quotation,Sol · licitud de pressupost
 DocType: Healthcare Settings,Require Lab Test Approval,Requereix aprovació de la prova de laboratori
 DocType: Salary Slip Timesheet,Working Hours,Hores de Treball
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +10,Total Outstanding,Total pendent
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Canviar el número de seqüència inicial/actual d'una sèrie existent.
 DocType: Dosage Strength,Strength,Força
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1508,Create a new Customer,Crear un nou client
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1523,Create a new Customer,Crear un nou client
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si hi ha diverses regles de preus vàlides, es demanarà als usuaris que estableixin la prioritat manualment per resoldre el conflicte."
 apps/erpnext/erpnext/utilities/activation.py +90,Create Purchase Orders,Crear ordres de compra
 ,Purchase Register,Compra de Registre
-DocType: Course Scheduling Tool,Rechedule,Rechedule
+DocType: Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Càrrecs aplicables
 DocType: Workstation,Consumable Cost,Cost de consumibles
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ha de tenir rol 'Aprovador d'absències'
 DocType: Purchase Receipt,Vehicle Date,Data de Vehicles
 DocType: Student Log,Medical,Metge
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Motiu de pèrdua
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Propietari plom no pot ser la mateixa que la de plom
-apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not greater than unadjusted amount,import assignat no pot superar l&#39;import no ajustat
+apps/erpnext/erpnext/accounts/doctype/account/account.js +52,Update Account Number,Actualitza el número del compte
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Propietari plom no pot ser la mateixa que la de plom
+apps/erpnext/erpnext/accounts/utils.py +353,Allocated amount can not greater than unadjusted amount,import assignat no pot superar l&#39;import no ajustat
 DocType: Announcement,Receiver,receptor
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Estació de treball està tancada en les següents dates segons Llista de vacances: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Oportunitats
@@ -528,7 +559,7 @@
 DocType: Lab Test Template,No Result,sense Resultat
 DocType: Purchase Invoice Item,Quantity and Rate,Quantitat i taxa
 DocType: Delivery Note,% Installed,% Instal·lat
-apps/erpnext/erpnext/utilities/user_progress.py +209,Classrooms/ Laboratories etc where lectures can be scheduled.,"Aules / laboratoris, etc., on les conferències es poden programar."
+apps/erpnext/erpnext/utilities/user_progress.py +227,Classrooms/ Laboratories etc where lectures can be scheduled.,"Aules / laboratoris, etc., on les conferències es poden programar."
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Si us plau introdueix el nom de l'empresa primer
 DocType: Purchase Invoice,Supplier Name,Nom del proveïdor
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Llegiu el Manual ERPNext
@@ -536,40 +567,45 @@
 DocType: Email Digest,Pending Purchase Orders,A l&#39;espera d&#39;ordres de compra
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Ajusta automàticament els números de sèrie basat en FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Comprovar Proveïdor Nombre de factura Singularitat
+apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +34,Primary Address Details,Detalls de l&#39;adreça principal
 DocType: Vehicle Service,Oil Change,Canviar l&#39;oli
+DocType: Asset Maintenance Log,Asset Maintenance Log,Registre de manteniment d&#39;actius
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""Per al cas núm ' no pot ser inferior a 'De Cas No.'"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Non Profit,Sense ànim de lucre
+DocType: Chapter,Non Profit,Sense ànim de lucre
 DocType: Production Order,Not Started,Sense començar
 DocType: Lead,Channel Partner,Partner de Canal
 DocType: Account,Old Parent,Antic Pare
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Camp obligatori - Any Acadèmic
+apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Camp obligatori - Any Acadèmic
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} is not associated with {2} {3},{0} {1} no està associat a {2} {3}
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Personalitza el text d'introducció que va com una part d'aquest correu electrònic. Cada transacció té un text introductori independent.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +157,Please set default payable account for the company {0},Configureu compte per pagar per defecte per a l&#39;empresa {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +182,Please set default payable account for the company {0},Configureu compte per pagar per defecte per a l&#39;empresa {0}
 DocType: Setup Progress Action,Min Doc Count,Min Doc Count
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,La configuració global per a tots els processos de fabricació.
 DocType: Accounts Settings,Accounts Frozen Upto,Comptes bloquejats fins a
 DocType: SMS Log,Sent On,Enviar on
-apps/erpnext/erpnext/stock/doctype/item/item.py +685,Attribute {0} selected multiple times in Attributes Table,Atribut {0} seleccionat diverses vegades en la taula Atributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +671,Attribute {0} selected multiple times in Attributes Table,Atribut {0} seleccionat diverses vegades en la taula Atributs
 DocType: HR Settings,Employee record is created using selected field. ,Es crea el registre d'empleat utilitzant el camp seleccionat.
 DocType: Sales Order,Not Applicable,No Aplicable
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Mestre de vacances.
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +77,Opening Invoice Item,Obertura de l&#39;element de la factura
 DocType: Request for Quotation Item,Required Date,Data Requerit
 DocType: Delivery Note,Billing Address,Direcció De Enviament
 DocType: BOM,Costing,Costejament
 DocType: Tax Rule,Billing County,Comtat de facturació
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","If checked, the tax amount will be considered as already included in the Print Rate / Print Amount"
 DocType: Request for Quotation,Message for Supplier,Missatge per als Proveïdors
+DocType: Driver,DRIVER-.#####,DRIVER -. #####
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Quantitat total
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +62,Guardian2 Email ID,Guardian2 ID de correu electrònic
+apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +62,Guardian2 Email ID,Guardian2 ID de correu electrònic
 DocType: Item,Show in Website (Variant),Mostra en el lloc web (variant)
 DocType: Employee,Health Concerns,Problemes de Salut
-DocType: Process Payroll,Select Payroll Period,Seleccioneu el període de nòmina
+DocType: Payroll Entry,Select Payroll Period,Seleccioneu el període de nòmina
 DocType: Purchase Invoice,Unpaid,No pagat
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Mantinguts per a la venda
 DocType: Packing Slip,From Package No.,Del paquet número
 DocType: Item Attribute,To Range,Per Abast
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valors i Dipòsits
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","No es pot canviar el mètode de valoració, ja que hi ha transaccions en contra d&#39;alguns articles que no tenen el seu propi mètode de valoració"
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +46,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","No es pot canviar el mètode de valoració, ja que hi ha transaccions en contra d&#39;alguns articles que no tenen el seu propi mètode de valoració"
 apps/erpnext/erpnext/config/healthcare.py +133,Test Sample Master.,Màster d&#39;exemple de prova.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Fulles totals assignats és obligatori
 DocType: Patient,AB Positive,AB Positiu
@@ -591,35 +627,39 @@
 DocType: Training Event,Workshop,Taller
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Aviseu comandes de compra
 apps/erpnext/erpnext/utilities/user_progress.py +64,List a few of your customers. They could be organizations or individuals.,Enumerar alguns dels seus clients. Podrien ser les organitzacions o individus.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +21,Enough Parts to Build,Peces suficient per construir
 DocType: POS Profile User,POS Profile User,Usuari de perfil de TPV
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +128,Direct Income,Ingrés Directe
 DocType: Patient Appointment,Date TIme,Data i hora
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","No es pot filtrar en funció del compte, si agrupats per Compte"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +126,Administrative Officer,Oficial Administratiu
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Seleccioneu de golf
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +130,Administrative Officer,Oficial Administratiu
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +39,Setting up company and taxes,Creació d&#39;empreses i impostos
+apps/erpnext/erpnext/education/doctype/student_group/student_group.py +22,Please select Course,Seleccioneu de golf
 DocType: Codification Table,Codification Table,Taula de codificació
 DocType: Timesheet Detail,Hrs,hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +342,Please select Company,Seleccioneu de l&#39;empresa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +350,Please select Company,Seleccioneu de l&#39;empresa
 DocType: Stock Entry Detail,Difference Account,Compte de diferències
 DocType: Purchase Invoice,Supplier GSTIN,GSTIN proveïdor
 apps/erpnext/erpnext/projects/doctype/task/task.py +47,Cannot close task as its dependant task {0} is not closed.,No es pot tancar tasca com no tanca la seva tasca depèn {0}.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Si us plau indica el Magatzem en què es faràa la Sol·licitud de materials
 DocType: Production Order,Additional Operating Cost,Cost addicional de funcionament
 DocType: Lab Test Template,Lab Routine,Rutina de laboratori
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Productes cosmètics
-apps/erpnext/erpnext/stock/doctype/item/item.py +545,"To merge, following properties must be same for both items","Per fusionar, propietats han de ser el mateix per a tots dos articles"
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,Productes cosmètics
+apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +18,Please select Completion Date for Completed Asset Maintenance Log,Seleccioneu Data de finalització del registre de manteniment d&#39;actius completat
+apps/erpnext/erpnext/stock/doctype/item/item.py +526,"To merge, following properties must be same for both items","Per fusionar, propietats han de ser el mateix per a tots dos articles"
 DocType: Shipping Rule,Net Weight,Pes Net
 DocType: Employee,Emergency Phone,Telèfon d'Emergència
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,comprar
 ,Serial No Warranty Expiry,Venciment de la garantia del número de sèrie
 DocType: Sales Invoice,Offline POS Name,Desconnectat Nom POS
-apps/erpnext/erpnext/utilities/user_progress.py +159,Student Application,Sol·licitud d&#39;estudiant
-apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,"Si us plau, defineixi el grau de Llindar 0%"
+apps/erpnext/erpnext/utilities/user_progress.py +177,Student Application,Sol·licitud d&#39;estudiant
+apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,"Si us plau, defineixi el grau de Llindar 0%"
 DocType: Sales Order,To Deliver,Per Lliurar
 DocType: Purchase Invoice Item,Item,Article
-apps/erpnext/erpnext/healthcare/setup.py +255,High Sensitivity,Alta sensibilitat
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2493,Serial no item cannot be a fraction,Nº de sèrie article no pot ser una fracció
+apps/erpnext/erpnext/healthcare/setup.py +256,High Sensitivity,Alta sensibilitat
+apps/erpnext/erpnext/config/non_profit.py +48,Volunteer Type information.,Informació del tipus de voluntariat.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2512,Serial no item cannot be a fraction,Nº de sèrie article no pot ser una fracció
 DocType: Journal Entry,Difference (Dr - Cr),Diferència (Dr - Cr)
 DocType: Account,Profit and Loss,Pèrdues i Guanys
 DocType: Patient,Risk Factors,Factors de risc
@@ -628,6 +668,7 @@
 apps/erpnext/erpnext/config/stock.py +330,Managing Subcontracting,Subcontractació Gestió
 DocType: Vital Signs,Body Temperature,Temperatura corporal
 DocType: Project,Project will be accessible on the website to these users,Projecte serà accessible a la pàgina web a aquests usuaris
+DocType: Detected Disease,Disease,Malaltia
 apps/erpnext/erpnext/config/projects.py +24,Define Project type.,Defineix el tipus de projecte.
 DocType: Supplier Scorecard,Weighting Function,Funció de ponderació
 DocType: Physician,OP Consulting Charge,OP Consultancy Charge
@@ -636,27 +677,29 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +62,Account {0} does not belong to company: {1},Compte {0} no pertany a la companyia: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +51,Abbreviation already used for another company,Abreviatura ja utilitzat per una altra empresa
 DocType: Selling Settings,Default Customer Group,Grup predeterminat Client
+DocType: Asset Repair,ARLOG-,ARLOG-
 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
 DocType: Sales Order Item,Gross Profit,Benefici Brut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Increment no pot ser 0
 DocType: Production Planning Tool,Material Requirement,Requirement de Material
 DocType: Company,Delete Company Transactions,Eliminar Transaccions Empresa
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Reference No and Reference Date is mandatory for Bank transaction,No de referència i data de referència és obligatòria per a les transaccions bancàries
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Reference No and Reference Date is mandatory for Bank transaction,No de referència i data de referència és obligatòria per a les transaccions bancàries
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Afegeix / Edita les taxes i càrrecs
 DocType: Payment Entry Reference,Supplier Invoice No,Número de Factura de Proveïdor
 DocType: Territory,For reference,Per referència
 DocType: Healthcare Settings,Appointment Confirmation,Confirmació de cita
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Cannot delete Serial No {0}, as it is used in stock transactions","No es pot eliminar de sèrie n {0}, ja que s&#39;utilitza en les transaccions de valors"
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Tancament (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +253,Closing (Cr),Tancament (Cr)
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +1,Hello,Hola
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +110,Move Item,moure element
 DocType: Serial No,Warranty Period (Days),Període de garantia (Dies)
 DocType: Installation Note Item,Installation Note Item,Nota d'instal·lació de l'article
 DocType: Production Plan Item,Pending Qty,Pendent Quantitat
 DocType: Budget,Ignore,Ignorar
-apps/erpnext/erpnext/accounts/party.py +372,{0} {1} is not active,{0} {1} no està actiu
-apps/erpnext/erpnext/config/accounts.py +285,Setup cheque dimensions for printing,dimensions de verificació de configuració per a la impressió
+apps/erpnext/erpnext/accounts/party.py +384,{0} {1} is not active,{0} {1} no està actiu
+apps/erpnext/erpnext/config/accounts.py +272,Setup cheque dimensions for printing,dimensions de verificació de configuració per a la impressió
 DocType: Salary Slip,Salary Slip Timesheet,Part d&#39;hores de salari de lliscament
 apps/erpnext/erpnext/controllers/buying_controller.py +157,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Magatzem obligatori per rebut de compra de subcontractació de proveïdors
 DocType: Pricing Rule,Valid From,Vàlid des
@@ -664,19 +707,21 @@
 DocType: Pricing Rule,Sales Partner,Soci de vendes
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,Tots els quadres de comandament del proveïdor.
 DocType: Buying Settings,Purchase Receipt Required,Es requereix rebut de compra
-apps/erpnext/erpnext/stock/doctype/item/item.py +142,Valuation Rate is mandatory if Opening Stock entered,Valoració dels tipus és obligatòria si l&#39;obertura Stock entrar
+apps/erpnext/erpnext/stock/doctype/item/item.py +144,Valuation Rate is mandatory if Opening Stock entered,Valoració dels tipus és obligatòria si l&#39;obertura Stock entrar
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,No es troben en la taula de registres de factures
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Seleccioneu de l'empresa i el Partit Tipus primer
-apps/erpnext/erpnext/config/accounts.py +301,Financial / accounting year.,Exercici comptabilitat /.
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default","Ja heu definit el valor per defecte al perfil de pos {0} per a l&#39;usuari {1}, amabilitat per defecte"
+apps/erpnext/erpnext/config/accounts.py +293,Financial / accounting year.,Exercici comptabilitat /.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Els valors acumulats
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +162,"Sorry, Serial Nos cannot be merged","Ho sentim, els números de sèrie no es poden combinar"
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +63,Territory is Required in POS Profile,El territori es requereix en el perfil de POS
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +68,Territory is Required in POS Profile,El territori es requereix en el perfil de POS
 DocType: Supplier,Prevent RFQs,Evita les RFQ
 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 +168,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
 ,Lead Id,Identificador del client potencial
 DocType: C-Form Invoice Detail,Grand Total,Gran Total
-DocType: Training Event,Course,curs
+DocType: Assessment Plan,Course,curs
 DocType: Timesheet,Payslip,rebut de sou
 apps/erpnext/erpnext/public/js/pos/pos.html +4,Item Cart,Cistella d&#39;articles
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Fiscal Any Data d'inici no ha de ser major que l'any fiscal Data de finalització
@@ -689,7 +734,9 @@
 DocType: Job Applicant,Resume Attachment,Adjunt currículum vitae
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repetiu els Clients
 DocType: Leave Control Panel,Allocate,Assignar
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +804,Sales Return,Devolucions de vendes
+apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +108,Create Variant,Crea una variant
+DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Obrir l&#39;eina de creació de la factura
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +851,Sales Return,Devolucions de vendes
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Nota: Els fulls totals assignats {0} no ha de ser inferior a les fulles ja aprovats {1} per al període
 ,Total Stock Summary,Resum de la total
 DocType: Announcement,Posted By,Publicat per
@@ -700,40 +747,45 @@
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,Base de dades de clients.
 DocType: Quotation,Quotation To,Oferta per
 DocType: Lead,Middle Income,Ingrés Mig
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Obertura (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +849,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unitat de mesura per defecte per a l&#39;article {0} no es pot canviar directament perquè ja ha realitzat alguna transacció (s) amb una altra UOM. Vostè haurà de crear un nou element a utilitzar un UOM predeterminat diferent.
-apps/erpnext/erpnext/accounts/utils.py +349,Allocated amount can not be negative,Suma assignat no pot ser negatiu
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +225,Opening (Cr),Obertura (Cr)
+apps/erpnext/erpnext/stock/doctype/item/item.py +835,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unitat de mesura per defecte per a l&#39;article {0} no es pot canviar directament perquè ja ha realitzat alguna transacció (s) amb una altra UOM. Vostè haurà de crear un nou element a utilitzar un UOM predeterminat diferent.
+apps/erpnext/erpnext/accounts/utils.py +351,Allocated amount can not be negative,Suma assignat no pot ser negatiu
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,Si us plau ajust la Companyia
 DocType: Purchase Order Item,Billed Amt,Quantitat facturada
 DocType: Training Result Employee,Training Result Employee,Empleat Formació Resultat
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Magatzem lògic contra el qual es fan les entrades en existències.
 DocType: Repayment Schedule,Principal Amount,Suma de Capital
 DocType: Employee Loan Application,Total Payable Interest,L&#39;interès total a pagar
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +59,Total Outstanding: {0},Total pendent: {0}
+apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +60,Total Outstanding: {0},Total pendent: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Factura de venda de parts d&#39;hores
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},No de referència i obres de consulta Data es requereix per {0}
-DocType: Process Payroll,Select Payment Account to make Bank Entry,Seleccionar el compte de pagament per fer l&#39;entrada del Banc
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,Reference No & Reference Date is required for {0},No de referència i obres de consulta Data es requereix per {0}
+DocType: Payroll Entry,Select Payment Account to make Bank Entry,Seleccionar el compte de pagament per fer l&#39;entrada del Banc
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll","Crear registres dels empleats per gestionar les fulles, les reclamacions de despeses i nòmina"
 apps/erpnext/erpnext/config/healthcare.py +118,Prescription Period,Període de recepta
 DocType: Restaurant Reservation,Restaurant Reservation,Reserva de restaurants
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Proposal Writing,Redacció de propostes
+DocType: Land Unit,Land Unit Name,Nom de la unitat de la terra
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +190,Proposal Writing,Redacció de propostes
 DocType: Payment Entry Deduction,Payment Entry Deduction,El pagament Deducció d&#39;entrada
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +14,Wrapping up,Embolcall
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +35,Notify Customers via Email,Notifica als clients per correu electrònic
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Hi ha una altra Sales Person {0} amb el mateix ID d&#39;empleat
+DocType: Employee Advance,Claimed Amount,Quantia reclamada
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Si està marcada, les matèries primeres per als articles que són sub-contractats seran inclosos en les sol·licituds de materials"
 apps/erpnext/erpnext/config/healthcare.py +61,Masters,Màsters
 DocType: Assessment Plan,Maximum Assessment Score,Puntuació màxima d&#39;Avaluació
-apps/erpnext/erpnext/config/accounts.py +146,Update Bank Transaction Dates,Dates de les transaccions d&#39;actualització del Banc
+apps/erpnext/erpnext/config/accounts.py +138,Update Bank Transaction Dates,Dates de les transaccions d&#39;actualització del Banc
 apps/erpnext/erpnext/config/projects.py +36,Time Tracking,temps de seguiment
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,Duplicat per TRANSPORTADOR
+apps/erpnext/erpnext/hr/doctype/employee_advance/employee_advance.py +49,Row {0}# Paid Amount cannot be greater than requested advance amount,La fila {0} # Quantitat pagada no pot ser superior a la quantitat sol·licitada
 DocType: Fiscal Year Company,Fiscal Year Company,Any fiscal Companyia
 DocType: Packing Slip Item,DN Detail,Detall DN
 DocType: Training Event,Conference,conferència
 DocType: Timesheet,Billed,Facturat
 DocType: Batch,Batch Description,Descripció lots
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,La creació de grups d&#39;estudiants
-apps/erpnext/erpnext/accounts/utils.py +721,"Payment Gateway Account not created, please create one manually.","Pagament de comptes de porta d&#39;enllaç no es crea, si us plau crear una manualment."
+apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,La creació de grups d&#39;estudiants
+apps/erpnext/erpnext/accounts/utils.py +724,"Payment Gateway Account not created, please create one manually.","Pagament de comptes de porta d&#39;enllaç no es crea, si us plau crear una manualment."
 DocType: Supplier Scorecard,Per Year,Per any
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,No és elegible per a l&#39;admissió en aquest programa segons la DOB
+apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,No és elegible per a l&#39;admissió en aquest programa segons la DOB
 DocType: Sales Invoice,Sales Taxes and Charges,Els impostos i càrrecs de venda
 DocType: Employee,Organization Profile,Perfil de l'organització
 DocType: Vital Signs,Height (In Meter),Alçada (en metro)
@@ -741,25 +793,25 @@
 DocType: Vehicle Service,Vehicle Service,Servei en el vehicle
 apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,desencadena automàticament la sol·licitud de realimentació sobre la base de condicions.
 DocType: Employee,Reason for Resignation,Motiu del cessament
-apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Plantilla per a les avaluacions d'acompliment.
+apps/erpnext/erpnext/config/hr.py +152,Template for performance appraisals.,Plantilla per a les avaluacions d'acompliment.
 DocType: Sales Invoice,Credit Note Issued,Nota de Crèdit Publicat
 DocType: Project Task,Weight,pes
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Factura / Diari Detalls de l'entrada
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' no es troba en l'exercici fiscal {2}
 DocType: Buying Settings,Settings for Buying Module,Ajustaments del mòdul de Compres
-apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Actius {0} no pertany a l&#39;empresa {1}
+apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Actius {0} no pertany a l&#39;empresa {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Si us plau primer entra el rebut de compra
 DocType: Buying Settings,Supplier Naming By,NOmenament de proveïdors per
 DocType: Activity Type,Default Costing Rate,Taxa d&#39;Incompliment Costea
 DocType: Maintenance Schedule,Maintenance Schedule,Programa de manteniment
 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 Type, Campaign, Sales Partner etc.","Llavors Tarifes de Preu es filtren sobre la base de client, grup de clients, Territori, Proveïdor, Tipus Proveïdor, Campanya, soci de vendes, etc."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Canvi net en l&#39;Inventari
-apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Administració de Préstecs empleat
+apps/erpnext/erpnext/config/hr.py +162,Employee Loan Management,Administració de Préstecs empleat
 DocType: Employee,Passport Number,Nombre de Passaport
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Relació amb Guardian2
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +120,Manager,Gerent
+apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,Relació amb Guardian2
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +124,Manager,Gerent
 DocType: Payment Entry,Payment From / To,El pagament de / a
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +127,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nou límit de crèdit és menor que la quantitat pendent actual per al client. límit de crèdit ha de ser almenys {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +155,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nou límit de crèdit és menor que la quantitat pendent actual per al client. límit de crèdit ha de ser almenys {0}
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basat En' i 'Agrupar Per' no pot ser el mateix
 DocType: Sales Person,Sales Person Targets,Objectius persona de vendes
 DocType: Installation Note,IN-,IN-
@@ -768,43 +820,46 @@
 DocType: Lab Test Template,Compound,Compòsit
 DocType: Student Batch Name,Batch Name,Nom del lot
 DocType: Fee Validity,Max number of visit,Nombre màxim de visites
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Part d&#39;hores de creació:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +908,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/schools/doctype/student_applicant/student_applicant.js +24,Enroll,inscriure
+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 +920,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
 DocType: Selling Settings,Customer Naming By,Customer Naming By
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Mostrarà a l&#39;estudiant com Estudiant Present en informes mensuals d&#39;assistència
 DocType: Depreciation Schedule,Depreciation Amount,import de l&#39;amortització
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Convertir el Grup
+DocType: Delivery Trip,TOUR-.#####,GIRA-.#####
 DocType: Activity Cost,Activity Type,Tipus d'activitat
 DocType: Request for Quotation,For individual supplier,Per proveïdor individual
 DocType: BOM Operation,Base Hour Rate(Company Currency),La tarifa bàsica d&#39;Hora (Companyia de divises)
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Quantitat lliurada
-DocType: Supplier,Fixed Days,Dies Fixos
-apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests,Proves de laboratori
+DocType: Company,Fixed Days,Dies Fixos
 DocType: Quotation Item,Item Balance,concepte Saldo
 DocType: Sales Invoice,Packing List,Llista De Embalatge
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Ordres de compra donades a Proveïdors.
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publicant
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +43,Publishing,Publicant
 DocType: Activity Cost,Projects User,Usuari de Projectes
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumit
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +157,{0}: {1} not found in Invoice Details table,{0}: {1} no es troba a Detalls de la factura taula
+DocType: Asset,Asset Owner Company,Propietari de l&#39;empresa propietària
 DocType: Company,Round Off Cost Center,Completen centres de cost
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +227,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manteniment Visita {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +242,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manteniment Visita {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
+DocType: Asset Maintenance Log,AML-,AML-
 DocType: Item,Material Transfer,Transferència de material
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,No s&#39;ha pogut trobar la ruta
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +211,Opening (Dr),Obertura (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Dr),Obertura (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Data i hora d'enviament ha de ser posterior a {0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,Per fer documents recurrents
 ,GST Itemised Purchase Register,GST per elements de Compra Registre
+DocType: Course Scheduling Tool,Reschedule,Reprogramar
 DocType: Employee Loan,Total Interest Payable,L&#39;interès total a pagar
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Impostos i Càrrecs Landed Cost
 DocType: Production Order Operation,Actual Start Time,Temps real d'inici
 DocType: BOM Operation,Operation Time,Temps de funcionament
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +293,Finish,acabat
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +395,Base,base
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +315,Finish,acabat
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +412,Base,base
 DocType: Timesheet,Total Billed Hours,Total d&#39;hores facturades
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1351,Write Off Amount,Anota la quantitat
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1438,Write Off Amount,Anota la quantitat
 DocType: Leave Block List Allow,Allow User,Permetre a l'usuari
 DocType: Journal Entry,Bill No,Factura Número
 DocType: Company,Gain/Loss Account on Asset Disposal,Compte guany / pèrdua en la disposició d&#39;actius
@@ -818,33 +873,38 @@
 DocType: Student Attendance,Student Attendance,Assistència de l&#39;estudiant
 DocType: Sales Invoice Timesheet,Time Sheet,Horari
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush matèries primeres Based On
-DocType: Interest,Interest,interès
+DocType: Lead,Lead is an Organization,El plom és una organització
+DocType: Guardian Interest,Interest,interès
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,abans de la compra
 DocType: Purchase Receipt,Other Details,Altres detalls
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplir
 DocType: Lab Test,Test Template,Plantilla de prova
 DocType: Restaurant Order Entry Item,Served,Servit
+apps/erpnext/erpnext/config/non_profit.py +13,Chapter information.,Informació del capítol.
 DocType: Account,Accounts,Comptes
 DocType: Vehicle,Odometer Value (Last),Valor del comptaquilòmetres (última)
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,Plantilles de criteri de quadre de comandament de proveïdors.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Marketing,Màrqueting
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +109,Marketing,Màrqueting
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +290,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 +545,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 +377,Preview Salary Slip,Salari vista prèvia de lliscament
+apps/erpnext/erpnext/controllers/accounts_controller.py +589,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 +394,Preview Salary Slip,Salari vista prèvia de lliscament
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,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 +23,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: Land Unit,Longitude,Longitud
 ,Absent Student Report,Informe de l&#39;alumne absent
+DocType: Crop,Crop Spacing UOM,UOM d&#39;espaiat de cultiu
 DocType: Email Digest,Next email will be sent on:,El següent correu electrònic s'enviarà a:
 DocType: Offer Letter Term,Offer Letter Term,Present Carta Termini
 DocType: Supplier Scorecard,Per Week,Per setmana
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item has variants.,L&#39;article té variants.
-apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Total d&#39;estudiants
+apps/erpnext/erpnext/stock/doctype/item/item.py +639,Item has variants.,L&#39;article té variants.
+apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,Total d&#39;estudiants
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Article {0} no trobat
 DocType: Bin,Stock Value,Estoc Valor
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +41,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,"Els registres de tarifes es crearan en segon pla. En cas d&#39;error, el missatge d&#39;error s&#39;actualitzarà a l&#39;Agenda."
-apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Companyia {0} no existeix
+apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +42,Fee records will be created in the background. In case of any error the error message will be updated in the Schedule.,"Els registres de tarifes es crearan en segon pla. En cas d&#39;error, el missatge d&#39;error s&#39;actualitzarà a l&#39;Agenda."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +241,Company {0} does not exist,Companyia {0} no existeix
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +40,{0} has fee validity till {1},{0} té validesa de tarifa fins a {1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +57,Tree Type,Tipus Arbre
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Quantitat consumida per unitat
@@ -852,42 +912,46 @@
 DocType: Material Request Item,Quantity and Warehouse,Quantitat i Magatzem
 DocType: Hub Settings,Unregister,Anul·lar la baixa
 DocType: Sales Invoice,Commission Rate (%),Comissió (%)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Seleccioneu Programa
+apps/erpnext/erpnext/education/doctype/student_group/student_group.py +24,Please select Program,Seleccioneu Programa
 DocType: Project,Estimated Cost,cost estimat
 DocType: Purchase Order,Link to material requests,Enllaç a les sol·licituds de materials
 DocType: Hub Settings,Publish,Publica
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aeroespacial
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +7,Aerospace,Aeroespacial
 DocType: Journal Entry,Credit Card Entry,Introducció d'una targeta de crèdit
 apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,Empresa i Comptabilitat
 apps/erpnext/erpnext/config/healthcare.py +108,Appointment Type Master,Tipus de cita Màster
-apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Productes rebuts de proveïdors.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +58,In Value,en Valor
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +68,In Value,en Valor
 DocType: Lead,Campaign Name,Nom de la campanya
 DocType: Selling Settings,Close Opportunity After Days,Tancar Oportunitat Després Dies
 ,Reserved,Reservat
+DocType: Driver,License Details,Detalls de la llicència
 DocType: Purchase Order,Supply Raw Materials,Subministrament de Matèries Primeres
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Actiu Corrent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,{0} is not a stock Item,{0} no és un article d'estoc
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +99,{0} is not a stock Item,{0} no és un article d'estoc
 apps/erpnext/erpnext/hr/email_alert/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',"Compartiu els vostres comentaris a la formació fent clic a &quot;Feedback de formació&quot; i, a continuació, &quot;Nou&quot;"
 DocType: Mode of Payment Account,Default Account,Compte predeterminat
+apps/erpnext/erpnext/stock/doctype/item/item.py +262,Please select Sample Retention Warehouse in Stock Settings first,Seleccioneu primer el magatzem de conservació de mostra a la configuració de valors
 DocType: Payment Entry,Received Amount (Company Currency),Quantitat rebuda (Companyia de divises)
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,S'ha d'indicar el client potencial si la oportunitat té el seu origen en un client potencial
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Si us plau seleccioni el dia lliure setmanal
 DocType: Patient,O Negative,O negatiu
 DocType: Production Order Operation,Planned End Time,Planificació de Temps Final
 ,Sales Person Target Variance Item Group-Wise,Sales Person Target Variance Item Group-Wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,El Compte de la transacció existent no es pot convertir a llibre major
+apps/erpnext/erpnext/accounts/doctype/account/account.py +95,Account with existing transaction cannot be converted to ledger,El Compte de la transacció existent no es pot convertir a llibre major
+apps/erpnext/erpnext/config/non_profit.py +33,Memebership Type Details,Detalls del tipus Memebership
 DocType: Delivery Note,Customer's Purchase Order No,Del client Ordre de Compra No
 DocType: Budget,Budget Against,contra pressupost
 DocType: Employee,Cell Number,Número de cel·la
-apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Les sol·licituds de material auto generada
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +445,There's no employee for the given criteria. Check that Salary Slips have not already been created.,No hi ha cap empleat per als criteris establerts. Comproveu que ja no s&#39;hagin creat salaris.
+apps/erpnext/erpnext/stock/reorder_item.py +190,Auto Material Requests Generated,Les sol·licituds de material auto generada
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdut
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Vostè no pot entrar bo actual a 'Contra entrada de diari' columna
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,You can not enter current voucher in 'Against Journal Entry' column,Vostè no pot entrar bo actual a 'Contra entrada de diari' columna
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reservat per a la fabricació
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
+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/config/hr.py +98,Monthly salary statement.,Nòmina mensual.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +876,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 +881,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
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +78,{0} is an invalid email address in 'Recipients',{0} és una adreça electrònica no vàlida a &quot;Destinataris&quot;
@@ -895,12 +959,14 @@
 apps/erpnext/erpnext/config/healthcare.py +143,Antibiotic.,Antibiòtics.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Des {0} de tipus {1}
 DocType: Warranty Claim,CI-,CI-
-apps/erpnext/erpnext/controllers/buying_controller.py +291,Row {0}: Conversion Factor is mandatory,Fila {0}: el factor de conversió és obligatori
-DocType: Employee,A+,A +
+apps/erpnext/erpnext/controllers/buying_controller.py +292,Row {0}: Conversion Factor is mandatory,Fila {0}: el factor de conversió és obligatori
+DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +326,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Regles Preu múltiples existeix amb el mateix criteri, si us plau, resoldre els conflictes mitjançant l&#39;assignació de prioritat. Regles de preus: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +501,Cannot deactivate or cancel BOM as it is linked with other BOMs,No es pot desactivar o cancel·lar BOM ja que està vinculat amb altres llistes de materials
-DocType: Opportunity,Maintenance,Manteniment
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +504,Cannot deactivate or cancel BOM as it is linked with other BOMs,No es pot desactivar o cancel·lar BOM ja que està vinculat amb altres llistes de materials
+DocType: Asset,Maintenance,Manteniment
 DocType: Item Attribute Value,Item Attribute Value,Element Atribut Valor
+DocType: Item,Maximum sample quantity that can be retained,Quantitat màxima de mostra que es pot conservar
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},La fila {0} # L&#39;element {1} no es pot transferir més de {2} contra l&#39;ordre de compra {3}
 apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Campanyes de venda.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +117,Make Timesheet,fer part d&#39;hores
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -950,21 +1016,25 @@
 DocType: Expense Claim Detail,Expense Claim Type,Expense Claim Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Ajustos predeterminats del Carro de Compres
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +26,Add Timeslots,Afegeix Timeslots
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Actius rebutjat a través d&#39;entrada de diari {0}
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +138,Asset scrapped via Journal Entry {0},Actius rebutjat a través d&#39;entrada de diari {0}
 DocType: Employee Loan,Interest Income Account,Compte d&#39;Utilitat interès
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotecnologia
+apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,Revisa la invitació enviada
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,Biotecnologia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Office Maintenance Expenses,Despeses de manteniment d'oficines
 apps/erpnext/erpnext/utilities/user_progress.py +51,Go to ,Anar a
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Configuració de comptes de correu electrònic
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Si us plau entra primer l'article
+DocType: Asset Repair,Downtime,Temps d&#39;inactivitat
 DocType: Account,Liability,Responsabilitat
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Import sancionat no pot ser major que la reclamació Quantitat a la fila {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +234,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Import sancionat no pot ser major que la reclamació Quantitat a la fila {0}.
 DocType: Salary Detail,Do not include in total,No s&#39;inclouen en total
 DocType: Company,Default Cost of Goods Sold Account,Cost per defecte del compte mercaderies venudes
-apps/erpnext/erpnext/stock/get_item_details.py +319,Price List not selected,Llista de preus no seleccionat
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +964,Sample quantity {0} cannot be more than received quantity {1},La quantitat de mostra {0} no pot ser més de la quantitat rebuda {1}
+apps/erpnext/erpnext/stock/get_item_details.py +362,Price List not selected,Llista de preus no seleccionat
 DocType: Employee,Family Background,Antecedents de família
 DocType: Request for Quotation Supplier,Send Email,Enviar per correu electrònic
-apps/erpnext/erpnext/stock/doctype/item/item.py +216,Warning: Invalid Attachment {0},Advertència: no vàlida Adjunt {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +218,Warning: Invalid Attachment {0},Advertència: no vàlida Adjunt {0}
+DocType: Item,Max Sample Quantity,Quantitat màxima de mostra
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +764,No Permission,No permission
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +438,Quote Requested,Cita sol·licitada
 DocType: Vital Signs,Heart Rate / Pulse,Taxa / pols del cor
@@ -972,32 +1042,34 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Per filtrar la base de la festa, seleccioneu Partit Escrigui primer"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Actualització d'Estoc""no es pot comprovar perquè els articles no es lliuren a través de {0}"
 DocType: Vehicle,Acquisition Date,Data d&#39;adquisició
-apps/erpnext/erpnext/utilities/user_progress.py +125,Nos,Ens
+apps/erpnext/erpnext/utilities/user_progress.py +143,Nos,Ens
 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/patient/patient_dashboard.py +14,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 +549,Row #{0}: Asset {1} must be submitted,Fila # {0}: {1} d&#39;actius ha de ser presentat
+apps/erpnext/erpnext/controllers/accounts_controller.py +593,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: Subscription,Stopped,Detingut
 DocType: Item,If subcontracted to a vendor,Si subcontractat a un proveïdor
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +111,Student Group is already updated.,Grup d&#39;alumnes ja està actualitzat.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +111,Student Group is already updated.,Grup d&#39;alumnes ja està actualitzat.
 DocType: SMS Center,All Customer Contact,Contacte tot client
-apps/erpnext/erpnext/config/stock.py +158,Upload stock balance via csv.,Puja saldo d'existències a través csv.
-DocType: Warehouse,Tree Details,Detalls de l&#39;arbre
+DocType: Land Unit,Tree Details,Detalls de l&#39;arbre
 DocType: Training Event,Event Status,Estat d&#39;esdeveniments
+DocType: Volunteer,Availability Timeslot,Disponibilitat Timeslot
 ,Support Analytics,Suport Analytics
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +352,"If you have any questions, please get back to us.","Si vostè té alguna pregunta, si us plau tornar a nosaltres."
 DocType: Item,Website Warehouse,Lloc Web del magatzem
 DocType: Payment Reconciliation,Minimum Invoice Amount,Volum mínim Factura
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Centre de cost {2} no pertany a l&#39;empresa {3}
+apps/erpnext/erpnext/utilities/user_progress.py +89,Upload your letter head (Keep it web friendly as 900px by 100px),Carregueu el vostre capçal de lletra (manteniu-lo web a 900px per 100px)
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Compte {2} no pot ser un grup
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Element Fila {} idx: {} {DOCTYPE docname} no existeix en l&#39;anterior &#39;{} tipus de document&#39; taula
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Timesheet {0} is already completed or cancelled,Part d&#39;hores {0} ja s&#39;hagi completat o cancel·lat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +291,Timesheet {0} is already completed or cancelled,Part d&#39;hores {0} ja s&#39;hagi completat o cancel·lat
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,No hi ha tasques
 DocType: Item Variant Settings,Copy Fields to Variant,Copia els camps a la variant
 DocType: Asset,Opening Accumulated Depreciation,L&#39;obertura de la depreciació acumulada
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score ha de ser menor que o igual a 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Eina d&#39;Inscripció Programa
-apps/erpnext/erpnext/config/accounts.py +343,C-Form records,Registres C-Form
+apps/erpnext/erpnext/config/accounts.py +335,C-Form records,Registres C-Form
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Clients i Proveïdors
 DocType: Email Digest,Email Digest Settings,Ajustos del processador d'emails
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +354,Thank you for your business!,Gràcies pel teu negoci!
@@ -1008,43 +1080,48 @@
 DocType: HR Settings,Retirement Age,Edat de jubilació
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Seleccionar elements
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} contra Factura {1} {2} de data
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +370,{0} against Bill {1} dated {2},{0} contra Factura {1} {2} de data
 apps/erpnext/erpnext/utilities/user_progress.py +24,Setup Institution,Institució de configuració
 DocType: Program Enrollment,Vehicle/Bus Number,Vehicle / Nombre Bus
-apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Horari del curs
+apps/erpnext/erpnext/education/doctype/course/course.js +17,Course Schedule,Horari del curs
 DocType: Request for Quotation Supplier,Quote Status,Estat de cotització
 DocType: Maintenance Visit,Completion Status,Estat de finalització
 DocType: HR Settings,Enter retirement age in years,Introdueixi l&#39;edat de jubilació en anys
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +252,Target Warehouse,Magatzem destí
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +118,Please select a warehouse,Seleccioneu un magatzem
+DocType: Crop,Target Warehouse,Magatzem destí
+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 +128,Please select a warehouse,Seleccioneu un magatzem
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,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: Cheque Print Template,Starting location from left edge,Posició inicial des la vora esquerra
 DocType: Item,Allow over delivery or receipt upto this percent,Permetre sobre el lliurament o recepció fins aquest percentatge
 DocType: Stock Entry,STE-,Stephen
 DocType: Upload Attendance,Import Attendance,Importa Assistència
 apps/erpnext/erpnext/public/js/pos/pos.html +113,All Item Groups,Tots els grups d'articles
-DocType: Process Payroll,Activity Log,Registre d'activitat
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Net Profit / Loss,Guany/Pèrdua neta
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Compondre automàticament el missatge en la presentació de les transaccions.
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,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: Production Order,Item To Manufacture,Article a fabricar
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} l'estat és {2}
+DocType: Water Analysis,Collection Temperature ,Temperatura de recollida
 DocType: Employee,Provide Email Address registered in company,Proporcionar adreça de correu electrònic registrada a la companyia
 DocType: Shopping Cart Settings,Enable Checkout,habilitar Comanda
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Ordre de compra de Pagament
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Quantitat projectada
 DocType: Sales Invoice,Payment Due Date,Data de pagament
 DocType: Drug Prescription,Interval UOM,Interval UOM
-apps/erpnext/erpnext/stock/doctype/item/item.js +363,Item Variant {0} already exists with same attributes,Article Variant {0} ja existeix amb els mateixos atributs
+apps/erpnext/erpnext/stock/doctype/item/item.js +489,Item Variant {0} already exists with same attributes,Article Variant {0} ja existeix amb els mateixos atributs
 DocType: Item,Hub Publishing Details,Detalls de publicació del Hub
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +115,'Opening',&#39;Obertura&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Obert a fer
 DocType: Notification Control,Delivery Note Message,Missatge de la Nota de lliurament
 DocType: Lab Test Template,Result Format,Format de resultats
 DocType: Expense Claim,Expenses,Despeses
+DocType: Delivery Stop,Delivery Notes,Notes de lliurament
 DocType: Item Variant Attribute,Item Variant Attribute,Article Variant Atribut
 ,Purchase Receipt Trends,Purchase Receipt Trends
-DocType: Process Payroll,Bimonthly,bimensual
+DocType: Payroll Entry,Bimonthly,bimensual
 DocType: Vehicle Service,Brake Pad,Pastilla de fre
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Research & Development,Investigació i Desenvolupament
+DocType: Fertilizer,Fertilizer Contents,Contingut de fertilitzants
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Research & Development,Investigació i Desenvolupament
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,La quantitat a Bill
 DocType: Company,Registration Details,Detalls de registre
 DocType: Timesheet,Total Billed Amount,Suma total Anunciada
@@ -1056,16 +1133,18 @@
 DocType: Sales Team,Incentives,Incentius
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +64,Register for Hub,Registreu-vos per a un concentrador
 DocType: SMS Log,Requested Numbers,Números sol·licitats
+DocType: Volunteer,Evening,Nit
 DocType: Production Planning Tool,Only Obtain Raw Materials,Només obtenció de matèries primeres
-apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,L'avaluació de l'acompliment.
+DocType: Customer,Bypass credit limit check at Sales Order,Comprovació del límit de crèdit bypass a l&#39;ordre de vendes
+apps/erpnext/erpnext/config/hr.py +147,Performance appraisal.,L'avaluació de l'acompliment.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Habilitació d &#39; «ús de Compres&#39;, com cistella de la compra és activat i ha d&#39;haver almenys una regla fiscal per Compres"
-apps/erpnext/erpnext/controllers/accounts_controller.py +347,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Entrada de pagament {0} està enllaçat amb l&#39;Ordre {1}, comprovar si s&#39;ha de llençar com avanç en aquesta factura."
+apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Entrada de pagament {0} està enllaçat amb l&#39;Ordre {1}, comprovar si s&#39;ha de llençar com avanç en aquesta factura."
 DocType: Sales Invoice Item,Stock Details,Estoc detalls
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor de Projecte
 apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Punt de venda
 DocType: Fee Schedule,Fee Creation Status,Estat de creació de tarifes
 DocType: Vehicle Log,Odometer Reading,La lectura del odòmetre
-apps/erpnext/erpnext/accounts/doctype/account/account.py +119,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","El saldo del compte ja està en crèdit, no tens permisos per establir-lo com 'El balanç ha de ser ""com ""Dèbit """
+apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","El saldo del compte ja està en crèdit, no tens permisos per establir-lo com 'El balanç ha de ser ""com ""Dèbit """
 DocType: Account,Balance must be,El balanç ha de ser
 DocType: Hub Settings,Publish Pricing,Publicar preus
 DocType: Notification Control,Expense Claim Rejected Message,Missatge de rebuig de petició de despeses
@@ -1074,12 +1153,15 @@
 DocType: Purchase Invoice Item,Rejected Qty,rebutjat Quantitat
 DocType: Setup Progress Action,Action Field,Camp d&#39;acció
 DocType: Healthcare Settings,Manage Customer,Gestioneu el client
+DocType: Delivery Trip,Delivery Stops,Els terminis de lliurament
 DocType: Salary Slip,Working Days,Dies feiners
 DocType: Serial No,Incoming Rate,Incoming Rate
 DocType: Packing Slip,Gross Weight,Pes Brut
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +47,Enable Hub,Activa el concentrador
-apps/erpnext/erpnext/public/js/setup_wizard.js +107,The name of your company for which you are setting up this system.,El nom de la teva empresa per a la qual està creant aquest sistema.
+apps/erpnext/erpnext/public/js/setup_wizard.js +110,The name of your company for which you are setting up this system.,El nom de la teva empresa per a la qual està creant aquest sistema.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Inclou vacances en el número total de dies laborables
+apps/erpnext/erpnext/setup/setup_wizard/operations/sample_data.py +108,Setup your Institute in ERPNext,Configura el vostre institut a ERPNext
+DocType: Agriculture Analysis Criteria,Plant Analysis,Anàlisi de plantes
 DocType: Job Applicant,Hold,Mantenir
 DocType: Employee,Date of Joining,Data d'ingrés
 DocType: Naming Series,Update Series,Actualitza Sèries
@@ -1087,27 +1169,31 @@
 DocType: Restaurant Table,Minimum Seating,Seient mínim
 DocType: Item Attribute,Item Attribute Values,Element Valors d'atributs
 DocType: Examination Result,Examination Result,examen Resultat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +817,Purchase Receipt,Albarà de compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +843,Purchase Receipt,Albarà de compra
 ,Received Items To Be Billed,Articles rebuts per a facturar
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Submitted Salary Slips,nòmines presentades
-apps/erpnext/erpnext/config/accounts.py +311,Currency exchange rate master.,Tipus de canvi principal.
+apps/erpnext/erpnext/config/accounts.py +303,Currency exchange rate master.,Tipus de canvi principal.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +198,Reference Doctype must be one of {0},Referència Doctype ha de ser un {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Incapaç de trobar la ranura de temps en els pròxims {0} dies per a l&#39;operació {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +322,Unable to find Time Slot in the next {0} days for Operation {1},Incapaç de trobar la ranura de temps en els pròxims {0} dies per a l&#39;operació {1}
 DocType: Production 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 +581,BOM {0} must be active,BOM {0} ha d'estar activa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +585,BOM {0} must be active,BOM {0} ha d'estar activa
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +221,Closing (Opening + Total),Tancament (obertura + total)
 DocType: Journal Entry,Depreciation Entry,Entrada depreciació
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Si us plau. Primer seleccioneu el tipus de document
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancel·la Visites Materials {0} abans de cancel·lar aquesta visita de manteniment
+DocType: Crop Cycle,ISO 8016 standard,Norma ISO 8016
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} does not belong to Item {1},El número de Sèrie {0} no pertany a l'article {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Quantitat necessària
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +127,Warehouses with existing transaction can not be converted to ledger.,Complexos de dipòsit de transaccions existents no es poden convertir en el llibre major.
 DocType: Bank Reconciliation,Total Amount,Quantitat total
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publicant a Internet
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +32,Internet Publishing,Publicant a Internet
 DocType: Prescription Duration,Number,Número
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js +25,Creating {0} Invoice,S&#39;està creant {0} factura
 DocType: Medical Code,Medical Code Standard,Codi mèdic estàndard
+DocType: Soil Texture,Clay Composition (%),Composició de fang (%)
 DocType: Production Planning Tool,Production Orders,Ordres de Producció
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +62,Balance Value,Valor Saldo
+apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +81,Please save before assigning task.,Deseu abans d&#39;assignar una tasca.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,Balance Value,Valor Saldo
 DocType: Lab Test,Lab Technician,Tècnic de laboratori
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Llista de preus de venda
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
@@ -1119,31 +1205,33 @@
 DocType: Supplier,Default Payable Accounts,Comptes per Pagar per defecte
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,L'Empleat {0} no està actiu o no existeix
 DocType: Fee Structure,Components,components
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +251,Please enter Asset Category in Item {0},"Si us plau, introdueixi categoria d&#39;actius en el punt {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Item Variants {0} updated,Article Variants {0} actualitza
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +272,Please enter Asset Category in Item {0},"Si us plau, introdueixi categoria d&#39;actius en el punt {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +634,Item Variants {0} updated,Article Variants {0} actualitza
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +9,"to be generated. If delayed, you will have to manually change the ""Repeat on Day of Month"" field
 of this","per generar. Si es retarda, haurà de canviar manualment el camp &quot;Repetir el dia del mes&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +919,Cannot {0} {1} {2} without any negative outstanding invoice,No es pot {0} {1} {2} sense cap factura pendent negatiu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +945,Cannot {0} {1} {2} without any negative outstanding invoice,No es pot {0} {1} {2} sense cap factura pendent negatiu
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Fila {0}: entrada de crèdit no pot vincular amb un {1}
-apps/erpnext/erpnext/config/accounts.py +254,Define budget for a financial year.,Definir pressupost per a un exercici.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +197,Row {0}: Credit entry can not be linked with a {1},Fila {0}: entrada de crèdit no pot vincular amb un {1}
+apps/erpnext/erpnext/config/accounts.py +246,Define budget for a financial year.,Definir pressupost per a un exercici.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,El compte bancs/efectiu predeterminat s'actualitzarà automàticament a les factures de TPV quan es selecciona aquest.
 DocType: Lead,LEAD-,DIRIGIR-
 DocType: Employee,Permanent Address Is,Adreça permanent
 DocType: Production Order Operation,Operation completed for how many finished goods?,L'operació es va realitzar per la quantitat de productes acabats?
-apps/erpnext/erpnext/public/js/setup_wizard.js +47,The Brand,La Marca
+DocType: Payment Terms Template,Payment Terms Template,Plantilla de condicions de pagament
+apps/erpnext/erpnext/public/js/setup_wizard.js +51,The Brand,La Marca
 DocType: Employee,Exit Interview Details,Detalls de l'entrevista final
 DocType: Item,Is Purchase Item,És Compra d'articles
-DocType: Asset,Purchase Invoice,Factura de Compra
+DocType: Journal Entry Account,Purchase Invoice,Factura de Compra
 DocType: Stock Ledger Entry,Voucher Detail No,Número de detall del comprovant
-apps/erpnext/erpnext/accounts/page/pos/pos.js +765,New Sales Invoice,Nova factura de venda
+apps/erpnext/erpnext/accounts/page/pos/pos.js +780,New Sales Invoice,Nova factura de venda
 DocType: Stock Entry,Total Outgoing Value,Valor Total sortint
 DocType: Physician,Appointments,Cites
 apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Data i Data de Tancament d&#39;obertura ha de ser dins el mateix any fiscal
 DocType: Lead,Request for Information,Sol·licitud d'Informació
 ,LeaderBoard,Leaderboard
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,Sync Offline Invoices,Les factures sincronització sense connexió
+DocType: Sales Invoice Item,Rate With Margin (Company Currency),Taxa amb marge (moneda d&#39;empresa)
+apps/erpnext/erpnext/accounts/page/pos/pos.js +793,Sync Offline Invoices,Les factures sincronització sense connexió
 DocType: Payment Request,Paid,Pagat
 DocType: Program Fee,Program Fee,tarifa del programa
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
@@ -1153,12 +1241,12 @@
 DocType: Guardian,Guardian Name,nom tutor
 DocType: Cheque Print Template,Has Print Format,Format d&#39;impressió té
 DocType: Employee Loan,Sanctioned,sancionada
-apps/erpnext/erpnext/accounts/page/pos/pos.js +73, is mandatory. Maybe Currency Exchange record is not created for ,és obligatori. Potser no es crea registre de canvi de divisa per
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},Fila #{0}: Si us plau especifica el número de sèrie per l'article {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +622,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pels articles &#39;Producte Bundle&#39;, Magatzem, Serial No i lots No serà considerat en el quadre &#39;Packing List&#39;. Si Warehouse i lots No són les mateixes per a tots els elements d&#39;embalatge per a qualsevol element &#39;Producte Bundle&#39;, aquests valors es poden introduir a la taula principal de l&#39;article, els valors es copiaran a la taula &quot;Packing List &#39;."
-DocType: Job Opening,Publish on website,Publicar al lloc web
-apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Enviaments a clients.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +641,Supplier Invoice Date cannot be greater than Posting Date,Factura Proveïdor La data no pot ser major que la data de publicació
+apps/erpnext/erpnext/accounts/page/pos/pos.js +75, is mandatory. Maybe Currency Exchange record is not created for ,és obligatori. Potser no es crea registre de canvi de divisa per
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +117,Row #{0}: Please specify Serial No for Item {1},Fila #{0}: Si us plau especifica el número de sèrie per l'article {1}
+DocType: Crop Cycle,Crop Cycle,Cicle de cultius
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pels articles &#39;Producte Bundle&#39;, Magatzem, Serial No i lots No serà considerat en el quadre &#39;Packing List&#39;. Si Warehouse i lots No són les mateixes per a tots els elements d&#39;embalatge per a qualsevol element &#39;Producte Bundle&#39;, aquests valors es poden introduir a la taula principal de l&#39;article, els valors es copiaran a la taula &quot;Packing List &#39;."
+DocType: Student Admission,Publish on website,Publicar al lloc web
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +645,Supplier Invoice Date cannot be greater than Posting Date,Factura Proveïdor La data no pot ser major que la data de publicació
 DocType: Purchase Invoice Item,Purchase Order Item,Ordre de compra d'articles
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Indirect Income,Ingressos Indirectes
 DocType: Student Attendance Tool,Student Attendance Tool,Eina d&#39;assistència dels estudiants
@@ -1167,7 +1255,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Desacord
 ,Company Name,Nom de l'Empresa
 DocType: SMS Center,Total Message(s),Total Missatge(s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +888,Select Item for Transfer,Seleccionar element de Transferència
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +913,Select Item for Transfer,Seleccionar element de Transferència
 DocType: Purchase Invoice,Additional Discount Percentage,Percentatge de descompte addicional
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Veure una llista de tots els vídeos d&#39;ajuda
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Seleccioneu cap compte del banc on xec va ser dipositat.
@@ -1175,13 +1263,13 @@
 DocType: Pricing Rule,Max Qty,Quantitat màxima
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","Fila {0}: {1} factura no és vàlida, podria ser cancel·lat / no existeix. \ Introduïu una factura vàlida"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pagament contra Vendes / Ordre de Compra sempre ha d'estar marcat com a pagamet anticipat (bestreta)
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Químic
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pagament contra Vendes / Ordre de Compra sempre ha d'estar marcat com a pagamet anticipat (bestreta)
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +16,Chemical,Químic
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Defecte del compte bancari / efectiu s&#39;actualitzarà automàticament en el Salari entrada de diari quan es selecciona aquesta manera.
 DocType: BOM,Raw Material Cost(Company Currency),Prima Cost de Materials (Companyia de divises)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Tots els articles ja han estat transferits per aquesta ordre de producció.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +758,All items have already been transferred for this Production Order.,Tots els articles ja han estat transferits per aquesta ordre de producció.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Fila # {0}: taxa no pot ser més gran que la taxa utilitzada en {1} {2}
-apps/erpnext/erpnext/utilities/user_progress.py +126,Meter,Metre
+apps/erpnext/erpnext/utilities/user_progress.py +144,Meter,Metre
 DocType: Workstation,Electricity Cost,Cost d'electricitat
 DocType: HR Settings,Don't send Employee Birthday Reminders,No envieu Empleat recordatoris d'aniversari
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +34,Save Settings,Desa configuració
@@ -1189,33 +1277,33 @@
 DocType: Item,Inspection Criteria,Criteris d'Inspecció
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Transferit
 DocType: BOM Website Item,BOM Website Item,BOM lloc web d&#39;articles
-apps/erpnext/erpnext/public/js/setup_wizard.js +48,Upload your letter head and logo. (you can edit them later).,Puja el teu cap lletra i logotip. (Pots editar més tard).
+apps/erpnext/erpnext/public/js/setup_wizard.js +52,Upload your letter head and logo. (you can edit them later).,Puja el teu cap lletra i logotip. (Pots editar més tard).
 DocType: Timesheet Detail,Bill,projecte de llei
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,La depreciació propera data s&#39;introdueix com a data passada
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +204,White,Blanc
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,La depreciació propera data s&#39;introdueix com a data passada
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +208,White,Blanc
 DocType: SMS Center,All Lead (Open),Tots els clients potencials (Obert)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +231,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Fila {0}: Quantitat no està disponible per {4} al magatzem {1} a publicar moment de l&#39;entrada ({2} {3})
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +248,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Fila {0}: Quantitat no està disponible per {4} al magatzem {1} a publicar moment de l&#39;entrada ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Obtenir bestretes pagades
 DocType: Item,Automatically Create New Batch,Crear nou lot de forma automàtica
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Make ,Fer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +808,Make ,Fer
 DocType: Student Admission,Admission Start Date,L&#39;entrada Data d&#39;Inici
 DocType: Journal Entry,Total Amount in Words,Suma total en Paraules
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"S'ha produït un error. Una raó probable podria ser que no ha guardat el formulari. Si us plau, poseu-vos en contacte amb support@erpnext.com si el problema persisteix."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Carro de la compra
-apps/erpnext/erpnext/controllers/selling_controller.py +158,Order Type must be one of {0},Tipus d'ordre ha de ser un de {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +126,Order Type must be one of {0},Tipus d'ordre ha de ser un de {0}
 DocType: Lead,Next Contact Date,Data del següent contacte
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,Quantitat d'obertura
 DocType: Healthcare Settings,Appointment Reminder,Recordatori de cites
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Please enter Account for Change Amount,"Si us plau, introdueixi el compte per al Canvi Monto"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +472,Please enter Account for Change Amount,"Si us plau, introdueixi el compte per al Canvi Monto"
 DocType: Student Batch Name,Student Batch Name,Lot Nom de l&#39;estudiant
 DocType: Consultation,Doctor,Doctor
 DocType: Holiday List,Holiday List Name,Nom de la Llista de vacances
 DocType: Repayment Schedule,Balance Loan Amount,Saldo del Préstec Monto
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Calendari de Cursos
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +224,Stock Options,Opcions sobre accions
+apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Calendari de Cursos
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +234,Stock Options,Opcions sobre accions
 DocType: Journal Entry Account,Expense Claim,Compte de despeses
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +234,Do you really want to restore this scrapped asset?,De veres voleu restaurar aquest actiu rebutjat?
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +358,Qty for {0},Quantitat de {0}
+apps/erpnext/erpnext/assets/doctype/asset/asset.js +254,Do you really want to restore this scrapped asset?,De veres voleu restaurar aquest actiu rebutjat?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +380,Qty for {0},Quantitat de {0}
 DocType: Leave Application,Leave Application,Deixar Aplicació
 DocType: Patient,Patient Relation,Relació del pacient
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Deixa Eina d'Assignació
@@ -1231,18 +1319,18 @@
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},Si us plau especificar un {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Elements retirats sense canvi en la quantitat o el valor.
 DocType: Delivery Note,Delivery To,Lliurar a
-apps/erpnext/erpnext/stock/doctype/item/item.py +682,Attribute table is mandatory,Taula d&#39;atributs és obligatori
+apps/erpnext/erpnext/stock/doctype/item/item.py +668,Attribute table is mandatory,Taula d&#39;atributs és obligatori
 DocType: Production Planning Tool,Get Sales Orders,Rep ordres de venda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} no pot ser negatiu
 DocType: Training Event,Self-Study,Acte estudi
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +480,Discount,Descompte
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +537,Discount,Descompte
 DocType: Asset,Total Number of Depreciations,Nombre total d&#39;amortitzacions
 DocType: Sales Invoice Item,Rate With Margin,Amb la taxa de marge
 DocType: Workstation,Wages,Salari
-DocType: Task,Urgent,Urgent
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +157,Please specify a valid Row ID for row {0} in table {1},"Si us plau, especifiqueu un ID de fila vàlida per a la fila {0} a la taula {1}"
+DocType: Agriculture Task,Urgent,Urgent
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +174,Please specify a valid Row ID for row {0} in table {1},"Si us plau, especifiqueu un ID de fila vàlida per a la fila {0} a la taula {1}"
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +84,Unable to find variable: ,No es pot trobar la variable:
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +664,Please select a field to edit from numpad,Seleccioneu un camp per editar des del teclat numèric
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +723,Please select a field to edit from numpad,Seleccioneu un camp per editar des del teclat numèric
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Aneu a l&#39;escriptori i començar a utilitzar ERPNext
 DocType: Item,Manufacturer,Fabricant
 DocType: Landed Cost Item,Purchase Receipt Item,Rebut de compra d'articles
@@ -1251,12 +1339,11 @@
 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 +72,Selling Amount,Quantitat de Venda
 DocType: Repayment Schedule,Interest Amount,Suma d&#39;interès
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +109,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Ets l'aprovador de despeses per a aquest registre. Actualitza l '""Estat"" i Desa"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Ets l'aprovador de despeses per a aquest registre. Actualitza l '""Estat"" i Desa"
 DocType: Serial No,Creation Document No,Creació document nº
 DocType: Issue,Issue,Incidència
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation_dashboard.py +11,Records,Registres
 DocType: Asset,Scrapped,rebutjat
-apps/erpnext/erpnext/config/stock.py +200,"Attributes for Item Variants. e.g Size, Color etc.","Atributs per Punt variants. per exemple, mida, color, etc."
 DocType: Purchase Invoice,Returns,les devolucions
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,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}
@@ -1265,7 +1352,7 @@
 DocType: Tax Rule,Shipping State,Estat de l&#39;enviament
 ,Projected Quantity as Source,Quantitat projectada com Font
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,L'article ha de ser afegit usant 'Obtenir elements de rebuts de compra' botó
-DocType: Employee,A-,A-
+DocType: Student,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Incloure elements no estan en estoc
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Sales Expenses,Despeses de venda
 DocType: Consultation,Diagnosis,Diagnòstic
@@ -1273,8 +1360,8 @@
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Per defecte Centre de Cost de Venda
 DocType: Sales Partner,Implementation Partner,Soci d'Aplicació
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1598,ZIP Code,Codi ZIP
-apps/erpnext/erpnext/controllers/selling_controller.py +271,Sales Order {0} is {1},Vendes Sol·licitar {0} és {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1613,ZIP Code,Codi ZIP
+apps/erpnext/erpnext/controllers/selling_controller.py +245,Sales Order {0} is {1},Vendes Sol·licitar {0} és {1}
 DocType: Opportunity,Contact Info,Informació de Contacte
 apps/erpnext/erpnext/config/stock.py +315,Making Stock Entries,Fer comentaris Imatges
 DocType: Packing Slip,Net Weight UOM,Pes net UOM
@@ -1286,18 +1373,19 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Data de finalització no pot ser inferior a data d'inici
 DocType: Sales Person,Select company name first.,Seleccioneu el nom de l'empresa en primer lloc.
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +181,Low to High,Baixa a alta
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +202,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 +24,To {0} | {1} {2},Per {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Edat mitjana
-DocType: School Settings,Attendance Freeze Date,L&#39;assistència Freeze Data
-apps/erpnext/erpnext/utilities/user_progress.py +89,List a few of your suppliers. They could be organizations or individuals.,Enumera alguns de les teves proveïdors. Poden ser les organitzacions o individuals.
+DocType: Education Settings,Attendance Freeze Date,L&#39;assistència Freeze Data
+apps/erpnext/erpnext/utilities/user_progress.py +107,List a few of your suppliers. They could be organizations or individuals.,Enumera alguns de les teves proveïdors. Poden ser les organitzacions o individuals.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Veure tots els Productes
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),El plom sobre l&#39;edat mínima (Dies)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +57,All BOMs,totes les llistes de materials
 DocType: Patient,Default Currency,Moneda per defecte
 DocType: Expense Claim,From Employee,D'Empleat
-apps/erpnext/erpnext/controllers/accounts_controller.py +407,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 +451,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: Upload Attendance,Attendance From Date,Assistència des de data
 DocType: Appraisal Template Goal,Key Performance Area,Àrea Clau d'Acompliment
@@ -1310,16 +1398,16 @@
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Invoice Detail
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Factura de Pagament de Reconciliació
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,Contribució%
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +212,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","D&#39;acord amb la configuració de comprar si l&#39;ordre de compra Obligatori == &#39;SÍ&#39;, a continuació, per a la creació de la factura de compra, l&#39;usuari necessita per crear l&#39;ordre de compra per al primer element {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +215,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}","D&#39;acord amb la configuració de comprar si l&#39;ordre de compra Obligatori == &#39;SÍ&#39;, a continuació, per a la creació de la factura de compra, l&#39;usuari necessita per crear l&#39;ordre de compra per al primer element {0}"
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Els números de registre de l'empresa per la seva referència. Nombres d'impostos, etc."
 DocType: Sales Partner,Distributor,Distribuïdor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Regles d'enviament de la cistella de lacompra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +233,Production Order {0} must be cancelled before cancelling this Sales Order,Ordre de Producció {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
-apps/erpnext/erpnext/public/js/controllers/transaction.js +68,Please set 'Apply Additional Discount On',"Si us plau, estableix &quot;Aplicar descompte addicional en &#39;"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +252,Production Order {0} must be cancelled before cancelling this Sales Order,Ordre de Producció {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',"Si us plau, estableix &quot;Aplicar descompte addicional en &#39;"
 ,Ordered Items To Be Billed,Els articles comandes a facturar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,De Gamma ha de ser menor que en la nostra gamma
 DocType: Global Defaults,Global Defaults,Valors per defecte globals
-apps/erpnext/erpnext/projects/doctype/project/project.py +215,Project Collaboration Invitation,Invitació del Projecte de Col·laboració
+apps/erpnext/erpnext/projects/doctype/project/project.py +226,Project Collaboration Invitation,Invitació del Projecte de Col·laboració
 DocType: Salary Slip,Deductions,Deduccions
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,Nom de l&#39;acció
@@ -1327,49 +1415,47 @@
 apps/erpnext/erpnext/regional/india/utils.py +24,First 2 digits of GSTIN should match with State number {0},2 primers dígits de GSTIN ha de coincidir amb el nombre d&#39;Estat {0}
 DocType: Purchase Invoice,Start date of current invoice's period,Data inicial del període de facturació actual
 DocType: Salary Slip,Leave Without Pay,Absències sense sou
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Planificació de la capacitat d&#39;error
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +366,Capacity Planning Error,Planificació de la capacitat d&#39;error
 ,Trial Balance for Party,Balanç de comprovació per a la festa
 DocType: Lead,Consultant,Consultor
 DocType: Salary Slip,Earnings,Guanys
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +391,Finished Item {0} must be entered for Manufacture type entry,Article Acabat {0} ha de ser introduït per a l&#39;entrada Tipus de Fabricació
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +416,Finished Item {0} must be entered for Manufacture type entry,Article Acabat {0} ha de ser introduït per a l&#39;entrada Tipus de Fabricació
 apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Obertura de Balanç de Comptabilitat
 ,GST Sales Register,GST Registre de Vendes
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura proforma
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +550,Nothing to request,Res per sol·licitar
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Un altre rècord Pressupost &#39;{0}&#39; ja existeix en contra {1} &#39;{2}&#39; per a l&#39;any fiscal {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',La 'Data d'Inici Real' no pot ser major que la 'Data de Finalització Real'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Management,Administració
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Management,Administració
 DocType: Cheque Print Template,Payer Settings,Configuració del pagador
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Això s'afegeix al Codi de l'article de la variant. Per exemple, si la seva abreviatura és ""SM"", i el codi de l'article és ""samarreta"", el codi de l'article de la variant serà ""SAMARRETA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,El sou net (en paraules) serà visible un cop que es guardi la nòmina.
 DocType: Purchase Invoice,Is Return,És la tornada
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,Caution,Precaució
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +787,Return / Debit Note,Retorn / dèbit Nota
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +81,Caution,Precaució
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +813,Return / Debit Note,Retorn / dèbit Nota
 DocType: Price List Country,Price List Country,Preu de llista País
 DocType: Item,UOMs,UOMS
-apps/erpnext/erpnext/stock/utils.py +205,{0} valid serial nos for Item {1},{0} amb números de sèrie vàlids per Punt {1}
+apps/erpnext/erpnext/stock/utils.py +210,{0} valid serial nos for Item {1},{0} amb números de sèrie vàlids per Punt {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,El Codi de l'article no es pot canviar de número de sèrie
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +26,POS Profile {0} already created for user: {1} and company {2},POS Perfil {0} ja creat per a l&#39;usuari: {1} i companyia {2}
-DocType: Sales Invoice Item,UOM Conversion Factor,UOM factor de conversió
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +23,Please enter Item Code to get Batch Number,"Si us plau, introdueixi el codi d&#39;article per obtenir el nombre de lot"
+DocType: Purchase Invoice Item,UOM Conversion Factor,UOM factor de conversió
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +40,Please enter Item Code to get Batch Number,"Si us plau, introdueixi el codi d&#39;article per obtenir el nombre de lot"
 DocType: Stock Settings,Default Item Group,Grup d'articles predeterminat
 DocType: Employee Loan,Partially Disbursed,parcialment Desemborsament
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Base de dades de proveïdors.
 DocType: Account,Balance Sheet,Balanç
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +701,Cost Center For Item with Item Code ',Centre de cost per l'article amb Codi d'article '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Cost Center For Item with Item Code ',Centre de cost per l'article amb Codi d'article '
 DocType: Fee Validity,Valid Till,Vàlid fins a
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2454,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode de pagament no està configurat. Si us plau, comproveu, si el compte s&#39;ha establert en la manera de pagament o en punts de venda perfil."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2473,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode de pagament no està configurat. Si us plau, comproveu, si el compte s&#39;ha establert en la manera de pagament o en punts de venda perfil."
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,El mateix article no es pot introduir diverses vegades.
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Altres comptes es poden fer en grups, però les entrades es poden fer contra els no Grups"
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +30,"Further accounts can be made under Groups, but entries can be made against non-Groups","Altres comptes es poden fer en grups, però les entrades es poden fer contra els no Grups"
 DocType: Lead,Lead,Client potencial
 DocType: Email Digest,Payables,Comptes per Pagar
 DocType: Course,Course Intro,curs Introducció
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,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ó
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +90,Stock Entry {0} created,De l&#39;entrada {0} creat
-apps/erpnext/erpnext/controllers/buying_controller.py +297,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/batch/batch.js +97,Stock Entry {0} created,De l&#39;entrada {0} creat
+apps/erpnext/erpnext/controllers/buying_controller.py +298,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
 ,Purchase Order Items To Be Billed,Ordre de Compra articles a facturar
 DocType: Purchase Invoice Item,Net Rate,Taxa neta
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +151,Please select a customer,Seleccioneu un client
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +147,Please select a customer,Seleccioneu un client
 DocType: Purchase Invoice Item,Purchase Invoice Item,Compra Factura article
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Les entrades d'ajust d'estocs i les entrades de GL estan inserits en els rebuts de compra seleccionats
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Article 1
@@ -1382,27 +1468,27 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +20,Order Count,Recompte de sol·licituds
 DocType: Global Defaults,Current Fiscal Year,Any fiscal actual
 DocType: Purchase Order,Group same items,Grup mateixos articles
-DocType: Global Defaults,Disable Rounded Total,Desactivar total arrodonit
+DocType: Purchase Invoice,Disable Rounded Total,Desactivar total arrodonit
 DocType: Employee Loan Application,Repayment Info,Informació de la devolució
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,'Entrades' no pot estar buit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +446,'Entries' cannot be empty,'Entrades' no pot estar buit
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Duplicar fila {0} amb el mateix {1}
 ,Trial Balance,Balanç provisional
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +449,Fiscal Year {0} not found,Any fiscal {0} no trobat
-apps/erpnext/erpnext/config/hr.py +300,Setting up Employees,Configuració d&#39;Empleats
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +438,Fiscal Year {0} not found,Any fiscal {0} no trobat
+apps/erpnext/erpnext/config/hr.py +305,Setting up Employees,Configuració d&#39;Empleats
 DocType: Sales Order,SO-,TAN-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Please select prefix first,Seleccioneu el prefix primer
-DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +185,Research,Recerca
+DocType: Student,O-,O-
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Research,Recerca
 DocType: Maintenance Visit Purpose,Work Done,Treballs Realitzats
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,"Si us plau, especifiqui almenys un atribut a la taula d&#39;atributs"
 DocType: Announcement,All Students,tots els alumnes
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Element {0} ha de ser una posició no de magatzem
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Element {0} ha de ser una posició no de magatzem
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Veure Ledger
 DocType: Grading Scale,Intervals,intervals
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Earliest
-apps/erpnext/erpnext/stock/doctype/item/item.py +519,"An Item Group exists with same name, please change the item name or rename the item group","Hi ha un grup d'articles amb el mateix nom, si us plau, canvieu el nom de l'article o del grup d'articles"
-apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Nº d&#39;Estudiants mòbil
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +367,Rest Of The World,Resta del món
+apps/erpnext/erpnext/stock/doctype/item/item.py +500,"An Item Group exists with same name, please change the item name or rename the item group","Hi ha un grup d'articles amb el mateix nom, si us plau, canvieu el nom de l'article o del grup d'articles"
+apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,Nº d&#39;Estudiants mòbil
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +105,Rest Of The World,Resta del món
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,L'article {0} no pot tenir per lots
 ,Budget Variance Report,Pressupost Variància Reportar
 DocType: Salary Slip,Gross Pay,Sou brut
@@ -1422,7 +1508,6 @@
 DocType: Student,STUD.,Stud.
 DocType: Production Order,Qty To Manufacture,Quantitat a fabricar
 DocType: Email Digest,New Income,nou Ingrés
-DocType: School Settings,School Settings,Característiques de l&#39;escola
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mantenir mateix ritme durant tot el cicle de compra
 DocType: Opportunity Item,Opportunity Item,Opportunity Item
 ,Student and Guardian Contact Details,Alumne i tutor detalls de contacte
@@ -1434,26 +1519,26 @@
 DocType: Patient Appointment,More Info,Més Info
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +178,Valuation Rate required for Item in row {0},Valoració dels tipus requerits per l&#39;article a la fila {0}
 DocType: Supplier Scorecard,Scorecard Actions,Accions de quadre de comandament
-apps/erpnext/erpnext/utilities/user_progress.py +148,Example: Masters in Computer Science,Exemple: Mestratge en Ciències de la Computació
+apps/erpnext/erpnext/utilities/user_progress.py +166,Example: Masters in Computer Science,Exemple: Mestratge en Ciències de la Computació
 DocType: Purchase Invoice,Rejected Warehouse,Magatzem no conformitats
 DocType: GL Entry,Against Voucher,Contra justificant
 DocType: Item,Default Buying Cost Center,Centres de cost de compres predeterminat
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Per obtenir el millor de ERPNext, us recomanem que es prengui un temps i veure aquests vídeos d&#39;ajuda."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +74, to ,a
+apps/erpnext/erpnext/accounts/page/pos/pos.js +76, to ,a
 DocType: Supplier Quotation Item,Lead Time in days,Termini d&#39;execució en dies
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Comptes per Pagar Resum
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +337,Payment of salary from {0} to {1},El pagament del salari de {0} a {1}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +321,Payment of salary from {0} to {1},El pagament del salari de {0} a {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},No autoritzat per editar el compte bloquejat {0}
 DocType: Journal Entry,Get Outstanding Invoices,Rep les factures pendents
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +70,Sales Order {0} is not valid,Vendes Sol·licitar {0} no és vàlid
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +84,Sales Order {0} is not valid,Vendes Sol·licitar {0} no és vàlid
 DocType: Supplier Scorecard,Warn for new Request for Quotations,Adverteu una nova sol·licitud de pressupostos
 apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,Les ordres de compra li ajudarà a planificar i donar seguiment a les seves compres
-apps/erpnext/erpnext/setup/doctype/company/company.py +218,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
+apps/erpnext/erpnext/setup/doctype/company/company.py +215,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,Prescripcions de proves de laboratori
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +162,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La quantitat total d&#39;emissió / Transferència {0} en la Sol·licitud de material {1} \ no pot ser major que la quantitat sol·licitada {2} per a l&#39;article {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +193,Small,Petit
-DocType: Employee,Employee Number,Número d'empleat
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +197,Small,Petit
+DocType: Education Settings,Employee Number,Número d'empleat
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},Cas No (s) ja en ús. Intenta Cas n {0}
 DocType: Project,% Completed,% Completat
 ,Invoiced Amount (Exculsive Tax),Quantitat facturada (Impost exculsive)
@@ -1463,17 +1548,17 @@
 DocType: Item,Auto re-order,Acte reordenar
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total Aconseguit
 DocType: Employee,Place of Issue,Lloc de la incidència
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Contract,Contracte
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +101,Contract,Contracte
 DocType: Email Digest,Add Quote,Afegir Cita
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +869,UOM coversion factor required for UOM: {0} in Item: {1},Es necessita un factor de coversió per la UDM: {0} per l'article: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +932,UOM coversion factor required for UOM: {0} in Item: {1},Es necessita un factor de coversió per la UDM: {0} per l'article: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Indirect Expenses,Despeses Indirectes
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Fila {0}: Quantitat és obligatori
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
-apps/erpnext/erpnext/accounts/page/pos/pos.js +770,Sync Master Data,Sincronització de dades mestres
-apps/erpnext/erpnext/utilities/user_progress.py +117,Your Products or Services,Els Productes o Serveis de la teva companyia
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +88,Row {0}: Qty is mandatory,Fila {0}: Quantitat és obligatori
+DocType: Agriculture Analysis Criteria,Agriculture,Agricultura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +785,Sync Master Data,Sincronització de dades mestres
+apps/erpnext/erpnext/utilities/user_progress.py +135,Your Products or Services,Els Productes o Serveis de la teva companyia
 DocType: Special Test Items,Special Test Items,Elements de prova especials
 DocType: Mode of Payment,Mode of Payment,Forma de pagament
-apps/erpnext/erpnext/stock/doctype/item/item.py +190,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
+apps/erpnext/erpnext/stock/doctype/item/item.py +192,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
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,This is a root item group and cannot be edited.
@@ -1481,49 +1566,49 @@
 DocType: Vehicle,Fuel UOM,UOM de combustible
 DocType: Warehouse,Warehouse Contact Info,Informació del contacte del magatzem
 DocType: Payment Entry,Write Off Difference Amount,Amortitzar import de la diferència
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +415,"{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/salary_slip/salary_slip.py +434,"{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"
 DocType: Item,Foreign Trade Details,Detalls estrangera Comerç
 ,Assessment Plan Status,Estat del pla d&#39;avaluació
 DocType: Email Digest,Annual Income,Renda anual
 DocType: Serial No,Serial No Details,Serial No Detalls
 DocType: Purchase Invoice Item,Item Tax Rate,Element Tipus impositiu
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +67,Please select Physician and Date,Seleccioneu Metge i Data
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +75,Please select Physician and Date,Seleccioneu Metge i Data
 DocType: Student Group Student,Group Roll Number,Nombre Rotllo Grup
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Per {0}, només els comptes de crèdit es poden vincular amb un altre seient de dèbit"
-apps/erpnext/erpnext/projects/doctype/project/project.py +78,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total de tots els pesos de tasques ha de ser 1. Si us plau ajusta els pesos de totes les tasques del projecte en conseqüència
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +578,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
-apps/erpnext/erpnext/stock/get_item_details.py +151,Item {0} must be a Sub-contracted Item,Article {0} ha de ser un subcontractada article
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +143,"For {0}, only credit accounts can be linked against another debit entry","Per {0}, només els comptes de crèdit es poden vincular amb un altre seient de dèbit"
+apps/erpnext/erpnext/projects/doctype/project/project.py +80,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total de tots els pesos de tasques ha de ser 1. Si us plau ajusta els pesos de totes les tasques del projecte en conseqüència
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +582,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
+apps/erpnext/erpnext/stock/get_item_details.py +146,Item {0} must be a Sub-contracted Item,Article {0} ha de ser un subcontractada article
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Capital Equipments,Capital Equipments
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regla preus es selecciona per primera basada en 'Aplicar On' camp, que pot ser d'article, grup d'articles o Marca."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +223,Please set the Item Code first,Configureu primer el codi de l&#39;element
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +245,Please set the Item Code first,Configureu primer el codi de l&#39;element
 DocType: Item,ITEM-,ARTICLE-
-apps/erpnext/erpnext/controllers/selling_controller.py +151,Total allocated percentage for sales team should be 100,El Percentatge del total assignat per a l'equip de vendes ha de ser de 100
+apps/erpnext/erpnext/controllers/selling_controller.py +119,Total allocated percentage for sales team should be 100,El Percentatge del total assignat per a l'equip de vendes ha de ser de 100
 DocType: Sales Invoice Item,Edit Description,Descripció
 DocType: Antibiotic,Antibiotic,Antibiòtics
 ,Team Updates,actualitzacions equip
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +885,For Supplier,Per Proveïdor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +910,For Supplier,Per Proveïdor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Configurar el Tipus de compte ajuda en la selecció d'aquest compte en les transaccions.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total (En la moneda de la companyia)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Crear Format d&#39;impressió
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +5,Fee Created,Taxa creada
+apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +5,Fee Created,Taxa creada
 apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},No s&#39;ha trobat cap element anomenat {0}
 DocType: Supplier Scorecard Criteria,Criteria Formula,Fórmula de criteris
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Sortint total
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +47,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Només pot haver-hi una Enviament Condició de regla amb 0 o valor en blanc de ""valor"""
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +39,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Només pot haver-hi una Enviament Condició de regla amb 0 o valor en blanc de ""valor"""
 DocType: Authorization Rule,Transaction,Transacció
 DocType: Patient Appointment,Duration,Durada
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: aquest centre de costos és un Grup. No es poden fer anotacions en compte als grups.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +54,Child warehouse exists for this warehouse. You can not delete this warehouse.,existeix magatzem nen per a aquest magatzem. No es pot eliminar aquest magatzem.
 DocType: Item,Website Item Groups,Grups d'article del Web
 DocType: Purchase Invoice,Total (Company Currency),Total (Companyia moneda)
-apps/erpnext/erpnext/stock/utils.py +200,Serial number {0} entered more than once,Nombre de sèrie {0} va entrar més d'una vegada
-DocType: Depreciation Schedule,Journal Entry,Entrada de diari
+apps/erpnext/erpnext/stock/utils.py +205,Serial number {0} entered more than once,Nombre de sèrie {0} va entrar més d'una vegada
+DocType: Journal Entry,Journal Entry,Entrada de diari
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +148,{0} items in progress,{0} articles en procés
 DocType: Workstation,Workstation Name,Nom de l'Estació de treball
 DocType: Grading Scale Interval,Grade Code,codi grau
 DocType: POS Item Group,POS Item Group,POS Grup d&#39;articles
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar Resum:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +587,BOM {0} does not belong to Item {1},BOM {0} no pertany a Punt {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +591,BOM {0} does not belong to Item {1},BOM {0} no pertany a Punt {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Salary Slip,Bank Account No.,Compte Bancari No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Aquest és el nombre de l'última transacció creat amb aquest prefix
@@ -1538,11 +1623,11 @@
 DocType: BOM Operation,Workstation,Lloc de treball
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Sol·licitud de Cotització Proveïdor
 DocType: Healthcare Settings,Registration Message,Missatge de registre
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Hardware,Maquinari
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +154,Hardware,Maquinari
 DocType: Prescription Dosage,Prescription Dosage,Dosificació de recepta
 DocType: Attendance,HR Manager,Gerent de Recursos Humans
-apps/erpnext/erpnext/accounts/party.py +177,Please select a Company,Seleccioneu una Empresa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/accounts/party.py +178,Please select a Company,Seleccioneu una Empresa
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +92,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Data Factura Proveïdor
 apps/erpnext/erpnext/templates/includes/product_page.js +18,per,per
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Has d'habilitar el carro de la compra
@@ -1554,7 +1639,7 @@
 ,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: Purchase Taxes and Charges,Add or Deduct,Afegir o Deduir
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +82,Overlapping conditions found between:,La superposició de les condicions trobades entre:
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +148,Overlapping conditions found between:,La superposició de les condicions trobades entre:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,Contra Diari entrada {0} ja s'ajusta contra algun altre bo
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Valor Total de la comanda
 apps/erpnext/erpnext/demo/setup/setup_data.py +328,Food,Menjar
@@ -1562,7 +1647,7 @@
 DocType: Maintenance Schedule Item,No of Visits,Número de Visites
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Programa de manteniment {0} existeix en contra de {1}
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +118,Do you want to publish your Items to Hub ?,Voleu publicar els vostres elements al concentrador?
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +36,Enrolling student,estudiant que s&#39;inscriu
+apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +36,Enrolling student,estudiant que s&#39;inscriu
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Divisa del compte de clausura ha de ser {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma de punts per a totes les metes ha de ser 100. És {0}
 DocType: Project,Start and End Dates,Les dates d&#39;inici i fi
@@ -1574,7 +1659,7 @@
 DocType: Rename Tool,Utilities,Utilitats
 DocType: POS Profile,Accounting,Comptabilitat
 DocType: Employee,EMP/,EMP /
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +123,Please select batches for batched item ,Seleccioneu lots per lots per al punt
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +133,Please select batches for batched item ,Seleccioneu lots per lots per al punt
 DocType: Asset,Depreciation Schedules,programes de depreciació
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Període d&#39;aplicació no pot ser període d&#39;assignació llicència fos
 DocType: Activity Cost,Projects,Projectes
@@ -1587,7 +1672,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Mitjana diària sortint
 DocType: POS Profile,Campaign,Campanya
 DocType: Supplier,Name and Type,Nom i Tipus
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',"Estat d'aprovació ha de ser ""Aprovat"" o ""Rebutjat"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +66,Approval Status must be 'Approved' or 'Rejected',"Estat d'aprovació ha de ser ""Aprovat"" o ""Rebutjat"""
 DocType: Physician,Contacts and Address,Contactes i adreça
 DocType: Purchase Invoice,Contact Person,Persona De Contacte
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Expected Start Date' can not be greater than 'Expected End Date',La 'Data Prevista d'Inici' no pot ser major que la 'Data de Finalització Prevista'
@@ -1596,13 +1681,13 @@
 DocType: Sales Order Item,Planned Quantity,Quantitat planificada
 DocType: Purchase Invoice Item,Item Tax Amount,Suma d'impostos d'articles
 DocType: Item,Maintain Stock,Mantenir Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +212,Stock Entries already created for Production Order ,Imatges de entrades ja creades per Ordre de Producció
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +217,Stock Entries already created for Production Order ,Imatges de entrades ja creades per Ordre de Producció
 DocType: Employee,Prefered Email,preferit per correu electrònic
 DocType: Student Admission,Eligibility and Details,Elegibilitat i detalls
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Canvi net en actius fixos
 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 +663,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/production_order/production_order.js +359,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +775,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/production_order/production_order.js +381,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: Email Digest,For Company,Per a l'empresa
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Registre de Comunicació.
@@ -1611,18 +1696,18 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Buying Amount,Import Comprar
 DocType: Sales Invoice,Shipping Address Name,Nom de l'Adreça d'enviament
 DocType: Material Request,Terms and Conditions Content,Contingut de Termes i Condicions
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +555,cannot be greater than 100,no pot ser major que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +734,Item {0} is not a stock Item,Article {0} no és un article d'estoc
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +580,cannot be greater than 100,no pot ser major que 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +720,Item {0} is not a stock Item,Article {0} no és un article d'estoc
 DocType: Maintenance Visit,Unscheduled,No programada
 DocType: Employee,Owned,Propietat de
 DocType: Salary Detail,Depends on Leave Without Pay,Depèn de la llicència sense sou
 DocType: Pricing Rule,"Higher the number, higher the priority","Més gran sigui el nombre, més gran és la prioritat"
 ,Purchase Invoice Trends,Tendències de les Factures de Compra
 DocType: Employee,Better Prospects,Millors perspectives
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Fila # {0}: El lot {1} té solament {2} Quant. Si us plau seleccioni un altre lot que té {3} Cant disponible o dividir la fila en diverses files, per lliurar / tema des de diversos lots"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +119,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Fila # {0}: El lot {1} té solament {2} Quant. Si us plau seleccioni un altre lot que té {3} Cant disponible o dividir la fila en diverses files, per lliurar / tema des de diversos lots"
 DocType: Vehicle,License Plate,Matrícula
 DocType: Appraisal,Goals,Objectius
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +326,Select POS Profile,Selecciona el perfil de POS
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +343,Select POS Profile,Selecciona el perfil de POS
 DocType: Warranty Claim,Warranty / AMC Status,Garantia / Estat de l'AMC
 ,Accounts Browser,Comptes Browser
 DocType: Payment Entry Reference,Payment Entry Reference,El pagament d&#39;entrada de referència
@@ -1631,20 +1716,20 @@
 ,Batch-Wise Balance History,Batch-Wise Balance History
 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/install_fixtures.py +101,Apprentice,Aprenent
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +105,Apprentice,Aprenent
 DocType: Purchase Invoice,Company GSTIN,companyia GSTIN
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,No s'admenten quantitats negatives
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Impost taula de detalls descarregui de mestre d'articles com una cadena i emmagatzemada en aquest camp.
  S'utilitza per a les taxes i càrrecs"
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Empleat no pot informar-se a si mateix.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +159,Employee cannot report to himself.,Empleat no pot informar-se a si mateix.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si el compte està bloquejat, només es permeten entrades alguns usuaris."
 DocType: Email Digest,Bank Balance,Balanç de Banc
-apps/erpnext/erpnext/accounts/party.py +245,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrada de Comptabilitat per a {0}: {1} només pot fer-se en moneda: {2}
+apps/erpnext/erpnext/accounts/party.py +243,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrada de Comptabilitat per a {0}: {1} només pot fer-se en moneda: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil del lloc, formació necessària, etc."
 DocType: Journal Entry Account,Account Balance,Saldo del compte
-apps/erpnext/erpnext/config/accounts.py +191,Tax Rule for transactions.,Regla fiscal per a les transaccions.
+apps/erpnext/erpnext/config/accounts.py +183,Tax Rule for transactions.,Regla fiscal per a les transaccions.
 DocType: Rename Tool,Type of document to rename.,Tipus de document per canviar el nom.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Es requereix al client contra el compte per cobrar {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Impostos i càrrecs (En la moneda de la Companyia)
@@ -1657,44 +1742,44 @@
 DocType: Stock Entry,Total Additional Costs,Total de despeses addicionals
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),El cost del rebuig de materials (Companyia de divises)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Sub Assemblies,Sub Assemblies
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +66,Sub Assemblies,Sub Assemblies
 DocType: Asset,Asset Name,Nom d&#39;actius
 DocType: Project,Task Weight,Pes de tasques
 DocType: Shipping Rule Condition,To Value,Per Valor
 DocType: Asset Movement,Stock Manager,Gerent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Magatzem d'origen obligatori per a la fila {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Packing Slip,Llista de presència
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Source warehouse is mandatory for row {0},Magatzem d'origen obligatori per a la fila {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +856,Packing Slip,Llista de presència
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Office Rent,lloguer de l'oficina
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Paràmetres de configuració de Porta de SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +61,Import Failed!,Error en importar!
 apps/erpnext/erpnext/public/js/templates/address_list.html +20,No address added yet.,Sense direcció no afegeix encara.
 DocType: Workstation Working Hour,Workstation Working Hour,Estació de treball Hores de Treball
 DocType: Vital Signs,Blood Pressure,Pressió sanguínea
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +121,Analyst,Analista
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +125,Analyst,Analista
 DocType: Item,Inventory,Inventari
 DocType: Item,Sales Details,Detalls de venda
 DocType: Quality Inspection,QI-,qi
 DocType: Opportunity,With Items,Amb articles
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,In Qty,En Quantitat
-DocType: School Settings,Validate Enrolled Course for Students in Student Group,Validar matriculats Curs per a estudiants en grup d&#39;alumnes
+DocType: Education Settings,Validate Enrolled Course for Students in Student Group,Validar matriculats Curs per a estudiants en grup d&#39;alumnes
 DocType: Notification Control,Expense Claim Rejected,Compte de despeses Rebutjat
 DocType: Item,Item Attribute,Element Atribut
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Government,Govern
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +147,Government,Govern
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Relació de despeses {0} ja existeix per al registre de vehicles
-apps/erpnext/erpnext/public/js/setup_wizard.js +60,Institute Name,nom Institut
+apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,nom Institut
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,"Si us plau, ingressi la suma d&#39;amortització"
 apps/erpnext/erpnext/config/stock.py +305,Item Variants,Variants de l&#39;article
-DocType: Company,Services,Serveis
+apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,Serveis
 DocType: HR Settings,Email Salary Slip to Employee,Enviar correu electrònic am salari a l'empleat
 DocType: Cost Center,Parent Cost Center,Centre de Cost de Pares
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1017,Select Possible Supplier,Seleccionar Possible Proveïdor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1039,Select Possible Supplier,Seleccionar Possible Proveïdor
 DocType: Sales Invoice,Source,Font
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mostra tancada
 DocType: Leave Type,Is Leave Without Pay,Es llicencia sense sou
-apps/erpnext/erpnext/stock/doctype/item/item.py +248,Asset Category is mandatory for Fixed Asset item,Categoria actiu és obligatori per a la partida de l&#39;actiu fix
+apps/erpnext/erpnext/stock/doctype/item/item.py +250,Asset Category is mandatory for Fixed Asset item,Categoria actiu és obligatori per a la partida de l&#39;actiu fix
 DocType: Fee Validity,Fee Validity,Valida tarifes
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,No hi ha registres a la taula de Pagaments
-apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Aquest {0} conflictes amb {1} de {2} {3}
+apps/erpnext/erpnext/education/utils.py +19,This {0} conflicts with {1} for {2} {3},Aquest {0} conflictes amb {1} de {2} {3}
 DocType: Student Attendance Tool,Students HTML,Els estudiants HTML
 DocType: POS Profile,Apply Discount,aplicar descompte
 DocType: GST HSN Code,GST HSN Code,Codi HSN GST
@@ -1709,10 +1794,10 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Pres
 DocType: Student,Date of Leaving,Data de baixa
 DocType: Pricing Rule,For Price List,Per Preu
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Cerca d'Executius
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +27,Executive Search,Cerca d'Executius
 apps/erpnext/erpnext/utilities/activation.py +63,Create Leads,crear Vendes
 DocType: Maintenance Schedule,Schedules,Horaris
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +331,POS Profile is required to use Point-of-Sale,El perfil de la TPV és obligatori per utilitzar Point-of-Sale
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +451,POS Profile is required to use Point-of-Sale,El perfil de la TPV és obligatori per utilitzar Point-of-Sale
 DocType: Purchase Invoice Item,Net Amount,Import Net
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +138,{0} {1} has not been submitted so the action cannot be completed,{0} {1} no s&#39;ha presentat de manera que l&#39;acció no es pot completar
 DocType: Purchase Order Item Supplied,BOM Detail No,Detall del BOM No
@@ -1731,7 +1816,7 @@
 DocType: Leave Block List,Block Holidays on important days.,Vacances de Bloc en dies importants.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +71,Accounts Receivable Summary,Comptes per Cobrar Resum
 DocType: Employee Loan,Monthly Repayment Amount,Quantitat de pagament mensual
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,"Si us plau, estableix camp ID d'usuari en un registre d'empleat per establir Rol d'empleat"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +195,Please set User ID field in an Employee record to set Employee Role,"Si us plau, estableix camp ID d'usuari en un registre d'empleat per establir Rol d'empleat"
 DocType: UOM,UOM Name,Nom UDM
 DocType: GST HSN Code,HSN Code,codi HSN
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Quantitat aportada
@@ -1739,25 +1824,24 @@
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Aquesta eina us ajuda a actualitzar o corregir la quantitat i la valoració dels estocs en el sistema. Normalment s'utilitza per sincronitzar els valors del sistema i el que realment hi ha en els magatzems.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,En paraules seran visibles un cop que es guarda l'albarà de lliurament.
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +205,Brand master.,Mestre Marca.
-apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Estudiant {0} - {1} apareix en múltiples ocasions consecutives {2} i {3}
+apps/erpnext/erpnext/education/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Estudiant {0} - {1} apareix en múltiples ocasions consecutives {2} i {3}
 DocType: Healthcare Settings,Manage Sample Collection,Gestiona la col · lecció d&#39;exemple
 DocType: Program Enrollment Tool,Program Enrollments,Les inscripcions del programa
 DocType: Patient,Tobacco Past Use,Ús del passat del tabac
 DocType: Sales Invoice Item,Brand Name,Marca
 DocType: Purchase Receipt,Transporter Details,Detalls Transporter
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +65,User {0} is already assigned to Physician {1},L&#39;usuari {0} ja està assignat al metge {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2638,Default warehouse is required for selected item,Es requereix dipòsit per omissió per a l&#39;element seleccionat
-apps/erpnext/erpnext/utilities/user_progress.py +125,Box,Caixa
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1014,Possible Supplier,possible Proveïdor
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2657,Default warehouse is required for selected item,Es requereix dipòsit per omissió per a l&#39;element seleccionat
+apps/erpnext/erpnext/utilities/user_progress.py +143,Box,Caixa
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1036,Possible Supplier,possible Proveïdor
 DocType: Budget,Monthly Distribution,Distribució Mensual
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"La llista de receptors és buida. Si us plau, crea la Llista de receptors"
-apps/erpnext/erpnext/public/js/setup_wizard.js +29,Healthcare (beta),Assistència sanitària (beta)
+apps/erpnext/erpnext/public/js/setup_wizard.js +31,Healthcare (beta),Assistència sanitària (beta)
 DocType: Production Plan Sales Order,Production Plan Sales Order,Pla de Producció d'ordres de venda
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 DocType: Loan Type,Maximum Loan Amount,La quantitat màxima del préstec
 DocType: Pricing Rule,Pricing Rule,Regla preus
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},nombre de rotllo duplicat per a l&#39;estudiant {0}
+apps/erpnext/erpnext/education/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},nombre de rotllo duplicat per a l&#39;estudiant {0}
 DocType: Budget,Action if Annual Budget Exceeded,Acció Si el pressupost anual va superar
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Sol·licitud de materials d&#39;Ordre de Compra
 DocType: Shopping Cart Settings,Payment Success URL,Pagament URL Èxit
@@ -1772,15 +1856,14 @@
 DocType: C-Form,III,III
 apps/erpnext/erpnext/config/stock.py +310,Opening Stock Balance,Obertura de la balança
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} ha d'aparèixer només una vegada
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +368,Not allowed to tranfer more {0} than {1} against Purchase Order {2},No es permet Tranfer més {0} de {1} contra l&#39;Ordre de Compra {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Les fulles Numerat amb èxit per {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +42,No Items to pack,No hi ha articles per embalar
 DocType: Shipping Rule Condition,From Value,De Valor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +555,Manufacturing Quantity is mandatory,Quantitat de fabricació és obligatori
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +581,Manufacturing Quantity is mandatory,Quantitat de fabricació és obligatori
 DocType: Employee Loan,Repayment Method,Mètode d&#39;amortització
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Si se selecciona, la pàgina d&#39;inici serà el grup per defecte de l&#39;article per al lloc web"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
-apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Les reclamacions per compte de l'empresa.
+apps/erpnext/erpnext/config/hr.py +132,Claims for company expense.,Les reclamacions per compte de l'empresa.
 apps/erpnext/erpnext/utilities/activation.py +118,"Students are at the heart of the system, add all your students","Els estudiants estan en el cor del sistema, se sumen tots els seus estudiants"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Fila # {0}: data de liquidació {1} no pot ser anterior Xec Data {2}
 DocType: Company,Default Holiday List,Per defecte Llista de vacances
@@ -1788,7 +1871,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +145,Stock Liabilities,Stock Liabilities
 DocType: Purchase Invoice,Supplier Warehouse,Magatzem Proveïdor
 DocType: Opportunity,Contact Mobile No,Contacte Mòbil No
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +356,Select Company,Seleccioneu l&#39;empresa
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +382,Select Company,Seleccioneu l&#39;empresa
 ,Material Requests for which Supplier Quotations are not created,Les sol·licituds de material per als quals no es creen Ofertes de Proveïdor
 DocType: Student Group,Set 0 for no limit,Ajust 0 indica sense límit
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,El dia (s) en el qual està sol·licitant la llicència són els dies festius. Vostè no necessita sol·licitar l&#39;excedència.
@@ -1798,24 +1881,26 @@
 apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,Fer Cita
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,altres informes
 DocType: Dependent Task,Dependent Task,Tasca dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de conversió per a la unitat de mesura per defecte ha de ser d'1 a la fila {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +430,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de conversió per a la unitat de mesura per defecte ha de ser d'1 a la fila {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Una absència del tipus {0} no pot ser de més de {1}
 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/process_payroll/process_payroll.py +250,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 +235,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: SMS Center,Receiver List,Llista de receptors
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1068,Search Item,cerca article
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1083,Search Item,cerca article
+DocType: Payment Schedule,Payment Amount,Quantitat de pagament
 DocType: Patient Appointment,Referring Physician,Metge que fa referència
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantitat consumida
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Canvi Net en Efectiu
 DocType: Assessment Plan,Grading Scale,Escala de Qualificació
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Unit of Measure {0} has been entered more than once in Conversion Factor Table,La unitat de mesura {0} s'ha introduït més d'una vegada a la taula de valors de conversió
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +612,Already completed,ja acabat
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Unit of Measure {0} has been entered more than once in Conversion Factor Table,La unitat de mesura {0} s'ha introduït més d'una vegada a la taula de valors de conversió
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +616,Already completed,ja acabat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock In Hand,A la mà de la
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,Importació correcta!
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},Sol·licitud de pagament ja existeix {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost d'articles Emeses
 DocType: Physician,Hospital,Hospital
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +362,Quantity must not be more than {0},La quantitat no ha de ser més de {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +384,Quantity must not be more than {0},La quantitat no ha de ser més de {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Exercici anterior no està tancada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +46,Age (Days),Edat (dies)
 DocType: Quotation Item,Quotation Item,Cita d'article
@@ -1825,14 +1910,14 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +198,Serial No {0} quantity {1} cannot be a fraction,Número de sèrie {0} quantitat {1} no pot ser una fracció
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Taula mestre de tipus de proveïdor
 DocType: Purchase Order Item,Supplier Part Number,PartNumber del proveïdor
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Conversion rate cannot be 0 or 1,La taxa de conversió no pot ser 0 o 1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Conversion rate cannot be 0 or 1,La taxa de conversió no pot ser 0 o 1
 DocType: Subscription,Reference Document,Document de referència
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +208,{0} {1} is cancelled or stopped,{0} {1} està cancel·lat o parat
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +209,{0} {1} is cancelled or stopped,{0} {1} està cancel·lat o parat
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Vehicle Dispatch Date
 DocType: Healthcare Settings,Default Medical Code Standard,Codi per defecte de codi mèdic
 DocType: Purchase Invoice Item,HSN/SAC,HSN / SAC
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +234,Purchase Receipt {0} is not submitted,El rebut de compra {0} no està presentat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +237,Purchase Receipt {0} is not submitted,El rebut de compra {0} no està presentat
 DocType: Company,Default Payable Account,Compte per Pagar per defecte
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Ajustaments per a la compra en línia, com les normes d'enviament, llista de preus, etc."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}% Anunciat
@@ -1841,37 +1926,36 @@
 DocType: Party Account,Party Account,Compte Partit
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Recursos Humans
 DocType: Lead,Upper Income,Ingrés Alt
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +41,Reject,Rebutjar
+apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,Rebutjar
 DocType: Journal Entry Account,Debit in Company Currency,Dèbit a Companyia moneda
 DocType: BOM Item,BOM Item,Article BOM
 DocType: Appraisal,For Employee,Per als Empleats
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +49,Make Disbursement Entry,Fer l&#39;entrada de desemborsament
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Fila {0}: Avanç contra el Proveïdor ha de afeblir
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Supplier must be debit,Fila {0}: Avanç contra el Proveïdor ha de afeblir
 DocType: Company,Default Values,Valors Predeterminats
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +60,{frequency} Digest,{} La freqüència Digest
 DocType: Expense Claim,Total Amount Reimbursed,Suma total reemborsat
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Això es basa en els registres contra aquest vehicle. Veure cronologia avall per saber més
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Against Supplier Invoice {0} dated {1},Contra Proveïdor Factura {0} {1} datat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,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/accounts/doctype/asset/asset.py +244,Asset Movement record {0} created,registrar el moviment d&#39;actius {0} creat
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +265,Asset Movement record {0} created,registrar el moviment d&#39;actius {0} creat
 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
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,Ja existeix un client amb el mateix nom
 DocType: Journal Entry,Entry Type,Tipus d&#39;entrada
-apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Sense pla d&#39;avaluació relacionat amb aquest grup d&#39;avaluació
+apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +44,No assessment plan linked with this assessment group,Sense pla d&#39;avaluació relacionat amb aquest grup d&#39;avaluació
 ,Customer Credit Balance,Saldo de crèdit al Client
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Canvi net en comptes per pagar
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Client requereix per a 'Descompte Customerwise'
-apps/erpnext/erpnext/config/accounts.py +148,Update bank payment dates with journals.,Actualització de les dates de pagament dels bancs amb les revistes.
+apps/erpnext/erpnext/config/accounts.py +140,Update bank payment dates with journals.,Actualització de les dates de pagament dels bancs amb les revistes.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,la fixació de preus
 DocType: Quotation,Term Details,Detalls termini
-DocType: Project,Total Sales Cost (via Sales Order),Cost total de vendes (a través d&#39;ordres de venda)
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,No es pot inscriure més de {0} estudiants d&#39;aquest grup d&#39;estudiants.
+apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,No es pot inscriure més de {0} estudiants d&#39;aquest grup d&#39;estudiants.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Comptador de plom
-apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} ha de ser més gran que 0
+apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} ha de ser més gran que 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planificació de la capacitat per a (Dies)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,obtenció
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Cap dels articles tenen qualsevol canvi en la quantitat o el valor.
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Camp obligatori - Programa
+apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Camp obligatori - Programa
 DocType: Special Test Template,Result Component,Component de resultats
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Reclamació de la Garantia
 ,Lead Details,Detalls del client potencial
@@ -1885,14 +1969,14 @@
 DocType: Shipping Rule Country,Shipping Rule Country,Regla País d&#39;enviament
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Deixa i Assistència
 DocType: Maintenance Visit,Partially Completed,Va completar parcialment
-apps/erpnext/erpnext/healthcare/setup.py +256,Moderate Sensitivity,Sensibilitat moderada
+apps/erpnext/erpnext/healthcare/setup.py +257,Moderate Sensitivity,Sensibilitat moderada
 DocType: Leave Type,Include holidays within leaves as leaves,Inclogui les vacances dins de les fulles com les fulles
 DocType: Sales Invoice,Packed Items,Dinar Articles
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Reclamació de garantia davant el No. de sèrie
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,'Total',&quot;Total&quot;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +71,'Total',&quot;Total&quot;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Habilita Compres
 DocType: Employee,Permanent Address,Adreça Permanent
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Avançament pagat contra {0} {1} no pot ser major \ de Gran Total {2}
 DocType: Patient,Medication,Medicaments
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Seleccioneu el codi de l'article
@@ -1903,15 +1987,15 @@
 DocType: Purchase Invoice,Additional Discount,Descompte addicional
 DocType: Selling Settings,Selling Settings,La venda d'Ajustaments
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +83,Confirm Action,Confirma l&#39;acció
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Subhastes en línia
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,Subhastes en línia
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Si us plau especificar Quantitat o valoració de tipus o ambdós
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,Realització
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,veure Cistella
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +103,Marketing Expenses,Despeses de Màrqueting
 ,Item Shortage Report,Informe d'escassetat d'articles
-apps/erpnext/erpnext/stock/doctype/item/item.js +279,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","S'esmenta Pes, \n Si us plau, ""Pes UOM"" massa"
+apps/erpnext/erpnext/stock/doctype/item/item.js +275,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","S'esmenta Pes, \n Si us plau, ""Pes UOM"" massa"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Sol·licitud de material utilitzat per fer aquesta entrada Stock
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,La depreciació propera data és obligatori per als nous actius
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,La depreciació propera data és obligatori per als nous actius
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Grup basat curs separat per a cada lot
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Unitat individual d'un article
 DocType: Fee Category,Fee Category,Fee Categoria
@@ -1920,19 +2004,19 @@
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +23,Appointment Duration (mins),Durada de la cita (minuts)
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Feu Entrada Comptabilitat Per Cada moviment d'estoc
 DocType: Leave Allocation,Total Leaves Allocated,Absències totals assignades
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +160,Warehouse required at Row No {0},Magatzem requerit a la fila n {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +139,Please enter valid Financial Year Start and End Dates,"Si us plau, introdueixi Any vàlida Financera dates inicial i final"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +163,Warehouse required at Row No {0},Magatzem requerit a la fila n {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Please enter valid Financial Year Start and End Dates,"Si us plau, introdueixi Any vàlida Financera dates inicial i final"
 DocType: Employee,Date Of Retirement,Data de la jubilació
 DocType: Upload Attendance,Get Template,Aconsegueix Plantilla
 DocType: Material Request,Transferred,transferit
 DocType: Vehicle,Doors,portes
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,Configuració ERPNext completa!
+apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +117,ERPNext Setup Complete!,Configuració ERPNext completa!
 DocType: Healthcare Settings,Collect Fee for Patient Registration,Recull la tarifa per al registre del pacient
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Purchase Invoice,Tax Breakup,desintegració impostos
 DocType: Packing Slip,PS-,PD-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,"{0} {1}: es requereix de centres de cost de &#39;pèrdues i guanys&#39; compte {2}. Si us plau, establir un centre de cost per defecte per a la Companyia."
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +118,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Hi ha un grup de clients amb el mateix nom, si us plau canvia el nom del client o el nom del Grup de Clients"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +146,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Hi ha un grup de clients amb el mateix nom, si us plau canvia el nom del client o el nom del Grup de Clients"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +37,New Contact,Nou contacte
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Sales Invoice,Place of Supply,Lloc de subministrament
@@ -1942,17 +2026,17 @@
 DocType: Announcement,Instructor,instructor
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +61,Select Item (optional),Selecciona l&#39;element (opcional)
 DocType: Fee Schedule Student Group,Fee Schedule Student Group,Calendari de tarifes Grup d&#39;estudiants
-DocType: Employee,AB+,AB +
+DocType: Student,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si aquest article té variants, llavors no pot ser seleccionada en les comandes de venda, etc."
 DocType: Lead,Next Contact By,Següent Contactar Per
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +311,Quantity required for Item {0} in row {1},Quantitat necessària per Punt {0} a la fila {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +314,Quantity required for Item {0} in row {1},Quantitat necessària per Punt {0} a la fila {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +46,Warehouse {0} can not be deleted as quantity exists for Item {1},Magatzem {0} no es pot eliminar com existeix quantitat d'article {1}
 DocType: Quotation,Order Type,Tipus d'ordre
 ,Item-wise Sales Register,Tema-savi Vendes Registre
 DocType: Asset,Gross Purchase Amount,Compra import brut
 apps/erpnext/erpnext/utilities/user_progress.py +36,Opening Balances,Balanços d&#39;obertura
 DocType: Asset,Depreciation Method,Mètode de depreciació
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +67,Offline,desconnectat
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +64,Offline,desconnectat
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Aqeust impost està inclòs a la tarifa bàsica?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Totals de l'objectiu
 DocType: Job Applicant,Applicant for a Job,Sol·licitant d'ocupació
@@ -1961,20 +2045,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliació JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Massa columnes. Exporta l'informe i utilitza una aplicació de full de càlcul.
 DocType: Purchase Invoice Item,Batch No,Lot número
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +141,Request for Quotation: {0},Sol·licitud de cotització: {0}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permetre diverses ordres de venda en contra d&#39;un client Ordre de Compra
 DocType: Student Group Instructor,Student Group Instructor,Instructor grup d&#39;alumnes
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Sense Guardian2 mòbil
-apps/erpnext/erpnext/setup/doctype/company/company.py +197,Main,Inici
-apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
+apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +61,Guardian2 Mobile No,Sense Guardian2 mòbil
+apps/erpnext/erpnext/setup/doctype/company/company.py +194,Main,Inici
+apps/erpnext/erpnext/stock/doctype/item/item.js +72,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establir prefix de numeracions seriades a les transaccions
 DocType: Employee Attendance Tool,Employees HTML,Els empleats HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +428,Default BOM ({0}) must be active for this item or its template,Per defecte la llista de materials ({0}) ha d&#39;estar actiu per aquest material o la seva plantilla
+apps/erpnext/erpnext/stock/doctype/item/item.py +444,Default BOM ({0}) must be active for this item or its template,Per defecte la llista de materials ({0}) ha d&#39;estar actiu per aquest material o la seva plantilla
 DocType: Employee,Leave Encashed?,Leave Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunitat de camp és obligatori
 DocType: Email Digest,Annual Expenses,Les despeses anuals
 DocType: Item,Variants,Variants
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1088,Make Purchase Order,Feu l'Ordre de Compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1137,Make Purchase Order,Feu l'Ordre de Compra
 DocType: SMS Center,Send To,Enviar a
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},There is not enough leave balance for Leave Type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Monto assignat
@@ -1982,28 +2065,28 @@
 DocType: Sales Invoice Item,Customer's Item Code,Del client Codi de l'article
 DocType: Stock Reconciliation,Stock Reconciliation,Reconciliació d'Estoc
 DocType: Territory,Territory Name,Nom del Territori
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,Work-in-Progress Warehouse is required before Submit,Es requereix Magatzem de treballs en procés abans de Presentar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Work-in-Progress Warehouse is required before Submit,Es requereix Magatzem de treballs en procés abans de Presentar
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Sol·licitant d'ocupació.
 DocType: Purchase Order Item,Warehouse and Reference,Magatzem i Referència
 DocType: Supplier,Statutory info and other general information about your Supplier,Informació legal i altra informació general sobre el Proveïdor
 DocType: Item,Serial Nos and Batches,Nº de sèrie i lots
-apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Força grup d&#39;alumnes
+apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Força grup d&#39;alumnes
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +250,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Diari entrada {0} no té cap {1} entrada inigualable
-apps/erpnext/erpnext/config/hr.py +137,Appraisals,taxacions
+apps/erpnext/erpnext/config/hr.py +142,Appraisals,taxacions
 apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,Esdeveniments de formació
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +205,Duplicate Serial No entered for Item {0},Número de sèrie duplicat per l'article {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condició per a una regla d'enviament
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,"Si us plau, entra"
-apps/erpnext/erpnext/controllers/accounts_controller.py +423,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","No es pot cobrar massa a Punt de {0} a la fila {1} més {2}. Per permetre que l&#39;excés de facturació, si us plau, defineixi en la compra d&#39;Ajustaments"
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +212,Please set filter based on Item or Warehouse,"Si us plau, configurar el filtre basada en l&#39;apartat o Magatzem"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +167,Please enter ,"Si us plau, entra"
+apps/erpnext/erpnext/controllers/accounts_controller.py +467,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","No es pot cobrar massa a Punt de {0} a la fila {1} més {2}. Per permetre que l&#39;excés de facturació, si us plau, defineixi en la compra d&#39;Ajustaments"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +234,Please set filter based on Item or Warehouse,"Si us plau, configurar el filtre basada en l&#39;apartat o Magatzem"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),El pes net d'aquest paquet. (Calculats automàticament com la suma del pes net d'articles)
 DocType: Sales Order,To Deliver and Bill,Per Lliurar i Bill
 DocType: Student Group,Instructors,els instructors
 DocType: GL Entry,Credit Amount in Account Currency,Suma de crèdit en compte Moneda
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +584,BOM {0} must be submitted,BOM {0} ha de ser presentat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +588,BOM {0} must be submitted,BOM {0} ha de ser presentat
 DocType: Authorization Control,Authorization Control,Control d'Autorització
-apps/erpnext/erpnext/controllers/buying_controller.py +308,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: Magatzem Rebutjat és obligatori en la partida rebutjada {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +782,Payment,Pagament
+apps/erpnext/erpnext/controllers/buying_controller.py +309,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: Magatzem Rebutjat és obligatori en la partida rebutjada {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +808,Payment,Pagament
 apps/erpnext/erpnext/controllers/stock_controller.py +92,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.","Magatzem {0} no està vinculada a cap compte, si us plau esmentar el compte en el registre de magatzem o un conjunt predeterminat compte d&#39;inventari en companyia {1}."
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,Gestionar les seves comandes
 DocType: Production Order Operation,Actual Time and Cost,Temps real i Cost
@@ -2011,7 +2094,7 @@
 DocType: Course,Course Abbreviation,Abreviatura de golf
 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/accounts/doctype/asset/asset.py +160,"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 +160,"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 +29,Employee {0} on Half day on {1},Empleat {0} del mig dia del {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,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
@@ -2021,9 +2104,9 @@
 DocType: Quality Inspection Reading,Reading 10,Reading 10
 DocType: Hub Category,Hub Node,Node Hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Has introduït articles duplicats. Si us plau, rectifica-ho i torna a intentar-ho."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +125,Associate,Associat
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +129,Associate,Associat
 DocType: Asset Movement,Asset Movement,moviment actiu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2165,New Cart,nou carro
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2180,New Cart,nou carro
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Article {0} no és un article serialitzat
 DocType: SMS Center,Create Receiver List,Crear Llista de receptors
 DocType: Vehicle,Wheels,rodes
@@ -2034,18 +2117,18 @@
 DocType: Activity Cost,Activity Cost,Cost Activitat
 DocType: Sales Invoice Timesheet,Timesheet Detail,Detall de part d&#39;hores
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Quantitat utilitzada
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicacions
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +52,Telecommunications,Telecomunicacions
 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)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,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
 DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprovar Fulles
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,For,Per
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +150,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Pot referir fila només si el tipus de càrrega és 'On Anterior Suma Fila ""o"" Anterior Fila Total'"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +167,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Pot referir fila només si el tipus de càrrega és 'On Anterior Suma Fila ""o"" Anterior Fila Total'"
 DocType: Sales Order Item,Delivery Warehouse,Magatzem Lliurament
-apps/erpnext/erpnext/config/accounts.py +249,Tree of financial Cost Centers.,Arbre de Centres de costos financers.
+apps/erpnext/erpnext/config/accounts.py +241,Tree of financial Cost Centers.,Arbre de Centres de costos financers.
 DocType: Serial No,Delivery Document No,Lliurament document nº
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Ajust &#39;Compte / Pèrdua de beneficis per alienacions d&#39;actius&#39; en la seva empresa {0}
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +191,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Ajust &#39;Compte / Pèrdua de beneficis per alienacions d&#39;actius&#39; en la seva empresa {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obtenir els articles des dels rebuts de compra
 DocType: Serial No,Creation Date,Data de creació
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Article {0} apareix diverses vegades en el Preu de llista {1}
@@ -2058,10 +2141,10 @@
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,Actualitza la resposta
 apps/erpnext/erpnext/public/js/utils.js +226,You have already selected items from {0} {1},Ja ha seleccionat articles de {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la Distribució Mensual
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Identificació del lot és obligatori
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +26,Batch ID is mandatory,Identificació del lot és obligatori
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +180,High to Low,Alt a baix
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +24,Select the program first,Seleccioneu primer el programa
+apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,Seleccioneu primer el programa
 DocType: Patient Appointment,Patient Age,Edat del pacient
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Gestió de Projectes
 DocType: Supplier,Supplier of Goods or Services.,Proveïdor de productes o serveis.
@@ -2069,8 +2152,8 @@
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,Compte per cobrar per defecte que s&#39;utilitzarà si no s&#39;estableix a Patient per reservar càrrecs de consulta.
 DocType: Vehicle Log,Fuel Price,Preu del combustible
 DocType: Budget,Budget,Pressupost
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +43,Set Open,Estableix obert
-apps/erpnext/erpnext/stock/doctype/item/item.py +245,Fixed Asset Item must be a non-stock item.,Actius Fixos L&#39;article ha de ser una posició no de magatzem.
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +51,Set Open,Estableix obert
+apps/erpnext/erpnext/stock/doctype/item/item.py +247,Fixed Asset Item must be a non-stock item.,Actius Fixos L&#39;article ha de ser una posició no de magatzem.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Pressupost no es pot assignar en contra {0}, ja que no és un compte d&#39;ingressos o despeses"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Aconseguit
 DocType: Student Admission,Application Form Route,Ruta Formulari de Sol·licitud
@@ -2084,12 +2167,13 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,L'Article {0} no està configurat per a números de sèrie. Comprova la configuració d'articles
 DocType: Maintenance Visit,Maintenance Time,Temps de manteniment
 ,Amount to Deliver,La quantitat a Deliver
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +321,Same item has been entered multiple times. {0},S&#39;ha introduït el mateix element diverses vegades. {0}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"El Termini Data d&#39;inici no pot ser anterior a la data d&#39;inici d&#39;any de l&#39;any acadèmic a què està vinculat el terme (any acadèmic {}). Si us plau, corregeixi les dates i torna a intentar-ho."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +324,Same item has been entered multiple times. {0},S&#39;ha introduït el mateix element diverses vegades. {0}
+apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"El Termini Data d&#39;inici no pot ser anterior a la data d&#39;inici d&#39;any de l&#39;any acadèmic a què està vinculat el terme (any acadèmic {}). Si us plau, corregeixi les dates i torna a intentar-ho."
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +192,There were errors.,Hi han hagut errors.
 DocType: Guardian,Guardian Interests,Interessos de la guarda
 DocType: Naming Series,Current Value,Valor actual
-apps/erpnext/erpnext/controllers/accounts_controller.py +240,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: School Settings,Instructor Records to be created by,Instructor Records a ser creat per
+apps/erpnext/erpnext/controllers/accounts_controller.py +263,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: Delivery Note Item,Against Sales Order,Contra l'Ordre de Venda
 ,Serial No Status,Estat del número de sèrie
@@ -2101,19 +2185,19 @@
  ha de ser més gran que o igual a {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Això es basa en el moviment de valors. Veure {0} per a més detalls
 DocType: Pricing Rule,Selling,Vendes
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +378,Amount {0} {1} deducted against {2},Suma {0} {1} presenta disminuint {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +379,Amount {0} {1} deducted against {2},Suma {0} {1} presenta disminuint {2}
 DocType: Employee,Salary Information,Informació sobre sous
 DocType: Sales Person,Name and Employee ID,Nom i ID d'empleat
-apps/erpnext/erpnext/accounts/party.py +310,Due Date cannot be before Posting Date,Data de venciment no pot ser anterior Data de comptabilització
+apps/erpnext/erpnext/accounts/party.py +311,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Duties and Taxes,Taxes i impostos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Si us plau, introduïu la data de referència"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Please enter Reference date,"Si us plau, introduïu la data de referència"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entrades de pagament no es poden filtrar per {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Taula d'article que es mostra en el lloc web
 DocType: Purchase Order Item Supplied,Supplied Qty,Subministrat Quantitat
 DocType: Purchase Order Item,Material Request Item,Material Request Item
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Arbre dels grups d'articles.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +160,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
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +177,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
 DocType: Asset,Sold,venut
 ,Item-wise Purchase History,Historial de compres d'articles
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Si us plau, feu clic a ""Generar Planificació 'per reservar números de sèrie per l'article {0}"
@@ -2125,7 +2209,7 @@
 DocType: Sales Invoice,Accounting Details,Detalls de Comptabilitat
 apps/erpnext/erpnext/setup/doctype/company/company.js +84,Delete all the Transactions for this Company,Eliminar totes les transaccions per aquesta empresa
 DocType: Patient,O Positive,O positiu
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Fila # {0}: Operació {1} no s'ha completat per {2} Quantitat de productes acabats en ordre de producció # {3}. Si us plau, actualitzi l'estat de funcionament a través dels registres de temps"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +195,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Fila # {0}: Operació {1} no s'ha completat per {2} Quantitat de productes acabats en ordre de producció # {3}. Si us plau, actualitzi l'estat de funcionament a través dels registres de temps"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Investments,Inversions
 DocType: Issue,Resolution Details,Resolució Detalls
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,les assignacions
@@ -2146,7 +2230,7 @@
 DocType: Course,Default Grading Scale,Escala de Qualificació per defecte
 DocType: Appraisal,For Employee Name,Per Nom de l'Empleat
 DocType: Holiday List,Clear Table,Taula en blanc
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +98,Available slots,Escletxes disponibles
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +106,Available slots,Escletxes disponibles
 DocType: C-Form Invoice Detail,Invoice No,Número de Factura
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +350,Make Payment,Fer pagament
 DocType: Room,Room Name,Nom de la sala
@@ -2163,9 +2247,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +335,Please set the Date Of Joining for employee {0},Si us plau ajust la data d&#39;incorporació dels empleats {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Facturació quantitat total (a través de fulla d&#39;hores)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repetiu els ingressos dels clients
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ha de tenir rol 'aprovador de despeses'
-apps/erpnext/erpnext/utilities/user_progress.py +125,Pair,Parell
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +912,Select BOM and Qty for Production,Seleccioneu la llista de materials i d&#39;Unitats de Producció
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +200,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ha de tenir rol 'aprovador de despeses'
+apps/erpnext/erpnext/utilities/user_progress.py +143,Pair,Parell
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +959,Select BOM and Qty for Production,Seleccioneu la llista de materials i d&#39;Unitats de Producció
 DocType: Asset,Depreciation Schedule,Programació de la depreciació
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,Les adreces soci de vendes i contactes
 DocType: Bank Reconciliation Detail,Against Account,Contra Compte
@@ -2173,37 +2257,37 @@
 DocType: Maintenance Schedule Detail,Actual Date,Data actual
 DocType: Item,Has Batch No,Té número de lot
 apps/erpnext/erpnext/public/js/utils.js +100,Annual Billing: {0},Facturació anual: {0}
-apps/erpnext/erpnext/config/accounts.py +208,Goods and Services Tax (GST India),Béns i serveis (GST Índia)
+apps/erpnext/erpnext/config/accounts.py +200,Goods and Services Tax (GST India),Béns i serveis (GST Índia)
 DocType: Delivery Note,Excise Page Number,Excise Page Number
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +157,"Company, From Date and To Date is mandatory","Company, des de la data i fins a la data és obligatòria"
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +225,"Company, From Date and To Date is mandatory","Company, des de la data i fins a la data és obligatòria"
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,Accedeix a la Consulta
 DocType: Asset,Purchase Date,Data de compra
-DocType: Employee,Personal Details,Dades Personals
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Ajust &#39;Centre de l&#39;amortització del cost de l&#39;actiu&#39; a l&#39;empresa {0}
+DocType: Student,Personal Details,Dades Personals
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +193,Please set 'Asset Depreciation Cost Center' in Company {0},Ajust &#39;Centre de l&#39;amortització del cost de l&#39;actiu&#39; a l&#39;empresa {0}
 ,Maintenance Schedules,Programes de manteniment
 DocType: Task,Actual End Date (via Time Sheet),Data de finalització real (a través de fulla d&#39;hores)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +373,Amount {0} {1} against {2} {3},Suma {0} {1} {2} contra {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +374,Amount {0} {1} against {2} {3},Suma {0} {1} {2} contra {3}
 ,Quotation Trends,Quotation Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Grup L'article no esmenta en mestre d'articles per a l'article {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Debit To account must be a Receivable account,Dèbit al compte ha de ser un compte per cobrar
-DocType: Shipping Rule Condition,Shipping Amount,Total de l'enviament
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +362,Debit To account must be a Receivable account,Dèbit al compte ha de ser un compte per cobrar
+DocType: Shipping Rule,Shipping Amount,Total de l'enviament
 DocType: Supplier Scorecard Period,Period Score,Puntuació de períodes
 apps/erpnext/erpnext/utilities/user_progress.py +63,Add Customers,Afegir Clients
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,A l'espera de l'Import
 DocType: Lab Test Template,Special,Especial
-DocType: Purchase Invoice Item,Conversion Factor,Factor de conversió
+DocType: Purchase Order Item Supplied,Conversion Factor,Factor de conversió
 DocType: Purchase Order,Delivered,Alliberat
 ,Vehicle Expenses,Les despeses de vehicles
 DocType: Serial No,Invoice Details,Detalls de la factura
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Valor esperat després de la vida útil ha de ser major o igual a {0}
-apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +29,Start on,Comença
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +155,Expected value after useful life must be greater than or equal to {0},Valor esperat després de la vida útil ha de ser major o igual a {0}
+apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,Comença
 DocType: Hub Category,Hub Category,Categoria de concentrador
 DocType: Purchase Invoice,SEZ,SEZ
 DocType: Purchase Receipt,Vehicle Number,Nombre de vehicles
 DocType: Employee Loan,Loan Amount,Total del préstec
 DocType: Program Enrollment,Self-Driving Vehicle,Vehicle auto-conducció
 DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,Quadre de comandament del proveïdor
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +419,Row {0}: Bill of Materials not found for the Item {1},Fila {0}: Llista de materials que no es troba per a l&#39;element {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +420,Row {0}: Bill of Materials not found for the Item {1},Fila {0}: Llista de materials que no es troba per a l&#39;element {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total de fulls assignades {0} no pot ser inferior a les fulles ja aprovats {1} per al període
 DocType: Journal Entry,Accounts Receivable,Comptes Per Cobrar
 ,Supplier-Wise Sales Analytics,Proveïdor-Wise Vendes Analytics
@@ -2214,27 +2298,27 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Curs per a Pares (Deixar en blanc, si això no és part del Curs per a Pares)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Deixar en blanc si es considera per a tot tipus d'empleats
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir els càrrecs en base a
-apps/erpnext/erpnext/hooks.py +140,Timesheets,taula de temps
+apps/erpnext/erpnext/hooks.py +144,Timesheets,taula de temps
 DocType: HR Settings,HR Settings,Configuració de recursos humans
 DocType: Salary Slip,net pay info,Dades de la xarxa de pagament
 DocType: Lab Test Template,This value is updated in the Default Sales Price List.,Aquest valor s&#39;actualitza a la llista de preus de venda predeterminada.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,Expense Claim is pending approval. Only the Expense Approver can update status.,El compte de despeses està pendent d'aprovació. Només l'aprovador de despeses pot actualitzar l'estat.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +122,Expense Claim is pending approval. Only the Expense Approver can update status.,El compte de despeses està pendent d'aprovació. Només l'aprovador de despeses pot actualitzar l'estat.
 DocType: Email Digest,New Expenses,Les noves despeses
 DocType: Purchase Invoice,Additional Discount Amount,Import addicional de descompte
 DocType: Consultation,Patient Details,Detalls del pacient
 DocType: Patient,B Positive,B Positiu
-apps/erpnext/erpnext/controllers/accounts_controller.py +531,"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 +575,"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 +291,Abbr can not be blank or space,Abbr no pot estar en blanc o l&#39;espai
+apps/erpnext/erpnext/setup/doctype/company/company.py +288,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
-apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,Grup de No-Grup
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Esports
+apps/erpnext/erpnext/accounts/doctype/account/account.js +68,Group to Non-Group,Grup de No-Grup
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,Esports
 DocType: Loan Type,Loan Name,Nom del préstec
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Actual total
 DocType: Lab Test UOM,Test UOM,Prova UOM
 DocType: Student Siblings,Student Siblings,Els germans dels estudiants
-apps/erpnext/erpnext/utilities/user_progress.py +125,Unit,Unitat
-apps/erpnext/erpnext/stock/get_item_details.py +141,Please specify Company,"Si us plau, especifiqui l'empresa"
+apps/erpnext/erpnext/utilities/user_progress.py +143,Unit,Unitat
+apps/erpnext/erpnext/stock/get_item_details.py +136,Please specify Company,"Si us plau, especifiqui l'empresa"
 ,Customer Acquisition and Loyalty,Captació i Fidelització
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Magatzem en què es desen les existències dels articles rebutjats
 DocType: Production Order,Skip Material Transfer,Saltar de transferència de material
@@ -2245,70 +2329,67 @@
 DocType: Issue,Support,Suport
 ,BOM Search,BOM Cercar
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Publica &quot;En existència&quot; o &quot;No està en existència&quot; al Hub basant-se en les existències disponibles en aquest magatzem.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Tancament (Obertura + totals)
 DocType: Vehicle,Fuel Type,Tipus de combustible
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Si us plau, especifiqui la moneda a l'empresa"
 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
 DocType: Email Digest,Pending Sales Orders,A l&#39;espera d&#39;ordres de venda
-apps/erpnext/erpnext/controllers/accounts_controller.py +279,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 +302,Account {0} is invalid. Account Currency must be {1},Compte {0} no és vàlid. Compte moneda ha de ser {1}
 DocType: Healthcare Settings,Remind Before,Recordeu abans
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Es requereix el factor de conversió de la UOM a la fila {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1034,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Fila # {0}: Tipus de document de referència ha de ser una d&#39;ordres de venda, factura de venda o entrada de diari"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1060,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Fila # {0}: Tipus de document de referència ha de ser una d&#39;ordres de venda, factura de venda o entrada de diari"
 DocType: Salary Component,Deduction,Deducció
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,Fila {0}: Del temps i el temps és obligatori.
 DocType: Stock Reconciliation Item,Amount Difference,diferència suma
-apps/erpnext/erpnext/stock/get_item_details.py +306,Item Price added for {0} in Price List {1},Article Preu afegit per {0} en Preu de llista {1}
+apps/erpnext/erpnext/stock/get_item_details.py +349,Item Price added for {0} in Price List {1},Article Preu afegit per {0} en Preu de llista {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Introdueixi Empleat Id d&#39;aquest venedor
 DocType: Territory,Classification of Customers by region,Classificació dels clients per regió
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Diferència La quantitat ha de ser zero
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +59,Difference Amount must be zero,Diferència La quantitat ha de ser zero
 DocType: Project,Gross Margin,Marge Brut
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +61,Please enter Production Item first,Si us plau indica primer l'Article a Producció
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Calculat equilibri extracte bancari
 DocType: Normal Test Template,Normal Test Template,Plantilla de prova normal
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,desactivat usuari
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +764,Quotation,Oferta
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +957,Cannot set a received RFQ to No Quote,No es pot establir una RFQ rebuda a cap quota
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +913,Quotation,Oferta
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +982,Cannot set a received RFQ to No Quote,No es pot establir una RFQ rebuda a cap quota
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Deducció total
 ,Production Analytics,Anàlisi de producció
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,Això es basa en operacions contra aquest pacient. Vegeu la línia de temps a continuació per obtenir detalls
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +201,Cost Updated,Cost Actualitzat
-DocType: Employee,Date of Birth,Data de naixement
+DocType: Patient,Date of Birth,Data de naixement
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +129,Item {0} has already been returned,Article {0} ja s'ha tornat
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Any Fiscal ** representa un exercici financer. Els assentaments comptables i altres transaccions importants es segueixen contra ** Any Fiscal **.
 DocType: Opportunity,Customer / Lead Address,Client / Direcció Plom
-DocType: Patient,DOB,DOB
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,Configuració del quadre de comandaments del proveïdor
-apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Nom del pla d&#39;avaluació
-apps/erpnext/erpnext/stock/doctype/item/item.py +220,Warning: Invalid SSL certificate on attachment {0},Avís: certificat SSL no vàlid en la inclinació {0}
+apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,Nom del pla d&#39;avaluació
+apps/erpnext/erpnext/stock/doctype/item/item.py +222,Warning: Invalid SSL certificate on attachment {0},Avís: certificat SSL no vàlid en la inclinació {0}
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads","Cables ajuden a obtenir negoci, posar tots els seus contactes i més com els seus clients potencials"
 DocType: Production Order Operation,Actual Operation Time,Temps real de funcionament
 DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuari)
 DocType: Purchase Taxes and Charges,Deduct,Deduir
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +226,Job Description,Descripció del Treball
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +236,Job Description,Descripció del Treball
 DocType: Student Applicant,Applied,aplicat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +834,Re-open,Torna a obrir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +859,Re-open,Torna a obrir
 DocType: Sales Invoice Item,Qty as per Stock UOM,La quantitat d'existències ha d'estar expresada en la UDM
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,nom Guardian2
+apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,nom Guardian2
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +127,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caràcters especials excepte ""-"" ""."", ""#"", i ""/"" no permès en el nomenament de sèrie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Porteu un registre de les campanyes de venda. Porteu un registre de conductors, Cites, comandes de venda, etc de Campanyes per mesurar retorn de la inversió."
 DocType: Expense Claim,Approver,Aprovador
 ,SO Qty,SO Qty
 DocType: Guardian,Work Address,Direcció del treball
 DocType: Appraisal,Calculate Total Score,Calcular Puntuació total
-DocType: Request for Quotation,Manufacturing Manager,Gerent de Fàbrica
+DocType: Asset Repair,Manufacturing Manager,Gerent de Fàbrica
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},El número de sèrie {0} està en garantia fins {1}
-apps/erpnext/erpnext/config/stock.py +163,Split Delivery Note into packages.,Dividir nota de lliurament en paquets.
-apps/erpnext/erpnext/hooks.py +107,Shipments,Els enviaments
+apps/erpnext/erpnext/hooks.py +109,Shipments,Els enviaments
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Total assignat (Companyia de divises)
 DocType: Purchase Order Item,To be delivered to customer,Per ser lliurat al client
 DocType: BOM,Scrap Material Cost,Cost de materials de rebuig
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +227,Serial No {0} does not belong to any Warehouse,Número de sèrie {0} no pertany a cap magatzem
 DocType: Purchase Invoice,In Words (Company Currency),En paraules (Divisa de la Companyia)
-DocType: Asset,Supplier,Proveïdor
+DocType: Pricing Rule,Supplier,Proveïdor
 DocType: Consultation,Consultation Time,Temps de consulta
 DocType: C-Form,Quarter,Trimestre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Miscellaneous Expenses,Despeses diverses
@@ -2321,16 +2402,16 @@
 DocType: Leave Application,Total Leave Days,Dies totals d'absències
 DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: El correu electrònic no serà enviat als usuaris amb discapacitat
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Nombre d&#39;Interacció
-apps/erpnext/erpnext/stock/doctype/item/item.js +102,Item Variant Settings,Configuració de la variant de l&#39;element
+apps/erpnext/erpnext/stock/doctype/item/item.js +105,Item Variant Settings,Configuració de la variant de l&#39;element
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Seleccioneu l'empresa ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Deixar en blanc si es considera per a tots els departaments
-apps/erpnext/erpnext/config/hr.py +223,"Types of employment (permanent, contract, intern etc.).","Tipus d'ocupació (permanent, contractats, intern etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,{0} is mandatory for Item {1},{0} és obligatori per l'article {1}
-DocType: Process Payroll,Fortnightly,quinzenal
+apps/erpnext/erpnext/config/hr.py +228,"Types of employment (permanent, contract, intern etc.).","Tipus d'ocupació (permanent, contractats, intern etc.)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,{0} is mandatory for Item {1},{0} és obligatori per l'article {1}
+DocType: Payroll Entry,Fortnightly,quinzenal
 DocType: Currency Exchange,From Currency,De la divisa
 DocType: Vital Signs,Weight (In Kilogram),Pes (en quilogram)
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Seleccioneu suma assignat, Tipus factura i número de factura en almenys una fila"
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Cost de Compra de Nova
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +128,Cost of New Purchase,Cost de Compra de Nova
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +97,Sales Order required for Item {0},Ordres de venda requerides per l'article {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Companyia moneda)
 DocType: Student Guardian,Others,Altres
@@ -2339,89 +2420,87 @@
 DocType: POS Profile,Taxes and Charges,Impostos i càrrecs
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un producte o un servei que es compra, es ven o es manté en estoc."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,No hi ha més actualitzacions
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +154,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,No es pot seleccionar el tipus de càrrega com 'Suma de la fila anterior' o 'Total de la fila anterior' per la primera fila
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,No es pot seleccionar el tipus de càrrega com 'Suma de la fila anterior' o 'Total de la fila anterior' per la primera fila
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,Cobreix totes les taules de seguiment vinculades a aquesta configuració
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Nen Article no ha de ser un paquet de productes. Si us plau remoure l&#39;article `` {0} i guardar
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banca
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +12,Banking,Banca
 apps/erpnext/erpnext/utilities/activation.py +108,Add Timesheets,Afegir parts d&#39;hores
 DocType: Vehicle Service,Service Item,servei d&#39;articles
 DocType: Bank Guarantee,Bank Guarantee,garantia bancària
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Si us plau, feu clic a ""Generar la Llista d'aconseguir horari"
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,S&#39;han produït errors mentre esborra següents horaris:
 DocType: Bin,Ordered Quantity,Quantitat demanada
-apps/erpnext/erpnext/public/js/setup_wizard.js +115,"e.g. ""Build tools for builders""","per exemple ""Construir eines per als constructors """
+apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""","per exemple ""Construir eines per als constructors """
 DocType: Grading Scale,Grading Scale Intervals,Intervals de classificació en l&#39;escala
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Entrada de Comptabilitat per a {2} només pot fer-se en moneda: {3}
-DocType: Production Order,In Process,En procés
+DocType: Fee Schedule,In Process,En procés
 DocType: Authorization Rule,Itemwise Discount,Descompte d'articles
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,Arbre dels comptes financers.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} en contra d'ordres de venda {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +362,{0} against Sales Order {1},{0} en contra d'ordres de venda {1}
 DocType: Account,Fixed Asset,Actius Fixos
 apps/erpnext/erpnext/config/stock.py +320,Serialized Inventory,Inventari serialitzat
 DocType: Employee Loan,Account Info,Informació del compte
 DocType: Activity Type,Default Billing Rate,Per defecte Facturació Tarifa
 DocType: Fees,Include Payment,Inclou el pagament
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Grups d&#39;estudiants creats.
+apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0} Grups d&#39;estudiants creats.
 DocType: Sales Invoice,Total Billing Amount,Suma total de facturació
 apps/erpnext/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py +17,There must be a default incoming Email Account enabled for this to work. Please setup a default incoming Email Account (POP/IMAP) and try again.,"Hi ha d&#39;haver un defecte d&#39;entrada compte de correu electrònic habilitat perquè això funcioni. Si us plau, configurar un compte de correu electrònic entrant per defecte (POP / IMAP) i torna a intentar-ho."
-DocType: Healthcare Settings,Receivable Account,Compte per Cobrar
-apps/erpnext/erpnext/controllers/accounts_controller.py +553,Row #{0}: Asset {1} is already {2},Fila # {0}: {1} d&#39;actius ja és {2}
+DocType: Fee Schedule,Receivable Account,Compte per Cobrar
+apps/erpnext/erpnext/controllers/accounts_controller.py +597,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 +316,Sales Order to Payment,Ordres de venda al Pagament
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +119,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,CEO,CEO
 DocType: Purchase Invoice,With Payment of Tax,Amb el pagament de l&#39;impost
 DocType: Expense Claim Detail,Expense Claim Detail,Reclamació de detall de despesa
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,Triplicat per PROVEÏDOR
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +868,Please select correct account,Seleccioneu el compte correcte
-DocType: Item,Weight UOM,UDM del pes
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +869,Please select correct account,Seleccioneu el compte correcte
+DocType: Purchase Invoice Item,Weight UOM,UDM del pes
 DocType: Salary Structure Employee,Salary Structure Employee,Empleat Estructura salarial
-DocType: Patient,Blood Group,Grup sanguini
+DocType: Student,Blood Group,Grup sanguini
 DocType: Course,Course Name,Nom del curs
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Els usuaris que poden aprovar les sol·licituds de llicència d'un empleat específic
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +52,Office Equipments,Material d'oficina
 DocType: Purchase Invoice Item,Qty,Quantitat
 DocType: Fiscal Year,Companies,Empreses
 DocType: Supplier Scorecard,Scoring Setup,Configuració de puntuacions
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electrònica
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +24,Electronics,Electrònica
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Llevant Sol·licitud de material quan l'acció arriba al nivell de re-ordre
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Full-time,Temps complet
-DocType: Salary Structure,Employees,empleats
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +98,Full-time,Temps complet
+DocType: Payroll Entry,Employees,empleats
 DocType: Employee,Contact Details,Detalls de contacte
 DocType: C-Form,Received Date,Data de recepció
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Si ha creat una plantilla estàndard de les taxes i càrrecs de venda de plantilla, escollir un i feu clic al botó de sota."
 DocType: BOM Scrap Item,Basic Amount (Company Currency),Import de base (Companyia de divises)
 DocType: Student,Guardians,guardians
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Els preus no es mostren si la llista de preus no s&#39;ha establert
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Si us plau, especifiqui un país d&#39;aquesta Regla de la tramesa o del check Enviament mundial"
 DocType: Stock Entry,Total Incoming Value,Valor Total entrant
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +352,Debit To is required,Es requereix dèbit per
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Debit To is required,Es requereix dèbit per
 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/stock/report/item_prices/item_prices.py +39,Purchase Price List,Llista de preus de Compra
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,Plantilles de variables de quadre de comandament de proveïdors.
 DocType: Offer Letter Term,Offer Term,Oferta Termini
-DocType: Quality Inspection,Quality Manager,Gerent de Qualitat
+DocType: Asset,Quality Manager,Gerent de Qualitat
 DocType: Job Applicant,Job Opening,Obertura de treball
 DocType: Payment Reconciliation,Payment Reconciliation,Reconciliació de Pagaments
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Si us plau, seleccioneu el nom de la persona al càrrec"
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tecnologia
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +51,Technology,Tecnologia
 DocType: Hub Settings,Unregister from Hub,Desenregistreu del Hub
 apps/erpnext/erpnext/public/js/utils.js +102,Total Unpaid: {0},Total no pagat: {0}
 DocType: BOM Website Operation,BOM Website Operation,Operació Pàgina Web de llista de materials
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Carta De Oferta
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generar sol·licituds de materials (MRP) i ordres de producció.
 DocType: Supplier Scorecard,Supplier Score,Puntuació del proveïdor
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +76,Total Invoiced Amt,Total facturat Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +87,Total Invoiced Amt,Total facturat Amt
 DocType: Supplier,Warn RFQs,Adverteu RFQs
 DocType: BOM,Conversion Rate,Taxa de conversió
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Cercar producte
-DocType: Physician Schedule Time Slot,To Time,Per Temps
+DocType: Assessment Plan,To Time,Per Temps
 DocType: Authorization Rule,Approving Role (above authorized value),Aprovar Rol (per sobre del valor autoritzat)
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Payable account,Crèdit al compte ha de ser un compte per pagar
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Si us plau, seleccioneu Admissió d&#39;estudiants que és obligatòria per al sol·licitant estudiant pagat"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,BOM recursion: {0} cannot be parent or child of {2},BOM recursiu: {0} no pot ser pare o fill de {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +118,Credit To account must be a Payable account,Crèdit al compte ha de ser un compte per pagar
+apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,"Si us plau, seleccioneu Admissió d&#39;estudiants que és obligatòria per al sol·licitant estudiant pagat"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +338,BOM recursion: {0} cannot be parent or child of {2},BOM recursiu: {0} no pot ser pare o fill de {2}
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +23,Please select a Price List to publish pricing,Seleccioneu una llista de preus per publicar preus
 DocType: Production Order Operation,Completed Qty,Quantitat completada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Per {0}, només els comptes de dèbit poden ser enllaçats amb una altra entrada de crèdit"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +146,"For {0}, only debit accounts can be linked against another credit entry","Per {0}, només els comptes de dèbit poden ser enllaçats amb una altra entrada de crèdit"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,La llista de preus {0} està deshabilitada
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},Fila {0}: Complet Quantitat no pot contenir més de {1} per a l&#39;operació {2}
 DocType: Manufacturing Settings,Allow Overtime,Permetre Overtime
@@ -2443,7 +2522,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Centres de costos addicionals es poden fer en grups, però les entrades es poden fer contra els no Grups"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuaris i permisos
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +945,Production Orders Created: {0},Ordres de fabricació creades: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +994,Production Orders Created: {0},Ordres de fabricació creades: {0}
 DocType: Branch,Branch,Branca
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Printing and Branding
 DocType: Company,Total Monthly Sales,Vendes mensuals totals
@@ -2455,15 +2534,15 @@
 DocType: Fee Schedule Program,Student Batch,lot estudiant
 apps/erpnext/erpnext/utilities/activation.py +119,Make Student,fer Estudiant
 DocType: Supplier Scorecard Scoring Standing,Min Grade,Grau mínim
-apps/erpnext/erpnext/projects/doctype/project/project.py +203,You have been invited to collaborate on the project: {0},Se li ha convidat a col·laborar en el projecte: {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +214,You have been invited to collaborate on the project: {0},Se li ha convidat a col·laborar en el projecte: {0}
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Physician not available on {0},El metge no està disponible a {0}
 DocType: Leave Block List Date,Block Date,Bloquejar Data
 DocType: Purchase Receipt,Supplier Delivery Note,Nota de lliurament del proveïdor
-apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +70,Apply Now,Aplicar ara
+apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +70,Apply Now,Aplicar ara
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Quantitat real {0} / tot esperant Quantitat {1}
 DocType: Purchase Invoice,E-commerce GSTIN,Comerç electrònic GSTIN
 DocType: Sales Order,Not Delivered,No Lliurat
-apps/erpnext/erpnext/controllers/buying_controller.py +421,Expected Date cannot be before Transaction Date,La data prevista no es pot fer abans de la data de la transacció
+apps/erpnext/erpnext/controllers/buying_controller.py +422,Expected Date cannot be before Transaction Date,La data prevista no es pot fer abans de la data de la transacció
 ,Bank Clearance Summary,Resum Liquidació del Banc
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Creació i gestió de resums de correu electrònic diàries, setmanals i mensuals."
 DocType: Appraisal Goal,Appraisal Goal,Avaluació Meta
@@ -2472,8 +2551,8 @@
 DocType: Fee Schedule,Fee Structure,Estructura de tarifes
 DocType: Timesheet Detail,Costing Amount,Pago Monto
 DocType: Student Admission Program,Application Fee,Taxa de sol·licitud
-DocType: Process Payroll,Submit Salary Slip,Presentar nòmina
-apps/erpnext/erpnext/controllers/selling_controller.py +165,Maxiumm discount for Item {0} is {1}%,Maxim descompte per article {0} és {1}%
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +50,Submit Salary Slip,Presentar nòmina
+apps/erpnext/erpnext/controllers/selling_controller.py +133,Maxiumm discount for Item {0} is {1}%,Maxim descompte per article {0} és {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importació a granel
 DocType: Sales Partner,Address & Contacts,Direcció i contactes
 DocType: SMS Log,Sender Name,Nom del remitent
@@ -2483,10 +2562,10 @@
 DocType: SMS Log,Sent To,Enviat A
 DocType: Payment Request,Make Sales Invoice,Fer Factura Vendes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Softwares,programaris
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Següent Contacte La data no pot ser en el passat
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +51,Next Contact Date cannot be in the past,Següent Contacte La data no pot ser en el passat
 DocType: Company,For Reference Only.,Només de referència.
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +91,Physician {0} not available on {1},El metge {0} no està disponible a {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2519,Select Batch No,Seleccioneu Lot n
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +99,Physician {0} not available on {1},El metge {0} no està disponible a {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2538,Select Batch No,Seleccioneu Lot n
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},No vàlida {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Fee Validity,Reference Inv,Referència Inv
@@ -2498,12 +2577,12 @@
 DocType: Employee,Employment Details,Detalls d'Ocupació
 DocType: Employee,New Workplace,Nou lloc de treball
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Establir com Tancada
-apps/erpnext/erpnext/stock/get_item_details.py +131,No Item with Barcode {0},Número d'article amb Codi de barres {0}
+apps/erpnext/erpnext/stock/get_item_details.py +125,No Item with Barcode {0},Número d'article amb Codi de barres {0}
 DocType: Normal Test Items,Require Result Value,Requereix un valor de resultat
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Cas No. No pot ser 0
 DocType: Item,Show a slideshow at the top of the page,Mostra una presentació de diapositives a la part superior de la pàgina
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +514,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +149,Stores,Botigues
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +517,Boms,Boms
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,Stores,Botigues
 DocType: Project Type,Projects Manager,Gerent de Projectes
 DocType: Serial No,Delivery Time,Temps de Lliurament
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Envelliment basat en
@@ -2518,13 +2597,13 @@
 DocType: Rename Tool,Rename Tool,Eina de canvi de nom
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +72,Update Cost,Actualització de Costos
 DocType: Item Reorder,Item Reorder,Punt de reorden
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +446,Show Salary Slip,Slip Mostra Salari
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,Transfer Material,Transferir material
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +463,Show Salary Slip,Slip Mostra Salari
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +848,Transfer Material,Transferir material
 DocType: Fees,Send Payment Request,Enviar sol·licitud de pagament
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especifiqueu les operacions, el cost d'operació i dona una número d'operació únic a les operacions."
 apps/erpnext/erpnext/controllers/status_updater.py +201,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 +1006,Please set recurring after saving,Si us plau conjunt recurrent després de guardar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +758,Select change amount account,Seleccioneu el canvi import del compte
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1086,Please set recurring after saving,Si us plau conjunt recurrent després de guardar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +763,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
@@ -2537,34 +2616,33 @@
 DocType: Grading Scale Interval,Grade Description,grau Descripció
 DocType: Stock Entry,Purchase Receipt No,Número de rebut de compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Diners Earnest
-DocType: Process Payroll,Create Salary Slip,Crear fulla de nòmina
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,traçabilitat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +137,Source of Funds (Liabilities),Font dels fons (Passius)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +381,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantitat a la fila {0} ({1}) ha de ser igual que la quantitat fabricada {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +406,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantitat a la fila {0} ({1}) ha de ser igual que la quantitat fabricada {2}
 DocType: Supplier Scorecard Scoring Standing,Employee,Empleat
 DocType: Sample Collection,Collected Time,Temps recopilats
 DocType: Company,Sales Monthly History,Historial mensual de vendes
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +204,Select Batch,Seleccioneu lot
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} està totalment facturat
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +214,Select Batch,Seleccioneu lot
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,{0} {1} is fully billed,{0} {1} està totalment facturat
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.js +48,Vital Signs,Signes vitals
 DocType: Training Event,End Time,Hora de finalització
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +63,Active Salary Structure {0} found for employee {1} for the given dates,Estructura salarial activa {0} trobats per als empleats {1} dates escollides
 DocType: Payment Entry,Payment Deductions or Loss,Les deduccions de pagament o pèrdua
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Condicions contractuals estàndard per Vendes o la compra.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Agrupa per comprovants
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +186,Are you sure you want to cancel this appointment?,Estàs segur que vols cancel·lar aquesta cita?
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +195,Are you sure you want to cancel this appointment?,Estàs segur que vols cancel·lar aquesta cita?
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,pipeline vendes
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +216,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 +201,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}
 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},Compte {0} no coincideix amb el de la seva empresa {1} en la manera de compte: {2}
-apps/erpnext/erpnext/controllers/buying_controller.py +270,Specified BOM {0} does not exist for Item {1},BOM especificat {0} no existeix la partida {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +221,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de manteniment {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
+apps/erpnext/erpnext/controllers/buying_controller.py +271,Specified BOM {0} does not exist for Item {1},BOM especificat {0} no existeix la partida {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +232,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de manteniment {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
 DocType: POS Profile,Applicable for Users,Aplicable per als usuaris
 DocType: Notification Control,Expense Claim Approved,Compte de despeses Aprovat
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +321,Salary Slip of employee {0} already created for this period,Nòmina dels empleats {0} ja creat per a aquest període
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Pharmaceutical,Farmacèutic
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +155,Pharmaceutical,Farmacèutic
 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: Selling Settings,Sales Order Required,Ordres de venda Obligatori
 DocType: Purchase Invoice,Credit To,Crèdit Per
@@ -2574,76 +2652,73 @@
 DocType: Supplier Scorecard,Warn for new Purchase Orders,Adverteix noves comandes de compra
 DocType: Quality Inspection Reading,Reading 9,Lectura 9
 DocType: Supplier,Is Frozen,Està Congelat
-apps/erpnext/erpnext/stock/utils.py +217,Group node warehouse is not allowed to select for transactions,magatzem node de grup no se li permet seleccionar per a les transaccions
+apps/erpnext/erpnext/stock/utils.py +222,Group node warehouse is not allowed to select for transactions,magatzem node de grup no se li permet seleccionar per a les transaccions
 DocType: Buying Settings,Buying Settings,Ajustaments de compra
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. de producte acabat d'article
 DocType: Upload Attendance,Attendance To Date,Assistència fins a la Data
 DocType: Request for Quotation Supplier,No Quote,Sense pressupost
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,Compte de Pagament
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +880,Please specify Company to proceed,"Si us plau, especifiqui l'empresa per a procedir"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +906,Please specify Company to proceed,"Si us plau, especifiqui l'empresa per a procedir"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Canvi net en els comptes per cobrar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Compensatory Off,Compensatori
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +88,Compensatory Off,Compensatori
 DocType: Offer Letter,Accepted,Acceptat
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,organització
+DocType: Grant Application,Organization,organització
 DocType: BOM Update Tool,BOM Update Tool,Eina d&#39;actualització de la BOM
-apps/erpnext/erpnext/accounts/party.py +204,"Party account not specified, please setup default party account in company","El compte de partit no s&#39;especifica, configureu el compte de partit predeterminat a l&#39;empresa"
 DocType: SG Creation Tool Course,Student Group Name,Nom del grup d&#39;estudiant
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Creació de tarifes
+apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +7,Creating Fees,Creació de tarifes
 apps/erpnext/erpnext/setup/doctype/company/company.js +62,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Si us plau, assegureu-vos que realment voleu esborrar totes les transaccions d&#39;aquesta empresa. Les seves dades mestres romandran tal com és. Aquesta acció no es pot desfer."
 DocType: Room,Room Number,Número d&#39;habitació
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Invàlid referència {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +167,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no pot ser major que quanitity planejat ({2}) en l'ordre de la producció {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +187,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no pot ser major que quanitity planejat ({2}) en l'ordre de la producció {3}
 DocType: Shipping Rule,Shipping Rule Label,Regla Etiqueta d'enviament
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Fòrum d&#39;Usuaris
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +305,Raw Materials cannot be blank.,Matèries primeres no poden estar en blanc.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +488,"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."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +308,Raw Materials cannot be blank.,Matèries primeres no poden estar en blanc.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +492,"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: Lab Test Sample,Lab Test Sample,Exemple de prova de laboratori
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +484,Quick Journal Entry,Seient Ràpida
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +492,Quick Journal Entry,Seient Ràpida
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +200,You can not change rate if BOM mentioned agianst any item,No es pot canviar la tarifa si el BOM va cap a un article
 DocType: Restaurant,Invoice Series Prefix,Prefix de la sèrie de factures
 DocType: Employee,Previous Work Experience,Experiència laboral anterior
 DocType: Stock Entry,For Quantity,Per Quantitat
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},Si us plau entra la quantitat Planificada per l'article {0} a la fila {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} no está presentat
-apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Sol·licituds d'articles.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +239,{0} {1} is not submitted,{0} {1} no está presentat
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Per a la producció per separat es crearà per a cada bon article acabat.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +127,{0} must be negative in return document,{0} ha de ser negatiu en el document de devolució
 ,Minutes to First Response for Issues,Minuts fins a la primera resposta per Temes
 DocType: Purchase Invoice,Terms and Conditions1,Termes i Condicions 1
-apps/erpnext/erpnext/public/js/setup_wizard.js +106,The name of the institute for which you are setting up this system.,El nom de l&#39;institut per al qual està configurant aquest sistema.
+apps/erpnext/erpnext/public/js/setup_wizard.js +109,The name of the institute for which you are setting up this system.,El nom de l&#39;institut per al qual està configurant aquest sistema.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Assentament comptable congelat fins ara, ningú pot fer / modificar entrada excepte paper s'especifica a continuació."
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Si us plau, guardi el document abans de generar el programa de manteniment"
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +30,Latest price updated in all BOMs,Últim preu actualitzat a totes les BOM
-DocType: Fee Schedule,Successful,Èxit
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Estat del Projecte
 DocType: UOM,Check this to disallow fractions. (for Nos),Habiliteu aquesta opció per no permetre fraccions. (Per números)
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +423,The following Production Orders were created:,Es van crear les següents ordres de fabricació:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +424,The following Production Orders were created:,Es van crear les següents ordres de fabricació:
 DocType: Student Admission Program,Naming Series (for Student Applicant),Sèrie de nomenclatura (per Estudiant Sol·licitant)
 DocType: Delivery Note,Transporter Name,Nom Transportista
 DocType: Authorization Rule,Authorized Value,Valor Autoritzat
 DocType: BOM,Show Operations,Mostra Operacions
 ,Minutes to First Response for Opportunity,Minuts fins a la primera resposta per Oportunitats
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Absent,Total Absent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +794,Item or Warehouse for row {0} does not match Material Request,Article o magatzem per a la fila {0} no coincideix Sol·licitud de materials
-apps/erpnext/erpnext/config/stock.py +194,Unit of Measure,Unitat de mesura
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +823,Item or Warehouse for row {0} does not match Material Request,Article o magatzem per a la fila {0} no coincideix Sol·licitud de materials
+apps/erpnext/erpnext/config/stock.py +187,Unit of Measure,Unitat de mesura
 DocType: Fiscal Year,Year End Date,Any Data de finalització
 DocType: Task Depends On,Task Depends On,Tasca Depèn de
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +999,Opportunity,Oportunitat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1024,Opportunity,Oportunitat
 ,Completed Production Orders,Ordres de fabricació completades
 DocType: Operation,Default Workstation,Per defecte l'estació de treball
 DocType: Notification Control,Expense Claim Approved Message,Missatge Reclamació d'aprovació de Despeses
 DocType: Payment Entry,Deductions or Loss,Deduccions o Pèrdua
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +247,{0} {1} is closed,{0} {1} està tancat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +245,{0} {1} is closed,{0} {1} està tancat
 DocType: Email Digest,How frequently?,Amb quina freqüència?
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +57,Total Collected: {0},Total recopilat: {0}
+apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +58,Total Collected: {0},Total recopilat: {0}
 DocType: Purchase Receipt,Get Current Stock,Obtenir Stock actual
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Arbre de la llista de materials
 DocType: Student,Joining Date,Data d&#39;incorporació
 ,Employees working on a holiday,Els empleats que treballen en un dia festiu
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Marc Present
 DocType: Project,% Complete Method,Mètode complet%
-apps/erpnext/erpnext/healthcare/setup.py +180,Drug,Drogues
+apps/erpnext/erpnext/healthcare/setup.py +181,Drug,Drogues
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Data d'inici de manteniment no pot ser abans de la data de lliurament pel número de sèrie {0}
 DocType: Production Order,Actual End Date,Data de finalització actual
 DocType: BOM,Operating Cost (Company Currency),Cost de funcionament (Companyia de divises)
@@ -2651,12 +2726,12 @@
 DocType: Authorization Rule,Applicable To (Role),Aplicable a (Rol)
 DocType: BOM Update Tool,Replace BOM,Reemplaça BOM
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +110,Code {0} already exist,El codi {0} ja existeix
-DocType: Stock Entry,Purpose,Propòsit
+DocType: Employee Advance,Purpose,Propòsit
 DocType: Company,Fixed Asset Depreciation Settings,Configuració de depreciació dels immobles
 DocType: Item,Will also apply for variants unless overrridden,També s'aplicarà per a les variants menys overrridden
 DocType: Purchase Invoice,Advances,Advances
 DocType: Production Order,Manufacture against Material Request,Fabricació contra comanda Material
-apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +10,Assessment Group: ,Grup d&#39;avaluació:
+apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +10,Assessment Group: ,Grup d&#39;avaluació:
 DocType: Item Reorder,Request for,sol·licitud de
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Approving User cannot be same as user the rule is Applicable To
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Taxa Bàsica (segons de la UOM)
@@ -2664,19 +2739,19 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +245,Leave Without Pay does not match with approved Leave Application records,Llicència sense sou no coincideix amb els registres de llicències d&#39;aplicacions aprovades
 DocType: Campaign,Campaign-.####,Campanya-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Propers passos
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +769,Please supply the specified items at the best possible rates,Si us plau subministrar els elements especificats en les millors taxes possibles
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +794,Please supply the specified items at the best possible rates,Si us plau subministrar els elements especificats en les millors taxes possibles
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,Fer Factura
 DocType: Selling Settings,Auto close Opportunity after 15 days,Tancament automàtic després de 15 dies d&#39;Oportunitats
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +75,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Les ordres de compra no estan permeses per {0} a causa d&#39;un quadre de comandament de peu de {1}.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +76,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,Les ordres de compra no estan permeses per {0} a causa d&#39;un quadre de comandament de peu de {1}.
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,De cap d&#39;any
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot /% Plom
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,La Data de finalització del contracte ha de ser major que la data d'inici
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +124,Contract End Date must be greater than Date of Joining,La Data de finalització del contracte ha de ser major que la data d'inici
 DocType: Vital Signs,Nutrition Values,Valors nutricionals
 DocType: Lab Test Template,Is billable,És facturable
 DocType: Delivery Note,DN-,DN
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +44,"Both ""Physician Schedule"" and Time Per Appointment"" must be set for Dr {0}",Tant &quot;Programació mèdica&quot; com Time Per Appointment &quot;s&#39;han d&#39;establir per al Dr {0}
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un distribuïdor de tercers / distribuïdor / comissió de l'agent / de la filial / distribuïdor que ven els productes de les empreses d'una comissió.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} contra l'Ordre de Compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +374,{0} against Purchase Order {1},{0} contra l'Ordre de Compra {1}
 DocType: Patient,Patient Demographics,Demografia del pacient
 DocType: Task,Actual Start Date (via Time Sheet),Data d&#39;inici real (a través de fulla d&#39;hores)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Aquest és un lloc web d'exemple d'auto-generada a partir ERPNext
@@ -2725,17 +2800,17 @@
 DocType: Homepage,Homepage,pàgina principal
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +71,Select Physician...,Seleccioneu el metge ...
 DocType: Purchase Receipt Item,Recd Quantity,Recd Quantitat
-apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Els registres d&#39;honoraris creats - {0}
+apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +59,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/manufacturing/doctype/production_order/production_order.py +117,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/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Entrada de la {0} no es presenta
+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/accounts/doctype/journal_entry/journal_entry.py +537,Stock Entry {0} is not submitted,Entrada de la {0} no es presenta
 DocType: Payment Reconciliation,Bank / Cash Account,Compte Bancari / Efectiu
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Per següent Contacte no pot ser la mateixa que la de plom Adreça de correu electrònic
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +45,Next Contact By cannot be same as the Lead Email Address,Per següent Contacte no pot ser la mateixa que la de plom Adreça de correu electrònic
 DocType: Tax Rule,Billing City,Facturació Ciutat
 DocType: Asset,Manual,manual
 DocType: Salary Component Account,Salary Component Account,Compte Nòmina Component
 DocType: Global Defaults,Hide Currency Symbol,Amaga Símbol de moneda
-apps/erpnext/erpnext/config/accounts.py +338,"e.g. Bank, Cash, Credit Card","per exemple bancària, Efectiu, Targeta de crèdit"
+apps/erpnext/erpnext/config/accounts.py +330,"e.g. Bank, Cash, Credit Card","per exemple bancària, Efectiu, Targeta de crèdit"
 DocType: Lead Source,Source Name,font Nom
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","La pressió arterial normal en un adult és d&#39;aproximadament 120 mmHg sistòlica i 80 mmHg diastòlica, abreujada &quot;120/80 mmHg&quot;"
 DocType: Journal Entry,Credit Note,Nota de Crèdit
@@ -2751,7 +2826,7 @@
 DocType: Opportunity,Customer / Lead Name,nom del Client/Client Potencial
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,No s'esmenta l'espai de dates
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Producció
-DocType: Patient,Occupation,ocupació
+DocType: Guardian,Occupation,ocupació
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Fila {0}: Data d'inici ha de ser anterior Data de finalització
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Quantitat)
 DocType: Installation Note Item,Installed Qty,Quantitat instal·lada
@@ -2763,24 +2838,22 @@
 DocType: Salary Structure,Total Earning,Benefici total
 DocType: Purchase Receipt,Time at which materials were received,Moment en què es van rebre els materials
 DocType: Stock Ledger Entry,Outgoing Rate,Sortint Rate
-apps/erpnext/erpnext/config/hr.py +228,Organization branch master.,Organization branch master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +280, or ,o
+apps/erpnext/erpnext/config/hr.py +233,Organization branch master.,Organization branch master.
+apps/erpnext/erpnext/controllers/accounts_controller.py +303, 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/public/js/setup_wizard.js +28,Education (beta),Educació (beta)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Utility Expenses,Despeses de serveis públics
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Per sobre de 90-
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +241,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Fila # {0}: Seient {1} no té en compte {2} o ja compara amb un altre bo
 DocType: Supplier Scorecard Criteria,Criteria Weight,Criteris de pes
 DocType: Buying Settings,Default Buying Price List,Llista de preus per defecte
-DocType: Process Payroll,Salary Slip Based on Timesheet,Sobre la base de nòmina de part d&#39;hores
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +113,No employee for the above selected criteria OR salary slip already created,Cap empleat per als criteris anteriorment seleccionat o nòmina ja creat
+DocType: Payroll Entry,Salary Slip Based on Timesheet,Sobre la base de nòmina de part d&#39;hores
 DocType: Notification Control,Sales Order Message,Sol·licitar Sales Missatge
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Establir valors predeterminats com a Empresa, vigència actual any fiscal, etc."
 DocType: Payment Entry,Payment Type,Tipus de Pagament
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +131,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleccioneu un lot d&#39;articles per {0}. No és possible trobar un únic lot que compleix amb aquest requisit
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +140,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleccioneu un lot d&#39;articles per {0}. No és possible trobar un únic lot que compleix amb aquest requisit
 DocType: Hub Category,Parent Category,Categoria primària
-DocType: Process Payroll,Select Employees,Seleccioneu Empleats
+DocType: Payroll Entry,Select Employees,Seleccioneu Empleats
 DocType: Opportunity,Potential Sales Deal,Tracte de vendes potencials
 DocType: Complaint,Complaints,Queixes
 DocType: Payment Entry,Cheque/Reference Date,Xec / Data de referència
@@ -2789,7 +2862,7 @@
 DocType: Bank Reconciliation Detail,Payment Entry,Entrada de pagament
 DocType: Item,Quality Parameters,Paràmetres de Qualitat
 ,sales-browser,les vendes en el navegador
-apps/erpnext/erpnext/accounts/doctype/account/account.js +73,Ledger,Llibre major
+apps/erpnext/erpnext/accounts/doctype/account/account.js +79,Ledger,Llibre major
 DocType: Patient Medical Record,PMR-,PMR-
 DocType: Drug Prescription,Drug Code,Codi de drogues
 DocType: Target Detail,Target  Amount,Objectiu Monto
@@ -2797,12 +2870,11 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Ajustaments de la cistella de la compra
 DocType: Journal Entry,Accounting Entries,Assentaments comptables
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},"Entrada duplicada. Si us plau, consulteu Regla d'autorització {0}"
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +29,Global POS Profile {0} already created for company {1},POS Perfil Global {0} ja creat per la companyia de {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Receipt document must be submitted,document de recepció ha de ser presentat
 DocType: Purchase Invoice Item,Received Qty,Quantitat rebuda
 DocType: Stock Entry Detail,Serial No / Batch,Número de sèrie / lot
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +320,Not Paid and Not Delivered,"No satisfets, i no lliurats"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +340,Not Paid and Not Delivered,"No satisfets, i no lliurats"
 DocType: Product Bundle,Parent Item,Article Pare
 DocType: Account,Account Type,Tipus de compte
 DocType: Delivery Note,DN-RET-,DN-RET-
@@ -2811,32 +2883,32 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"El programa de manteniment no es genera per a tots els articles Si us plau, feu clic a ""Generar Planificació"""
 ,To Produce,Per a Produir
 apps/erpnext/erpnext/config/hr.py +93,Payroll,nòmina de sous
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Per a la fila {0} a {1}. Per incloure {2} en la taxa d&#39;article, files {3} també han de ser inclosos"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +196,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Per a la fila {0} a {1}. Per incloure {2} en la taxa d&#39;article, files {3} també han de ser inclosos"
 apps/erpnext/erpnext/utilities/activation.py +101,Make User,fer usuari
 DocType: Packing Slip,Identification of the package for the delivery (for print),La identificació del paquet per al lliurament (per imprimir)
 DocType: Bin,Reserved Quantity,Quantitat reservades
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Si us plau, introdueixi l&#39;adreça de correu electrònic vàlida"
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +654,Please select an item in the cart,Seleccioneu un article al carretó
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +713,Please select an item in the cart,Seleccioneu un article al carretó
 DocType: Landed Cost Voucher,Purchase Receipt Items,Rebut de compra d'articles
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formes Personalització
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Arrear,arriar
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Import de l&#39;amortització durant el període
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +74,Arrear,arriar
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +158,Depreciation Amount during the period,Import de l&#39;amortització durant el període
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,plantilla persones amb discapacitat no ha de ser plantilla per defecte
 DocType: Account,Income Account,Compte d'ingressos
 DocType: Payment Request,Amount in customer's currency,Suma de la moneda del client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +776,Delivery,Lliurament
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +823,Delivery,Lliurament
 DocType: Stock Reconciliation Item,Current Qty,Quantitat actual
 DocType: Restaurant Menu,Restaurant Menu,Menú de restaurant
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,anterior
 DocType: Appraisal Goal,Key Responsibility Area,Àrea de Responsabilitat clau
 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 +143,Set default inventory account for perpetual inventory,Establir compte d&#39;inventari predeterminat d&#39;inventari perpetu
+apps/erpnext/erpnext/setup/doctype/company/company.py +140,Set default inventory account for perpetual inventory,Establir compte d&#39;inventari predeterminat d&#39;inventari perpetu
 DocType: Item Reorder,Material Request Type,Material de Sol·licitud Tipus
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +268,Accural Journal Entry for salaries from {0} to {1},Entrada de diari Accural per a salaris de {0} a {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +824,"LocalStorage is full, did not save","LocalStorage està plena, no va salvar"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Fila {0}: UOM factor de conversió és obligatori
-apps/erpnext/erpnext/utilities/user_progress.py +214,Room Capacity,Capacitat de l&#39;habitació
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +252,Accural Journal Entry for salaries from {0} to {1},Entrada de diari Accural per a salaris de {0} a {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +839,"LocalStorage is full, did not save","LocalStorage està plena, no va salvar"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,Row {0}: UOM Conversion Factor is mandatory,Fila {0}: UOM factor de conversió és obligatori
+apps/erpnext/erpnext/utilities/user_progress.py +232,Room Capacity,Capacitat de l&#39;habitació
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +14,Ref,Àrbitre
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,Quota d&#39;inscripció
@@ -2850,16 +2922,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Regla de preus està feta per a sobreescriure la llista de preus/defineix percentatge de descompte, en base a algun criteri."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magatzem només es pot canviar a través d'entrada d'estoc / Nota de lliurament / recepció de compra
 DocType: Employee Education,Class / Percentage,Classe / Percentatge
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +130,Head of Marketing and Sales,Director de Màrqueting i Vendes
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Income Tax,Impost sobre els guanys
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +134,Head of Marketing and Sales,Director de Màrqueting i Vendes
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +72,Income Tax,Impost sobre els guanys
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Si Regla preus seleccionada està fet per a 'Preu', sobreescriurà Llista de Preus. Regla preu El preu és el preu final, així que no hi ha descompte addicional s'ha d'aplicar. Per tant, en les transaccions com comandes de venda, ordres de compra, etc, es va anar a buscar al camp ""Rate"", en lloc de camp 'Preu de llista Rate'."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Seguiment dels clients potencials per tipus d'indústria.
 DocType: Item Supplier,Item Supplier,Article Proveïdor
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1107,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 +827,Please select a value for {0} quotation_to {1},Please select a value for {0} quotation_to {1}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1187,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 +874,Please select a value for {0} quotation_to {1},Please select a value for {0} quotation_to {1}
 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 +199,"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"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +185,"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"
 DocType: Vehicle,Electric,elèctric
 DocType: Task,% Progress,% Progrés
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +123,Gain/Loss on Asset Disposal,Guany / Pèrdua per venda d&#39;actius
@@ -2873,9 +2945,9 @@
 DocType: Project,Task Completion,Finalització de tasques
 apps/erpnext/erpnext/templates/includes/product_page.js +21,Not in Stock,No en Stock
 DocType: Appraisal,HR User,HR User
-apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +53,POS?,TPV?
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +36,POS?,TPV?
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impostos i despeses deduïdes
-apps/erpnext/erpnext/hooks.py +138,Issues,Qüestions
+apps/erpnext/erpnext/hooks.py +142,Issues,Qüestions
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Estat ha de ser un {0}
 DocType: Sales Invoice,Debit To,Per Dèbit
 DocType: Restaurant Menu Item,Restaurant Menu Item,Element del menú del restaurant
@@ -2883,60 +2955,60 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Actual Quantitat Després de Transacció
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +79,No salary slip found between {0} and {1},Sense nòmina trobat entre {0} i {1}
 ,Pending SO Items For Purchase Request,A l'espera dels Articles de la SO per la sol·licitud de compra
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +35,Student Admissions,Admissió d&#39;Estudiants
-apps/erpnext/erpnext/accounts/party.py +364,{0} {1} is disabled,{0} {1} està desactivat
+apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +35,Student Admissions,Admissió d&#39;Estudiants
+apps/erpnext/erpnext/accounts/party.py +376,{0} {1} is disabled,{0} {1} està desactivat
 DocType: Supplier,Billing Currency,Facturació moneda
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +196,Extra Large,Extra gran
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +200,Extra Large,Extra gran
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Leaves,fulles totals
 DocType: Consultation,In print,En impressió
 ,Profit and Loss Statement,Guanys i Pèrdues
 DocType: Bank Reconciliation Detail,Cheque Number,Número de Xec
 ,Sales Browser,Analista de Vendes
 DocType: Journal Entry,Total Credit,Crèdit Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Hi ha un altre {0} # {1} contra l&#39;entrada de població {2}: Són els
-apps/erpnext/erpnext/utilities/user_progress_utils.py +51,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +540,Warning: Another {0} # {1} exists against stock entry {2},Hi ha un altre {0} # {1} contra l&#39;entrada de població {2}: Són els
+apps/erpnext/erpnext/utilities/user_progress_utils.py +66,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Préstecs i bestretes (Actius)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Deutors
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +195,Large,Gran
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +199,Large,Gran
 DocType: Homepage Featured Product,Homepage Featured Product,Pàgina d&#39;inici Producte destacat
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +236,All Assessment Groups,Tots els grups d&#39;avaluació
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +246,All Assessment Groups,Tots els grups d&#39;avaluació
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Magatzem nou nom
 apps/erpnext/erpnext/accounts/report/financial_statements.py +233,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territori
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Si us plau, no de visites requerides"
 DocType: Stock Settings,Default Valuation Method,Mètode de valoració predeterminat
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +26,Fee,quota
-apps/erpnext/erpnext/setup/doctype/company/company.js +124,Update in progress. It might take a while.,Actualització en progrés. Pot trigar un temps.
+apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +26,Fee,quota
+apps/erpnext/erpnext/setup/doctype/company/company.js +125,Update in progress. It might take a while.,Actualització en progrés. Pot trigar un temps.
 DocType: Vehicle Log,Fuel Qty,Quantitat de combustible
 DocType: Production Order Operation,Planned Start Time,Planificació de l'hora d'inici
 DocType: Course,Assessment,valoració
 DocType: Payment Entry Reference,Allocated,Situat
-apps/erpnext/erpnext/config/accounts.py +275,Close Balance Sheet and book Profit or Loss.,Tancar Balanç i llibre Guany o Pèrdua.
+apps/erpnext/erpnext/config/accounts.py +267,Close Balance Sheet and book Profit or Loss.,Tancar Balanç i llibre Guany o Pèrdua.
 DocType: Student Applicant,Application Status,Estat de la sol·licitud
 DocType: Sensitivity Test Items,Sensitivity Test Items,Elements de prova de sensibilitat
 DocType: Fees,Fees,taxes
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar Tipus de canvi per convertir una moneda en una altra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +158,Quotation {0} is cancelled,L'annotació {0} està cancel·lada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +159,Quotation {0} is cancelled,L'annotació {0} està cancel·lada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Outstanding Amount,Total Monto Pendent
 DocType: Sales Partner,Targets,Blancs
 DocType: Price List,Price List Master,Llista de preus Mestre
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Totes les transaccions de venda es poden etiquetar contra múltiples venedors ** ** perquè pugui establir i monitoritzar metes.
 ,S.O. No.,S.O. No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +199,Please create Customer from Lead {0},"Si us plau, crea Client a partir del client potencial {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +241,Please create Customer from Lead {0},"Si us plau, crea Client a partir del client potencial {0}"
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,Seleccioneu el pacient
 DocType: Price List,Applicable for Countries,Aplicable per als Països
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,Nom del paràmetre
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Només Deixa aplicacions amb estat &quot;Aprovat&quot; i &quot;Rebutjat&quot; pot ser presentat
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Estudiant Nom del grup és obligatori a la fila {0}
+apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},Estudiant Nom del grup és obligatori a la fila {0}
 DocType: Homepage,Products to be shown on website homepage,Els productes que es mostren a la pàgina d&#39;inici pàgina web
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Es tracta d'un grup de clients de l'arrel i no es pot editar.
-DocType: Employee,AB-,AB-
+DocType: Student,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Ignorar Regla preus
 DocType: Employee Education,Graduate,Graduat
 DocType: Leave Block List,Block Days,Bloc de Dies
 DocType: Journal Entry,Excise Entry,Entrada impostos especials
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +64,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Són els Vendes Sol·licitar {0} ja existeix en contra del client Ordre de Compra {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +65,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Són els Vendes Sol·licitar {0} ja existeix en contra del client Ordre de Compra {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2968,48 +3040,46 @@
 DocType: Project,Copied From,de copiat
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +96,Name error: {0},Nom d&#39;error: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +12,Shortage,escassetat
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +209,{0} {1} does not associated with {2} {3},{0} {1} no associada a {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Assistència per a l'empleat {0} ja està marcat
 DocType: Packing Slip,If more than one package of the same type (for print),Si més d'un paquet del mateix tipus (per impressió)
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,Establiu el client predeterminat a la Configuració del restaurant
 ,Salary Register,salari Registre
 DocType: Warehouse,Parent Warehouse,Magatzem dels pares
 DocType: C-Form Invoice Detail,Net Total,Total Net
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM not found for Item {0} and Project {1},Per defecte la llista de materials que no es troba d&#39;article {0} i {1} Projecte
-apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Definir diversos tipus de préstecs
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +526,Default BOM not found for Item {0} and Project {1},Per defecte la llista de materials que no es troba d&#39;article {0} i {1} Projecte
+apps/erpnext/erpnext/config/hr.py +168,Define various loan types,Definir diversos tipus de préstecs
 DocType: Bin,FCFS Rate,FCFS Rate
-DocType: Payment Reconciliation Invoice,Outstanding Amount,Quantitat Pendent
+DocType: Opening Invoice Creation Tool Item,Outstanding Amount,Quantitat Pendent
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Temps (en minuts)
 DocType: Project Task,Working,Treballant
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Estoc de cua (FIFO)
-apps/erpnext/erpnext/public/js/setup_wizard.js +124,Financial Year,Any financer
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +41,{0} does not belong to Company {1},{0} no pertany a l'empresa {1}
+apps/erpnext/erpnext/public/js/setup_wizard.js +127,Financial Year,Any financer
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,{0} does not belong to Company {1},{0} no pertany a l'empresa {1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,No s&#39;ha pogut resoldre la funció de puntuació de criteris per a {0}. Assegureu-vos que la fórmula sigui vàlida.
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,costar en
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +122,Cost as on,costar en
 DocType: Healthcare Settings,Out Patient Settings,Fora de configuració del pacient
 DocType: Account,Round Off,Arrodonir
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +231,Quantity must be positive,La quantitat ha de ser positiva
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +252,Quantity must be positive,La quantitat ha de ser positiva
 ,Requested Qty,Sol·licitat Quantitat
 DocType: Tax Rule,Use for Shopping Cart,L&#39;ús per Compres
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},El valor {0} per a l&#39;atribut {1} no existeix a la llista de valors d&#39;atributs d&#39;article vàlid per al punt {2}
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +78,Select Serial Numbers,Seleccionar números de sèrie
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +79,Select Serial Numbers,Seleccionar números de sèrie
 DocType: BOM Item,Scrap %,Scrap%
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Els càrrecs es distribuiran proporcionalment basen en Quantitat o import de l'article, segons la teva selecció"
 DocType: Maintenance Visit,Purposes,Propòsits
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +111,Atleast one item should be entered with negative quantity in return document,Almenys un element ha de introduir-se amb quantitat negativa en el document de devolució
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operació {0} ja que qualsevol temps de treball disponibles a l&#39;estació de treball {1}, trencar l&#39;operació en múltiples operacions"
 ,Requested,Comanda
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,No Remarks,Sense Observacions
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +93,No Remarks,Sense Observacions
 DocType: Purchase Invoice,Overdue,Endarrerit
 DocType: Account,Stock Received But Not Billed,Estoc Rebudes però no facturats
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Compte arrel ha de ser un grup
+apps/erpnext/erpnext/accounts/doctype/account/account.py +86,Root Account must be a group,Compte arrel ha de ser un grup
 DocType: Consultation,Drug Prescription,Prescripció per drogues
 DocType: Fees,FEE.,FEE.
 DocType: Employee Loan,Repaid/Closed,Reemborsat / Tancat
 DocType: Item,Total Projected Qty,Quantitat total projectada
 DocType: Monthly Distribution,Distribution Name,Distribution Name
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
-apps/erpnext/erpnext/stock/stock_ledger.py +464,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","No s&#39;ha trobat el percentatge de valoració de l&#39;element {0}, que es requereix per fer entrades de comptabilitat per {1} {2}. Si l&#39;element es transacciona com a element de la taxa de valoració zero a {1}, mencioneu-lo a la taula {1} Element. En cas contrari, creeu una transacció d&#39;accions entrants per l&#39;element o mencioneu el percentatge de valoració al registre de l&#39;element i, a continuació, intenteu enviar / cancel·lar aquesta entrada."
+apps/erpnext/erpnext/stock/stock_ledger.py +471,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","No s&#39;ha trobat el percentatge de valoració de l&#39;element {0}, que es requereix per fer entrades de comptabilitat per {1} {2}. Si l&#39;element es transacciona com a element de la taxa de valoració zero a {1}, mencioneu-lo a la taula {1} Element. En cas contrari, creeu una transacció d&#39;accions entrants per l&#39;element o mencioneu el percentatge de valoració al registre de l&#39;element i, a continuació, intenteu enviar / cancel·lar aquesta entrada."
 DocType: Course,Course Code,Codi del curs
 apps/erpnext/erpnext/controllers/stock_controller.py +331,Quality Inspection required for Item {0},Inspecció de qualitat requerida per a l'article {0}
 DocType: POS Settings,Use POS in Offline Mode,Utilitzeu TPV en mode fora de línia
@@ -3020,20 +3090,19 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Administrar Territori arbre.
 DocType: Journal Entry Account,Sales Invoice,Factura de vendes
 DocType: Journal Entry Account,Party Balance,Equilibri Partit
-apps/erpnext/erpnext/accounts/page/pos/pos.js +484,Please select Apply Discount On,Seleccioneu Aplicar descompte en les
+apps/erpnext/erpnext/accounts/page/pos/pos.js +497,Please select Apply Discount On,Seleccioneu Aplicar descompte en les
 DocType: Company,Default Receivable Account,Predeterminat Compte per Cobrar
-DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Crear entrada del banc per al sou total pagat pels criteris anteriorment seleccionats
 DocType: Physician,Physician Schedule,Horari del metge
 DocType: Purchase Invoice,Deemed Export,Es considera exportar
 DocType: Stock Entry,Material Transfer for Manufacture,Transferència de material per a la fabricació
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,El percentatge de descompte es pot aplicar ja sigui contra una llista de preus o per a tot Llista de Preus.
 DocType: Subscription,Half-yearly,Semestral
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +402,Accounting Entry for Stock,Entrada Comptabilitat de Stock
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +406,Accounting Entry for Stock,Entrada Comptabilitat de Stock
 DocType: Lab Test,LabTest Approver,LabTest Approver
-apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Vostè ja ha avaluat pels criteris d&#39;avaluació {}.
+apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +49,You have already assessed for the assessment criteria {}.,Vostè ja ha avaluat pels criteris d&#39;avaluació {}.
 DocType: Vehicle Service,Engine Oil,d&#39;oli del motor
 DocType: Sales Invoice,Sales Team1,Equip de Vendes 1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Article {0} no existeix
+apps/erpnext/erpnext/stock/doctype/item/item.py +521,Item {0} does not exist,Article {0} no existeix
 DocType: Sales Invoice,Customer Address,Direcció del client
 DocType: Employee Loan,Loan Details,Detalls de préstec
 DocType: Company,Default Inventory Account,Compte d&#39;inventari per defecte
@@ -3048,21 +3117,21 @@
 DocType: Item Group,Show this slideshow at the top of the page,Mostra aquesta presentació de diapositives a la part superior de la pàgina
 DocType: BOM,Item UOM,Article UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Suma d&#39;impostos Després Quantitat de Descompte (Companyia moneda)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Magatzem destí obligatori per a la fila {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +155,Target warehouse is mandatory for row {0},Magatzem destí obligatori per a la fila {0}
 DocType: Cheque Print Template,Primary Settings,ajustos primaris
 DocType: Purchase Invoice,Select Supplier Address,Seleccionar adreça del proveïdor
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +380,Add Employees,Afegir Empleats
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Add Employees,Afegir Empleats
 DocType: Purchase Invoice Item,Quality Inspection,Inspecció de Qualitat
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +192,Extra Small,Extra Petit
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +196,Extra Small,Extra Petit
 DocType: Company,Standard Template,plantilla estàndard
 DocType: Training Event,Theory,teoria
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +780,Warning: Material Requested Qty is less than Minimum Order Qty,Advertència: La quantitat de Material sol·licitada és inferior a la Quantitat mínima
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +805,Warning: Material Requested Qty is less than Minimum Order Qty,Advertència: La quantitat de Material sol·licitada és inferior a la Quantitat mínima
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,El compte {0} està bloquejat
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entitat Legal / Subsidiari amb un gràfic separat de comptes que pertanyen a l'Organització.
 DocType: Payment Request,Mute Email,Silenciar-mail
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentació, begudes i tabac"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +689,Can only make payment against unbilled {0},Només es pot fer el pagament contra facturats {0}
-apps/erpnext/erpnext/controllers/selling_controller.py +130,Commission rate cannot be greater than 100,La Comissió no pot ser major que 100
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +29,"Food, Beverage & Tobacco","Alimentació, begudes i tabac"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +714,Can only make payment against unbilled {0},Només es pot fer el pagament contra facturats {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +98,Commission rate cannot be greater than 100,La Comissió no pot ser major que 100
 DocType: Stock Entry,Subcontract,Subcontracte
 apps/erpnext/erpnext/public/js/utils/party.js +165,Please enter {0} first,"Si us plau, introdueixi {0} primer"
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +87,No replies from,No hi ha respostes des
@@ -3076,11 +3145,11 @@
 apps/erpnext/erpnext/utilities/user_progress.py +44,Set a Target,Estableix una destinació
 DocType: Dosage Strength,Dosage Strength,Força de dosificació
 DocType: Account,Expense Account,Compte de Despeses
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Programari
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +199,Colour,Color
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,Programari
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +203,Colour,Color
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Criteris d&#39;avaluació del pla
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Evitar les comandes de compra
-apps/erpnext/erpnext/healthcare/setup.py +257,Susceptible,Susceptible
+apps/erpnext/erpnext/healthcare/setup.py +258,Susceptible,Susceptible
 DocType: Patient Appointment,Scheduled,Programat
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Sol · licitud de pressupost.
 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","Seleccioneu l&#39;ítem on &quot;És de la Element&quot; és &quot;No&quot; i &quot;És d&#39;articles de venda&quot; és &quot;Sí&quot;, i no hi ha un altre paquet de producte"
@@ -3088,24 +3157,24 @@
 DocType: Student Log,Academic,acadèmic
 DocType: Patient,Personal and Social History,Història personal i social
 DocType: Fee Schedule,Fee Breakup for each student,Taxa d&#39;interrupció per cada estudiant
-apps/erpnext/erpnext/controllers/accounts_controller.py +476,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 +520,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/lab_test_template/lab_test_template.js +78,Change Code,Canvia el codi
 DocType: Purchase Invoice Item,Valuation Rate,Tarifa de Valoració
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,dièsel
-apps/erpnext/erpnext/stock/get_item_details.py +338,Price List Currency not selected,No s'ha escollit una divisa per la llista de preus
+apps/erpnext/erpnext/stock/get_item_details.py +381,Price List Currency not selected,No s'ha escollit una divisa per la llista de preus
 apps/erpnext/erpnext/config/healthcare.py +46,Results,Resultats
 ,Student Monthly Attendance Sheet,Estudiant Full d&#39;Assistència Mensual
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},L'Empleat {0} ja ha sol·licitat {1} entre {2} i {3}
 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 +5,Until,Fins
 DocType: Rename Tool,Rename Log,Canviar el nom de registre
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Grup d&#39;estudiant o Horari del curs és obligatòria
+apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Grup d&#39;estudiant o Horari del curs és obligatòria
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Mantenir Hores i hores de treball de facturació igual en part d&#39;hores
 DocType: Maintenance Visit Purpose,Against Document No,Contra el document n
 DocType: BOM,Scrap,ferralla
-apps/erpnext/erpnext/utilities/user_progress.py +196,Go to Instructors,Aneu a Instructors
+apps/erpnext/erpnext/utilities/user_progress.py +214,Go to Instructors,Aneu a Instructors
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Administrar Punts de vendes.
 DocType: Quality Inspection,Inspection Type,Tipus d'Inspecció
 DocType: Fee Validity,Visited yet,Visitat encara
@@ -3113,17 +3182,17 @@
 DocType: Assessment Result Tool,Result HTML,El resultat HTML
 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/public/js/utils.js +264,Please select {0},Seleccioneu {0}
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/utilities/user_progress.py +118,List your products or services that you buy or sell.,Indiqueu els vostres productes o serveis que compreu o veniu.
+apps/erpnext/erpnext/utilities/user_progress.py +136,List your products or services that you buy or sell.,Indiqueu els vostres productes o serveis que compreu o veniu.
 DocType: Employee Attendance Tool,Unmarked Attendance,L&#39;assistència sense marcar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Researcher,Investigador
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +137,Researcher,Investigador
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Estudiant Eina d&#39;Inscripció Programa
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nom o Email és obligatori
-apps/erpnext/erpnext/config/stock.py +168,Incoming quality inspection.,Inspecció de qualitat entrant.
 DocType: Purchase Order Item,Returned Qty,Tornat Quantitat
-DocType: Employee,Exit,Sortida
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Root Type is mandatory
+DocType: Student,Exit,Sortida
+apps/erpnext/erpnext/accounts/doctype/account/account.py +158,Root Type is mandatory,Root Type is mandatory
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0} té actualment un {1} Quadre de comandament del proveïdor en posició i les RFQs a aquest proveïdor s&#39;han de fer amb precaució.
 DocType: BOM,Total Cost(Company Currency),Cost total (Companyia de divises)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +315,Serial No {0} created,Serial No {0} creat
@@ -3135,40 +3204,39 @@
 DocType: Employee,You can enter any date manually,Podeu introduir qualsevol data manualment
 DocType: Healthcare Settings,Result Printed,Resultat imprès
 DocType: Asset Category Account,Depreciation Expense Account,Compte de despeses de depreciació
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +221,Probationary Period,Període De Prova
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +231,Probationary Period,Període De Prova
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +32,View {0},Visualitza {0}
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Només els nodes fulla es permet l'entrada de transaccions
-DocType: Expense Claim,Expense Approver,Aprovador de despeses
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Fila {0}: Avanç contra el Client ha de ser de crèdit
-apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,No al Grup Grup
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +58,Batch is mandatory in row {0},Lot és obligatori a la fila {0}
+DocType: Employee Advance,Expense Approver,Aprovador de despeses
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,Row {0}: Advance against Customer must be credit,Fila {0}: Avanç contra el Client ha de ser de crèdit
+apps/erpnext/erpnext/accounts/doctype/account/account.js +89,Non-Group to Group,No al Grup Grup
+apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +58,Batch is mandatory in row {0},Lot és obligatori a la fila {0}
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Rebut de compra dels articles subministrats
 DocType: Payment Entry,Pay,Pagar
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,To Datetime
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Calendari de cursos eliminen:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Registres per mantenir l&#39;estat de lliurament de sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Fa el pagament via entrada de diari
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +86,Printed On,impresa:
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +97,Printed On,impresa:
 DocType: Item,Inspection Required before Delivery,Inspecció requerida abans del lliurament
 DocType: Item,Inspection Required before Purchase,Inspecció requerida abans de la compra
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Activitats pendents
 DocType: Patient Appointment,Reminded,Recordat
 DocType: Patient,PID-,PID-
-apps/erpnext/erpnext/public/js/setup_wizard.js +103,Your Organization,la seva Organització
+apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,la seva Organització
 DocType: Fee Component,Fees Category,taxes Categoria
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Please enter relieving date.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Please enter relieving date.,Please enter relieving date.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Supplier Scorecard,Notify Employee,Notificar a l&#39;empleat
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Introduïu el nom de la campanya si la font de la investigació és la campanya
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Editors de Newspapers
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +38,Newspaper Publishers,Editors de Newspapers
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Seleccioneu l'any fiscal
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +114,Expected Delivery Date should be after Sales Order Date,La data de lliurament prevista hauria de ser posterior a la data de la comanda de vendes
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +115,Expected Delivery Date should be after Sales Order Date,La data de lliurament prevista hauria de ser posterior a la data de la comanda de vendes
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Nivell de Reabastecimiento
 DocType: Company,Chart Of Accounts Template,Gràfic de la plantilla de Comptes
 DocType: Attendance,Attendance Date,Assistència Data
-apps/erpnext/erpnext/stock/get_item_details.py +302,Item Price updated for {0} in Price List {1},Article Preu s&#39;actualitza per {0} de la llista de preus {1}
+apps/erpnext/erpnext/stock/get_item_details.py +345,Item Price updated for {0} in Price List {1},Article Preu s&#39;actualitza per {0} de la llista de preus {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salary breakup based on Earning and Deduction.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Compta amb nodes secundaris no es pot convertir en llibre major
+apps/erpnext/erpnext/accounts/doctype/account/account.py +130,Account with child nodes cannot be converted to ledger,Compta amb nodes secundaris no es pot convertir en llibre major
 DocType: Purchase Invoice Item,Accepted Warehouse,Magatzem Acceptat
 DocType: Bank Reconciliation Detail,Posting Date,Data de publicació
 DocType: Item,Valuation Method,Mètode de Valoració
@@ -3177,15 +3245,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Entrada duplicada
 DocType: Program Enrollment Tool,Get Students,obtenir estudiants
 DocType: Serial No,Under Warranty,Sota Garantia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +491,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +515,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,En paraules seran visibles un cop que es guarda la comanda de vendes.
 ,Employee Birthday,Aniversari d'Empleat
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Eina de lots d&#39;Assistència de l&#39;Estudiant
 apps/erpnext/erpnext/controllers/status_updater.py +210,Limit Crossed,límit creuades
-apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Programat fins a
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Un terme acadèmic amb això &#39;Any Acadèmic&#39; {0} i &#39;Nom terme&#39; {1} ja existeix. Si us plau, modificar aquestes entrades i torneu a intentar."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"As there are existing transactions against item {0}, you can not change the value of {1}","Com que hi ha transaccions existents contra l&#39;element {0}, no es pot canviar el valor de {1}"
+apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js +22,Scheduled Upto,Programat fins a
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Un terme acadèmic amb això &#39;Any Acadèmic&#39; {0} i &#39;Nom terme&#39; {1} ja existeix. Si us plau, modificar aquestes entrades i torneu a intentar."
 DocType: UOM,Must be Whole Number,Ha de ser nombre enter
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Noves Fulles Assignats (en dies)
 DocType: Purchase Invoice,Invoice Copy,Còpia de la factura
@@ -3195,7 +3262,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Número de factura
 DocType: Shopping Cart Settings,Orders,Ordres
 DocType: Employee Leave Approver,Leave Approver,Aprovador d'absències
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +272,Please select a batch,Seleccioneu un lot
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +285,Please select a batch,Seleccioneu un lot
 DocType: Assessment Group,Assessment Group Name,Nom del grup d&#39;avaluació
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material transferit per a la Fabricació
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Un usuari amb rol de ""Aprovador de despeses"""
@@ -3210,7 +3277,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Entrada de Tancament de Període
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +75,Select Department...,Selecciona departament ...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Un Centre de costos amb transaccions existents no es pot convertir en grup
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +360,Amount {0} {1} {2} {3},Suma {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +361,Amount {0} {1} {2} {3},Suma {0} {1} {2} {3}
 DocType: Account,Depreciation,Depreciació
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveïdor (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Empleat Eina Assistència
@@ -3218,7 +3285,7 @@
 DocType: Supplier,Credit Limit,Límit de Crèdit
 DocType: Production Plan Sales Order,Salse Order Date,Salse Data de la comanda
 DocType: Salary Component,Salary Component,component salari
-apps/erpnext/erpnext/accounts/utils.py +490,Payment Entries {0} are un-linked,Les entrades de pagament {0} són no-relacionat
+apps/erpnext/erpnext/accounts/utils.py +492,Payment Entries {0} are un-linked,Les entrades de pagament {0} són no-relacionat
 DocType: GL Entry,Voucher No,Número de comprovant
 ,Lead Owner Efficiency,Eficiència plom propietari
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +195,Most Popular,El més popular
@@ -3231,12 +3298,12 @@
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Plantilla de termes o contracte.
 DocType: Purchase Invoice,Address and Contact,Direcció i Contacte
 DocType: Cheque Print Template,Is Account Payable,És compte per pagar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +273,Stock cannot be updated against Purchase Receipt {0},Stock no es pot actualitzar en contra rebut de compra {0}
-DocType: Supplier,Last Day of the Next Month,Últim dia del mes
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +276,Stock cannot be updated against Purchase Receipt {0},Stock no es pot actualitzar en contra rebut de compra {0}
+DocType: Company,Last Day of the Next Month,Últim dia del mes
 DocType: Support Settings,Auto close Issue after 7 days,Tancament automàtic d&#39;emissió després de 7 dies
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixi no poden ser distribuïdes abans {0}, com a balanç de la llicència ja ha estat remès equipatge al futur registre d&#39;assignació de permís {1}"
-apps/erpnext/erpnext/accounts/party.py +319,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: A causa / Data de referència supera permesos dies de crèdit de clients per {0} dia (es)
-apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,estudiant sol·licitant
+apps/erpnext/erpnext/accounts/party.py +320,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: A causa / Data de referència supera permesos dies de crèdit de clients per {0} dia (es)
+apps/erpnext/erpnext/education/doctype/program/program.js +8,Student Applicant,estudiant sol·licitant
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,ORIGINAL PER RECEPTOR
 DocType: Asset Category Account,Accumulated Depreciation Account,Compte de depreciació acumulada
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +11,This email is autogenerated,Aquest correu electrònic està autogenerat
@@ -3247,38 +3314,38 @@
 DocType: Activity Cost,Billing Rate,Taxa de facturació
 ,Qty to Deliver,Quantitat a lliurar
 ,Stock Analytics,Imatges Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +505,Operations cannot be left blank,Les operacions no poden deixar-se en blanc
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +508,Operations cannot be left blank,Les operacions no poden deixar-se en blanc
 DocType: Maintenance Visit Purpose,Against Document Detail No,Contra Detall del document núm
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +98,Party Type is mandatory,Tipus del partit és obligatori
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party Type is mandatory,Tipus del partit és obligatori
 DocType: Quality Inspection,Outgoing,Extravertida
 DocType: Material Request,Requested For,Requerida Per
 DocType: Quotation Item,Against Doctype,Contra Doctype
-apps/erpnext/erpnext/controllers/buying_controller.py +395,{0} {1} is cancelled or closed,{0} {1} està cancel·lat o tancat
+apps/erpnext/erpnext/controllers/buying_controller.py +396,{0} {1} is cancelled or closed,{0} {1} està cancel·lat o tancat
 DocType: Delivery Note,Track this Delivery Note against any Project,Seguir aquesta nota de lliurament contra qualsevol projecte
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Efectiu net d&#39;inversió
 DocType: Production Order,Work-in-Progress Warehouse,Magatzem de treballs en procés
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +111,Asset {0} must be submitted,Actius {0} ha de ser presentat
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +111,Asset {0} must be submitted,Actius {0} ha de ser presentat
 DocType: Fee Schedule Program,Total Students,Total d&#39;estudiants
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Registre d&#39;assistència {0} existeix en contra d&#39;estudiants {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Referència #{0} amb data {1}
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,La depreciació Eliminat causa de la disposició dels béns
+apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},Registre d&#39;assistència {0} existeix en contra d&#39;estudiants {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +352,Reference #{0} dated {1},Referència #{0} amb data {1}
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +164,Depreciation Eliminated due to disposal of assets,La depreciació Eliminat causa de la disposició dels béns
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Administrar Direccions
-DocType: Asset,Item Code,Codi de l'article
+DocType: Pricing Rule,Item Code,Codi de l'article
 DocType: Production Planning Tool,Create Production Orders,Crear ordres de producció
 DocType: Serial No,Warranty / AMC Details,Detalls de la Garantia/AMC
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +116,Select students manually for the Activity based Group,Estudiants seleccionats de forma manual per al grup basat en activitats
+apps/erpnext/erpnext/education/doctype/student_group/student_group.js +116,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
 DocType: Lead,Market Segment,Sector de mercat
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +924,Paid Amount cannot be greater than total negative outstanding amount {0},La quantitat pagada no pot ser superior a la quantitat pendent negativa total de {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +950,Paid Amount cannot be greater than total negative outstanding amount {0},La quantitat pagada no pot ser superior a la quantitat pendent negativa total de {0}
 DocType: Supplier Scorecard Period,Variables,Les variables
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de treball intern de l'empleat
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Tancament (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Dr),Tancament (Dr)
 DocType: Cheque Print Template,Cheque Size,xec Mida
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +232,Serial No {0} not in stock,El número de sèrie {0} no està en estoc
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Plantilla d'Impostos per a la venda de les transaccions.
 DocType: Sales Invoice,Write Off Outstanding Amount,Write Off Outstanding Amount
 apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},Compte {0} no coincideix amb el de l&#39;empresa {1}
-DocType: School Settings,Current Academic Year,Any acadèmic actual
+DocType: Education Settings,Current Academic Year,Any acadèmic actual
 DocType: Stock Settings,Default Stock UOM,UDM d'estoc predeterminat
 DocType: Asset,Number of Depreciations Booked,Nombre de reserva Depreciacions
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Préstec contra de l&#39;empleat: {0}
@@ -3286,49 +3353,48 @@
 DocType: Production Planning Tool,Create Material Requests,Crear sol·licituds de materials
 DocType: Employee Education,School/University,Escola / Universitat
 DocType: Payment Request,Reference Details,Detalls Referència
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor esperat després de la vida útil ha de ser inferior a l&#39;import brut de compra
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor esperat després de la vida útil ha de ser inferior a l&#39;import brut de compra
 DocType: Sales Invoice Item,Available Qty at Warehouse,Disponible Quantitat en magatzem
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Quantitat facturada
 DocType: Asset,Double Declining Balance,Doble saldo decreixent
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +179,Closed order cannot be cancelled. Unclose to cancel.,ordre tancat no es pot cancel·lar. Unclose per cancel·lar.
-DocType: Patient Relation,Father,pare
-apps/erpnext/erpnext/controllers/accounts_controller.py +562,'Update Stock' cannot be checked for fixed asset sale,"""Actualització d'Estoc 'no es pot comprovar en venda d'actius fixos"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +180,Closed order cannot be cancelled. Unclose to cancel.,ordre tancat no es pot cancel·lar. Unclose per cancel·lar.
+DocType: Student Guardian,Father,pare
+apps/erpnext/erpnext/controllers/accounts_controller.py +606,'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
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Compte {2} no pertany a l&#39;empresa {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +147,Material Request {0} is cancelled or stopped,Material de Sol·licitud {0} es cancel·la o s'atura
-apps/erpnext/erpnext/config/hr.py +305,Leave Management,Deixa Gestió
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +156,Material Request {0} is cancelled or stopped,Material de Sol·licitud {0} es cancel·la o s'atura
+apps/erpnext/erpnext/config/hr.py +310,Leave Management,Deixa Gestió
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Agrupa Per Comptes
 DocType: Sales Order,Fully Delivered,Totalment Lliurat
 DocType: Lead,Lower Income,Lower Income
 DocType: Restaurant Order Entry,Current Order,Ordre actual
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Font i el magatzem de destinació no pot ser igual per fila {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Source and target warehouse cannot be same for row {0},Font i el magatzem de destinació no pot ser igual per fila {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Compte diferència ha de ser un tipus de compte d&#39;Actius / Passius, ja que aquest arxiu reconciliació és una entrada d&#39;Obertura"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Suma desemborsat no pot ser més gran que Suma del préstec {0}
-apps/erpnext/erpnext/utilities/user_progress.py +155,Go to Programs,Vés als programes
+apps/erpnext/erpnext/utilities/user_progress.py +173,Go to Programs,Vés als programes
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +89,Purchase Order number required for Item {0},Número d'ordre de Compra per {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +896,Production Order not created,Ordre de producció no s&#39;ha creat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +943,Production Order not created,Ordre de producció no s&#39;ha creat
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Des de la data' ha de ser després de 'A data'
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},No es pot canviar l&#39;estat d&#39;estudiant {0} està vinculada amb l&#39;aplicació de l&#39;estudiant {1}
+apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},No es pot canviar l&#39;estat d&#39;estudiant {0} està vinculada amb l&#39;aplicació de l&#39;estudiant {1}
 DocType: Asset,Fully Depreciated,Estant totalment amortitzats
 ,Stock Projected Qty,Quantitat d'estoc previst
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +434,Customer {0} does not belong to project {1},Client {0} no pertany a projectar {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Customer {0} does not belong to project {1},Client {0} no pertany a projectar {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Assistència marcat HTML
 apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers","Les cites són propostes, les ofertes que ha enviat als seus clients"
 DocType: Sales Order,Customer's Purchase Order,Àrea de clients Ordre de Compra
 DocType: Consultation,Patient,Pacient
-apps/erpnext/erpnext/config/stock.py +117,Serial No and Batch,Número de sèrie i de lot
+apps/erpnext/erpnext/config/stock.py +109,Serial No and Batch,Número de sèrie i de lot
 DocType: Warranty Claim,From Company,Des de l'empresa
-apps/erpnext/erpnext/schools/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/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Si us plau, ajusteu el número d&#39;amortitzacions Reservats"
+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 +77,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 +89,Value or Qty,Valor o Quantitat
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +425,Productions Orders cannot be raised for:,Comandes produccions no poden ser criats per:
-apps/erpnext/erpnext/utilities/user_progress.py +126,Minute,Minut
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +201,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/stock/doctype/material_request/material_request.py +426,Productions Orders cannot be raised for:,Comandes produccions no poden ser criats per:
+apps/erpnext/erpnext/utilities/user_progress.py +144,Minute,Minut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Compra Impostos i Càrrecs
-apps/erpnext/erpnext/utilities/user_progress.py +100,Go to Suppliers,Aneu als proveïdors
+apps/erpnext/erpnext/utilities/user_progress.py +118,Go to Suppliers,Aneu als proveïdors
 ,Qty to Receive,Quantitat a Rebre
 DocType: Leave Block List,Leave Block List Allowed,Llista d'absències permeses bloquejades
 DocType: Grading Scale Interval,Grading Scale Interval,Escala de Qualificació d&#39;interval
@@ -3336,33 +3402,32 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Descompte (%) sobre el preu de llista tarifa amb Marge
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,tots els cellers
 DocType: Sales Partner,Retailer,Detallista
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +112,Credit To account must be a Balance Sheet account,Crèdit al compte ha de ser un compte de Balanç
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +115,Credit To account must be a Balance Sheet account,Crèdit al compte ha de ser un compte de Balanç
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Tots els tipus de proveïdors
 DocType: Global Defaults,Disable In Words,En desactivar Paraules
-apps/erpnext/erpnext/stock/doctype/item/item.py +51,Item Code is mandatory because Item is not automatically numbered,El codi de l'article és obligatori perquè no s'havia numerat automàticament
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Cita {0} no del tipus {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Item Code is mandatory because Item is not automatically numbered,El codi de l'article és obligatori perquè no s'havia numerat automàticament
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +98,Quotation {0} not of type {1},Cita {0} no del tipus {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de manteniment d'articles
 DocType: Sales Order,%  Delivered,% Lliurat
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Configureu l&#39;identificador de correu electrònic de l&#39;estudiant per enviar la sol·licitud de pagament
+apps/erpnext/erpnext/education/doctype/fees/fees.js +105,Please set the Email ID for the Student to send the Payment Request,Configureu l&#39;identificador de correu electrònic de l&#39;estudiant per enviar la sol·licitud de pagament
 DocType: Production Order,PRO-,PRO-
 DocType: Patient,Medical History,Historial mèdic
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +157,Bank Overdraft Account,Bank Overdraft Account
 DocType: Patient,Patient ID,Identificador del pacient
 DocType: Physician Schedule,Schedule Name,Programar el nom
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Feu nòmina
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +813,Add All Suppliers,Afegeix tots els proveïdors
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +81,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Fila # {0}: quantitat assignada no pot ser més gran que la quantitat pendent.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +838,Add All Suppliers,Afegeix tots els proveïdors
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +83,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Fila # {0}: quantitat assignada no pot ser més gran que la quantitat pendent.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +75,Browse BOM,Navegar per llista de materials
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Secured Loans,Préstecs Garantits
 DocType: Purchase Invoice,Edit Posting Date and Time,Edita data i hora d&#39;enviament
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Si us plau, estableix els comptes relacionats de depreciació d&#39;actius en Categoria {0} o de la seva empresa {1}"
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +101,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Si us plau, estableix els comptes relacionats de depreciació d&#39;actius en Categoria {0} o de la seva empresa {1}"
 DocType: Lab Test Groups,Normal Range,Rang normal
 DocType: Academic Term,Academic Year,Any escolar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Opening Balance Equity,Saldo inicial Equitat
 DocType: Lead,CRM,CRM
 DocType: Purchase Invoice,N,N
-apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +24,Reconciliation,Reconciliació
-apps/erpnext/erpnext/schools/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,restant
+apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,restant
 DocType: Appraisal,Appraisal,Avaluació
 DocType: Purchase Invoice,GST Details,Detalls de GST
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,Email sent to supplier {0},El correu electrònic enviat al proveïdor {0}
@@ -3371,19 +3436,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data repetida
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Signant Autoritzat
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},L'aprovador d'absències ha de ser un de {0}
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule.js +66,Create Fees,Crea tarifes
+apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +67,Create Fees,Crea tarifes
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Cost total de compra (mitjançant compra de la factura)
 DocType: Training Event,Start Time,Hora d'inici
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +377,Select Quantity,Seleccioneu Quantitat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +399,Select Quantity,Seleccioneu Quantitat
 DocType: Customs Tariff Number,Customs Tariff Number,Nombre aranzel duaner
 DocType: Patient Appointment,Patient Appointment,Cita del pacient
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,El rol d'aprovador no pot ser el mateix que el rol al que la regla s'ha d'aplicar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +64,Unsubscribe from this Email Digest,Donar-se de baixa d&#39;aquest butlletí per correu electrònic
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +803,Get Suppliers By,Obteniu proveïdors per
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +828,Get Suppliers By,Obteniu proveïdors per
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +170,{0} not found for Item {1},{0} no s&#39;ha trobat per a l&#39;element {1}
-apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Courses,Anar als cursos
+apps/erpnext/erpnext/utilities/user_progress.py +194,Go to Courses,Anar als cursos
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Missatge enviat
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Compta amb nodes secundaris no es pot establir com a llibre major
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Account with child nodes cannot be set as ledger,Compta amb nodes secundaris no es pot establir com a llibre major
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Velocitat a la qual la llista de preus de divises es converteix la moneda base del client
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Import net (Companyia moneda)
@@ -3405,9 +3470,9 @@
 DocType: Sales Order,Fully Billed,Totalment Anunciat
 DocType: Vital Signs,BMI,IMC
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Efectiu disponible
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +136,Delivery warehouse required for stock item {0},Magatzem de lliurament requerit per tema de valors {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +137,Delivery warehouse required for stock item {0},Magatzem de lliurament requerit per tema de valors {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),"El pes brut del paquet. En general, el pes net + embalatge pes del material. (Per imprimir)"
-apps/erpnext/erpnext/schools/doctype/course/course.js +3,Program,programa
+apps/erpnext/erpnext/education/doctype/course/course.js +3,Program,programa
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Els usuaris amb aquest rol poden establir comptes bloquejats i crear/modificar els assentaments comptables contra els comptes bloquejats
 DocType: Serial No,Is Cancelled,Està cancel·lat
 DocType: Student Group,Group Based On,Grup d&#39;acord amb
@@ -3415,15 +3480,14 @@
 DocType: Healthcare Settings,Laboratory SMS Alerts,Alertes SMS de laboratori
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","es requereix la reparació d&#39;articles, tipus, freqüència i quantitat de despeses"
 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:","Fins i tot si hi ha diverses regles de preus amb major prioritat, s'apliquen prioritats internes:"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +128,Do you really want to Submit all Salary Slip from {0} to {1},De debò vols que presentin tots nòmina de {0} a {1}
 DocType: Cheque Print Template,Cheque Height,xec Alçada
 DocType: Supplier,Supplier Details,Detalls del proveïdor
 DocType: Setup Progress,Setup Progress,Progrés de configuració
 DocType: Expense Claim,Approval Status,Estat d'aprovació
 DocType: Hub Settings,Publish Items to Hub,Publicar articles a Hub
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +43,From value must be less than to value in row {0},De valor ha de ser inferior al valor de la fila {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Wire Transfer,Transferència Bancària
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Marqueu totes les
+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}
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Wire Transfer,Transferència Bancària
+apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,Marqueu totes les
 DocType: Vehicle Log,Invoice Ref,Ref factura
 DocType: Company,Default Income Account,Compte d'Ingressos predeterminat
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Grup de Clients / Client
@@ -3432,19 +3496,18 @@
 DocType: Lab Test Template,Change In Item,Canvi en l&#39;element
 DocType: Payment Gateway Account,Default Payment Request Message,Defecte de sol·licitud de pagament del missatge
 DocType: Item Group,Check this if you want to show in website,Seleccioneu aquesta opció si voleu que aparegui en el lloc web
-apps/erpnext/erpnext/config/accounts.py +142,Banking and Payments,De bancs i pagaments
+apps/erpnext/erpnext/config/accounts.py +134,Banking and Payments,De bancs i pagaments
 ,Welcome to ERPNext,Benvingut a ERPNext
 apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,El plom a la Petició
 DocType: Patient,A Negative,A negatiu
 apps/erpnext/erpnext/templates/includes/product_list.js +45,Nothing more to show.,Res més que mostrar.
 DocType: Lead,From Customer,De Client
 apps/erpnext/erpnext/demo/setup/setup_data.py +327,Calls,Trucades
-apps/erpnext/erpnext/utilities/user_progress.py +122,A Product,Un producte
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +197,Batches,lots
-DocType: Project,Total Costing Amount (via Time Logs),Suma total del càlcul del cost (a través dels registres de temps)
-apps/erpnext/erpnext/schools/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Feu horari de tarifes
+apps/erpnext/erpnext/utilities/user_progress.py +140,A Product,Un producte
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +207,Batches,lots
+apps/erpnext/erpnext/education/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,Feu horari de tarifes
 DocType: Purchase Order Item Supplied,Stock UOM,UDM de l'Estoc
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +230,Purchase Order {0} is not submitted,Ordre de Compra {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +233,Purchase Order {0} is not submitted,Ordre de Compra {0} no es presenta
 DocType: Vital Signs,Normal reference range for an adult is 16–20 breaths/minute (RCP 2012),El rang de referència normal per a un adult és de 16-20 respiracions / minut (RCP 2012)
 DocType: Customs Tariff Number,Tariff Number,Nombre de tarifes
 DocType: Production Order Item,Available Qty at WIP Warehouse,Quantitats disponibles en magatzem WIP
@@ -3454,7 +3517,7 @@
 DocType: Notification Control,Quotation Message,Cita Missatge
 DocType: Employee Loan,Employee Loan Application,Sol·licitud de Préstec empleat
 DocType: Issue,Opening Date,Data d'obertura
-apps/erpnext/erpnext/schools/api.py +80,Attendance has been marked successfully.,L&#39;assistència ha estat marcada amb èxit.
+apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,L&#39;assistència ha estat marcada amb èxit.
 DocType: Program Enrollment,Public Transport,Transport públic
 DocType: Journal Entry,Remark,Observació
 DocType: Healthcare Settings,Avoid Confirmation,Eviteu la confirmació
@@ -3462,61 +3525,61 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +165,Account Type for {0} must be {1},Tipus de compte per {0} ha de ser {1}
 DocType: Healthcare Settings,Default income accounts to be used if not set in Physician to book Consultation charges.,Compte de renda per defecte que s&#39;utilitzarà si no s&#39;uneix al metge per reservar càrrecs de consulta.
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Les fulles i les vacances
-DocType: School Settings,Current Academic Term,Període acadèmic actual
+DocType: Education Settings,Current Academic Term,Període acadèmic actual
 DocType: Sales Order,Not Billed,No Anunciat
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Both Warehouse must belong to same Company,Tant Magatzem ha de pertànyer al mateix Company
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,Encara no hi ha contactes.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Landed Cost Monto Voucher
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Bills plantejades pels proveïdors.
 DocType: POS Profile,Write Off Account,Escriu Off Compte
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +78,Debit Note Amt,Nota de càrrec Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +89,Debit Note Amt,Nota de càrrec Amt
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Quantitat de Descompte
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retorn Contra Compra Factura
 DocType: Item,Warranty Period (in days),Període de garantia (en dies)
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Relació amb Guardian1
+apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,Relació amb Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Efectiu net de les operacions
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Article 4
 DocType: Student Admission,Admission End Date,L&#39;entrada Data de finalització
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +30,Sub-contracting,la subcontractació
 DocType: Journal Entry Account,Journal Entry Account,Compte entrada de diari
-apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grup d&#39;Estudiants
+apps/erpnext/erpnext/education/doctype/academic_year/academic_year.js +3,Student Group,Grup d&#39;Estudiants
 DocType: Shopping Cart Settings,Quotation Series,Sèrie Cotització
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +56,"An item exists with same name ({0}), please change the item group name or rename the item","Hi ha un element amb el mateix nom ({0}), canvieu el nom de grup d'articles o canviar el nom de l'element"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2005,Please select customer,Seleccioneu al client
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2020,Please select customer,Seleccioneu al client
 DocType: C-Form,I,jo
 DocType: Company,Asset Depreciation Cost Center,Centre de l&#39;amortització del cost dels actius
 DocType: Sales Order Item,Sales Order Date,Sol·licitar Sales Data
 DocType: Sales Invoice Item,Delivered Qty,Quantitat lliurada
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Si se selecciona, tots els fills de cada element de la producció s&#39;inclouran en les sol·licituds de materials."
 DocType: Assessment Plan,Assessment Plan,pla d&#39;avaluació
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,S&#39;ha creat el client {0}.
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +93,Customer {0} is created.,S&#39;ha creat el client {0}.
 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
 DocType: Sample Collection,No. of print,Nº d&#39;impressió
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Manca de canvi de moneda per {0}
 DocType: Assessment Plan,Examiner,examinador
-DocType: Patient Relation,Siblings,els germans
+DocType: Student,Siblings,els germans
 DocType: Journal Entry,Stock Entry,Entrada estoc
 DocType: Payment Entry,Payment References,Referències de pagament
 DocType: C-Form,C-FORM-,C-FORM
 DocType: Vehicle,Insurance Details,Detalls d&#39;Assegurances
 DocType: Account,Payable,Pagador
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Si us plau, introdueixi terminis d&#39;amortització"
-apps/erpnext/erpnext/shopping_cart/cart.py +365,Debtors ({0}),Deutors ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +376,Debtors ({0}),Deutors ({0})
 DocType: Pricing Rule,Margin,Marge
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clients Nous
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Gross Profit %,Benefici Brut%
 DocType: Appraisal Goal,Weightage (%),Ponderació (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Data Liquidació
-apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Informe d&#39;avaluació
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Compra import brut és obligatori
+apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,Informe d&#39;avaluació
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Compra import brut és obligatori
 DocType: Lead,Address Desc,Descripció de direcció
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +101,Party is mandatory,Part és obligatòria
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +102,Party is mandatory,Part és obligatòria
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Nom del tema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Has de marcar compra o venda
-apps/erpnext/erpnext/public/js/setup_wizard.js +33,Select the nature of your business.,Seleccioneu la naturalesa del seu negoci.
+apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,Seleccioneu la naturalesa del seu negoci.
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
 <br>
 Compound for results which require multiple input fields with corresponding event names, result UOMs and normal values
@@ -3526,11 +3589,11 @@
 Grouped for test templates which are a group of other test templates.
 <br>
 No Result for tests with no results. Also, no Lab Test is created. e.g.. Sub Tests for Grouped results.","Únic per als resultats que requereixen només una entrada única, un resultat UOM i un valor normal <br> Compòsit per a resultats que requereixen múltiples camps d'entrada amb noms d'esdeveniments corresponents, UOM de resultats i valors normals <br> Descriptiva per a les proves que tenen diversos components de resultats i els camps d'entrada de resultats corresponents. <br> Agrupats per plantilles de prova que són un grup d'altres plantilles de prova. <br> Cap resultat per a proves sense resultats. A més, no es crea cap prova de laboratori. per exemple. Proves secundàries per a resultats agrupats."
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +73,Row #{0}: Duplicate entry in References {1} {2},Fila # {0}: Duplicar entrada a les Referències {1} {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +75,Row #{0}: Duplicate entry in References {1} {2},Fila # {0}: Duplicar entrada a les Referències {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,On es realitzen les operacions de fabricació.
 DocType: Asset Movement,Source Warehouse,Magatzem d'origen
 DocType: Installation Note,Installation Date,Data d'instal·lació
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,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 +585,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/lab_test/lab_test.js +206,Sales Invoice {0} created,S&#39;ha creat la factura de vendes {0}
 DocType: Employee,Confirmation Date,Data de confirmació
 DocType: C-Form,Total Invoiced Amount,Suma total facturada
@@ -3548,33 +3611,33 @@
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pagament Brut - Deducció total - Pagament de Préstecs
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +26,Current BOM and New BOM can not be same,El BOM actual i el nou no poden ser el mateix
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +45,Salary Slip ID,Salari Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Data de la jubilació ha de ser major que la data del contracte
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Va haver-hi errors en programar el curs:
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +118,Date Of Retirement must be greater than Date of Joining,Data de la jubilació ha de ser major que la data del contracte
 DocType: Sales Invoice,Against Income Account,Contra el Compte d'Ingressos
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}% Lliurat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +95,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Article {0}: Quantitat ordenada {1} no pot ser menor que el qty comanda mínima {2} (definit en l&#39;article).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +96,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Article {0}: Quantitat ordenada {1} no pot ser menor que el qty comanda mínima {2} (definit en l&#39;article).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mensual Distribució percentual
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +90,Please login as another user.,Inicieu sessió com un altre usuari.
 DocType: Territory,Territory Targets,Objectius Territori
 DocType: Delivery Note,Transporter Info,Informació del transportista
-apps/erpnext/erpnext/accounts/utils.py +497,Please set default {0} in Company {1},Si us plau ajust per defecte {0} a l&#39;empresa {1}
+apps/erpnext/erpnext/accounts/utils.py +499,Please set default {0} in Company {1},Si us plau ajust per defecte {0} a l&#39;empresa {1}
 DocType: Cheque Print Template,Starting position from top edge,posició des de la vora superior de partida
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +31,Same supplier has been entered multiple times,Mateix proveïdor s&#39;ha introduït diverses vegades
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Utilitat Bruta / Pèrdua
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Article de l'ordre de compra Subministrat
-apps/erpnext/erpnext/public/js/setup_wizard.js +90,Company Name cannot be Company,Nom de l&#39;empresa no pot ser l&#39;empresa
+apps/erpnext/erpnext/public/js/setup_wizard.js +94,Company Name cannot be Company,Nom de l&#39;empresa no pot ser l&#39;empresa
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Caps de lletres per a les plantilles d'impressió.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títols per a plantilles d'impressió, per exemple, factura proforma."
 DocType: Program Enrollment,Walking,per caminar
 DocType: Student Guardian,Student Guardian,Guardià de l&#39;estudiant
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +201,Valuation type charges can not marked as Inclusive,Càrrecs de tipus de valoració no poden marcat com Inclòs
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +218,Valuation type charges can not marked as Inclusive,Càrrecs de tipus de valoració no poden marcat com Inclòs
 DocType: POS Profile,Update Stock,Actualització de Stock
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,in the subscription,en la subscripció
 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.,UDMs diferents per als articles provocarà pesos nets (Total) erronis. Assegureu-vos que pes net de cada article és de la mateixa UDM.
+DocType: Membership,Payment Details,Detalls del pagament
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Entrada de diari de la ferralla
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Si us plau, tiri d'articles de lliurament Nota"
-apps/erpnext/erpnext/accounts/utils.py +467,Journal Entries {0} are un-linked,Entrades de diari {0} són no enllaçat
+apps/erpnext/erpnext/accounts/utils.py +469,Journal Entries {0} are un-linked,Entrades de diari {0} són no enllaçat
 apps/erpnext/erpnext/config/crm.py +92,"Record of all communications of type email, phone, chat, visit, etc.","Registre de totes les comunicacions de tipus de correu electrònic, telèfon, xat, visita, etc."
 DocType: Supplier Scorecard Scoring Standing,Supplier Scorecard Scoring Standing,Quadre de puntuació de proveïdors
 DocType: Manufacturer,Manufacturers used in Items,Fabricants utilitzats en articles
@@ -3586,7 +3649,7 @@
 DocType: Expense Claim,Total Sanctioned Amount,Suma total Sancionat
 ,Purchase Analytics,Anàlisi de Compres
 DocType: Sales Invoice Item,Delivery Note Item,Nota de lliurament d'articles
-DocType: Expense Claim,Task,Tasca
+DocType: Asset Maintenance Log,Task,Tasca
 DocType: Purchase Taxes and Charges,Reference Row #,Referència Fila #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Nombre de lot és obligatori per Punt {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Es tracta d'una persona de les vendes de l'arrel i no es pot editar.
@@ -3595,8 +3658,8 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Qualificació: {0}
 DocType: Company,Exchange Gain / Loss Account,Guany de canvi de compte / Pèrdua
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,I assistència d&#39;empleats
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Propòsit ha de ser un de {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Fill the form and save it,Ompliu el formulari i deseu
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Purpose must be one of {0},Propòsit ha de ser un de {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +116,Fill the form and save it,Ompliu el formulari i deseu
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Descarrega un informe amb totes les matèries primeres amb el seu estat últim inventari
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Fòrum de la comunitat
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Cant que aquesta en estoc
@@ -3609,7 +3672,7 @@
 DocType: Purchase Order,Get Items from Open Material Requests,Obtenir elements de sol·licituds obert de materials
 DocType: Lab Test Template,Standard Selling Rate,Estàndard tipus venedor
 DocType: Account,Rate at which this tax is applied,Rati a la qual s'aplica aquest impost
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +65,Reorder Qty,Quantitat per a generar comanda
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +75,Reorder Qty,Quantitat per a generar comanda
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Ofertes d&#39;ocupació actuals
 DocType: Company,Stock Adjustment Account,Compte d'Ajust d'estocs
 apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Cancel
@@ -3624,32 +3687,31 @@
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (#Form/Item/{0}) està esgotat
 ,Sales Payment Summary,Resum de pagaments de vendes
 DocType: Restaurant,Restaurant,Restaurant
-apps/erpnext/erpnext/accounts/party.py +322,Due / Reference Date cannot be after {0},A causa / Data de referència no pot ser posterior a {0}
+apps/erpnext/erpnext/accounts/party.py +323,Due / Reference Date cannot be after {0},A causa / Data de referència no pot ser posterior a {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Les dades d&#39;importació i exportació
 DocType: Patient,Account Details,Detalls del compte
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +76,No students Found,No s&#39;han trobat estudiants
+apps/erpnext/erpnext/education/doctype/student_group/student_group.py +76,No students Found,No s&#39;han trobat estudiants
 DocType: Medical Department,Medical Department,Departament Mèdic
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,Punts de referència del proveïdor Criteris de puntuació
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Data de la factura d&#39;enviament
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Vendre
-DocType: Sales Invoice,Rounded Total,Total Arrodonit
+DocType: Purchase Invoice,Rounded Total,Total Arrodonit
 DocType: Product Bundle,List items that form the package.,Llista d'articles que formen el paquet.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentatge d'assignació ha de ser igual a 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +567,Please select Posting Date before selecting Party,Seleccioneu Data d&#39;entrada abans de seleccionar la festa
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +584,Please select Posting Date before selecting Party,Seleccioneu Data d&#39;entrada abans de seleccionar la festa
 DocType: Program Enrollment,School House,Casa de l&#39;escola
 DocType: Serial No,Out of AMC,Fora d'AMC
-apps/erpnext/erpnext/public/js/utils.js +263,Please select Quotations,Seleccioneu Cites
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,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 +82,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Feu Manteniment Visita
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +170,Please contact to the user who have Sales Master Manager {0} role,"Si us plau, poseu-vos en contacte amb l'usuari que té vendes Mestre Director de {0} paper"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +198,Please contact to the user who have Sales Master Manager {0} role,"Si us plau, poseu-vos en contacte amb l'usuari que té vendes Mestre Director de {0} paper"
 DocType: Company,Default Cash Account,Compte de Tresoreria predeterminat
 apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,Companyia (no client o proveïdor) mestre.
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Això es basa en la presència d&#39;aquest Estudiant
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,No Estudiants en
+apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Això es basa en la presència d&#39;aquest Estudiant
+apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,No Estudiants en
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +171,Add more items or open full form,Afegir més elements o forma totalment oberta
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +206,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Albarans {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
-apps/erpnext/erpnext/utilities/user_progress.py +238,Go to Users,Aneu als usuaris
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Paid amount + Write Off Amount can not be greater than Grand Total,Quantitat pagada + s'amortitza La quantitat no pot ser més gran que la Gran Total
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +212,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Albarans {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
+apps/erpnext/erpnext/utilities/user_progress.py +256,Go to Users,Aneu als usuaris
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Paid amount + Write Off Amount can not be greater than Grand Total,Quantitat pagada + s'amortitza La quantitat no pot ser més gran que la Gran Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} no és un nombre de lot vàlida per Punt {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Note: There is not enough leave balance for Leave Type {0}
 apps/erpnext/erpnext/regional/india/utils.py +15,Invalid GSTIN or Enter NA for Unregistered,GSTIN invàlida o Enter NA per no registrat
@@ -3667,12 +3729,12 @@
 DocType: Hub Settings,Publish Availability,Publicar disponibilitat
 DocType: Company,Create Chart Of Accounts Based On,Crear pla de comptes basada en
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,No es pot convertir a no grup. Existeixen tasques infantils.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Data de naixement no pot ser més gran que l&#39;actual.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +112,Date of Birth cannot be greater than today.,Data de naixement no pot ser més gran que l&#39;actual.
 ,Stock Ageing,Estoc Envelliment
-apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Estudiant {0} existeix contra l&#39;estudiant sol·licitant {1}
+apps/erpnext/erpnext/education/doctype/student/student.py +38,Student {0} exist against student applicant {1},Estudiant {0} existeix contra l&#39;estudiant sol·licitant {1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),Ajust d&#39;arrodoniment (moneda d&#39;empresa)
 apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,Horari
-apps/erpnext/erpnext/controllers/accounts_controller.py +233,{0} '{1}' is disabled,{0} '{1}' es desactiva
+apps/erpnext/erpnext/controllers/accounts_controller.py +256,{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
@@ -3682,16 +3744,16 @@
 DocType: Purchase Order,Customer Contact Email,Client de correu electrònic de contacte
 DocType: Warranty Claim,Item and Warranty Details,Objecte i de garantia Detalls
 DocType: Sales Team,Contribution (%),Contribució (%)
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,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 +65,Project {0} already exists,El projecte {0} ja existeix
+apps/erpnext/erpnext/controllers/accounts_controller.py +100,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 +67,Project {0} already exists,El projecte {0} ja existeix
 DocType: Medical Department,Nursing User,Usuari d&#39;infermeria
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +227,Responsibilities,Responsabilitats
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +237,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.
 DocType: Expense Claim Account,Expense Claim Account,Compte de Despeses
 DocType: Accounts Settings,Allow Stale Exchange Rates,Permet els tipus d&#39;intercanvi moderats
 DocType: Sales Person,Sales Person Name,Nom del venedor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Si us plau, introdueixi almenys 1 factura a la taula"
-apps/erpnext/erpnext/utilities/user_progress.py +226,Add Users,Afegir usuaris
+apps/erpnext/erpnext/utilities/user_progress.py +244,Add Users,Afegir usuaris
 DocType: POS Item Group,Item Group,Grup d'articles
 DocType: Item,Safety Stock,seguretat de la
 DocType: Healthcare Settings,Healthcare Settings,Configuració assistencial
@@ -3699,75 +3761,73 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Abans de la reconciliació
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Per {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos i Càrrecs Afegits (Divisa de la Companyia)
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,La fila de l'impost d'article {0} ha de tenir en compte el tipus d'impostos o ingressos o despeses o imposable
+apps/erpnext/erpnext/stock/doctype/item/item.py +461,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,La fila de l'impost d'article {0} ha de tenir en compte el tipus d'impostos o ingressos o despeses o imposable
 DocType: Sales Order,Partly Billed,Parcialment Facturat
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Element {0} ha de ser un element d&#39;actiu fix
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Element {0} ha de ser un element d&#39;actiu fix
 DocType: Item,Default BOM,BOM predeterminat
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +24,Debit Note Amount,Nota de dèbit Quantitat
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Please re-type company name to confirm,"Si us plau, torneu a escriure nom de l&#39;empresa per confirmar"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +79,Total Outstanding Amt,Viu total Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Total Outstanding Amt,Viu total Amt
 DocType: Journal Entry,Printing Settings,Paràmetres d&#39;impressió
 DocType: Sales Invoice,Include Payment (POS),Incloure Pagament (POS)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,Total Debit must be equal to Total Credit. The difference is {0},Dèbit total ha de ser igual al total de crèdit. La diferència és {0}
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automòbil
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +290,Total Debit must be equal to Total Credit. The difference is {0},Dèbit total ha de ser igual al total de crèdit. La diferència és {0}
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,Automòbil
 DocType: Vehicle,Insurance Company,Companyia asseguradora
 DocType: Asset Category Account,Fixed Asset Account,Compte d&#39;actiu fix
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +397,Variable,variable
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +414,Variable,variable
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,De la nota de lliurament
 DocType: Student,Student Email Address,Estudiant Adreça de correu electrònic
 DocType: Item,Hub Warehouse,Hub Warehouse
-DocType: Physician Schedule Time Slot,From Time,From Time
+DocType: Assessment Plan,From Time,From Time
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,En Stock:
 DocType: Notification Control,Custom Message,Missatge personalitzat
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banca d'Inversió
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +78,Cash or Bank Account is mandatory for making payment entry,Diners en efectiu o compte bancari és obligatòria per a realitzar el registre de pagaments
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Direcció de l&#39;estudiant
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +33,Investment Banking,Banca d'Inversió
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +79,Cash or Bank Account is mandatory for making payment entry,Diners en efectiu o compte bancari és obligatòria per a realitzar el registre de pagaments
+apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,Direcció de l&#39;estudiant
 DocType: Purchase Invoice,Price List Exchange Rate,Tipus de canvi per a la llista de preus
 DocType: POS Profile,POS Profile Name,Nom del perfil de la TPV
 DocType: Purchase Invoice Item,Rate,Tarifa
 DocType: Purchase Invoice Item,Rate,Tarifa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +100,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1569,Address Name,nom direcció
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +104,Intern,Intern
+DocType: Delivery Stop,Address Name,nom direcció
 DocType: Stock Entry,From BOM,A partir de la llista de materials
 DocType: Assessment Code,Assessment Code,codi avaluació
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +69,Basic,Bàsic
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +73,Basic,Bàsic
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Operacions borsàries abans de {0} es congelen
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"Si us plau, feu clic a ""Generar Planificació"""
-apps/erpnext/erpnext/config/stock.py +195,"e.g. Kg, Unit, Nos, m","per exemple kg, unitat, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Reference No és obligatori si introduir Data de Referència
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,Reference No is mandatory if you entered Reference Date,Reference No és obligatori si introduir Data de Referència
 DocType: Bank Reconciliation Detail,Payment Document,El pagament del document
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,S&#39;ha produït un error en avaluar la fórmula de criteris
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Data d'ingrés ha de ser major que la data de naixement
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +115,Date of Joining must be greater than Date of Birth,Data d'ingrés ha de ser major que la data de naixement
 DocType: Salary Slip,Salary Structure,Estructura salarial
 DocType: Account,Bank,Banc
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aerolínia
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +827,Issue Material,Material Issue
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,Aerolínia
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +852,Issue Material,Material Issue
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +3,An error occured while creating recurring,S&#39;ha produït un error en crear-lo recurrent
 DocType: Material Request Item,For Warehouse,Per Magatzem
 DocType: Employee,Offer Date,Data d'Oferta
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Cites
-apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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.
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,No hi ha grups d&#39;estudiants van crear.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +726,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.
+apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,No hi ha grups d&#39;estudiants van crear.
 DocType: Purchase Invoice Item,Serial No,Número de sèrie
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Quantitat Mensual La devolució no pot ser més gran que Suma del préstec
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Si us plau entra primer els detalls de manteniment
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Fila # {0}: la data de lliurament prevista no pot ser abans de la data de la comanda de compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +56,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,Fila # {0}: la data de lliurament prevista no pot ser abans de la data de la comanda de compra
 DocType: Purchase Invoice,Print Language,Llenguatge d&#39;impressió
 DocType: Salary Slip,Total Working Hours,Temps de treball total
 DocType: Subscription,Next Schedule Date,Next Schedule Date
 DocType: Stock Entry,Including items for sub assemblies,Incloent articles per subconjunts
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1928,Enter value must be positive,Introduir el valor ha de ser positiu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1943,Enter value must be positive,Introduir el valor ha de ser positiu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +392,All Territories,Tots els territoris
 DocType: Purchase Invoice,Items,Articles
-apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Estudiant ja està inscrit.
+apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +28,Student is already enrolled.,Estudiant ja està inscrit.
 DocType: Fiscal Year,Year Name,Nom Any
-DocType: Process Payroll,Process Payroll,Process Payroll
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,There are more holidays than working days this month.,Hi ha més vacances que els dies de treball aquest mes.
 DocType: Product Bundle Item,Product Bundle Item,Producte Bundle article
 DocType: Sales Partner,Sales Partner Name,Nom del revenedor
-apps/erpnext/erpnext/hooks.py +132,Request for Quotations,Sol·licitud de Cites
+apps/erpnext/erpnext/hooks.py +136,Request for Quotations,Sol·licitud de Cites
 DocType: Payment Reconciliation,Maximum Invoice Amount,Import Màxim Factura
-apps/erpnext/erpnext/healthcare/setup.py +209,Haematology,Hematologia
+apps/erpnext/erpnext/healthcare/setup.py +210,Haematology,Hematologia
 DocType: Normal Test Items,Normal Test Items,Elements de prova normals
 DocType: Student Language,Student Language,idioma de l&#39;estudiant
 apps/erpnext/erpnext/config/selling.py +23,Customers,clients
@@ -3777,11 +3837,11 @@
 DocType: Asset,Partially Depreciated,parcialment depreciables
 DocType: Issue,Opening Time,Temps d'obertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Des i Fins a la data sol·licitada
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitat de mesura per defecte per Variant &#39;{0}&#39; ha de ser el mateix que a la plantilla &#39;{1}&#39;
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitat de mesura per defecte per Variant &#39;{0}&#39; ha de ser el mateix que a la plantilla &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcula a causa del
 DocType: Delivery Note Item,From Warehouse,De Magatzem
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +897,No Items with Bill of Materials to Manufacture,No hi ha articles amb la llista de materials per a la fabricació de
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +944,No Items with Bill of Materials to Manufacture,No hi ha articles amb la llista de materials per a la fabricació de
 DocType: Restaurant,Default Customer,Client per defecte
 DocType: Assessment Plan,Supervisor Name,Nom del supervisor
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,No confirmeu si es crea una cita per al mateix dia
@@ -3791,40 +3851,36 @@
 DocType: Tax Rule,Shipping City,Enviaments City
 DocType: Notification Control,Customize the Notification,Personalitza la Notificació
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Flux de caixa operatiu
-DocType: Sales Invoice,Shipping Rule,Regla d'enviament
+DocType: Purchase Invoice,Shipping Rule,Regla d'enviament
 DocType: Patient Relation,Spouse,Cònjuge
 DocType: Lab Test Groups,Add Test,Afegir prova
 DocType: Manufacturer,Limited to 12 characters,Limitat a 12 caràcters
 DocType: Journal Entry,Print Heading,Imprimir Capçalera
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,El total no pot ser zero
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dies Des de la Darrera Comanda' ha de ser més gran que o igual a zero
-DocType: Process Payroll,Payroll Frequency,La nòmina de freqüència
+DocType: Payroll Entry,Payroll Frequency,La nòmina de freqüència
 DocType: Lab Test Template,Sensitivity,Sensibilitat
-DocType: Asset,Amended From,Modificada Des de
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Raw Material,Matèria Primera
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +62,Raw Material,Matèria Primera
 DocType: Leave Application,Follow via Email,Seguiu per correu electrònic
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +55,Plants and Machineries,Les plantes i maquinàries
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Suma d'impostos Després del Descompte
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Ajustos diàries Resum Treball
 DocType: Payment Entry,Internal Transfer,transferència interna
-apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Child account exists for this account. You can not delete this account.,Compte Nen existeix per aquest compte. No es pot eliminar aquest compte.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Cal la Quantitat destí i la origen
-apps/erpnext/erpnext/stock/get_item_details.py +536,No default BOM exists for Item {0},No hi ha una llista de materials per defecte d'article {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +359,Please select Posting Date first,Seleccioneu Data de comptabilització primer
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +367,Please select Posting Date first,Seleccioneu Data de comptabilització primer
 apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Data d&#39;obertura ha de ser abans de la data de Tancament
 DocType: Leave Control Panel,Carry Forward,Portar endavant
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Centre de costos de les transaccions existents no es pot convertir en llibre major
 DocType: Department,Days for which Holidays are blocked for this department.,Dies de festa que estan bloquejats per aquest departament.
 ,Produced,Produït
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +118,Created Salary Slips,nòmines creades
 DocType: Item,Item Code for Suppliers,Codi de l&#39;article per Proveïdors
 DocType: Issue,Raised By (Email),Raised By (Email)
 DocType: Training Event,Trainer Name,nom entrenador
 DocType: Mode of Payment,General,General
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,última Comunicació
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +355,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',No es pot deduir quan categoria és per a 'Valoració' o 'Valoració i Total'
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +372,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',No es pot deduir quan categoria és per a 'Valoració' o 'Valoració i Total'
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +234,Serial Nos Required for Serialized Item {0},Nº de Sèrie Necessari per article serialitzat {0}
-apps/erpnext/erpnext/config/accounts.py +152,Match Payments with Invoices,Els pagaments dels partits amb les factures
+apps/erpnext/erpnext/config/accounts.py +144,Match Payments with Invoices,Els pagaments dels partits amb les factures
 DocType: Journal Entry,Bank Entry,Entrada Banc
 DocType: Authorization Rule,Applicable To (Designation),Aplicable a (Designació)
 ,Profitability Analysis,Compte de resultats
@@ -3834,15 +3890,15 @@
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Afegir a la cistella
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar per
 DocType: Guardian,Interests,interessos
-apps/erpnext/erpnext/config/accounts.py +306,Enable / disable currencies.,Activar / desactivar les divises.
+apps/erpnext/erpnext/config/accounts.py +298,Enable / disable currencies.,Activar / desactivar les divises.
 DocType: Production Planning Tool,Get Material Request,Obtenir Sol·licitud de materials
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Postal Expenses,Despeses postals
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entreteniment i Oci
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,Entreteniment i Oci
 DocType: Quality Inspection,Item Serial No,Número de sèrie d'article
 apps/erpnext/erpnext/utilities/activation.py +135,Create Employee Records,Crear registres d&#39;empleats
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +68,Total Present,Present total
-apps/erpnext/erpnext/config/accounts.py +113,Accounting Statements,Les declaracions de comptabilitat
+apps/erpnext/erpnext/config/accounts.py +105,Accounting Statements,Les declaracions de comptabilitat
 DocType: Drug Prescription,Hour,Hora
 DocType: Restaurant Order Entry,Last Sales Invoice,Factura de la darrera compra
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nou Nombre de sèrie no pot tenir Warehouse. Magatzem ha de ser ajustat per Stock entrada o rebut de compra
@@ -3864,7 +3920,7 @@
 DocType: Program Enrollment,Pick/Drop by Guardian,Esculli / gota per Guardian
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Crear per la quantitat completa, fent cas omís de la quantitat que ja estan en ordre"
 DocType: Account,Tax,Impost
-apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,no Marcat
+apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,no Marcat
 DocType: Production Planning Tool,Production Planning Tool,Eina de Planificació de la producció
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Article batched {0} no es pot actualitzar mitjançant la Reconciliació, en lloc d&#39;utilitzar l&#39;entrada"
 DocType: Quality Inspection,Report Date,Data de l'informe
@@ -3877,61 +3933,60 @@
 DocType: Manufacturing Settings,Update BOM Cost Automatically,Actualitza el cost de la BOM automàticament
 DocType: Lab Test,Test Name,Nom de la prova
 apps/erpnext/erpnext/utilities/activation.py +99,Create Users,crear usuaris
-apps/erpnext/erpnext/utilities/user_progress.py +126,Gram,gram
+apps/erpnext/erpnext/utilities/user_progress.py +144,Gram,gram
 DocType: Supplier Scorecard,Per Month,Per mes
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Quantitat de Fabricació ha de ser major que 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +414,Quantity to Manufacture must be greater than 0.,Quantitat de Fabricació ha de ser major que 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Visita informe de presa de manteniment.
 DocType: Stock Entry,Update Rate and Availability,Actualització de tarifes i disponibilitat
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Percentatge que se li permet rebre o lliurar més en contra de la quantitat demanada. Per exemple: Si vostè ha demanat 100 unitats. i el subsidi és de 10%, llavors se li permet rebre 110 unitats."
 DocType: POS Customer Group,Customer Group,Grup de Clients
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +113,New Batch ID (Optional),Nou lot d&#39;identificació (opcional)
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Expense account is mandatory for item {0},El compte de despeses és obligatòria per a cada element {0}
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +120,New Batch ID (Optional),Nou lot d&#39;identificació (opcional)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +201,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 +42,Net Change in Equity,Canvi en el Patrimoni Net
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +196,Newest,El més nou
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,"Si us plau, cancel·lar Factura de Compra {0} primera"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +163,Please cancel Purchase Invoice {0} first,"Si us plau, cancel·lar Factura de Compra {0} primera"
 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
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +840,Receipt,rebut
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +865,Receipt,rebut
 ,Sales Register,Registre de vendes
 DocType: Daily Work Summary Settings Company,Send Emails At,En enviar correus electrònics
 DocType: Quotation,Quotation Lost Reason,Cita Perduda Raó
-apps/erpnext/erpnext/public/js/setup_wizard.js +19,Select your Domain,Seleccioni el seu domini
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +367,Transaction reference no {0} dated {1},Referència de la transacció no {0} {1} datat
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Transaction reference no {0} dated {1},Referència de la transacció no {0} {1} datat
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,No hi ha res a editar.
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +419,Form View,Vista de formularis
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +476,Form View,Vista de formularis
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,Summary for this month and pending activities,Resum per a aquest mes i activitats pendents
-apps/erpnext/erpnext/utilities/user_progress.py +227,"Add users to your organization, other than yourself.","Afegiu usuaris a la vostra organització, a part de tu mateix."
+apps/erpnext/erpnext/utilities/user_progress.py +245,"Add users to your organization, other than yourself.","Afegiu usuaris a la vostra organització, a part de tu mateix."
 DocType: Customer Group,Customer Group Name,Nom del grup al Client
 apps/erpnext/erpnext/public/js/pos/pos.html +98,No Customers yet!,Els clients no hi ha encara!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Estat de fluxos d&#39;efectiu
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Suma del préstec no pot excedir quantitat màxima del préstec de {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,llicència
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +481,Please remove this Invoice {0} from C-Form {1},"Si us plau, elimini aquest Factura {0} de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +485,Please remove this Invoice {0} from C-Form {1},"Si us plau, elimini aquest Factura {0} de C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Seleccioneu Carry Forward si també voleu incloure el balanç de l'any fiscal anterior deixa a aquest any fiscal
 DocType: GL Entry,Against Voucher Type,Contra el val tipus
 DocType: Physician,Phone (R),Telèfon (R)
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +50,Time slots added,S&#39;han afegit franges horàries
 DocType: Item,Attributes,Atributs
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +31,Enable Template,Habilita la plantilla
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +223,Please enter Write Off Account,Si us plau indica el Compte d'annotació
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +226,Please enter Write Off Account,Si us plau indica el Compte d'annotació
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Darrera Data de comanda
 DocType: Patient,B Negative,B negatiu
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Compte {0} no pertany a la companyia de {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +873,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 +878,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: Student,Guardian Details,guardià detalls
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Marc d&#39;Assistència per a diversos empleats
 DocType: Vehicle,Chassis No,nº de xassís
 DocType: Payment Request,Initiated,Iniciada
 DocType: Production Order,Planned Start Date,Data d'inici prevista
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +592,Please select a BOM,Seleccioneu un BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +596,Please select a BOM,Seleccioneu un BOM
 DocType: Serial No,Creation Document Type,Creació de tipus de document
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +54,End date must be greater than start date,La data de finalització ha de ser superior a la data d&#39;inici
 DocType: Leave Type,Is Encash,És convertirà en efectiu
 DocType: Leave Allocation,New Leaves Allocated,Noves absències Assignades
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Dades-Project savi no està disponible per a la cita
-apps/erpnext/erpnext/schools/doctype/student_admission/templates/student_admission.html +30,End on,Finalitza
+apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +30,End on,Finalitza
 DocType: Project,Expected End Date,Esperat Data de finalització
 DocType: Budget Account,Budget Amount,pressupost Monto
 DocType: Appraisal Template,Appraisal Template Title,Títol de plantilla d'avaluació
@@ -3945,27 +4000,27 @@
 DocType: Expense Claim,More Details,Més detalls
 DocType: Supplier Quotation,Supplier Address,Adreça del Proveïdor
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Pressupost per al compte {1} contra {2} {3} {4} és. Es superarà per {5}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +685,Row {0}# Account must be of type 'Fixed Asset',Fila {0} # El compte ha de ser de tipus &quot;Actiu Fix&quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +689,Row {0}# Account must be of type 'Fixed Asset',Fila {0} # El compte ha de ser de tipus &quot;Actiu Fix&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,Quantitat de sortida
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,and unchcked Disabled in the,i desactivat deshabilitat al
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +46,Series is mandatory,Sèries és obligatori
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Serveis Financers
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,Serveis Financers
 DocType: Student Sibling,Student ID,Identificació de l&#39;estudiant
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +457,Supplier Email,Email del proveïdor
 apps/erpnext/erpnext/config/projects.py +46,Types of activities for Time Logs,Tipus d&#39;activitats per als registres de temps
-DocType: Tax Rule,Sales,Venda
+DocType: Opening Invoice Creation Tool,Sales,Venda
 DocType: Stock Entry Detail,Basic Amount,Suma Bàsic
 DocType: Training Event,Exam,examen
 DocType: Complaint,Complaint,Queixa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +452,Warehouse required for stock Item {0},Magatzem necessari per a l'article d'estoc {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +456,Warehouse required for stock Item {0},Magatzem necessari per a l'article d'estoc {0}
 DocType: Leave Allocation,Unused leaves,Fulles no utilitzades
 DocType: Patient,Alcohol Past Use,Ús del passat alcohòlic
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +179,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +188,Cr,Cr
 DocType: Tax Rule,Billing State,Estat de facturació
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +276,Transfer,Transferència
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +891,Fetch exploded BOM (including sub-assemblies),Fetch exploded BOM (including sub-assemblies)
+apps/erpnext/erpnext/assets/doctype/asset/asset.js +296,Transfer,Transferència
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +916,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 +113,Due Date is mandatory,Data de venciment és obligatori
+apps/erpnext/erpnext/controllers/accounts_controller.py +135,Due Date is mandatory,Data de venciment és obligatori
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Increment de Atribut {0} no pot ser 0
 DocType: Journal Entry,Pay To / Recd From,Pagar a/Rebut de
 DocType: Naming Series,Setup Series,Sèrie d'instal·lació
@@ -3979,13 +4034,12 @@
 DocType: Stock Entry,Delivery Note No,Número d'albarà de lliurament
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Si està marcada, només les sol·licituds de compra de material per a les matèries primeres finals s&#39;inclouen en les sol·licituds de materials. Altrament, es crearan sol·licituds de material per a articles pare"
 DocType: Cheque Print Template,Message to show,Missatge a mostrar
-DocType: Company,Retail,Venda al detall
-DocType: Attendance,Absent,Absent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Product Bundle,Bundle Producte
+apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,Venda al detall
+DocType: Student Attendance,Absent,Absent
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Product Bundle,Bundle Producte
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,No s&#39;ha pogut trobar la puntuació a partir de {0}. Has de tenir puntuacions de peu que abasten 0 a 100
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Fila {0}: Referència no vàlida {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,Row {0}: Invalid reference {1},Fila {0}: Referència no vàlida {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Compra les taxes i càrrecs Plantilla
-DocType: Upload Attendance,Download Template,Descarregar plantilla
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: O bé es requereix targeta de dèbit o crèdit per import {2}
 DocType: GL Entry,Remarks,Observacions
@@ -3996,28 +4050,28 @@
 apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,fer plom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +112,Print and Stationery,Impressió i papereria
 DocType: Stock Settings,Show Barcode Field,Mostra Camp de codi de barres
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,Send Supplier Emails,Enviar missatges de correu electrònic del proveïdor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +807,Send Supplier Emails,Enviar missatges de correu electrònic del proveïdor
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salari ja processada per al període entre {0} i {1}, Deixa període d&#39;aplicació no pot estar entre aquest interval de dates."
-apps/erpnext/erpnext/config/stock.py +132,Installation record for a Serial No.,Registre d'instal·lació per a un nº de sèrie
 DocType: Guardian Interest,Guardian Interest,guardià interès
-apps/erpnext/erpnext/config/accounts.py +327,Setup default values for POS Invoices,Configuració dels valors predeterminats per a les factures de POS
-apps/erpnext/erpnext/config/hr.py +177,Training,formació
+apps/erpnext/erpnext/config/accounts.py +319,Setup default values for POS Invoices,Configuració dels valors predeterminats per a les factures de POS
+apps/erpnext/erpnext/config/hr.py +182,Training,formació
 DocType: Timesheet,Employee Detail,Detall dels empleats
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ID de correu electrònic
+apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1 ID de correu electrònic
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +68,Next Date's day and Repeat on Day of Month must be equal,L&#39;endemà de la data i Repetir en el dia del mes ha de ser igual
 DocType: Lab Prescription,Test Code,Codi de prova
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Ajustos per a la pàgina d&#39;inici pàgina web
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +38,RFQs are not allowed for {0} due to a scorecard standing of {1},Les RFQ no estan permeses per {0} a causa d&#39;un quadre de comandament de peu de {1}
 DocType: Offer Letter,Awaiting Response,Espera de la resposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +60,Above,Per sobre de
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1298,Total Amount {0},Import total {0}
-apps/erpnext/erpnext/controllers/item_variant.py +232,Invalid attribute {0} {1},atribut no vàlid {0} {1}
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1375,Total Amount {0},Import total {0}
+apps/erpnext/erpnext/controllers/item_variant.py +301,Invalid attribute {0} {1},atribut no vàlid {0} {1}
 DocType: Supplier,Mention if non-standard payable account,Esmentar si compta per pagar no estàndard
-apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',"Si us plau, seleccioneu el grup d&#39;avaluació que no sigui &#39;Tots els grups d&#39;avaluació&#39;"
+apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +18,Please select the assessment group other than 'All Assessment Groups',"Si us plau, seleccioneu el grup d&#39;avaluació que no sigui &#39;Tots els grups d&#39;avaluació&#39;"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},Fila {0}: es requereix centre de costos per a un element {1}
 DocType: Training Event Employee,Optional,Opcional
 DocType: Salary Slip,Earning & Deduction,Guanyar i Deducció
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Opcional. Aquest ajust s'utilitza per filtrar en diverses transaccions.
+DocType: Chapter,Region,Regió
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,Optional. This setting will be used to filter in various transactions.,Opcional. Aquest ajust s'utilitza per filtrar en diverses transaccions.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,No es permeten els ràtios de valoració negatius
 DocType: Holiday List,Weekly Off,Setmanal Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Per exemple, 2012, 2012-13"
@@ -4031,11 +4085,10 @@
 ,Monthly Attendance Sheet,Full d'Assistència Mensual
 DocType: Production Order Item,Production Order Item,Article de l&#39;ordre de producció
 apps/erpnext/erpnext/healthcare/report/lab_test_report/lab_test_report.py +15,No record found,No s'ha trobat registre
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Cost d&#39;Actius Scrapped
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +140,Cost of Scrapped Asset,Cost d&#39;Actius Scrapped
 apps/erpnext/erpnext/controllers/stock_controller.py +236,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centre de Cost és obligatori per l'article {2}
 DocType: Vehicle,Policy No,sense política
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +659,Get Items from Product Bundle,Obtenir elements del paquet del producte
-apps/erpnext/erpnext/stock/doctype/item/item.py +663,"As stock exists against an item {0}, you can not enable has variants property","Com existeix existència contra un element {0}, no podeu activar propietats de variants"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +684,Get Items from Product Bundle,Obtenir elements del paquet del producte
 DocType: Asset,Straight Line,Línia recta
 DocType: Project User,Project User,usuari projecte
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +64,Split,divisió
@@ -4058,8 +4111,8 @@
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impostos i càrrecs de venda de plantilla
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Total (de crèdit)
 DocType: Repayment Schedule,Payment Date,Data de pagament
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +107,New Batch Qty,Nou lot Quantitat
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Roba i Accessoris
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +114,New Batch Qty,Nou lot Quantitat
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +10,Apparel & Accessories,Roba i Accessoris
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +91,Could not solve weighted score function. Make sure the formula is valid.,No s&#39;ha pogut resoldre la funció de puntuació ponderada. Assegureu-vos que la fórmula sigui vàlida.
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Número d'ordre
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner que apareixerà a la part superior de la llista de productes.
@@ -4067,36 +4120,36 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Paper deixa forjar congelats Comptes i editar les entrades congelades
 DocType: Supplier Scorecard Scoring Variable,Path,Camí
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"No es pot convertir de centres de cost per al llibre major, ja que té nodes secundaris"
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +56,Opening Value,Valor d&#39;obertura
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +66,Opening Value,Valor d&#39;obertura
 DocType: Salary Detail,Formula,fórmula
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,Serial #
 DocType: Lab Test Template,Lab Test Template,Plantilla de prova de laboratori
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +94,Commission on Sales,Comissió de Vendes
 DocType: Offer Letter Term,Value / Description,Valor / Descripció
-apps/erpnext/erpnext/controllers/accounts_controller.py +565,"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 +609,"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
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Dèbit i Crèdit no és igual per a {0} # {1}. La diferència és {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +98,Entertainment Expenses,Despeses d'Entreteniment
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +48,Make Material Request,Fer Sol·licitud de materials
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +63,Make Material Request,Fer Sol·licitud de materials
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Obrir element {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Sales Invoice {0} must be cancelled before cancelling this Sales Order,La factura {0} ha de ser cancel·lada abans de cancel·lar aquesta comanda de vendes
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +222,Sales Invoice {0} must be cancelled before cancelling this Sales Order,La factura {0} ha de ser cancel·lada abans de cancel·lar aquesta comanda de vendes
 DocType: Consultation,Age,Edat
 DocType: Sales Invoice Timesheet,Billing Amount,Facturació Monto
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantitat no vàlid per a l'aricle {0}. Quantitat ha de ser major que 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Les sol·licituds de llicència.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +177,Account with existing transaction can not be deleted,Un compte amb transaccions no es pot eliminar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +166,Account with existing transaction can not be deleted,Un compte amb transaccions no es pot eliminar
 DocType: Vehicle,Last Carbon Check,Últim control de Carboni
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Legal Expenses,Despeses legals
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +130,Please select quantity on row ,Si us plau seleccioni la quantitat al corredor
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +140,Please select quantity on row ,Si us plau seleccioni la quantitat al corredor
 DocType: Purchase Invoice,Posting Time,Temps d'enviament
 DocType: Timesheet,% Amount Billed,% Import Facturat
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +102,"""Time Per Appointment"" hasn""t been set for Dr {0}. Add it in Physician master.",&quot;Temps per cita&quot; no s&#39;ha establert per al Dr {0}. Afegiu-lo al mestre de metge.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Telephone Expenses,Despeses telefòniques
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Seleccioneu aquesta opció si voleu obligar l'usuari a seleccionar una sèrie abans de desar. No hi haurà cap valor per defecte si marca aquesta.
-apps/erpnext/erpnext/stock/get_item_details.py +135,No Item with Serial No {0},No Element amb Serial No {0}
+apps/erpnext/erpnext/stock/get_item_details.py +129,No Item with Serial No {0},No Element amb Serial No {0}
 DocType: Email Digest,Open Notifications,Obrir Notificacions
 DocType: Payment Entry,Difference Amount (Company Currency),Diferència Suma (Companyia de divises)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +79,Direct Expenses,Despeses directes
@@ -4104,31 +4157,30 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Travel Expenses,Despeses de viatge
 DocType: Maintenance Visit,Breakdown,Breakdown
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +50,Add custom field Subscription in the doctype {0},Afegeix una subscripció de camp personalitzada a la doctype {0}
-apps/erpnext/erpnext/controllers/accounts_controller.py +677,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 +789,Account: {0} with currency: {1} can not be selected,Compte: {0} amb la divisa: {1} no es pot seleccionar
 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: Bank Reconciliation Detail,Cheque Date,Data Xec
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,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/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} does not belong to company: {2},Compte {0}: el compte Pare {1} no pertany a la companyia: {2}
 DocType: Program Enrollment Tool,Student Applicants,Els sol·licitants dels estudiants
 apps/erpnext/erpnext/setup/doctype/company/company.js +77,Successfully deleted all transactions related to this company!,Eliminat correctament totes les transaccions relacionades amb aquesta empresa!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Com en la data
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,Data d&#39;inscripció
 DocType: Healthcare Settings,Out Patient SMS Alerts,Alertes SMS de pacients
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Probation,Probation
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +100,Probation,Probation
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,components de sous
 DocType: Program Enrollment Tool,New Academic Year,Nou Any Acadèmic
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +762,Return / Credit Note,Retorn / Nota de Crèdit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +809,Return / Credit Note,Retorn / Nota de Crèdit
 DocType: Stock Settings,Auto insert Price List rate if missing,Acte inserit taxa Llista de Preus si falta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +23,Total Paid Amount,Suma total de pagament
 DocType: Production Order Item,Transferred Qty,Quantitat Transferida
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegació
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Planning,Planificació
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +188,Planning,Planificació
 DocType: Material Request,Issued,Emès
-apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +14,Student Activity,Activitat de l&#39;estudiant
-DocType: Project,Total Billing Amount (via Time Logs),Suma total de facturació (a través dels registres de temps)
+apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,Activitat de l&#39;estudiant
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,Identificador de Proveïdor
 DocType: Payment Request,Payment Gateway Details,Passarel·la de Pagaments detalls
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +264,Quantity should be greater than 0,Quantitat ha de ser més gran que 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +267,Quantity should be greater than 0,Quantitat ha de ser més gran que 0
 DocType: Journal Entry,Cash Entry,Entrada Efectiu
 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: Leave Application,Half Day Date,Medi Dia Data
@@ -4137,7 +4189,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tipus de fulles com casual, malalts, etc."
 DocType: Email Digest,Send regular summary reports via Email.,Enviar informes periòdics resumits per correu electrònic.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +254,Please set default account in Expense Claim Type {0},"Si us plau, estableix per defecte en compte Tipus de Despeses {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +305,Please set default account in Expense Claim Type {0},"Si us plau, estableix per defecte en compte Tipus de Despeses {0}"
 DocType: Assessment Result,Student Name,Nom de l&#39;estudiant
 DocType: Brand,Item Manager,Administració d&#39;elements
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Payroll Payable,nòmina per pagar
@@ -4145,14 +4197,14 @@
 DocType: Production Order,Total Operating Cost,Cost total de funcionament
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +171,Note: Item {0} entered multiple times,Nota: L'article {0} entrat diverses vegades
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Tots els contactes.
-apps/erpnext/erpnext/public/js/setup_wizard.js +67,Company Abbreviation,Abreviatura de l'empresa
+apps/erpnext/erpnext/public/js/setup_wizard.js +71,Company Abbreviation,Abreviatura de l'empresa
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +57,User {0} does not exist,L'usuari {0} no existeix
 DocType: Subscription,SUB-,SUB-
 DocType: Item Attribute Value,Abbreviation,Abreviatura
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +182,Payment Entry already exists,Entrada de pagament ja existeix
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,No distribuïdor oficial autoritzat des {0} excedeix els límits
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Salary template master.
-apps/erpnext/erpnext/healthcare/setup.py +240,Pathology,Patologia
+apps/erpnext/erpnext/healthcare/setup.py +241,Pathology,Patologia
 DocType: Restaurant Order Entry,Restaurant Table,Taula de restaurants
 DocType: Leave Type,Max Days Leave Allowed,Màxim de dies d'absència permesos
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Estableixi la regla fiscal de carret de la compra
@@ -4165,11 +4217,11 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotitzacions a clients potencials o a clients.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Paper animals d'editar estoc congelat
 ,Territory Target Variance Item Group-Wise,Territori de destinació Variància element de grup-Wise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,All Customer Groups,Tots els Grups de clients
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +143,All Customer Groups,Tots els Grups de clients
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,acumulat Mensual
-apps/erpnext/erpnext/controllers/accounts_controller.py +638,{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 +750,{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 +41,Tax Template is mandatory.,Plantilla d&#39;impostos és obligatori.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Compte {0}: el compte superior {1} no existeix
+apps/erpnext/erpnext/accounts/doctype/account/account.py +44,Account {0}: Parent account {1} does not exist,Compte {0}: el compte superior {1} no existeix
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de preus (en la moneda de la companyia)
 DocType: Products Settings,Products Settings,productes Ajustaments
 DocType: Lab Prescription,Test Created,Prova creada
@@ -4177,11 +4229,11 @@
 DocType: Account,Temporary,Temporal
 DocType: Program,Courses,cursos
 DocType: Monthly Distribution Percentage,Percentage Allocation,Percentatge d'Assignació
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +124,Secretary,Secretari
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +128,Secretary,Secretari
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Si desactivat, &quot;en les paraules de camp no serà visible en qualsevol transacció"
 DocType: Serial No,Distinct unit of an Item,Unitat diferent d'un article
 DocType: Supplier Scorecard Criteria,Criteria Name,Nom del criteri
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1213,Please set Company,Si us plau ajust l&#39;empresa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1289,Please set Company,Si us plau ajust l&#39;empresa
 DocType: Pricing Rule,Buying,Compra
 DocType: HR Settings,Employee Records to be created by,Registres d'empleats a ser creats per
 DocType: Patient,AB Negative,AB negatiu
@@ -4192,25 +4244,25 @@
 DocType: Assessment Plan,Assessment Name,nom avaluació
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No is mandatory,Fila # {0}: Nombre de sèrie és obligatori
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detall d'impostos de tots els articles
-apps/erpnext/erpnext/public/js/setup_wizard.js +67,Institute Abbreviation,Institut Abreviatura
+apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,Institut Abreviatura
 ,Item-wise Price List Rate,Llista de Preus de tarifa d'article
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +941,Supplier Quotation,Cita Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +966,Supplier Quotation,Cita Proveïdor
 DocType: Quotation,In Words will be visible once you save the Quotation.,En paraules seran visibles un cop que es guarda la Cotització.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Quantitat ({0}) no pot ser una fracció a la fila {1}
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +457,Barcode {0} already used in Item {1},Barcode {0} ja utilitzat en el punt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +473,Barcode {0} already used in Item {1},Barcode {0} ja utilitzat en el punt {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Regles per afegir les despeses d'enviament.
 DocType: Item,Opening Stock,l&#39;obertura de la
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Es requereix client
 DocType: Lab Test,Result Date,Data de resultats
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} és obligatori per la Devolució
 DocType: Purchase Order,To Receive,Rebre
-apps/erpnext/erpnext/utilities/user_progress.py +231,user@example.com,user@example.com
+apps/erpnext/erpnext/utilities/user_progress.py +249,user@example.com,user@example.com
 DocType: Employee,Personal Email,Email Personal
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Variància total
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Si està activat, el sistema comptabilitza els assentaments comptables per a l'inventari automàticament."
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Corretatge
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +15,Brokerage,Corretatge
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,L&#39;assistència per a l&#39;empleat {0} ja està marcat per al dia d&#39;avui
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","en minuts 
@@ -4218,15 +4270,15 @@
 DocType: Customer,From Lead,De client potencial
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Comandes llançades per a la producció.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Seleccioneu l'Any Fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +557,POS Profile required to make POS Entry,POS perfil requerit per fer l&#39;entrada POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +561,POS Profile required to make POS Entry,POS perfil requerit per fer l&#39;entrada POS
 DocType: Program Enrollment Tool,Enroll Students,inscriure els estudiants
 DocType: Lab Test,Approved Date,Data aprovada
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Almenys un magatzem és obligatori
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Atleast one warehouse is mandatory,Almenys un magatzem és obligatori
 DocType: Serial No,Out of Warranty,Fora de la Garantia
 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.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} contra factura Vendes {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +358,{0} against Sales Invoice {1},{0} contra factura Vendes {1}
 DocType: Antibiotic,Laboratory User,Usuari del laboratori
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Nom del projecte
@@ -4237,10 +4289,10 @@
 apps/erpnext/erpnext/config/learn.py +234,Human Resource,Recursos Humans
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Payment Reconciliation Payment
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +38,Tax Assets,Actius per impostos
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +626,Production Order has been {0},Producció Ordre ha estat {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +630,Production Order has been {0},Producció Ordre ha estat {0}
 DocType: BOM Item,BOM No,No BOM
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,Seient {0} no té compte {1} o ja compara amb un altre bo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +158,Journal Entry {0} does not have account {1} or already matched against other voucher,Seient {0} no té compte {1} o ja compara amb un altre bo
 DocType: Item,Moving Average,Mitjana Mòbil
 DocType: BOM Update Tool,The BOM which will be replaced,Llista de materials que serà substituïda
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +46,Electronic Equipments,Equips Electrònics
@@ -4248,31 +4300,31 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Les fulles han de ser assignats en múltiples de 0,5"
 DocType: Production Order,Operation Cost,Cost d'operació
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Puja l'assistència d'un arxiu .csv
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Excel·lent Amt
+apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,Excel·lent Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Establir Grup d'articles per aquest venedor.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Congela els estocs més vells de [dies]
-apps/erpnext/erpnext/controllers/accounts_controller.py +535,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Fila # {0}: l&#39;element és obligatori per als actius fixos de compra / venda
+apps/erpnext/erpnext/controllers/accounts_controller.py +579,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Fila # {0}: l&#39;element és obligatori per als actius fixos de compra / venda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Si dos o més regles de preus es troben basats en les condicions anteriors, s'aplica Prioritat. La prioritat és un nombre entre 0 a 20 mentre que el valor per defecte és zero (en blanc). Un nombre més alt significa que va a prevaler si hi ha diverses regles de preus amb mateixes condicions."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Any fiscal: {0} no existeix
 DocType: Currency Exchange,To Currency,Per moneda
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Deixi els següents usuaris per aprovar sol·licituds de llicència per a diversos dies de bloc.
-apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Tipus de Compte de despeses.
-apps/erpnext/erpnext/controllers/selling_controller.py +176,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},tarifa per a la venda d&#39;element {0} és més baix que el seu {1}. tipus venedor ha de tenir una antiguitat {2}
+apps/erpnext/erpnext/config/hr.py +137,Types of Expense Claim.,Tipus de Compte de despeses.
+apps/erpnext/erpnext/controllers/selling_controller.py +144,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},tarifa per a la venda d&#39;element {0} és més baix que el seu {1}. tipus venedor ha de tenir una antiguitat {2}
 DocType: Item,Taxes,Impostos
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +324,Paid and Not Delivered,A càrrec i no lliurats
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +344,Paid and Not Delivered,A càrrec i no lliurats
 DocType: Project,Default Cost Center,Centre de cost predeterminat
 DocType: Bank Guarantee,End Date,Data de finalització
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Les transaccions de valors
 DocType: Budget,Budget Accounts,comptes Pressupost
 DocType: Employee,Internal Work History,Historial de treball intern
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,La depreciació acumulada Import
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,Private Equity
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,Variable del quadre de comandament del proveïdor
 DocType: Employee Loan,Fully Disbursed,desemborsat en la seva totalitat
 DocType: Maintenance Visit,Customer Feedback,Comentaris del client
 DocType: Account,Expense,Despesa
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Els resultats no pot ser més gran que puntuació màxim
-apps/erpnext/erpnext/utilities/user_progress.py +108,Customers and Suppliers,Clients i proveïdors
+apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.js +36,Score cannot be greater than Maximum Score,Els resultats no pot ser més gran que puntuació màxim
+apps/erpnext/erpnext/utilities/user_progress.py +126,Customers and Suppliers,Clients i proveïdors
 DocType: Item Attribute,From Range,De Gamma
 DocType: BOM,Set rate of sub-assembly item based on BOM,Estableix el tipus d&#39;element de subconjunt basat en BOM
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +98,Syntax error in formula or condition: {0},Error de sintaxi en la fórmula o condició: {0}
@@ -4289,18 +4341,18 @@
 ,Employee Information,Informació de l'empleat
 DocType: Stock Entry Detail,Additional Cost,Cost addicional
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Can not filter based on Voucher No, if grouped by Voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +891,Make Supplier Quotation,Fer Oferta de Proveïdor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +916,Make Supplier Quotation,Fer Oferta de Proveïdor
 DocType: Quality Inspection,Incoming,Entrant
-apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.py +47,Assessment Result record {0} already exists.,El registre del resultat de l&#39;avaluació {0} ja existeix.
+apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +47,Assessment Result record {0} already exists.,El registre del resultat de l&#39;avaluació {0} ja existeix.
 DocType: BOM,Materials Required (Exploded),Materials necessaris (explotat)
 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;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Data d&#39;entrada no pot ser data futura
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Fila # {0}: Nombre de sèrie {1} no coincideix amb {2} {3}
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +10,for generating the recurring,per generar el recurrent
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Casual Leave,Deixar Casual
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +86,Casual Leave,Deixar Casual
 apps/erpnext/erpnext/config/healthcare.py +138,Lab Test UOM.,Prova de laboratori UOM.
 DocType: Batch,Batch ID,Identificació de lots
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Nota: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +378,Note: {0},Nota: {0}
 ,Delivery Note Trends,Nota de lliurament Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,This Week's Summary,Resum de la setmana
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +20,In Stock Qty,En estoc Quantitat
@@ -4315,56 +4367,56 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Sol·licitud de Cotització d&#39;articles
 DocType: Purchase Order,To Bill,Per Bill
 DocType: Material Request,% Ordered,Demanem%
-DocType: School Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Per grup d&#39;alumnes basat curs, aquest serà validat per cada estudiant dels cursos matriculats en el Programa d&#39;Inscripció."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Piecework,Treball a preu fet
+DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Per grup d&#39;alumnes basat curs, aquest serà validat per cada estudiant dels cursos matriculats en el Programa d&#39;Inscripció."
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Piecework,Treball a preu fet
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Buying Rate,Quota de compra mitja
 DocType: Task,Actual Time (in Hours),Temps real (en hores)
 DocType: Employee,History In Company,Història a la Companyia
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Butlletins
 DocType: Drug Prescription,Description/Strength,Descripció / força
 DocType: Stock Ledger Entry,Stock Ledger Entry,Ledger entrada Stock
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +82,Same item has been entered multiple times,El mateix article s&#39;ha introduït diverses vegades
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +83,Same item has been entered multiple times,El mateix article s&#39;ha introduït diverses vegades
 DocType: Department,Leave Block List,Deixa Llista de bloqueig
-DocType: Sales Invoice,Tax ID,Identificació Tributària
+DocType: Purchase Invoice,Tax ID,Identificació Tributària
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +192,Item {0} is not setup for Serial Nos. Column must be blank,L'Article {0} no està configurat per números de sèrie. La columna ha d'estar en blanc
 DocType: Accounts Settings,Accounts Settings,Ajustaments de comptabilitat
-apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +38,Approve,aprovar
-apps/erpnext/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +149,No Result to submit,Cap resultat per enviar
+apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,aprovar
+apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js +151,No Result to submit,Cap resultat per enviar
 DocType: Customer,Sales Partner and Commission,Soci de vendes i de la Comissió
 DocType: Employee Loan,Rate of Interest (%) / Year,Taxa d&#39;interès (%) / Any
 ,Project Quantity,projecte Quantitat
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total d&#39;{0} per a tots els elements és zero, pot ser que vostè ha de canviar a &quot;Distribuir els càrrecs basats en &#39;"
 DocType: Opportunity,To Discuss,Per Discutir
-apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} unitats de {1} necessària en {2} per completar aquesta transacció.
+apps/erpnext/erpnext/stock/stock_ledger.py +375,{0} units of {1} needed in {2} to complete this transaction.,{0} unitats de {1} necessària en {2} per completar aquesta transacció.
 DocType: Loan Type,Rate of Interest (%) Yearly,Taxa d&#39;interès (%) anual
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +71,Temporary Accounts,Comptes temporals
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +203,Black,Negre
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +207,Black,Negre
 DocType: BOM Explosion Item,BOM Explosion Item,Explosió de BOM d'article
 DocType: Account,Auditor,Auditor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +132,{0} items produced,{0} articles produïts
 apps/erpnext/erpnext/utilities/user_progress.py +55,Learn More,Aprèn més
 DocType: Cheque Print Template,Distance from top edge,Distància des de la vora superior
-apps/erpnext/erpnext/stock/get_item_details.py +317,Price List {0} is disabled or does not exist,El preu de llista {0} està desactivat o no existeix
+apps/erpnext/erpnext/stock/get_item_details.py +360,Price List {0} is disabled or does not exist,El preu de llista {0} està desactivat o no existeix
 DocType: Purchase Invoice,Return,Retorn
 DocType: Production Order Operation,Production Order Operation,Ordre de Producció Operació
 DocType: Pricing Rule,Disable,Desactiva
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +161,Mode of payment is required to make a payment,Forma de pagament es requereix per fer un pagament
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +186,Mode of payment is required to make a payment,Forma de pagament es requereix per fer un pagament
 DocType: Project Task,Pending Review,Pendent de Revisió
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +10,Appointments and Consultations,Nomenaments i consultes
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} no està inscrit en el Lot {2}
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Actius {0} no pot ser rebutjada, com ja ho és {1}"
+apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0} - {1} no està inscrit en el Lot {2}
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,"Asset {0} cannot be scrapped, as it is already {1}","Actius {0} no pot ser rebutjada, com ja ho és {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Reclamació de despeses totals (a través de despeses)
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Marc Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +140,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Fila {0}: Divisa de la llista de materials # {1} ha de ser igual a la moneda seleccionada {2}
 DocType: Journal Entry Account,Exchange Rate,Tipus De Canvi
 DocType: Patient,Additional information regarding the patient,Informació addicional sobre el pacient
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +575,Sales Order {0} is not submitted,Comanda de client {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +579,Sales Order {0} is not submitted,Comanda de client {0} no es presenta
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Quota de components
-apps/erpnext/erpnext/config/hr.py +199,Fleet Management,Gestió de Flotes
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +939,Add items from,Afegir elements de
+apps/erpnext/erpnext/config/hr.py +204,Fleet Management,Gestió de Flotes
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +964,Add items from,Afegir elements de
 DocType: Cheque Print Template,Regular,regular
-apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Coeficient de ponderació total de tots els criteris d&#39;avaluació ha de ser del 100%
+apps/erpnext/erpnext/education/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Coeficient de ponderació total de tots els criteris d&#39;avaluació ha de ser del 100%
 DocType: Purchase Order Item,Last Purchase Rate,Darrera Compra Rate
 DocType: Account,Asset,Basa
 DocType: Project Task,Task ID,Tasca ID
@@ -4374,29 +4426,29 @@
 DocType: Training Event,Contact Number,Nombre de contacte
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0} does not exist,El magatzem {0} no existeix
 DocType: Monthly Distribution,Monthly Distribution Percentages,Els percentatges de distribució mensuals
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,L'element seleccionat no pot tenir per lots
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +38,The selected item cannot have Batch,L'element seleccionat no pot tenir per lots
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materials lliurats d'aquesta Nota de Lliurament
-DocType: Training Event,Has Certificate,Té un certificat
+DocType: Asset Maintenance Log,Has Certificate,Té un certificat
 DocType: Project,Customer Details,Dades del client
 DocType: Employee,Reports to,Informes a
 ,Unpaid Expense Claim,Reclamació de despeses no pagats
 DocType: Payment Entry,Paid Amount,Quantitat pagada
-apps/erpnext/erpnext/utilities/user_progress.py +137,Explore Sales Cycle,Exploreu el cicle de vendes
+apps/erpnext/erpnext/utilities/user_progress.py +155,Explore Sales Cycle,Exploreu el cicle de vendes
 DocType: Assessment Plan,Supervisor,supervisor
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +73,Online,en línia
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +70,Online,en línia
 ,Available Stock for Packing Items,Estoc disponible per articles d'embalatge
 DocType: Item Variant,Item Variant,Article Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Eina resultat de l&#39;avaluació
 DocType: BOM Scrap Item,BOM Scrap Item,La llista de materials de ferralla d&#39;articles
-apps/erpnext/erpnext/accounts/page/pos/pos.js +871,Submitted orders can not be deleted,comandes presentats no es poden eliminar
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo del compte ja en dèbit, no se li permet establir ""El balanç ha de ser"" com ""crèdit"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Quality Management,Gestió de la Qualitat
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Element {0} ha estat desactivat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +886,Submitted orders can not be deleted,comandes presentats no es poden eliminar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +116,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo del compte ja en dèbit, no se li permet establir ""El balanç ha de ser"" com ""crèdit"""
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +118,Quality Management,Gestió de la Qualitat
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +41,Item {0} has been disabled,Element {0} ha estat desactivat
 DocType: Employee Loan,Repay Fixed Amount per Period,Pagar una quantitat fixa per Període
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Introduïu la quantitat d'articles per {0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +78,Credit Note Amt,Nota de Crèdit Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +89,Credit Note Amt,Nota de Crèdit Amt
 DocType: Employee External Work History,Employee External Work History,Historial de treball d'Empleat extern
-DocType: Tax Rule,Purchase,Compra
+DocType: Opening Invoice Creation Tool,Purchase,Compra
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,Saldo Quantitat
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Els objectius no poden estar buits
 DocType: Item Group,Parent Item Group,Grup d'articles pare
@@ -4409,7 +4461,7 @@
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Permetre zero taxa de valorització
 DocType: Training Event Employee,Invited,convidat
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,Multiple active Salary Structures found for employee {0} for the given dates,Múltiples estructures salarials actius trobats per a l&#39;empleat {0} per a les dates indicades
-apps/erpnext/erpnext/config/accounts.py +316,Setup Gateway accounts.,Configuració de comptes de porta d&#39;enllaç.
+apps/erpnext/erpnext/config/accounts.py +308,Setup Gateway accounts.,Configuració de comptes de porta d&#39;enllaç.
 DocType: Employee,Employment Type,Tipus d'Ocupació
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +42,Fixed Assets,Actius Fixos
 DocType: Payment Entry,Set Exchange Gain / Loss,Ajust de guany de l&#39;intercanvi / Pèrdua
@@ -4417,10 +4469,10 @@
 ,Cash Flow,Flux d&#39;Efectiu
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Període d&#39;aplicació no pot ser a través de dos registres alocation
 DocType: Item Group,Default Expense Account,Compte de Despeses predeterminat
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Estudiant ID de correu electrònic
+apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Student Email ID,Estudiant ID de correu electrònic
 DocType: Employee,Notice (days),Avís (dies)
 DocType: Tax Rule,Sales Tax Template,Plantilla d&#39;Impost a les Vendes
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2448,Select items to save the invoice,Seleccioneu articles per estalviar la factura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2467,Select items to save the invoice,Seleccioneu articles per estalviar la factura
 DocType: Employee,Encashment Date,Data Cobrament
 DocType: Training Event,Internet,Internet
 DocType: Special Test Template,Special Test Template,Plantilla de prova especial
@@ -4454,53 +4506,51 @@
 apps/erpnext/erpnext/config/support.py +22,Warranty,garantia
 DocType: Purchase Invoice,Debit Note Issued,Nota de dèbit Publicat
 DocType: Production Order,Warehouses,Magatzems
-apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} actiu no es pot transferir
-apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Aquest article és una variant de {0} (plantilla).
+apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} actiu no es pot transferir
+apps/erpnext/erpnext/stock/doctype/item/item.js +80,This Item is a Variant of {0} (Template).,Aquest article és una variant de {0} (plantilla).
 DocType: Workstation,per hour,per hores
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,adquisitiu
 DocType: Announcement,Announcement,anunci
-DocType: School Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Per grup d&#39;alumnes amb base de lots, el lot dels estudiants serà vàlida per a tots els estudiants de la inscripció en el programa."
+DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Per grup d&#39;alumnes amb base de lots, el lot dels estudiants serà vàlida per a tots els estudiants de la inscripció en el programa."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +51,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,El Magatzem no es pot eliminar perquè hi ha entrades al llibre major d'existències d'aquest magatzem.
-DocType: Company,Distribution,Distribució
+apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,Distribució
 DocType: Lab Test,Report Preference,Prefereixen informes
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +129,Project Manager,Gerent De Projecte
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +133,Project Manager,Gerent De Projecte
 ,Quoted Item Comparison,Citat article Comparació
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},Superposició entre puntuació entre {0} i {1}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Dispatch,Despatx
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +114,Dispatch,Despatx
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +73,Max discount allowed for item: {0} is {1}%,Descompte màxim permès per l'article: {0} és {1}%
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,El valor net d&#39;actius com a
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +176,Net Asset value as on,El valor net d&#39;actius com a
 DocType: Account,Receivable,Compte per cobrar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +288,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: No es permet canviar de proveïdors com l&#39;Ordre de Compra ja existeix
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +308,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: No es permet canviar de proveïdors com l&#39;Ordre de Compra ja existeix
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol al que es permet presentar les transaccions que excedeixin els límits de crèdit establerts.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +929,Select Items to Manufacture,Seleccionar articles a Fabricació
-apps/erpnext/erpnext/accounts/page/pos/pos.js +939,"Master data syncing, it might take some time","Mestre sincronització de dades, que podria portar el seu temps"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +978,Select Items to Manufacture,Seleccionar articles a Fabricació
+apps/erpnext/erpnext/accounts/page/pos/pos.js +954,"Master data syncing, it might take some time","Mestre sincronització de dades, que podria portar el seu temps"
 DocType: Item,Material Issue,Material Issue
 DocType: Employee Education,Qualification,Qualificació
 DocType: Item Price,Item Price,Preu d'article
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sabó i Detergent
+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/schools/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/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Cinema i vídeo
+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/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
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +51,Resume,Resum
-DocType: Item Variant Settings,If enabled then system will not update the fields of variants from the template but will copy the data of below mentioned fields while making new variant,"Si està habilitat, el sistema no actualitzarà els camps de les variants de la plantilla, sinó que copiarà les dades dels camps esmentats a continuació fent una nova variant."
 DocType: Salary Detail,Component,component
 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/accounts/doctype/asset/asset.py +72,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 +72,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
 DocType: Naming Series,Select Transaction,Seleccionar Transacció
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Si us plau entra el rol d'aprovació o l'usuari aprovador
 DocType: Journal Entry,Write Off Entry,Escriu Off Entrada
 DocType: BOM,Rate Of Materials Based On,Tarifa de materials basats en
-DocType: Item Variant Settings,Do not Update Variants,No actualitzeu les variants
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Suport
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,desactivar tot
+apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +102,Uncheck all,desactivar tot
 DocType: POS Profile,Terms and Conditions,Condicions
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Per a la data ha d'estar dins de l'any fiscal. Suposant Per Data = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aquí pot actualitzar l'alçada, el pes, al·lèrgies, problemes mèdics, etc."
 DocType: Leave Block List,Applies to Company,S'aplica a l'empresa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +202,Cannot cancel because submitted Stock Entry {0} exists,No es pot cancel·lar perquè l'entrada d'estoc {0} ja ha estat Presentada
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +222,Cannot cancel because submitted Stock Entry {0} exists,No es pot cancel·lar perquè l'entrada d'estoc {0} ja ha estat Presentada
 DocType: Employee Loan,Disbursement Date,Data de desemborsament
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +80,'Recipients' not specified,No s&#39;especifiquen els &quot;destinataris&quot;
 DocType: BOM Update Tool,Update latest price in all BOMs,Actualitzeu el preu més recent en totes les BOM
@@ -4509,7 +4559,7 @@
 DocType: Purchase Invoice,In Words,En Paraules
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,{0} s&#39;ha de presentar
 DocType: POS Profile,Item Groups,els grups d&#39;articles
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Avui és {0} 's aniversari!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +221,Today is {0}'s birthday!,Avui és {0} 's aniversari!
 DocType: Production Planning Tool,Material Request For Warehouse,Sol·licitud de material per al magatzem
 DocType: Sales Order Item,For Production,Per Producció
 DocType: Payment Request,payment_url,payment_url
@@ -4517,20 +4567,20 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,OPP /% Plom
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Les depreciacions d&#39;actius i saldos
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +356,Amount {0} {1} transferred from {2} to {3},Suma {0} {1} transferit des {2} a {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Amount {0} {1} transferred from {2} to {3},Suma {0} {1} transferit des {2} a {3}
 DocType: Sales Invoice,Get Advances Received,Obtenir les bestretes rebudes
 DocType: Email Digest,Add/Remove Recipients,Afegir / Treure Destinataris
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +461,Transaction not allowed against stopped Production Order {0},No es permet la transacció cap a l'ordre de producció aturada {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +486,Transaction not allowed against stopped Production Order {0},No es permet la transacció cap a l'ordre de producció aturada {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Per establir aquest any fiscal predeterminat, feu clic a ""Estableix com a predeterminat"""
-apps/erpnext/erpnext/projects/doctype/project/project.py +205,Join,unir-se
+apps/erpnext/erpnext/projects/doctype/project/project.py +216,Join,unir-se
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Quantitat escassetat
-apps/erpnext/erpnext/stock/doctype/item/item.py +699,Item variant {0} exists with same attributes,Hi ha la variant d&#39;article {0} amb mateixos atributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +685,Item variant {0} exists with same attributes,Hi ha la variant d&#39;article {0} amb mateixos atributs
 DocType: Employee Loan,Repay from Salary,Pagar del seu sou
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +347,Requesting payment against {0} {1} for amount {2},Sol·licitant el pagament contra {0} {1} per la quantitat {2}
 DocType: Salary Slip,Salary Slip,Slip Salari
 DocType: Lead,Lost Quotation,cita perduda
-apps/erpnext/erpnext/utilities/user_progress.py +200,Student Batches,Llicències d&#39;estudiants
+apps/erpnext/erpnext/utilities/user_progress.py +218,Student Batches,Llicències d&#39;estudiants
 DocType: Pricing Rule,Margin Rate or Amount,Taxa de marge o Monto
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'A Data' es requereix
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generar albarans paquets que es lliuraran. S'utilitza per notificar el nombre de paquets, el contingut del paquet i el seu pes."
@@ -4544,8 +4594,8 @@
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Configuració global
 DocType: Assessment Result Detail,Assessment Result Detail,Avaluació de Resultats Detall
 DocType: Employee Education,Employee Education,Formació Empleat
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +48,Duplicate item group found in the item group table,grup d&#39;articles duplicat trobat en la taula de grup d&#39;articles
-apps/erpnext/erpnext/public/js/controllers/transaction.js +965,It is needed to fetch Item Details.,Es necessita a cercar Detalls de l&#39;article.
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,grup d&#39;articles duplicat trobat en la taula de grup d&#39;articles
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1045,It is needed to fetch Item Details.,Es necessita a cercar Detalls de l&#39;article.
 DocType: Salary Slip,Net Pay,Pay Net
 DocType: Account,Account,Compte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +217,Serial No {0} has already been received,Nombre de sèrie {0} ja s'ha rebut
@@ -4553,17 +4603,16 @@
 DocType: Expense Claim,Vehicle Log,Inicia vehicle
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Presència d&#39;una febre (temperatura&gt; 38,5 ° C / 101.3 ° F o temperatura sostinguda&gt; 38 ° C / 100.4 ° F)"
 DocType: Customer,Sales Team Details,Detalls de l'Equip de Vendes
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1326,Delete permanently?,Eliminar de forma permanent?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1341,Delete permanently?,Eliminar de forma permanent?
 DocType: Expense Claim,Total Claimed Amount,Suma total del Reclamat
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Els possibles oportunitats de venda.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},No vàlida {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Sick Leave,Baixa per malaltia
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +90,Sick Leave,Baixa per malaltia
 DocType: Email Digest,Email Digest,Butlletí per correu electrònic
 DocType: Delivery Note,Billing Address Name,Nom de l'adressa de facturació
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Grans Magatzems
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +22,Department Stores,Grans Magatzems
 ,Item Delivery Date,Data de lliurament de l&#39;article
 DocType: Warehouse,PIN,PIN
-apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +110,Setup your School in ERPNext,Configuració del seu School a ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base quantitat de canvi (moneda de l&#39;empresa)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +304,No accounting entries for the following warehouses,No hi ha assentaments comptables per als següents magatzems
 apps/erpnext/erpnext/projects/doctype/project/project.js +111,Save the document first.,Deseu el document primer.
@@ -4573,20 +4622,20 @@
 DocType: Item,Max Discount (%),Descompte màxim (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Darrera Quantitat de l'ordre
 DocType: Task,Is Milestone,és Milestone
-DocType: Daily Work Summary,Email Sent To,Correu electrònic enviat a
+DocType: Delivery Stop,Email Sent To,Correu electrònic enviat a
 DocType: Budget,Warn,Advertir
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +81,Are you sure you want to unregister?,Esteu segur que voleu cancel·lar el registre?
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Altres observacions, esforç notable que ha d&#39;anar en els registres."
-DocType: BOM,Manufacturing User,Usuari de fabricació
+DocType: Asset Maintenance,Manufacturing User,Usuari de fabricació
 DocType: Purchase Invoice,Raw Materials Supplied,Matèries primeres subministrades
 DocType: C-Form,Series,Sèrie
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +270,Currency of the price list {0} must be {1} or {2},La moneda de la llista de preus {0} ha de ser {1} o {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +273,Currency of the price list {0} must be {1} or {2},La moneda de la llista de preus {0} ha de ser {1} o {2}
 DocType: Appraisal,Appraisal Template,Plantilla d'Avaluació
 DocType: Item Group,Item Classification,Classificació d'articles
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +127,Business Development Manager,Gerent de Desenvolupament de Negocis
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +131,Business Development Manager,Gerent de Desenvolupament de Negocis
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Manteniment Motiu de visita
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,Facturació Registre de pacients
-DocType: Drug Prescription,Period,Període
+DocType: Crop,Period,Període
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Comptabilitat General
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Empleat {0} en excedència {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Veure ofertes
@@ -4594,9 +4643,9 @@
 DocType: Item Attribute Value,Attribute Value,Atribut Valor
 ,Itemwise Recommended Reorder Level,Nivell d'articles recomanat per a tornar a passar comanda
 DocType: Salary Detail,Salary Detail,Detall de sous
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1017,Please select {0} first,Seleccioneu {0} primer
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1043,Please select {0} first,Seleccioneu {0} primer
 DocType: Appointment Type,Physician,Metge
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +804,Batch {0} of Item {1} has expired.,Lot {0} de {1} article ha expirat.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +833,Batch {0} of Item {1} has expired.,Lot {0} de {1} article ha expirat.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment_dashboard.py +11,Consultations,Consultes
 DocType: Sales Invoice,Commission,Comissió
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Full de temps per a la fabricació.
@@ -4607,7 +4656,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Magatzem no trobat al sistema
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,This Month's Summary,Resum d&#39;aquest Mes
 DocType: Quality Inspection Reading,Quality Inspection Reading,Qualitat de Lectura d'Inspecció
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Bloqueja els estocs més antics que' ha de ser menor de %d dies.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +25,`Freeze Stocks Older Than` should be smaller than %d days.,`Bloqueja els estocs més antics que' ha de ser menor de %d dies.
 DocType: Tax Rule,Purchase Tax Template,Compra Plantilla Tributària
 apps/erpnext/erpnext/utilities/user_progress.py +45,Set a sales goal you'd like to achieve for your company.,Definiu un objectiu de vendes que vulgueu aconseguir per a la vostra empresa.
 ,Project wise Stock Tracking,Projecte savi Stock Seguiment
@@ -4615,38 +4664,38 @@
 apps/erpnext/erpnext/config/healthcare.py +40,Laboratory,Laboratori
 DocType: Stock Entry Detail,Actual Qty (at source/target),Actual Quantitat (en origen / destinació)
 DocType: Item Customer Detail,Ref Code,Codi de Referència
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +66,Customer Group is Required in POS Profile,El Grup de clients es requereix en el perfil de POS
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +71,Customer Group is Required in POS Profile,El Grup de clients es requereix en el perfil de POS
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Registres d'empleats.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Si us plau, estableix Següent Depreciació Data"
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Si us plau, estableix Següent Depreciació Data"
 DocType: HR Settings,Payroll Settings,Ajustaments de Nòmines
-apps/erpnext/erpnext/config/accounts.py +154,Match non-linked Invoices and Payments.,Coincideixen amb les factures i pagaments no vinculats.
+apps/erpnext/erpnext/config/accounts.py +146,Match non-linked Invoices and Payments.,Coincideixen amb les factures i pagaments no vinculats.
 DocType: POS Settings,POS Settings,Configuració de la TPV
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Poseu l&#39;ordre
 DocType: Email Digest,New Purchase Orders,Noves ordres de compra
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Root no pot tenir un centre de costos pares
 apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Seleccioneu una marca ...
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +18,Training Events/Results,L&#39;entrenament d&#39;Esdeveniments / Resultats
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,La depreciació acumulada com a
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +152,Accumulated Depreciation as on,La depreciació acumulada com a
 DocType: Sales Invoice,C-Form Applicable,C-Form Applicable
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Temps de funcionament ha de ser major que 0 per a l&#39;operació {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +419,Operation Time must be greater than 0 for Operation {0},Temps de funcionament ha de ser major que 0 per a l&#39;operació {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +106,Warehouse is mandatory,Magatzem és obligatori
 DocType: Supplier,Address and Contacts,Direcció i contactes
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detall UOM Conversió
 DocType: Program,Program Abbreviation,abreviatura programa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Ordre de fabricació no es pot aixecar en contra d&#39;una plantilla d&#39;article
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +407,Production Order cannot be raised against a Item Template,Ordre de fabricació no es pot aixecar en contra d&#39;una plantilla d&#39;article
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Els càrrecs s'actualitzen amb els rebuts de compra contra cada un dels articles
 DocType: Warranty Claim,Resolved By,Resolta Per
 DocType: Bank Guarantee,Start Date,Data De Inici
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Assignar absències per un període.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Els xecs i dipòsits esborren de forma incorrecta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: You can not assign itself as parent account,Compte {0}: No es pot assignar com compte principal
+apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: You can not assign itself as parent account,Compte {0}: No es pot assignar com compte principal
 DocType: Purchase Invoice Item,Price List Rate,Preu de llista Rate
 apps/erpnext/erpnext/utilities/activation.py +72,Create customer quotes,Crear cites de clients
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mostra ""En estock"" o ""No en estoc"", basat en l'estoc disponible en aquest magatzem."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Llista de materials (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Temps mitjà pel proveïdor per lliurar
 DocType: Sample Collection,Collected By,Recollida per
-apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +22,Assessment Result,avaluació de resultat
+apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.js +22,Assessment Result,avaluació de resultat
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,hores
 DocType: Project,Expected Start Date,Data prevista d'inici
 DocType: Setup Progress Action,Setup Progress Action,Configuració de l&#39;acció de progrés
@@ -4660,20 +4709,20 @@
 DocType: Workstation,Operating Costs,Costos Operatius
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Acció si s&#39;acumula pressupost mensual excedit
 DocType: Subscription,Submit on creation,Presentar a la creació
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +469,Currency for {0} must be {1},Moneda per {0} ha de ser {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +470,Currency for {0} must be {1},Moneda per {0} ha de ser {1}
 DocType: Asset,Disposal Date,disposició Data
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Els correus electrònics seran enviats a tots els empleats actius de l&#39;empresa a l&#39;hora determinada, si no tenen vacances. Resum de les respostes serà enviat a la mitjanit."
 DocType: Employee Leave Approver,Employee Leave Approver,Empleat Deixar aprovador
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada Reordenar ja existeix per aquest magatzem {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada Reordenar ja existeix per aquest magatzem {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.","No es pot declarar com perdut, perquè s'han fet ofertes"
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,Formació de vots
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +458,Production Order {0} must be submitted,L'Ordre de Producció {0} ha d'estar Presentada
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +483,Production Order {0} must be submitted,L'Ordre de Producció {0} ha d'estar Presentada
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Criteris de quadre de comandament de proveïdors
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Seleccioneu data d'inici i data de finalització per a l'article {0}
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Per descomptat és obligatori a la fila {0}
+apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},Per descomptat és obligatori a la fila {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Fins a la data no pot ser anterior a partir de la data
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc Doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +272,Add / Edit Prices,Afegeix / Edita Preus
+apps/erpnext/erpnext/stock/doctype/item/item.js +268,Add / Edit Prices,Afegeix / Edita Preus
 DocType: Batch,Parent Batch,lots dels pares
 DocType: Cheque Print Template,Cheque Print Template,Plantilla d&#39;impressió de xecs
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Gràfic de centres de cost
@@ -4682,7 +4731,6 @@
 apps/erpnext/erpnext/hub_node/page/hub/hub.js +655,My Orders,Les meves comandes
 DocType: Price List,Price List Name,nom de la llista de preus
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +32,Daily Work Summary for {0},Resum diari de treball per a {0}
-DocType: Employee Loan,Totals,Totals
 DocType: BOM,Manufacturing,Fabricació
 ,Ordered Items To Be Delivered,Els articles demanats per ser lliurats
 DocType: Account,Income,Ingressos
@@ -4692,105 +4740,102 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Sales Invoice {0} has already been submitted,Factura {0} ja s'ha presentat
 DocType: Supplier Scorecard Scoring Criteria,Score,puntuació
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Any fiscal {0} no existeix
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data d'acabament
+DocType: Asset Maintenance Log,Completion Date,Data d'acabament
 DocType: Purchase Invoice Item,Amount (Company Currency),Import (Companyia moneda)
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Valid till date cannot be before transaction date,Vàlid fins a la data no pot ser abans de la data de la transacció
-apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unitats de {1} necessària en {2} sobre {3} {4} {5} per completar aquesta transacció.
+apps/erpnext/erpnext/stock/stock_ledger.py +379,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unitats de {1} necessària en {2} sobre {3} {4} {5} per completar aquesta transacció.
 DocType: Fee Schedule,Student Category,categoria estudiant
 DocType: Announcement,Student,Estudiant
-apps/erpnext/erpnext/config/hr.py +233,Organization unit (department) master.,Unitat d'Organització (departament) mestre.
-apps/erpnext/erpnext/utilities/user_progress.py +218,Go to Rooms,Anar a Sales
+apps/erpnext/erpnext/config/hr.py +238,Organization unit (department) master.,Unitat d'Organització (departament) mestre.
+apps/erpnext/erpnext/utilities/user_progress.py +236,Go to Rooms,Anar a Sales
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Si us plau, escriviu el missatge abans d'enviar-"
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,Duplicat per PROVEÏDOR
 DocType: Email Digest,Pending Quotations,A l&#39;espera de Cites
-apps/erpnext/erpnext/config/accounts.py +326,Point-of-Sale Profile,Punt de Venda Perfil
+apps/erpnext/erpnext/config/accounts.py +318,Point-of-Sale Profile,Punt de Venda Perfil
 apps/erpnext/erpnext/config/healthcare.py +153,Lab Test Configurations.,Configuracions de prova de laboratori.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +156,Unsecured Loans,Préstecs sense garantia
 DocType: Cost Center,Cost Center Name,Nom del centre de cost
-DocType: Employee,B+,B +
+DocType: Student,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Màxim les hores de treball contra la part d&#39;hores
 DocType: Maintenance Schedule Detail,Scheduled Date,Data Prevista
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Total Paid Amt,Total pagat Amt
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +88,Total Paid Amt,Total pagat Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Els missatges de més de 160 caràcters es divideixen en diversos missatges
 DocType: Purchase Receipt Item,Received and Accepted,Rebut i acceptat
 DocType: Hub Settings,Company and Seller Profile,Perfil de l&#39;empresa i del venedor
 ,GST Itemised Sales Register,GST Detallat registre de vendes
 ,Serial No Service Contract Expiry,Número de sèrie del contracte de venciment del servei
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,No es pot configurar el mateix compte com crèdit i dèbit a la vegada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +297,You cannot credit and debit same account at the same time,No es pot configurar el mateix compte com crèdit i dèbit a la vegada
 DocType: Vital Signs,Adults' pulse rate is anywhere between 50 and 80 beats per minute.,El ritme de pols dels adults és entre 50 i 80 batecs per minut.
 DocType: Naming Series,Help HTML,Ajuda HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Eina de creació de grup d&#39;alumnes
 DocType: Item,Variant Based On,En variant basada
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},El pes total assignat ha de ser 100%. És {0}
-apps/erpnext/erpnext/utilities/user_progress.py +88,Your Suppliers,Els seus Proveïdors
+apps/erpnext/erpnext/utilities/user_progress.py +106,Your Suppliers,Els seus Proveïdors
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +6,Please correct the,Correu la correcció
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,No es pot establir tan perdut com està feta d'ordres de venda.
 DocType: Request for Quotation Item,Supplier Part No,Proveïdor de part
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +365,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',No es pot deduir que és la categoria de &#39;de Valoració &quot;o&quot; Vaulation i Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Received From,Rebut des
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +382,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',No es pot deduir que és la categoria de &#39;de Valoració &quot;o&quot; Vaulation i Total&#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +364,Received From,Rebut des
 DocType: Lead,Converted,Convertit
 DocType: Item,Has Serial No,No té de sèrie
 DocType: Employee,Date of Issue,Data d'emissió
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +24,{0}: From {0} for {1},{0}: Des {0} de {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +219,"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 +166,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunt de Proveïdors per a l&#39;element {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +222,"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 +167,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunt de Proveïdors per a l&#39;element {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,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 +183,Website Image {0} attached to Item {1} cannot be found,Lloc web Imatge {0} unit a l&#39;article {1} no es pot trobar
+apps/erpnext/erpnext/stock/doctype/item/item.py +185,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
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Ordinador
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,Ordinador
 DocType: Item,List this Item in multiple groups on the website.,Fes una llista d'articles en diversos grups en el lloc web.
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,Estableix el grup i grup de clients predeterminats a la Configuració de vendes
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +323,Please check Multi Currency option to allow accounts with other currency,"Si us plau, consulti l&#39;opció Multi moneda per permetre comptes amb una altra moneda"
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +85,Please set default customer group and territory in Selling Settings,Estableix el grup i grup de clients predeterminats a la Configuració de vendes
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,{0} {1} does not exist,{0} {1} no existeix
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +321,Please check Multi Currency option to allow accounts with other currency,"Si us plau, consulti l&#39;opció Multi moneda per permetre comptes amb una altra moneda"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +85,Item: {0} does not exist in the system,Article: {0} no existeix en el sistema
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,No estàs autoritzat per establir el valor bloquejat
+apps/erpnext/erpnext/accounts/doctype/account/account.py +108,You are not authorized to set Frozen value,No estàs autoritzat per establir el valor bloquejat
 DocType: Payment Reconciliation,Get Unreconciled Entries,Aconsegueix entrades no reconciliades
 DocType: Payment Reconciliation,From Invoice Date,Des Data de la factura
-apps/erpnext/erpnext/healthcare/doctype/consultation/consultation.py +28,You don't have permission to submit,No teniu permís per enviar
-apps/erpnext/erpnext/accounts/party.py +268,Billing currency must be equal to either default comapany's currency or party account currency,"moneda de facturació ha de ser igual a la moneda o divisa de compte del partit, ja sigui per defecte de comapany"
 DocType: Healthcare Settings,Laboratory Settings,Configuració del Laboratori
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Leave Encashment,deixa Cobrament
-apps/erpnext/erpnext/public/js/setup_wizard.js +111,What does it do?,Què fa?
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +75,To Warehouse,Magatzem destí
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,All Student Admissions,Tots Admissió d&#39;Estudiants
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +75,Leave Encashment,deixa Cobrament
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,What does it do?,Què fa?
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +76,To Warehouse,Magatzem destí
+apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +26,All Student Admissions,Tots Admissió d&#39;Estudiants
 ,Average Commission Rate,Comissió de Tarifes mitjana
-apps/erpnext/erpnext/stock/doctype/item/item.py +418,'Has Serial No' can not be 'Yes' for non-stock item,'Té Num de Sèrie' no pot ser 'Sí' per a items que no estan a l'estoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +434,'Has Serial No' can not be 'Yes' for non-stock item,'Té Num de Sèrie' no pot ser 'Sí' per a items que no estan a l'estoc
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +62,Select Status,Selecciona l&#39;estat
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,No es poden entrar assistències per dates futures
 DocType: Pricing Rule,Pricing Rule Help,Ajuda de la Regla de preus
 DocType: School House,House Name,Nom de la casa
 DocType: Fee Schedule,Total Amount per Student,Import total per estudiant
 DocType: Purchase Taxes and Charges,Account Head,Cap Compte
-apps/erpnext/erpnext/config/stock.py +173,Update additional costs to calculate landed cost of items,Actualització dels costos addicionals per al càlcul del preu al desembarcament d'articles
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Electrical,Elèctric
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +153,Electrical,Elèctric
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Afegir la resta de la seva organització com als seus usuaris. També podeu afegir convidar els clients al seu portal amb l&#39;addició d&#39;ells des Contactes
 DocType: Stock Entry,Total Value Difference (Out - In),Diferència Total Valor (Out - En)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipus de canvi és obligatori
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipus de canvi és obligatori
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID d'usuari no entrat per l'Empleat {0}
 DocType: Vehicle,Vehicle Value,El valor del vehicle
 DocType: Stock Entry,Default Source Warehouse,Magatzem d'origen predeterminat
 DocType: Item,Customer Code,Codi de Client
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Recordatori d'aniversari per {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +220,Birthday Reminder for {0},Recordatori d'aniversari per {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dies des de l'última comanda
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,Debit To account must be a Balance Sheet account,Dèbit al compte ha de ser un compte de Balanç
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +359,Debit To account must be a Balance Sheet account,Dèbit al compte ha de ser un compte de Balanç
 DocType: Buying Settings,Naming Series,Sèrie de nomenclatura
 DocType: Leave Block List,Leave Block List Name,Deixa Nom Llista de bloqueig
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,data d&#39;inici d&#39;assegurança ha de ser inferior a la data d&#39;Assegurances Fi
-apps/erpnext/erpnext/schools/doctype/instructor/instructor.py +15,Please setup Instructor Naming System in School &gt; School Settings,Configureu el sistema de nomenclatura d&#39;instructor a l&#39;escola&gt; Configuració de l&#39;escola
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Actius
 DocType: Timesheet,Production Detail,Detall de producció
 DocType: Restaurant,Active Menu,Menú actiu
 DocType: Target Detail,Target Qty,Objectiu Quantitat
 DocType: Shopping Cart Settings,Checkout Settings,Comanda Ajustaments
-DocType: Attendance,Present,Present
+DocType: Student Attendance,Present,Present
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,La Nota de lliurament {0} no es pot presentar
 DocType: Notification Control,Sales Invoice Message,Missatge de Factura de vendes
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Compte {0} Cloenda ha de ser de Responsabilitat / Patrimoni
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +325,Salary Slip of employee {0} already created for time sheet {1},La relliscada de sou de l&#39;empleat {0} ja creat per al full de temps {1}
 DocType: Vehicle Log,Odometer,comptaquilòmetres
 DocType: Sales Order Item,Ordered Qty,Quantitat demanada
-apps/erpnext/erpnext/stock/doctype/item/item.py +727,Item {0} is disabled,Article {0} està deshabilitat
+apps/erpnext/erpnext/stock/doctype/item/item.py +713,Item {0} is disabled,Article {0} està deshabilitat
 DocType: Stock Settings,Stock Frozen Upto,Estoc bloquejat fins a
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +904,BOM does not contain any stock item,BOM no conté cap article comuna
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +929,BOM does not contain any stock item,BOM no conté cap article comuna
 apps/erpnext/erpnext/config/projects.py +19,Project activity / task.,Activitat del projecte / tasca.
 DocType: Vehicle Log,Refuelling Details,Detalls de repostatge
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generar Salari Slips
@@ -4798,20 +4843,19 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Descompte ha de ser inferior a 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Escriu Off Import (Companyia moneda)
 DocType: Sales Invoice Timesheet,Billing Hours,Hores de facturació
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM per defecte per {0} no trobat
-apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row #{0}: Please set reorder quantity,Fila # {0}: Configureu la quantitat de comanda
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +528,Default BOM for {0} not found,BOM per defecte per {0} no trobat
+apps/erpnext/erpnext/stock/doctype/item/item.py +489,Row #{0}: Please set reorder quantity,Fila # {0}: Configureu la quantitat de comanda
 apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Toc els articles a afegir aquí
 DocType: Fees,Program Enrollment,programa d&#39;Inscripció
 DocType: Landed Cost Voucher,Landed Cost Voucher,Val Landed Cost
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Si us plau, estableix {0}"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} és estudiant inactiu
+apps/erpnext/erpnext/education/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0} - {1} és estudiant inactiu
 DocType: Employee,Health Details,Detalls de la Salut
 DocType: Offer Letter,Offer Letter Terms,Oferir Termes de lletres
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,Per a crear una sol·licitud de pagament es requereix document de referència
 DocType: Payment Entry,Allocate Payment Amount,Distribuir l&#39;import de pagament
 DocType: Employee External Work History,Salary,Salari
 DocType: Serial No,Delivery Document Type,Tipus de document de lliurament
-DocType: Process Payroll,Submit all salary slips for the above selected criteria,Presenta totes les nòmines amb els criteris anteriorment seleccionats
 DocType: Sales Order,Partly Delivered,Parcialment Lliurat
 DocType: Email Digest,Receivables,Cobrables
 DocType: Lead Source,Lead Source,Origen de clients potencials
@@ -4828,18 +4872,18 @@
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Exemple :. ABCD ##### 
  Si la sèrie s'estableix i Nombre de sèrie no s'esmenta en les transaccions, nombre de sèrie a continuació automàtica es crearà sobre la base d'aquesta sèrie. Si sempre vol esmentar explícitament els números de sèrie per a aquest article. deixeu en blanc."
 DocType: Upload Attendance,Upload Attendance,Pujar Assistència
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +319,BOM and Manufacturing Quantity are required,Llista de materials i de fabricació es requereixen Quantitat
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +535,BOM and Manufacturing Quantity are required,Llista de materials i de fabricació es requereixen Quantitat
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Rang 2 Envelliment
 DocType: SG Creation Tool Course,Max Strength,força màx
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +22,BOM replaced,BOM reemplaçat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Select Items based on Delivery Date,Seleccioneu els elements segons la data de lliurament
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1041,Select Items based on Delivery Date,Seleccioneu els elements segons la data de lliurament
 ,Sales Analytics,Analytics de venda
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +119,Available {0},Disponible {0}
 ,Prospects Engaged But Not Converted,Perspectives Enganxat Però no es converteix
 DocType: Manufacturing Settings,Manufacturing Settings,Ajustaments de Manufactura
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configuració de Correu
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Sense Guardian1 mòbil
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Please enter default currency in Company Master,Si us plau ingressi moneda per defecte en l'empresa Mestre
+apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Sense Guardian1 mòbil
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +106,Please enter default currency in Company Master,Si us plau ingressi moneda per defecte en l'empresa Mestre
 DocType: Stock Entry Detail,Stock Entry Detail,Detall de les entrades d'estoc
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +109,Daily Reminders,Recordatoris diaris
 DocType: Products Settings,Home Page is Products,Home Page is Products
@@ -4848,7 +4892,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nou Nom de compte
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Cost matèries primeres subministrades
 DocType: Selling Settings,Settings for Selling Module,Ajustos Mòdul de vendes
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Customer Service,Servei Al Client
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Customer Service,Servei Al Client
 DocType: BOM,Thumbnail,Ungla del polze
 DocType: Item Customer Detail,Item Customer Detail,Item Customer Detail
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Oferta candidat a Job.
@@ -4857,8 +4901,7 @@
 DocType: Pricing Rule,Percentage,percentatge
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Article {0} ha de ser un d'article de l'estoc
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Per defecte Work In Progress Magatzem
-apps/erpnext/erpnext/config/accounts.py +296,Default settings for accounting transactions.,Ajustos predeterminats per a les operacions comptables.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,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
+apps/erpnext/erpnext/config/accounts.py +288,Default settings for accounting transactions.,Ajustos predeterminats per a les operacions comptables.
 DocType: Maintenance Visit,MV,MV
 DocType: Restaurant,Default Tax Template,Plantilla d&#39;impostos predeterminada
 DocType: Fees,Student Details,Detalls dels estudiants
@@ -4871,11 +4914,11 @@
 DocType: Sales Order,Printing Details,Impressió Detalls
 DocType: Task,Closing Date,Data de tancament
 DocType: Sales Order Item,Produced Quantity,Quantitat produïda
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +122,Engineer,Enginyer
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +126,Engineer,Enginyer
 DocType: Journal Entry,Total Amount Currency,Suma total de divises
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Assemblees Cercar Sub
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Item Code required at Row No {0},Codi de l'article necessari a la fila n {0}
-apps/erpnext/erpnext/utilities/user_progress.py +133,Go to Items,Vés als elements
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +171,Item Code required at Row No {0},Codi de l'article necessari a la fila n {0}
+apps/erpnext/erpnext/utilities/user_progress.py +151,Go to Items,Vés als elements
 DocType: Sales Partner,Partner Type,Tipus de Partner
 DocType: Purchase Taxes and Charges,Actual,Reial
 DocType: Restaurant Menu,Restaurant Manager,Gerent de restaurant
@@ -4892,35 +4935,34 @@
 DocType: Item Reorder,Re-Order Level,Re-Order Nivell
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Introduïu articles i Quantitat prevista per a les que desitja elevar les ordres de producció o descàrrega de matèries primeres per a la seva anàlisi.
 apps/erpnext/erpnext/projects/doctype/project/project.js +64,Gantt Chart,Diagrama de Gantt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Part-time,Temps parcial
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +99,Part-time,Temps parcial
 DocType: Employee,Applicable Holiday List,Llista de vacances aplicable
 DocType: Employee,Cheque,Xec
 DocType: Training Event,Employee Emails,Correus electrònics d&#39;empleats
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +59,Series Updated,Sèries Actualitzat
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Tipus d'informe és obligatori
+apps/erpnext/erpnext/accounts/doctype/account/account.py +161,Report Type is mandatory,Tipus d'informe és obligatori
 DocType: Item,Serial Number Series,Nombre de sèrie de la sèrie
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},El magatzem és obligatòria per l'article d'estoc {0} a la fila {1}
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Al detall i a l'engròs
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +45,Retail & Wholesale,Al detall i a l'engròs
 DocType: Issue,First Responded On,Primer respost el
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Creu Fitxa d'article en diversos grups
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Any fiscal Data d'Inici i Final de l'exercici fiscal data ja es troben en l'Any Fiscal {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Liquidació Data s&#39;actualitza
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +131,Split Batch,Split batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +138,Split Batch,Split batch
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Reconciliats amb èxit
 DocType: Request for Quotation Supplier,Download PDF,descarregar PDF
 DocType: Production Order,Planned End Date,Planejat Data de finalització
-apps/erpnext/erpnext/controllers/buying_controller.py +423,Please enter Schedule Date,Introduïu Calendari de data
-apps/erpnext/erpnext/config/stock.py +189,Where items are stored.,Lloc d'emmagatzematge dels articles.
+apps/erpnext/erpnext/controllers/buying_controller.py +424,Please enter Schedule Date,Introduïu Calendari de data
 DocType: Request for Quotation,Supplier Detail,Detall del proveïdor
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +100,Error in formula or condition: {0},Error en la fórmula o condició: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +16,Invoiced Amount,Quantitat facturada
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,Els pesos dels criteris han de sumar fins al 100%
-DocType: Attendance,Attendance,Assistència
+apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,Assistència
 apps/erpnext/erpnext/public/js/pos/pos.html +104,Stock Items,stockItems
 DocType: BOM,Materials,Materials
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Si no està habilitada, la llista haurà de ser afegit a cada departament en què s'ha d'aplicar."
-apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Origen i destí de dipòsit no pot ser el mateix
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +535,Posting date and posting time is mandatory,Data de publicació i l'hora de publicar és obligatori
+apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Origen i destí de dipòsit no pot ser el mateix
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +561,Posting date and posting time is mandatory,Data de publicació i l'hora de publicar és obligatori
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Plantilla d'Impostos per a les transaccions de compres
 ,Item Prices,Preus de l'article
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,En paraules seran visibles un cop que es guardi l'ordre de compra.
@@ -4933,36 +4975,36 @@
 DocType: Purchase Invoice,Advance Payments,Pagaments avançats
 DocType: Purchase Taxes and Charges,On Net Total,En total net
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Valor de l&#39;atribut {0} ha d&#39;estar dins del rang de {1} a {2} en els increments de {3} per a l&#39;article {4}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,El magatzem de destinació de la fila {0} ha de ser igual que l'Ordre de Producció
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Target warehouse in row {0} must be same as Production Order,El magatzem de destinació de la fila {0} ha de ser igual que l'Ordre de Producció
 DocType: Restaurant Reservation,Waitlisted,Waitlisted
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Moneda no es pot canviar després de fer entrades utilitzant alguna altra moneda
+apps/erpnext/erpnext/accounts/doctype/account/account.py +126,Currency can not be changed after making entries using some other currency,Moneda no es pot canviar després de fer entrades utilitzant alguna altra moneda
 DocType: Vehicle Service,Clutch Plate,placa d&#39;embragatge
 DocType: Company,Round Off Account,Per arrodonir el compte
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Administrative Expenses,Despeses d'Administració
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
+apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Pares Grup de Clients
 DocType: Journal Entry,Subscription,Subscripció
 DocType: Purchase Invoice,Contact Email,Correu electrònic de contacte
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Creació de tarifes pendents
+apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +11,Fee Creation Pending,Creació de tarifes pendents
 DocType: Appraisal Goal,Score Earned,Score Earned
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +229,Notice Period,Període de Notificació
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +239,Notice Period,Període de Notificació
 DocType: Asset Category,Asset Category Name,Nom de la categoria d&#39;actius
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,This is a root territory and cannot be edited.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nom nou encarregat de vendes
 DocType: Packing Slip,Gross Weight UOM,Pes brut UDM
 DocType: Delivery Note Item,Against Sales Invoice,Contra la factura de venda
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +141,Please enter serial numbers for serialized item ,"Si us plau, introdueixi els números de sèrie per a l&#39;article serialitzat"
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +151,Please enter serial numbers for serialized item ,"Si us plau, introdueixi els números de sèrie per a l&#39;article serialitzat"
 DocType: Bin,Reserved Qty for Production,Quantitat reservada per a la Producció
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Deixa sense marcar si no vol tenir en compte per lots alhora que els grups basats en curs.
 DocType: Asset,Frequency of Depreciation (Months),Freqüència de Depreciació (Mesos)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +493,Credit Account,Compte de Crèdit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +501,Credit Account,Compte de Crèdit
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost article
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Mostra valors zero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantitat de punt obtingut després de la fabricació / reempaque de determinades quantitats de matèries primeres
 DocType: Lab Test,Test Group,Grup de prova
 DocType: Payment Reconciliation,Receivable / Payable Account,Compte de cobrament / pagament
 DocType: Delivery Note Item,Against Sales Order Item,Contra l'Ordre de Venda d'articles
-apps/erpnext/erpnext/stock/doctype/item/item.py +694,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l&#39;atribut {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +680,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l&#39;atribut {0}"
 DocType: Item,Default Warehouse,Magatzem predeterminat
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Pressupost no es pot assignar contra comptes de grup {0}
 DocType: Healthcare Settings,Patient Registration,Registre de pacients
@@ -4989,8 +5031,8 @@
 DocType: Journal Entry,Total Debit,Dèbit total
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Defecte Acabat Productes Magatzem
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +77,Sales Person,Sales Person
-apps/erpnext/erpnext/config/accounts.py +241,Budget and Cost Center,Pressupost i de centres de cost
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +60,Multiple default mode of payment is not allowed,No es permet el mode de pagament múltiple per defecte
+apps/erpnext/erpnext/config/accounts.py +233,Budget and Cost Center,Pressupost i de centres de cost
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +65,Multiple default mode of payment is not allowed,No es permet el mode de pagament múltiple per defecte
 apps/erpnext/erpnext/templates/emails/recurring_document_failed.html +5,for the,per a la
 ,Appointment Analytics,Anàlisi de cites
 DocType: Vehicle Service,Half Yearly,Semestrals
@@ -4999,17 +5041,17 @@
 DocType: Healthcare Settings,Consultations in valid days,Consultes en dies vàlids
 DocType: Assessment Plan Criteria,Maximum Score,puntuació màxima
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Crear regles per restringir les transaccions basades en valors.
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +49, Group Roll No,Grup rotllo n
-apps/erpnext/erpnext/schools/doctype/fee_schedule/fee_schedule_list.js +9,Fee Creation Failed,Error en la creació de tarifes
+apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +49, Group Roll No,Grup rotllo n
+apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +9,Fee Creation Failed,Error en la creació de tarifes
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Deixar en blanc si fas grups d&#39;estudiants per any
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si es marca, número total. de dies de treball s'inclouran els festius, i això reduirà el valor de Salari per dia"
 DocType: Purchase Invoice,Total Advance,Avanç total
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +27,Change Template Code,Canvieu el codi de la plantilla
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"La data final de durada no pot ser anterior a la data d&#39;inici Termini. Si us plau, corregeixi les dates i torna a intentar-ho."
+apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"La data final de durada no pot ser anterior a la data d&#39;inici Termini. Si us plau, corregeixi les dates i torna a intentar-ho."
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Comte quot
 ,BOM Stock Report,La llista de materials d&#39;Informe
 DocType: Stock Reconciliation Item,Quantity Difference,quantitat Diferència
-apps/erpnext/erpnext/config/hr.py +315,Processing Payroll,Processament de Nòmina
+apps/erpnext/erpnext/config/hr.py +320,Processing Payroll,Processament de Nòmina
 DocType: Opportunity Item,Basic Rate,Tarifa Bàsica
 DocType: GL Entry,Credit Amount,Suma de crèdit
 DocType: Cheque Print Template,Signatory Position,posició signatari
@@ -5017,7 +5059,7 @@
 DocType: Timesheet,Total Billable Hours,Total d&#39;hores facturables
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Pagament de rebuts Nota
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Això es basa en transaccions en contra d&#39;aquest client. Veure cronologia avall per saber més
-DocType: Supplier,Credit Days Based On,Dies crèdit basat en
+DocType: Company,Credit Days Based On,Dies crèdit basat en
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +161,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Fila {0}: quantitat assignada {1} ha de ser menor o igual a la quantitat d&#39;entrada de pagament {2}
 ,Course wise Assessment Report,Informe d&#39;avaluació el més prudent
 DocType: Tax Rule,Tax Rule,Regla Fiscal
@@ -5028,63 +5070,63 @@
 DocType: Student,Nationality,nacionalitat
 ,Items To Be Requested,Articles que s'han de demanar
 DocType: Company,Company Info,Qui Som
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1359,Select or add new customer,Seleccionar o afegir nou client
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Cost center is required to book an expense claim,Centre de cost és requerit per reservar una reclamació de despeses
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Select or add new customer,Seleccionar o afegir nou client
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +179,Cost center is required to book an expense claim,Centre de cost és requerit per reservar una reclamació de despeses
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicació de Fons (Actius)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Això es basa en la presència d&#39;aquest empleat
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Mark Attendance
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +487,Debit Account,Compte Dèbit
+apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,Mark Attendance
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +495,Debit Account,Compte Dèbit
 DocType: Fiscal Year,Year Start Date,Any Data d'Inici
 DocType: Attendance,Employee Name,Nom de l'Empleat
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,Element de l&#39;entrada a la comanda del restaurant
-DocType: Sales Invoice,Rounded Total (Company Currency),Total arrodonit (en la divisa de la companyia)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,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 +240,{0} {1} has been modified. Please refresh.,"{0} {1} ha estat modificat. Si us plau, actualitzia"
+DocType: Purchase Invoice,Rounded Total (Company Currency),Total arrodonit (en la divisa de la companyia)
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,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 +260,{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/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Import de la compra
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +259,Supplier Quotation {0} created,Cita Proveïdor {0} creat
 apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Any de finalització no pot ser anterior inici any
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +222,Employee Benefits,Beneficis als empleats
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +232,Employee Benefits,Beneficis als empleats
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,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: Production Order,Manufactured Qty,Quantitat fabricada
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +64,Invoice Created,Factura creada
 DocType: Purchase Receipt Item,Accepted Quantity,Quantitat Acceptada
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Si us plau, estableix una llista predeterminada de festa per Empleat {0} o de la seva empresa {1}"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +242,Please set a default Holiday List for Employee {0} or Company {1},"Si us plau, estableix una llista predeterminada de festa per Empleat {0} o de la seva empresa {1}"
 apps/erpnext/erpnext/accounts/party.py +31,{0}: {1} does not exists,{0}: {1} no existeix
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +75,Select Batch Numbers,Seleccioneu els números de lot
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +76,Select Batch Numbers,Seleccioneu els números de lot
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Factures enviades als clients.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Identificació del projecte
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila n {0}: Munto no pot ser major que l&#39;espera Monto al Compte de despeses de {1}. A l&#39;espera de Monto és {2}
-DocType: Maintenance Schedule,Schedule,Horari
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +532,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila n {0}: Munto no pot ser major que l&#39;espera Monto al Compte de despeses de {1}. A l&#39;espera de Monto és {2}
+DocType: Assessment Plan,Schedule,Horari
 DocType: Account,Parent Account,Compte primària
-apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +253,Available,Disponible
+apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +266,Available,Disponible
 DocType: Quality Inspection Reading,Reading 3,Lectura 3
 ,Hub,Cub
 DocType: GL Entry,Voucher Type,Tipus de Vals
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1691,Price List not found or disabled,La llista de preus no existeix o està deshabilitada
-DocType: Lab Test,Approved,Aprovat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1706,Price List not found or disabled,La llista de preus no existeix o està deshabilitada
+DocType: Student Applicant,Approved,Aprovat
 DocType: Pricing Rule,Price,Preu
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +266,Employee relieved on {0} must be set as 'Left',Empleat rellevat en {0} ha de ser establert com 'Esquerra'
 DocType: Hub Settings,Last Sync On,Última sincronització activada
 DocType: Guardian,Guardian,tutor
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Appraisal {0} creat per Empleat {1} en l'interval de dates determinat
-DocType: Employee,Education,Educació
+DocType: Academic Term,Education,Educació
 apps/erpnext/erpnext/public/js/pos/pos.html +78,Del,del
 DocType: Selling Settings,Campaign Naming By,Naming de Campanya Per
 DocType: Employee,Current Address Is,L'adreça actual és
 apps/erpnext/erpnext/utilities/user_progress.py +48,Monthly Sales Target (,Orientació mensual de vendes (
 apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modificat
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +41,"Optional. Sets company's default currency, if not specified.","Opcional. Estableix moneda per defecte de l&#39;empresa, si no s&#39;especifica."
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +43,"Optional. Sets company's default currency, if not specified.","Opcional. Estableix moneda per defecte de l&#39;empresa, si no s&#39;especifica."
 DocType: Sales Invoice,Customer GSTIN,GSTIN client
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,Entrades de diari de Comptabilitat.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponible Quantitat a partir de Magatzem
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Seleccioneu Employee Record primer.
 DocType: POS Profile,Account for Change Amount,Compte per al Canvi Monto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,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}
-apps/erpnext/erpnext/schools/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Codi del curs:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +215,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}
+apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +9,Course Code: ,Codi del curs:
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Si us plau ingressi Compte de Despeses
 DocType: Account,Stock,Estoc
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1042,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Fila # {0}: Tipus de document de referència ha de ser un l&#39;ordre de compra, factura de compra o d&#39;entrada de diari"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1068,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Fila # {0}: Tipus de document de referència ha de ser un l&#39;ordre de compra, factura de compra o d&#39;entrada de diari"
 DocType: Employee,Current Address,Adreça actual
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Si l'article és una variant d'un altre article llavors descripció, imatges, preus, impostos etc s'establirà a partir de la plantilla a menys que s'especifiqui explícitament"
 DocType: Serial No,Purchase / Manufacture Details,Compra / Detalls de Fabricació
@@ -5095,53 +5137,50 @@
 DocType: Sales Invoice Item,Discount and Margin,Descompte i Marge
 DocType: Lab Test,Prescription,Prescripció
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Ordres de venda i halar (pendent d'entregar) basat en els criteris anteriors
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +90,Not Available,No Disponible
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +98,Not Available,No Disponible
 DocType: Pricing Rule,Min Qty,Quantitat mínima
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.js +36,Disable Template,Desactiva la plantilla
-DocType: Asset Movement,Transaction Date,Data de Transacció
+DocType: GL Entry,Transaction Date,Data de Transacció
 DocType: Production Plan Item,Planned Qty,Planificada Quantitat
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +121,Total Tax,Impost Total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +177,For Quantity (Manufactured Qty) is mandatory,Per Quantitat (Fabricat Quantitat) és obligatori
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +182,For Quantity (Manufactured Qty) is mandatory,Per Quantitat (Fabricat Quantitat) és obligatori
 DocType: Stock Entry,Default Target Warehouse,Magatzem de destí predeterminat
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (En la moneda de la Companyia)
-apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,"L&#39;Any Data de finalització no pot ser anterior a la data d&#39;inici d&#39;any. Si us plau, corregeixi les dates i torna a intentar-ho."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Fila {0}: Partit Tipus i Partit és aplicable únicament contra el compte de cobrament / pagament
+apps/erpnext/erpnext/education/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,"L&#39;Any Data de finalització no pot ser anterior a la data d&#39;inici d&#39;any. Si us plau, corregeixi les dates i torna a intentar-ho."
 DocType: Notification Control,Purchase Receipt Message,Rebut de Compra Missatge
 DocType: BOM,Scrap Items,Els productes de rebuig
 DocType: Production Order,Actual Start Date,Data d'inici real
 DocType: Sales Order,% of materials delivered against this Sales Order,% de materials lliurats d'aquesta Ordre de Venda
-apps/erpnext/erpnext/config/stock.py +12,Record item movement.,Desa el Moviment d'article
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +57,Set default mode of payment,Estableix el mode de pagament per defecte
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +62,Set default mode of payment,Estableix el mode de pagament per defecte
+DocType: Grant Application,Withdrawn,Retirat
 DocType: Hub Settings,Hub Settings,Ajustaments Hub
 DocType: Project,Gross Margin %,Marge Brut%
 DocType: BOM,With Operations,Amb Operacions
-apps/erpnext/erpnext/accounts/party.py +264,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Assentaments comptables ja s&#39;han fet en moneda {0} per a la companyia de {1}. Seleccioneu un compte per cobrar o per pagar amb la moneda {0}.
+apps/erpnext/erpnext/accounts/party.py +262,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Assentaments comptables ja s&#39;han fet en moneda {0} per a la companyia de {1}. Seleccioneu un compte per cobrar o per pagar amb la moneda {0}.
 DocType: Asset,Is Existing Asset,És existent d&#39;actius
 DocType: Salary Detail,Statistical Component,component estadística
 DocType: Warranty Claim,If different than customer address,Si és diferent de la direcció del client
 DocType: Purchase Invoice,Without Payment of Tax,Sense pagament d&#39;impostos
 DocType: BOM Operation,BOM Operation,BOM Operació
 DocType: Purchase Taxes and Charges,On Previous Row Amount,A limport de la fila anterior
-DocType: Student,Home Address,Adreça de casa
 DocType: Item,Has Expiry Date,Té data de caducitat
-apps/erpnext/erpnext/config/stock.py +111,Item Variant Settings.,Configuració de la variant de l&#39;element.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +249,Transfer Asset,actius transferència
+apps/erpnext/erpnext/assets/doctype/asset/asset.js +269,Transfer Asset,actius transferència
 DocType: POS Profile,POS Profile,POS Perfil
 DocType: Training Event,Event Name,Nom de l&#39;esdeveniment
 DocType: Physician,Phone (Office),Telèfon (oficina)
-apps/erpnext/erpnext/hooks.py +147,Admission,admissió
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Admissions for {0},Les admissions per {0}
-apps/erpnext/erpnext/config/accounts.py +265,"Seasonality for setting budgets, targets etc.","L'estacionalitat d'establir pressupostos, objectius, etc."
+apps/erpnext/erpnext/hooks.py +151,Admission,admissió
+apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},Les admissions per {0}
+apps/erpnext/erpnext/config/accounts.py +257,"Seasonality for setting budgets, targets etc.","L'estacionalitat d'establir pressupostos, objectius, etc."
 DocType: Supplier Scorecard Scoring Variable,Variable Name,Nom de la variable
-apps/erpnext/erpnext/stock/get_item_details.py +147,"Item {0} is a template, please select one of its variants","Article {0} és una plantilla, per favor seleccioni una de les seves variants"
+apps/erpnext/erpnext/stock/get_item_details.py +142,"Item {0} is a template, please select one of its variants","Article {0} és una plantilla, per favor seleccioni una de les seves variants"
 DocType: Asset,Asset Category,categoria actius
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Salari net no pot ser negatiu
 DocType: Assessment Plan,Room,habitació
 DocType: Purchase Order,Advance Paid,Bestreta pagada
 DocType: Item,Item Tax,Impost d'article
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Material to Supplier,Materials de Proveïdor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +384,Excise Invoice,Impostos Especials Factura
-apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Llindar {0}% apareix més d&#39;una vegada
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +868,Material to Supplier,Materials de Proveïdor
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +594,Excise Invoice,Impostos Especials Factura
+apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Llindar {0}% apareix més d&#39;una vegada
 DocType: Expense Claim,Employees Email Id,Empleats Identificació de l'email
 DocType: Employee Attendance Tool,Marked Attendance,assistència marcada
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Current Liabilities,Passiu exigible
@@ -5150,15 +5189,14 @@
 DocType: Program,Program Name,Nom del programa
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Consider Tax or Charge for
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,La quantitat actual és obligatòria
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +80,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} té actualment un {1} Quadre de comandament del proveïdor en peu, i les ordres de compra d&#39;aquest proveïdor s&#39;han de fer amb precaució."
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +81,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} té actualment un {1} Quadre de comandament del proveïdor en peu, i les ordres de compra d&#39;aquest proveïdor s&#39;han de fer amb precaució."
 DocType: Employee Loan,Loan Type,Tipus de préstec
 DocType: Scheduling Tool,Scheduling Tool,Eina de programació
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Credit Card,Targeta De Crèdit
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +180,Credit Card,Targeta De Crèdit
 DocType: BOM,Item to be manufactured or repacked,Article que es fabricarà o embalarà de nou
-apps/erpnext/erpnext/config/stock.py +184,Default settings for stock transactions.,Ajustos per defecte per a les transaccions de valors.
 DocType: Employee Education,Major/Optional Subjects,Major/Optional Subjects
 DocType: Sales Invoice Item,Drop Ship,Nau de la gota
-DocType: Hub Settings,Suspended,Suspès
+DocType: Driver,Suspended,Suspès
 DocType: Training Event,Attendees,els assistents
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aquí pot mantenir els detalls de la família com el nom i ocupació dels pares, cònjuge i fills"
 DocType: Academic Term,Term End Date,Termini Data de finalització
@@ -5167,13 +5205,13 @@
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Des moneda i moneda no pot ser el mateix
 DocType: Stock Entry,Repack,Torneu a embalar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Has de desar el formulari abans de continuar
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +96,Please select the Company first,Seleccioneu primer la companyia
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +113,Please select the Company first,Seleccioneu primer la companyia
 DocType: Item Attribute,Numeric Values,Els valors numèrics
-apps/erpnext/erpnext/public/js/setup_wizard.js +52,Attach Logo,Adjuntar Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +56,Attach Logo,Adjuntar Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +43,Stock Levels,Els nivells d&#39;existències
 DocType: Customer,Commission Rate,Percentatge de comissió
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,S&#39;ha creat {0} quadres de paràgraf per {1} entre:
-apps/erpnext/erpnext/stock/doctype/item/item.js +346,Make Variant,Fer Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +472,Make Variant,Fer Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquejar sol·licituds d'absències per departament.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +144,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipus de pagament ha de ser un Rebre, Pagar i Transferència interna"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analítica
@@ -5181,7 +5219,7 @@
 DocType: Vehicle,Model,model
 DocType: Production Order,Actual Operating Cost,Cost de funcionament real
 DocType: Payment Entry,Cheque/Reference No,Xec / No. de Referència
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root no es pot editar.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +83,Root cannot be edited.,Root no es pot editar.
 DocType: Item,Units of Measure,Unitats de mesura
 DocType: Manufacturing Settings,Allow Production on Holidays,Permetre Producció en Vacances
 DocType: Sales Order,Customer's Purchase Order Date,Data de l'ordre de compra del client
@@ -5194,39 +5232,37 @@
 DocType: Company,Existing Company,companyia existent
 DocType: Healthcare Settings,Result Emailed,Resultat enviat per correu electrònic
 apps/erpnext/erpnext/controllers/buying_controller.py +84,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",Categoria impost ha estat canviat a &quot;total&quot; perquè tots els articles són articles no estan en estoc
-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/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Seleccioneu un arxiu csv
 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
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,productes destacats
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Designer,Dissenyador
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +136,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +487,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}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +491,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
 ,Item-wise Purchase Register,Registre de compra d'articles
-DocType: Batch,Expiry Date,Data De Caducitat
+DocType: Driver,Expiry Date,Data De Caducitat
 DocType: Healthcare Settings,Employee name and designation in print,Nom de l&#39;empleat i designació en format imprès
 ,accounts-browser,comptes en navegador
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +351,Please select Category first,"Si us plau, Selecciona primer la Categoria"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +368,Please select Category first,"Si us plau, Selecciona primer la Categoria"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projecte mestre.
 apps/erpnext/erpnext/controllers/status_updater.py +209,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Per permetre que l&#39;excés de facturació o excés de comandes, actualitzar &quot;Assignació&quot; a l&#39;arxiu Configuració o l&#39;article."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No mostrar qualsevol símbol com $ etc costat de monedes.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Mig dia)
-DocType: Supplier,Credit Days,Dies de Crèdit
+DocType: Payment Term,Credit Days,Dies de Crèdit
 apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,Fer lots Estudiant
 DocType: Fee Schedule,FRQ.,FRQ.
 DocType: Leave Type,Is Carry Forward,Is Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +815,Get Items from BOM,Obtenir elements de la llista de materials
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +840,Get Items from BOM,Obtenir elements de la llista de materials
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Temps de Lliurament Dies
-apps/erpnext/erpnext/controllers/accounts_controller.py +556,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 +600,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"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +182,Not Submitted Salary Slips,No Enviat a salaris relliscades
 ,Stock Summary,Resum de la
-apps/erpnext/erpnext/config/accounts.py +280,Transfer an asset from one warehouse to another,Transferir un actiu d&#39;un magatzem a un altre
+apps/erpnext/erpnext/config/assets.py +50,Transfer an asset from one warehouse to another,Transferir un actiu d&#39;un magatzem a un altre
 DocType: Vehicle,Petrol,gasolina
 apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Llista de materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Fila {0}: Partit Tipus i Partit es requereix per al compte per cobrar / pagar {1}
@@ -5236,9 +5272,9 @@
 DocType: Employee Loan Application,Rate of Interest,Tipus d&#39;interès
 DocType: Expense Claim Detail,Sanctioned Amount,Sanctioned Amount
 DocType: GL Entry,Is Opening,Està obrint
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Fila {0}: seient de dèbit no pot vincular amb un {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +194,Row {0}: Debit entry can not be linked with a {1},Fila {0}: seient de dèbit no pot vincular amb un {1}
 DocType: Journal Entry,Subscription Section,Secció de subscripció
-apps/erpnext/erpnext/accounts/doctype/account/account.py +193,Account {0} does not exist,El compte {0} no existeix
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account {0} does not exist,El compte {0} no existeix
 DocType: Training Event,Training Program,Programa d&#39;entrenament
 DocType: Account,Cash,Efectiu
 DocType: Employee,Short biography for website and other publications.,Breu biografia de la pàgina web i altres publicacions.