diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index 7983a9a..ffb20d6 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Salary Mode
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Seleccioneu Distribució mensual, si voleu fer un seguiment basat en l'estacionalitat."
 DocType: Employee,Divorced,Divorciat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Advertència: El mateix article s&#39;ha introduït diverses vegades.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Advertència: El mateix article s&#39;ha introduït diverses vegades.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Productes ja sincronitzen
 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/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Productes de Consum
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Productes de Consum
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Seleccioneu Partit Tipus primer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Recuit
 DocType: Item,Customer Items,Articles de clients
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,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
@@ -20,15 +19,14 @@
 DocType: About Us Settings,Website,Lloc web
 DocType: POS Profile,Applicable for User,Aplicable per a l&#39;usuari
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"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/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactació més sinterització
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Informa de la divisa pera la Llista de preus {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Es calcularà en la transacció.
 DocType: Purchase Order,Customer Contact,Client Contacte
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,De Sol·licituds de materials
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,From Material Request,De Sol·licituds de materials
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Arbre
 DocType: Job Applicant,Job Applicant,Job Applicant
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hi ha més resultats.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Legal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Legal
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,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&#39;article a la fila {0}
 DocType: C-Form,Customer,Client
 DocType: Purchase Receipt Item,Required By,Requerit per
@@ -43,7 +41,6 @@
 DocType: Manufacturing Settings,Default 10 mins,Per defecte 10 minuts
 DocType: Leave Type,Leave Type Name,Deixa Tipus Nom
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Sèrie actualitzat correctament
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Puntades
 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
@@ -51,8 +48,8 @@
 DocType: Quality Inspection Reading,Parameter,Paràmetre
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Esperat Data de finalització no pot ser inferior a Data prevista d&#39;inici
 apps/erpnext/erpnext/utilities/transaction_base.py +104,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 +189,New Leave Application,Nova aplicació Deixar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Lletra bancària
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Nova aplicació Deixar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Lletra bancària
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Utilitza aquesta opció per mantenir el codi de l'article del client i incloure'l en les cerques en base al seu codi
 DocType: Mode of Payment Account,Mode of Payment Account,Mode de Compte de Pagament
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostra variants
@@ -64,25 +61,23 @@
 DocType: Production Plan Item,Production Plan Item,Pla de Producció d'articles
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},L'usuari {0} ja està assignat a l'Empleat {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Fes el teu nou perfil de POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Sanitari
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sanitari
 DocType: Purchase Invoice,Monthly,Mensual
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Retard en el pagament (dies)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +519,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodicitat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Adreça de correu electrònic
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Defensa
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Adreça de correu electrònic
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Puntuació (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,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 +67,Row # {0}:,Fila # {0}: 
 DocType: Delivery Note,Vehicle No,Vehicle n
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Seleccionla llista de preus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Tractament de la fusta
 DocType: Production Order Operation,Work In Progress,Treball en curs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,La impressió 3D
 DocType: Employee,Holiday List,Llista de vacances
 DocType: Time Log,Time Log,Hora de registre
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Accountant
+apps/erpnext/erpnext/public/js/setup_wizard.js +274,Accountant,Accountant
 DocType: Cost Center,Stock User,Fotografia de l&#39;usuari
 DocType: Company,Phone No,Telèfon No
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Bloc d'activitats realitzades pels usuaris durant les feines que es poden utilitzar per al seguiment del temps, facturació."
@@ -98,18 +93,19 @@
 DocType: Bin,Quantity Requested for Purchase,Quantitat sol·licitada per a la compra
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Adjunta el fitxer .csv amb dues columnes, una per al nom antic i un altre per al nou nom"
 DocType: Packed Item,Parent Detail docname,Docname Detall de Pares
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,L'obertura per a una ocupació.
 DocType: Item Attribute,Increment,Increment
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Seleccioneu Magatzem ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Publicitat
+apps/erpnext/erpnext/setup/setup_wizard/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&#39;introdueix més d&#39;una vegada
 DocType: Employee,Married,Casat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,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/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},L'estoc no es pot actualitzar contra la Nota de Lliurament {0}
 DocType: Payment Reconciliation,Reconcile,Conciliar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Botiga
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Botiga
 DocType: Quality Inspection Reading,Reading 1,Lectura 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Feu entrada del banc
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fons de Pensions
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fons de Pensions
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Warehouse és obligatori si el tipus de compte és Magatzem
 DocType: SMS Center,All Sales Person,Tot el personal de vendes
 DocType: Lead,Person Name,Nom de la Persona
@@ -131,7 +127,7 @@
 DocType: Quality Inspection,Get Specification Details,Obtenir Detalls d'Especificacions
 DocType: Lead,Interested,Interessat
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Llista de materials (BOM)
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Obertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Obertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Des {0} a {1}
 DocType: Item,Copy From Item Group,Copiar del Grup d'Articles
 DocType: Journal Entry,Opening Entry,Entrada Obertura
@@ -145,23 +141,22 @@
 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 +22,Target On,Target On
 DocType: BOM,Total Cost,Cost total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Mandrinatge
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registre d'activitat:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,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/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Real Estate
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Estat de compte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Farmacèutics
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmacèutics
 DocType: Expense Claim Detail,Claim Amount,Reclamació Import
 DocType: Employee,Mr,Sr
 DocType: Custom Script,Client,Client
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tipus de Proveïdor / distribuïdor
 DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumible
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Consumable,Consumible
 DocType: Upload Attendance,Import Log,Importa registre
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Enviar
 DocType: Sales Invoice Item,Delivered By Supplier,Lliurat per proveïdor
 DocType: SMS Center,All Contact,Tots els contactes
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Salari Anual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Salari Anual
 DocType: Period Closing Voucher,Closing Fiscal Year,Tancant l'Any Fiscal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Despeses d'estoc
 DocType: Newsletter,Email Sent?,Email Sent?
@@ -169,7 +164,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Mostrar Registres Temps
 DocType: Journal Entry Account,Credit in Company Currency,Crèdit en moneda Companyia
 DocType: Delivery Note,Installation Status,Estat d'instal·lació
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,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/stock/doctype/purchase_receipt/purchase_receipt.py +118,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: Item,Supply Raw Materials for Purchase,Materials Subministrament primeres per a la Compra
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,L'Article {0} ha de ser un article de compra
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,19 +172,17 @@
  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 +446,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: Time Log Batch,Will be updated after Sales Invoice is Submitted.,S'actualitzarà després de la presentació de la factura de venda.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per incloure l'impost a la fila {0} en la tarifa d'article, els impostos a les files {1} també han de ser inclosos"
+apps/erpnext/erpnext/controllers/accounts_controller.py +494,"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 +90,Settings for HR Module,Ajustaments per al Mòdul de Recursos Humans
 DocType: SMS Center,SMS Center,Centre d'SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Redreçar
 DocType: BOM Replace Tool,New BOM,Nova llista de materials
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Lot Registres de temps per a la facturació.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Colada per contra
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,El Newsletter ja s'ha enviat
 DocType: Lead,Request Type,Tipus de sol·licitud
 DocType: Leave Application,Reason,Raó
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Radiodifusió
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Execució
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,El primer usuari es convertirà en l'Administrador del sistema (que pot canviar això més endavant).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Radiodifusió
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Execució
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,El primer usuari es convertirà en l'Administrador del sistema (que pot canviar això més endavant).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Els detalls de les operacions realitzades.
 DocType: Serial No,Maintenance Status,Estat de manteniment
 apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Articles i preus
@@ -206,7 +199,6 @@
 DocType: Pricing Rule,Discount on Price List Rate (%),Descompte Preu de llista Taxa (%)
 apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Començar
 DocType: User,First Name,Nom De Pila
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Fosa de motlle complet
 DocType: Offer Letter,Select Terms and Conditions,Selecciona Termes i Condicions
 DocType: Production Planning Tool,Sales Orders,Ordres de venda
 DocType: Purchase Taxes and Charges,Valuation,Valoració
@@ -218,8 +210,7 @@
 DocType: Bank Reconciliation,Bank Account,Compte Bancari
 DocType: Leave Type,Allow Negative Balance,Permetre balanç negatiu
 DocType: Selling Settings,Default Territory,Territori per defecte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televisió
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/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/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},El compte {0} no pertany a l'empresa {1}
 DocType: Naming Series,Series List for this Transaction,Llista de Sèries per a aquesta transacció
@@ -234,14 +225,13 @@
 DocType: Leave Allocation,Add unused leaves from previous allocations,Afegir les fulles no utilitzats de les assignacions anteriors
 apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Següent Recurrent {0} es crearà a {1}
 DocType: Newsletter List,Total Subscribers,Els subscriptors totals
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nom de Contacte
+,Contact Name,Nom de Contacte
 DocType: Production Plan Item,SO Pending Qty,SO Pendent Quantitat
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea nòmina per als criteris abans esmentats.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Sol·licitud de venda.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Habitatge Doble
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,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/leave_application/leave_application.py +171,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 +114,Relieving Date must be greater than Date of Joining,Alleujar data ha de ser major que la data de Unir
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Deixa per any
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Deixa per any
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Si us plau, estableix Naming Sèries per {0} a través de Configuració&gt; Configuració&gt; Sèrie Naming"
 DocType: Time Log,Will be updated when batched.,Will be updated when batched.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,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ó."
@@ -250,25 +240,24 @@
 DocType: Item Website Specification,Item Website Specification,Especificacions d'article al Web
 DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Referència número
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Absència bloquejada
-apps/erpnext/erpnext/stock/doctype/item/item.py +535,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/leave_application/leave_application.py +392,Leave Blocked,Absència bloquejada
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,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/accounts/utils.py +339,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: Lead,Do Not Contact,No entri en contacte
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,L'identificador únic per al seguiment de totes les factures recurrents. Es genera a enviar.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Desenvolupador de Programari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,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: Item,Publish in Hub,Publicar en el Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +555,Item {0} is cancelled,L'article {0} està cancel·lat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Sol·licitud de materials
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Item {0} is cancelled,L'article {0} està cancel·lat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,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 +323,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}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Raspall de filferro
 DocType: Employee,Relation,Relació
 DocType: Shipping Rule,Worldwide Shipping,Enviament mundial
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Comandes en ferm dels clients.
@@ -284,12 +273,11 @@
 DocType: Supplier,Address HTML,Adreça HTML
 DocType: Lead,Mobile No.,No mòbil
 DocType: Maintenance Schedule,Generate Schedule,Generar Calendari
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Cap de despeses
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Seleccioneu Tipus de Càrrec primer
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Més recent
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 caràcters
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Selecciona el teu idioma
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 caràcters
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +245,Select Your Language,Selecciona el teu idioma
 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: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Desactiva la creació de registres de temps en contra de les ordres de fabricació. Les operacions no seran objecte de seguiment contra l&#39;Ordre de Producció
@@ -301,8 +289,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Article {0} ha de ser Servei d'articles
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Completat Quantitat no pot ser major que 'Cant de Fabricació'
 DocType: DocType,Administrator,Administrador
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Perforació per làser
-DocType: Stock UOM Replace Utility,New Stock UOM,Nova UDM d'existències
 DocType: Period Closing Voucher,Closing Account Head,Tancant el Compte principal
 DocType: Employee,External Work History,Historial de treball extern
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Referència Circular Error
@@ -311,18 +297,15 @@
 DocType: Lead,Industry,Indústria
 DocType: Employee,Job Profile,Perfil Laboral
 DocType: Newsletter,Newsletter,Newsletter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Petoneig
 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
 DocType: Journal Entry,Multi Currency,Multi moneda
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,L'article s'ha actualitzat
 DocType: Async Task,System Manager,Administrador del sistema
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipus de Factura
 DocType: Sales Invoice Item,Delivery Note,Nota de lliurament
 DocType: Dropbox Backup,Allow Dropbox Access,Allow Dropbox Access
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configuració d&#39;Impostos
 apps/erpnext/erpnext/accounts/utils.py +189,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 +343,{0} entered twice in Item Tax,{0} entrat dues vegades en l'Impost d'article
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{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 +105,Summary for this week and pending activities,Resum per a aquesta setmana i activitats pendents
 DocType: Workstation,Rent Cost,Cost de lloguer
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Selecciona el mes i l'any
@@ -339,24 +322,22 @@
 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: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible a la llista de materials, nota de lliurament, factura de compra, ordre de producció, ordres de compra, rebut de compra, factura de venda, ordres de venda, entrada d'estoc, fulla d'hores"
 DocType: Item Tax,Tax Rate,Tax Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Seleccioneu Producte
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Select Item,Seleccioneu Producte
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Article: {0} gestionat per lots, no pot conciliar l'ús \
  Stock Reconciliació, en lloc d'utilitzar l'entrada Stock"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,La Factura de compra {0} ja està Presentada
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,La Factura de compra {0} ja està Presentada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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/account/account.js +54,Convert to non-Group,Convertir la no-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Rebut de compra s'ha de presentar
-DocType: Stock UOM Replace Utility,Current Stock UOM,Estoc actual UOM
 apps/erpnext/erpnext/config/stock.py +53,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 +223,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/templates/includes/footer/footer_extension.html +7,Your email address,La seva adreça de correu electrònic
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Si us plau, vegeu el document adjunt"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +203,Please see attachment,"Si us plau, vegeu el document adjunt"
 DocType: Purchase Order,% Received,% Rebut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Tall per raig d&#39;aigua
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Configuració acabada !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +20,Setup Already Complete!!,Configuració acabada !!
 ,Finished Goods,Béns Acabats
 DocType: Delivery Note,Instructions,Instruccions
 DocType: Quality Inspection,Inspected By,Inspeccionat per
@@ -371,6 +352,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"Si us plau, no crear comptes de clients i proveïdors. Es creen directament dels mestres al client / proveïdor."
 DocType: Currency Exchange,Currency Exchange,Valor de Canvi de divisa
 DocType: Purchase Invoice 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)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo creditor
 DocType: Employee,Widowed,Vidu
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Els productes que es sol·licitaran i que estan ""Esgotat"", considerant tots els magatzems basat en Quantitat projectada i quantitat mínima de comanda"
@@ -380,11 +362,10 @@
 ,Purchase Register,Compra de Registre
 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 +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ha de tenir paper 'Deixar aprovador'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ha de tenir paper 'Deixar aprovador'
 DocType: Purchase Receipt,Vehicle Date,Data de Vehicles
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Metge
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Metge
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Motiu de pèrdua
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Abaloris Tub
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,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}
 DocType: Employee,Single,Solter
 DocType: Issue,Attachment,Accessori
@@ -405,10 +386,8 @@
 DocType: Account,Is Group,És el Grup
 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/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,De tall longitudinal
 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/page/setup_wizard/install_fixtures.py +104,Non Profit,Sense ànim de lucre
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Sense ànim de lucre
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Sense començar
 DocType: Lead,Channel Partner,Partner de Canal
 DocType: Account,Old Parent,Antic Pare
@@ -417,13 +396,12 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,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 +512,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 +516,Attribute {0} selected multiple times in Attributes Table,Atribut {0} seleccionat diverses vegades en la taula Atributs
 DocType: Sales Order,Not Applicable,No Aplicable
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Mestre de vacances.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Emmotllament Shell
 DocType: Material Request Item,Required Date,Data Requerit
 DocType: Delivery Note,Billing Address,Direcció De Enviament
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Si us plau, introduïu el codi d'article."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +648,Please enter Item Code.,"Si us plau, introduïu el codi d'article."
 DocType: BOM,Costing,Costejament
 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"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Quantitat total
@@ -433,7 +411,7 @@
 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
 DocType: Features Setup,Imports,Importacions
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,La unió adhesiva
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Fulles totals assignats és obligatori
 DocType: Job Opening,Description of a Job Opening,Descripció d'una oferta de treball
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Activitats pendents per avui
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Registre d'assistència.
@@ -441,26 +419,25 @@
 DocType: Sales Order Item,Used for Production Plan,S'utilitza per al Pla de Producció
 DocType: System Settings,Loading...,Carregant ...
 DocType: DocField,Password,Contrasenya
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Modelat per deposició fosa
 DocType: Manufacturing Settings,Time Between Operations (in mins),Temps entre operacions (en minuts)
 DocType: Customer,Buyer of Goods and Services.,Compradors de Productes i Serveis.
 DocType: Journal Entry,Accounts Payable,Comptes Per Pagar
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Afegir Subscriptors
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" no existeix"
 DocType: Pricing Rule,Valid Upto,Vàlid Fins
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,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/public/js/setup_wizard.js +304,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Ingrés Directe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"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/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Oficial Administratiu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Oficial Administratiu
 DocType: Payment Tool,Received Or Paid,Rebut o pagat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Seleccioneu de l&#39;empresa
 DocType: Stock Entry,Difference Account,Compte de diferències
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,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 +305,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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Productes cosmètics
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Productes cosmètics
 DocType: DocField,Type,Tipus
-apps/erpnext/erpnext/stock/doctype/item/item.py +417,"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/stock/doctype/item/item.py +421,"To merge, following properties must be same for both items","Per fusionar, propietats han de ser el mateix per a tots dos articles"
 DocType: Communication,Subject,Subjecte
 DocType: Shipping Rule,Net Weight,Pes Net
 DocType: Employee,Emergency Phone,Telèfon d'Emergència
@@ -470,7 +447,6 @@
 DocType: Journal Entry,Difference (Dr - Cr),Diferència (Dr - Cr)
 DocType: Account,Profit and Loss,Pèrdues i Guanys
 apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Subcontractació Gestió
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,La nova UDM no pot ser de tipus Número sencer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mobles
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Valor pel qual la divisa de la llista de preus es converteix a la moneda base de la companyia
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Compte {0} no pertany a la companyia: {1}
@@ -490,14 +466,14 @@
 DocType: Purchase Invoice,Supplier Invoice No,Número de Factura de Proveïdor
 DocType: Territory,For reference,Per referència
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"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/public/js/account_tree_grid.js +52,Closing (Cr),Tancament (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Tancament (Cr)
 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
 ,Pending Qty,Pendent Quantitat
 DocType: Job Applicant,Thread HTML,Thread HTML
 DocType: Company,Ignore,Ignorar
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS enviat als telèfons: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Magatzem obligatori per rebut de compra de subcontractació de proveïdors
+apps/erpnext/erpnext/controllers/buying_controller.py +126,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
 DocType: Sales Invoice,Total Commission,Total Comissió
 DocType: Pricing Rule,Sales Partner,Soci de vendes
@@ -507,7 +483,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Distribució Mensual ** l'ajuda a distribuir el seu pressupost a través de mesos si té l'estacionalitat del seu negoci.
 
  Per distribuir un pressupost utilitzant aquesta distribució, establir aquesta distribució mensual ** ** ** al centre de costos **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,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.py +130,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 +20,Please select Company and Party Type first,Seleccioneu de l'empresa i el Partit Tipus primer
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Exercici comptabilitat /.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Ho sentim, els números de sèrie no es poden combinar"
@@ -523,25 +499,25 @@
 DocType: Sales Order,Billing and Delivery Status,Facturació i Lliurament Estat
 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/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Anterior
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +16,Previous,Anterior
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Devolucions de vendes
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Seleccioneu ordres de venda a partir del qual vol crear ordres de producció.
 DocType: Item,Delivered by Supplier (Drop Ship),Lliurat pel proveïdor (nau)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Components salarials.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Base de dades de clients potencials.
+DocType: Authorization Rule,Customer or Item,Client o article
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Base de dades de clients.
 DocType: Quotation,Quotation To,Oferta per
 DocType: Lead,Middle Income,Ingrés Mig
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Obertura (Cr)
 apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Suma assignat no pot ser negatiu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Quantitat facturada
 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.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},No de referència i obres de consulta Data es requereix per {0}
 DocType: Event,Wednesday,Dimecres
 DocType: Sales Invoice,Customer's Vendor,Venedor del Client
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ordre de Producció és obligatori
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Redacció de propostes
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Redacció de propostes
 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
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatiu Stock Error ({6}) per al punt {0} a Magatzem {1} a {2} {3} a {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Any fiscal Companyia
@@ -564,7 +540,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","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/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Si us plau, instal leu el mòdul python dropbox"
 DocType: Employee,Passport Number,Nombre de Passaport
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Gerent
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Gerent
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Des rebut de compra
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,El mateix article s'ha introduït diverses vegades.
 DocType: SMS Settings,Receiver Parameter,Paràmetre de Receptor
@@ -572,10 +548,9 @@
 DocType: Sales Person,Sales Person Targets,Objectius persona de vendes
 apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,A
 apps/frappe/frappe/templates/base.html +145,Please enter email address,Introduïu l'adreça de correu electrònic
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Fi tub formant
 DocType: Production Order Operation,In minutes,En qüestió de minuts
 DocType: Issue,Resolution Date,Resolució Data
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},"Si us plau, estableix pagament en efectiu o Compte bancari predeterminat a la Forma de pagament {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,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}"
 DocType: Selling Settings,Customer Naming By,Customer Naming By
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convertir el Grup
 DocType: Activity Cost,Activity Type,Tipus d'activitat
@@ -583,12 +558,12 @@
 DocType: Customer,Fixed Days,Dies Fixos
 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/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publicant
+apps/erpnext/erpnext/setup/setup_wizard/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 +198,{0}: {1} not found in Invoice Details table,{0}: {1} no es troba a Detalls de la factura taula
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} no es troba a Detalls de la factura taula
 DocType: Company,Round Off Cost Center,Completen centres de cost
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,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 +203,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: Material Request,Material Transfer,Transferència de material
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,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}
@@ -600,7 +575,6 @@
 DocType: Pricing Rule,Sales Manager,Gerent De Vendes
 apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Canviar el nom
 DocType: Journal Entry,Write Off Amount,Anota la quantitat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Doblegat
 apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permetre a l'usuari
 DocType: Journal Entry,Bill No,Factura Número
 DocType: Purchase Invoice,Quarterly,Trimestral
@@ -610,17 +584,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Entra els detalls de l'article
 DocType: Purchase Receipt,Other Details,Altres detalls
 DocType: Account,Accounts,Comptes
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Màrqueting
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Esquila Recta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Màrqueting
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Per realitzar el seguiment de l'article en vendes i documents de compra en base als seus números de sèrie. Aquest és també pugui utilitzat per rastrejar informació sobre la garantia del producte.
 DocType: Purchase Receipt Item Supplied,Current Stock,Estoc actual
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Cal indicar el magatzem de no conformitats per la partida rebutjada
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Cal indicar el magatzem de no conformitats per la partida rebutjada
 DocType: Account,Expenses Included In Valuation,Despeses incloses en la valoració
 DocType: Employee,Provide email id registered in company,Provide email id registered in company
 DocType: Hub Settings,Seller City,Ciutat del venedor
 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
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item has variants.,L&#39;article té variants.
+apps/erpnext/erpnext/stock/doctype/item/item.py +496,Item has variants.,L&#39;article té variants.
 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/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tipus Arbre
@@ -629,10 +602,9 @@
 DocType: Material Request Item,Quantity and Warehouse,Quantitat i Magatzem
 DocType: Sales Invoice,Commission Rate (%),Comissió (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Contra val Type ha de ser un comandes de venda, factura de venda o entrada de diari"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,No es pot trobar el tipus de canvi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aeroespacial
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Benvinguda
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aeroespacial
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +40,Welcome,Benvinguda
 DocType: Journal Entry,Credit Card Entry,Introducció d'una targeta de crèdit
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Tasca Assumpte
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Productes rebuts de proveïdors.
@@ -655,19 +627,19 @@
 DocType: Employee,Cell Number,Número de cel·la
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdut
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,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/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Oportunitat De
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Nòmina mensual.
 DocType: Item Group,Website Specifications,Especificacions del lloc web
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nou Compte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Des {0} de tipus {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Fila {0}: el factor de conversió és obligatori
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Fila {0}: el factor de conversió és obligatori
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Entrades de Comptabilitat es poden fer en contra de nodes fulla. No es permeten els comentaris en contra dels grups.
 DocType: ToDo,High,Alt
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,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
 DocType: User,Male,Home
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Nombre de recepció de compra d'articles requerits per {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +183,Purchase Receipt number required for Item {0},Nombre de recepció de compra d'articles requerits per {0}
 DocType: Item Attribute Value,Item Attribute Value,Element Atribut Valor
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campanyes de venda.
 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.
@@ -715,10 +687,9 @@
 DocType: Address,Personal,Personal
 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/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Seient {0} està enllaçat amb l'Ordre {1}, comproveu si ha de tirar com avançament en aquesta factura."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotecnologia
+apps/erpnext/erpnext/controllers/accounts_controller.py +325,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Seient {0} està enllaçat amb l'Ordre {1}, comproveu si ha de tirar com avançament en aquesta factura."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotecnologia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Despeses de manteniment d'oficines
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Si us plau entra primer l'article
 DocType: Account,Liability,Responsabilitat
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,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}.
@@ -731,10 +702,10 @@
 DocType: Company,Default Bank Account,Compte bancari per defecte
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"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},&quot;Actualització de la &#39;no es pot comprovar perquè els articles no es lliuren a través de {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Ens
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,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
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detall Conciliació Bancària
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Els meus Factures
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Els meus Factures
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,No s'ha trobat cap empeat
 DocType: Purchase Order,Stopped,Detingut
 DocType: Item,If subcontracted to a vendor,Si subcontractat a un proveïdor
@@ -753,35 +724,33 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Per habilitar les característiques de &quot;Punt de Venda&quot;
 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 +326,{0} against Bill {1} dated {2},{0} contra Bill {1} ​​{2} de data
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} contra Bill {1} ​​{2} de data
 DocType: Comment,Reference Name,Referència Nom
 DocType: Maintenance Visit,Completion Status,Estat de finalització
 DocType: Sales Invoice Item,Target Warehouse,Magatzem destí
 DocType: Item,Allow over delivery or receipt upto this percent,Permetre sobre el lliurament o recepció fins aquest percentatge
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Data prevista de lliurament no pot ser abans de la data de l'ordres de venda
 DocType: Upload Attendance,Import Attendance,Importa Assistència
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Tots els grups d'articles
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,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 +30,Net Profit / Loss,Guany/Pèrdua neta
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Compondre automàticament el missatge en la presentació de les transaccions.
 DocType: Production Order,Item To Manufacture,Article a fabricar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Fosa de motlle permanent
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Estat és {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ordre de compra de Pagament
 DocType: Sales Order Item,Projected Qty,Quantitat projectada
 DocType: Sales Invoice,Payment Due Date,Data de pagament
 DocType: Newsletter,Newsletter Manager,Butlletí Administrador
-apps/erpnext/erpnext/stock/doctype/item/item.js +229,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 +231,Item Variant {0} already exists with same attributes,Article Variant {0} ja existeix amb els mateixos atributs
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Obertura&#39;
 DocType: Notification Control,Delivery Note Message,Missatge de la Nota de lliurament
 DocType: Expense Claim,Expenses,Despeses
 DocType: Item Variant Attribute,Item Variant Attribute,Article Variant Atribut
 ,Purchase Receipt Trends,Purchase Receipt Trends
 DocType: Appraisal,Select template from which you want to get the Goals,Seleccioneu la plantilla de la qual vol aconseguir els Objectius de
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Investigació i Desenvolupament
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Investigació i Desenvolupament
 ,Amount to Bill,La quantitat a Bill
 DocType: Company,Registration Details,Detalls de registre
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Replanteig
 DocType: Item,Re-Order Qty,Re-Quantitat
 DocType: Leave Block List Date,Leave Block List Date,Deixa Llista de bloqueig Data
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programat per enviar a {0}
@@ -792,18 +761,16 @@
 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 +304,Point-of-Sale,Punt de venda
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},No es pot tirar endavant {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Clavat
 ,Available Qty,Disponible Quantitat
 DocType: Purchase Taxes and Charges,On Previous Row Total,Total fila anterior
 DocType: Salary Slip,Working Days,Dies feiners
 DocType: Serial No,Incoming Rate,Incoming Rate
 DocType: Packing Slip,Gross Weight,Pes Brut
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,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 +158,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
 DocType: Job Applicant,Hold,Mantenir
 DocType: Employee,Date of Joining,Data d'ingrés
@@ -813,7 +780,6 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Veure Subscriptors
 DocType: Purchase Invoice Item,Purchase Receipt,Albarà de compra
 ,Received Items To Be Billed,Articles rebuts per a facturar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Sorrejat abrasiu
 DocType: Employee,Ms,Sra
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Tipus de canvi principal.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,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}
@@ -825,7 +791,7 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,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
 DocType: Bank Reconciliation,Total Amount,Quantitat total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Publicant a Internet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publicant a Internet
 DocType: Production Planning Tool,Production Orders,Ordres de Producció
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Valor Saldo
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Llista de preus de venda
@@ -836,7 +802,7 @@
 DocType: Supplier,Default Payable Accounts,Comptes per Pagar per defecte
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,L'Empleat {0} no està actiu o no existeix
 DocType: Features Setup,Item Barcode,Codi de barres d'article
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Item Variants {0} updated,Article Variants {0} actualitza
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Item Variants {0} updated,Article Variants {0} actualitza
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
 DocType: Address,Shop,Botiga
@@ -845,7 +811,7 @@
 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: 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/setup/page/setup_wizard/setup_wizard.js +491,The Brand,La Marca
+apps/erpnext/erpnext/public/js/setup_wizard.js +237,The Brand,La Marca
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Provisió per superar {0} creuat per Punt {1}.
 DocType: Employee,Exit Interview Details,Detalls de l'entrevista final
 DocType: Item,Is Purchase Item,És Compra d'articles
@@ -865,16 +831,16 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Ingressos Indirectes
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Establir Import Pagament = Suma Pendent
 DocType: Contact Us Settings,Address Line 1,Adreça Línia 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Desacord
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nom de l'Empresa
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,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 +515,Select Item for Transfer,Seleccionar element de Transferència
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +538,Select Item for Transfer,Seleccionar element de Transferència
 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.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permetre a l'usuari editar la Llista de Preus de Tarifa en transaccions
 DocType: Pricing Rule,Max Qty,Quantitat màxima
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,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/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Químic
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Químic
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Tots els articles ja han estat transferits per aquesta ordre de producció.
 DocType: Process Payroll,Select Payroll Year and Month,Seleccioneu nòmina Any i Mes
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Anar al grup apropiat (generalment Aplicació de Fons&gt; Actiu Circulant&gt; Comptes Bancàries i crear un nou compte (fent clic a Afegeix nen) de tipus &quot;Banc&quot;
@@ -885,12 +851,12 @@
 DocType: Item,Inspection Criteria,Criteris d'Inspecció
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Arbre de Centres de Cost finanial.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferit
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,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/setup/page/setup_wizard/install_fixtures.py +156,White,Blanc
+apps/erpnext/erpnext/public/js/setup_wizard.js +238,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/setup/setup_wizard/install_fixtures.py +156,White,Blanc
 DocType: SMS Center,All Lead (Open),Tots els clients potencials (Obert)
 DocType: Purchase Invoice,Get Advances Paid,Obtenir bestretes pagades
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Adjunta la teva imatge
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Fer 
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Adjunta la teva imatge
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +540,Make ,Fer 
 DocType: Journal Entry,Total Amount in Words,Suma total en Paraules
 DocType: Workflow State,Stop,Aturi
 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."
@@ -899,14 +865,13 @@
 DocType: Lead,Next Contact Date,Data del següent contacte
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Quantitat d'obertura
 DocType: Holiday List,Holiday List Name,Nom de la Llista de vacances
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Opcions sobre accions
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Opcions sobre accions
 DocType: Journal Entry Account,Expense Claim,Compte de despeses
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Quantitat de {0}
 DocType: Leave Application,Leave Application,Deixar Aplicació
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Deixa Eina d'Assignació
 DocType: Leave Block List,Leave Block List Dates,Deixa llista de blocs dates
 DocType: Company,If Monthly Budget Exceeded (for expense account),Si Pressupost Mensual excedit (per compte de despeses)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Guarnició
 DocType: Workstation,Net Hour Rate,Hora taxa neta
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost rebut de compra
 DocType: Company,Default Terms,Termes predeterminats
@@ -914,10 +879,9 @@
 DocType: POS Profile,Cash/Bank Account,Compte de Caixa / Banc
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,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 +509,Attribute table is mandatory,Taula d&#39;atributs és obligatori
+apps/erpnext/erpnext/stock/doctype/item/item.py +513,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 +64,{0} can not be negative,{0} no pot ser negatiu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Presentació
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Descompte
 DocType: Features Setup,Purchase Discounts,Compra Descomptes
 DocType: Workstation,Wages,Salari
@@ -934,6 +898,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,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/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Compte no coincideix amb la Companyia
 apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributs per Punt variants. per exemple, mida, color, etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Magatzem
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial No {0} està sota contracte de manteniment fins {1}
@@ -942,7 +907,7 @@
 DocType: Tax Rule,Shipping State,Estat de l&#39;enviament
 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ó
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Despeses de venda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Compra Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Buying,Compra Standard
 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ó
@@ -963,29 +928,29 @@
 DocType: Time Log Batch,updated via Time Logs,actualitzada a través dels registres de temps
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Edat mitjana
 DocType: Opportunity,Your sales person who will contact the customer in future,La seva persona de vendes que es comunicarà amb el client en el futur
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,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/public/js/setup_wizard.js +326,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: Company,Default Currency,Moneda per defecte
 DocType: Contact,Enter designation of this Contact,Introduïu designació d'aquest contacte
 DocType: Contact Us Settings,Address,Adreça
 DocType: Expense Claim,From Employee,D'Empleat
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,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 +339,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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transports
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transports
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,i l'any: 
 DocType: Email Digest,Annual Expense,Despesa anual
 DocType: SMS Center,Total Characters,Personatges totals
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Seleccioneu la llista de materials en el camp de llista de materials per al punt {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Seleccioneu la llista de materials en el camp de llista de materials per al punt {0}
 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 +32,Contribution %,Contribució%
 DocType: Item,website page link,website page link
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Anem a preparar el sistema per al primer ús.
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +242,Let's prepare the system for first use.,Anem a preparar el sistema per al primer ús.
 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 +214,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/selling/doctype/sales_order/sales_order.py +209,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
 ,Ordered Items To Be Billed,Els articles comandes a facturar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,De Gamma ha de ser menor que en la nostra gamma
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selecciona Registres de temps i Presenta per a crear una nova factura de venda.
@@ -1005,14 +970,13 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura proforma
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Res per sol·licitar
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'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/page/setup_wizard/install_fixtures.py +75,Management,Administració
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Administració
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Tipus d'activitats per a les fitxes de Temps
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Fosa de precisió
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Es requereix ja sigui quantitat de dèbit o crèdit per {0}
 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.
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Actiu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blau
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blau
 DocType: Purchase Invoice,Is Return,És la tornada
 DocType: Price List Country,Price List Country,Preu de llista País
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Només es poden crear més nodes amb el tipus 'Grup'
@@ -1022,18 +986,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,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: Purchase Order Item,UOM Conversion Factor,UOM factor de conversió
 DocType: Stock Settings,Default Item Group,Grup d'articles predeterminat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Fabricació d&#39;objectes laminat
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Base de dades de proveïdors.
 DocType: Account,Balance Sheet,Balanç
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Centre de cost per l'article amb Codi d'article '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Formant Stretch
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,La seva persona de vendes es posarà un avís en aquesta data per posar-se en contacte amb el client
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"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/config/hr.py +125,Tax and other salary deductions.,Impostos i altres deduccions salarials.
 DocType: Lead,Lead,Client potencial
 DocType: Email Digest,Payables,Comptes per Pagar
 DocType: Account,Warehouse,Magatzem
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,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/purchase_receipt/purchase_receipt.py +93,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
 DocType: Purchase Invoice Item,Purchase Invoice Item,Compra Factura article
@@ -1048,13 +1010,13 @@
 DocType: Global Defaults,Current Fiscal Year,Any fiscal actual
 DocType: Global Defaults,Disable Rounded Total,Desactivar total arrodonit
 DocType: Lead,Call,Truca
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Entrades' no pot estar buit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,'Entries' cannot be empty,'Entrades' no pot estar buit
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicar fila {0} amb el mateix {1}
 ,Trial Balance,Balanç provisional
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configuració d&#39;Empleats
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Seleccioneu el prefix primer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Recerca
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Recerca
 DocType: Maintenance Visit Purpose,Work Done,Treballs Realitzats
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,"Si us plau, especifiqui almenys un atribut a la taula d&#39;atributs"
 DocType: Contact,User ID,ID d'usuari
@@ -1062,10 +1024,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Veure Ledger
 DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Earliest
-apps/erpnext/erpnext/stock/doctype/item/item.py +394,"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/stock/doctype/item/item.py +398,"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"
 DocType: Communication,Delivery Status,Estat de l'enviament
 DocType: Production Order,Manufacture against Sales Order,Fabricació contra ordre de vendes
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resta del món
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +455,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
@@ -1076,13 +1038,11 @@
 DocType: BOM Item,Item Description,Descripció de l'Article
 DocType: Payment Tool,Payment Mode,Mètode de pagament
 DocType: Purchase Invoice,Is Recurring,És recurrent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,De metall sinteritzat per làser directe
 DocType: Purchase Order,Supplied Items,Articles subministrats
 DocType: Production Order,Qty To Manufacture,Quantitat a fabricar
 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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Obertura Temporal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Balanç d'absències d'empleat
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Balanç per compte {0} ha de ser sempre {1}
 DocType: Address,Address Type,Tipus d'adreça
@@ -1098,23 +1058,23 @@
 DocType: Journal Entry,Get Outstanding Invoices,Rep les factures pendents
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Vendes Sol·licitar {0} no és vàlid
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Petit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Petit
 DocType: Employee,Employee Number,Número d'empleat
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Cas No (s) ja en ús. Intenta Cas n {0}
 ,Invoiced Amount (Exculsive Tax),Quantitat facturada (Impost exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Article 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Compte cap {0} creat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Verd
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Verd
 DocType: Item,Auto re-order,Acte reordenar
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total Aconseguit
+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/page/setup_wizard/install_fixtures.py +59,Contract,Contracte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Contracte
 DocType: Report,Disabled,Deshabilitat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,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 +83,Indirect Expenses,Despeses Indirectes
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Fila {0}: Quantitat és obligatori
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Agricultura
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Els Productes o Serveis de la teva companyia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
+apps/erpnext/erpnext/public/js/setup_wizard.js +347,Your Products or Services,Els Productes o Serveis de la teva companyia
 DocType: Mode of Payment,Mode of Payment,Forma de pagament
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,This is a root item group and cannot be edited.
 DocType: Journal Entry Account,Purchase Order,Ordre De Compra
@@ -1126,7 +1086,7 @@
 DocType: Serial No,Serial No Details,Serial No Detalls
 DocType: Purchase Invoice Item,Item Tax Rate,Element Tipus impositiu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"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/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
 apps/erpnext/erpnext/stock/get_item_details.py +136,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 +41,Capital Equipments,Capital Equipments
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regla preus es selecciona per primera basada en 'Aplicar On' camp, que pot ser d'article, grup d'articles o Marca."
@@ -1136,7 +1096,7 @@
 DocType: Appraisal Goal,Goal,Meta
 DocType: Sales Invoice Item,Edit Description,Descripció
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Data prevista de lliurament és menor que la data d&#39;inici prevista.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Per Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +602,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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Sortint total
@@ -1162,10 +1122,10 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may 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 &#39;Distribuir els càrrecs basats en&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Impostos i Càrrecs Càlcul
 DocType: BOM Operation,Workstation,Lloc de treball
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Maquinari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Maquinari
 DocType: Attendance,HR Manager,Gerent de Recursos Humans
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Seleccioneu una Empresa
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Data Factura Proveïdor
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Has d'habilitar el carro de la compra
 apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No hi ha dades
@@ -1178,7 +1138,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,La superposició de les condicions trobades entre:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,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/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Valor Total de la comanda
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Menjar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Menjar
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rang 3 Envelliment
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Vostè pot fer un registre de temps només contra una ordre de producció presentat
 DocType: Maintenance Schedule Item,No of Visits,Número de Visites
@@ -1198,6 +1158,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Veure oferta Carta
 DocType: Communication,Communication,Comunicació
 DocType: Item,Is Service Item,És un servei
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,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
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Seleccioneu l'any fiscal
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Des {0} | {1} {2}
@@ -1216,7 +1177,7 @@
 DocType: Item,Maintain Stock,Mantenir Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Imatges de entrades ja creades per Ordre de Producció 
 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 +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Càrrec del tipus 'real' a la fila {0} no pot ser inclòs en la partida Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +500,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 +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,A partir de data i hora
 DocType: Email Digest,For Company,Per a l'empresa
@@ -1226,7 +1187,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Pla General de Comptabilitat
 DocType: Material Request,Terms and Conditions Content,Contingut de Termes i Condicions
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,no pot ser major que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} is not a stock Item,Article {0} no és un article d'estoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,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 Slip Deduction,Depends on Leave Without Pay,Depèn de la llicència sense sou
@@ -1240,31 +1201,29 @@
 DocType: HR Settings,Employee Settings,Configuració dels empleats
 ,Batch-Wise Balance History,Batch-Wise Balance History
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Per fer la llista
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Aprenent
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Aprenent
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,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"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,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/controllers/accounts_controller.py +435,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/controllers/accounts_controller.py +436,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/hr/doctype/salary_slip/salary_slip.py +38,No active Salary Structure found for employee {0} and the month,No Estructura Salarial actiu que es troba per a l&#39;empleat {0} i el mes
 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 +112,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/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Comprem aquest article
+apps/erpnext/erpnext/public/js/setup_wizard.js +366,We buy this Item,Comprem aquest article
 DocType: Address,Billing,Facturació
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanger
 DocType: Bulk Email,Not Sent,No Enviat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Explosiu formació
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Impostos i càrrecs (En la moneda de la Companyia)
 DocType: Shipping Rule,Shipping Account,Compte d'Enviaments
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Programat per enviar a {0} destinataris
 DocType: Quality Inspection,Readings,Lectures
 DocType: Stock Entry,Total Additional Costs,Total de despeses addicionals
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub Assemblies
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Sub Assemblies,Sub Assemblies
 DocType: Shipping Rule Condition,To Value,Per Valor
 DocType: Supplier,Stock Manager,Gerent
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Magatzem d'origen obligatori per a la fila {0}
@@ -1274,44 +1233,42 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Error en importar!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Sense direcció no afegeix encara.
 DocType: Workstation Working Hour,Workstation Working Hour,Estació de treball Hores de Treball
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analista
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantitat assignada {1} ha de ser menor o igual a l'import JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analista
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantitat assignada {1} ha de ser menor o igual a l'import JV {2}
 DocType: Item,Inventory,Inventari
 DocType: Features Setup,"To enable ""Point of Sale"" view",Per habilitar &quot;Punt de Venda&quot; vista
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,El pagament no es pot fer per al carro buit
 DocType: Item,Sales Details,Detalls de venda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fixació
 DocType: Opportunity,With Items,Amb articles
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,En Quantitat
 DocType: Notification Control,Expense Claim Rejected,Compte de despeses Rebutjat
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",La data en què es generarà propera factura. Es genera en enviar.
 DocType: Item Attribute,Item Attribute,Element Atribut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Govern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Govern
 apps/erpnext/erpnext/config/stock.py +268,Item Variants,Variants de l&#39;article
 DocType: Company,Services,Serveis
 apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centre de Cost de Pares
 DocType: Sales Invoice,Source,Font
 DocType: Leave Type,Is Leave Without Pay,Es llicencia sense sou
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,No hi ha registres a la taula de Pagaments
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Data d'Inici de l'Exercici fiscal
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,No hi ha registres a la taula de Pagaments
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Data d'Inici de l'Exercici fiscal
 DocType: Employee External Work History,Total Experience,Experiència total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Avellanat
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Fulla(s) d'embalatge cancel·lat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Fulla(s) d'embalatge cancel·lat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight and Forwarding Charges
 DocType: Material Request Item,Sales Order No,Ordre de Venda No
 DocType: Item Group,Item Group Name,Nom del Grup d'Articles
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Pres
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Pres
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materials de transferència per Fabricació
 DocType: Pricing Rule,For Price List,Per Preu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Cerca d'Executius
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Cerca d'Executius
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Tarifa de compra per l'article: {0} no es troba, el que es requereix per reservar l'entrada comptable (despeses). Si us plau, esmentar el preu de l'article contra una llista de preus de compra."
 DocType: Maintenance Schedule,Schedules,Horaris
 DocType: Purchase Invoice Item,Net Amount,Import Net
 DocType: Purchase Order Item Supplied,BOM Detail No,Detall del BOM No
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Import addicional de descompte (moneda Company)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Error: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +541,Error: {0} > {1},Error: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Si us plau, creu un nou compte de Pla de Comptes."
 DocType: Maintenance Visit,Maintenance Visit,Manteniment Visita
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Client> Grup de Clients> Territori
@@ -1322,7 +1279,6 @@
 DocType: Event,Tuesday,Dimarts
 DocType: Leave Block List,Block Holidays on important days.,Vacances de Bloc en dies importants.
 ,Accounts Receivable Summary,Comptes per Cobrar Resum
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Fulles per al tipus {0} ja assignat per Empleat {1} per al període {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,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: Top Bar Item,Target,Objectiu
@@ -1334,15 +1290,14 @@
 DocType: ToDo,Due Date,Data De Venciment
 DocType: Sales Invoice Item,Brand Name,Marca
 DocType: Purchase Receipt,Transporter Details,Detalls Transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Caixa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,L'Organització
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Box,Caixa
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,L'Organització
 DocType: Monthly Distribution,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"
 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
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Entrada de Comptabilitat per a {0} només es pot fer en moneda: {1}
 DocType: Pricing Rule,Pricing Rule,Regla preus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Osques
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Sol·licitud de materials d&#39;Ordre de Compra
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: L&#39;article tornat {1} no existeix en {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Comptes bancaris
@@ -1359,20 +1314,19 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Les quantitats no es reflecteixen en el banc
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Les reclamacions per compte de l'empresa.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,La fosa centrífuga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Acabat assistida per camp magnètic
 DocType: Company,Default Holiday List,Per defecte Llista de vacances
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Liabilities
 DocType: Purchase Receipt,Supplier Warehouse,Magatzem Proveïdor
 DocType: Opportunity,Contact Mobile No,Contacte Mòbil No
 DocType: Production Planning Tool,Select Sales Orders,Seleccionar comandes de client
 ,Material Requests for which Supplier Quotations are not created,Les sol·licituds de material per als quals no es creen Ofertes de Proveïdor
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,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.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Per realitzar un seguiment d'elements mitjançant codi de barres. Vostè serà capaç d'entrar en els elements de la nota de lliurament i la factura de venda mitjançant l'escaneig de codi de barres de l'article.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Marcar com Lliurat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +497,Mark as Delivered,Marcar com Lliurat
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Fer Cita
 DocType: Dependent Task,Dependent Task,Tasca dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +306,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 +141,Leave of type {0} cannot be longer than {1},Una absència del tipus {0} no pot ser de més de {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,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 +155,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
 DocType: SMS Center,Receiver List,Llista de receptors
@@ -1380,15 +1334,14 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantitat consumida
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Veure
 DocType: Salary Structure Deduction,Salary Structure Deduction,Salary Structure Deduction
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Sinterització selectiva per làser
-apps/erpnext/erpnext/stock/doctype/item/item.py +301,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/stock/doctype/item/item.py +305,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/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importació correcta!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost d'articles Emeses
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},La quantitat no ha de ser més de {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Edat (dies)
 DocType: Quotation Item,Quotation Item,Cita d'article
 DocType: Account,Account Name,Nom del Compte
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,De la data no pot ser més gran que A Data
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,De la data no pot ser més gran que A Data
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,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 +59,Supplier Type master.,Taula mestre de tipus de proveïdor
 DocType: Purchase Order Item,Supplier Part Number,PartNumber del proveïdor
@@ -1397,14 +1350,14 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} és cancel·lat o detingut
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Vehicle Dispatch Date
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,El rebut de compra {0} no està presentat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,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 +13,"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/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Instal·lació completa
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +124,Setup Complete,Instal·lació completa
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Anunciat
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reservats Quantitat
 DocType: Party Account,Party Account,Compte Partit
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humans
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humans
 DocType: Lead,Upper Income,Ingrés Alt
 DocType: Journal Entry Account,Debit in Company Currency,Dèbit a Companyia moneda
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Els meus Qüestions
@@ -1413,11 +1366,9 @@
 DocType: Company,Default Values,Valors Predeterminats
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Fila {0}: Quantitat de pagament no pot ser negatiu
 DocType: Expense Claim,Total Amount Reimbursed,Suma total reemborsat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Press apropiat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Contra Proveïdor Factura {0} {1} datat
 DocType: Customer,Default Price List,Llista de preus per defecte
 DocType: Payment Reconciliation,Payments,Pagaments
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Premsat isostàtic en calent
 DocType: ToDo,Medium,Medium
 DocType: Budget Detail,Budget Allocated,Pressupost assignat
 DocType: Journal Entry,Entry Type,Tipus d&#39;entrada
@@ -1430,9 +1381,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Cap dels articles tenen qualsevol canvi en la quantitat o el valor.
 DocType: Warranty Claim,Warranty Claim,Reclamació de la Garantia
 ,Lead Details,Detalls del client potencial
-DocType: Authorization Rule,Approving User,Usuari aprovador
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forjant
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Enchapado
 DocType: Purchase Invoice,End date of current invoice's period,Data de finalització del període de facturació actual
 DocType: Pricing Rule,Applicable For,Aplicable per
 DocType: Bank Reconciliation,From Date,Des de la data
@@ -1454,31 +1402,29 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Suma Pagat (Companyia moneda)
 DocType: Purchase Invoice,Additional Discount,Descompte addicional
 DocType: Selling Settings,Selling Settings,La venda d'Ajustaments
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Subhastes en línia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Subhastes en línia
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Si us plau especificar Quantitat o valoració de tipus o ambdós
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Empresa, mes i de l'any fiscal és obligatòri"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Despeses de Màrqueting
 ,Item Shortage Report,Informe d'escassetat d'articles
-apps/erpnext/erpnext/stock/doctype/item/item.js +183,"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 +185,"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/config/support.py +43,Single unit of an Item.,Unitat individual d'un article
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',S'ha de 'Presentar' el registre de temps {0}
 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/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Magatzem requerit a la fila n {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Magatzem requerit a la fila n {0}
 DocType: Employee,Date Of Retirement,Data de la jubilació
 DocType: Upload Attendance,Get Template,Aconsegueix Plantilla
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Mineria
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resina de colada
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"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/pos/pos.js +147,Please select {0} first.,Seleccioneu {0} primer.
 apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Lectura 2
 DocType: Stock Entry,Material Receipt,Recepció de materials
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Productes
+apps/erpnext/erpnext/public/js/setup_wizard.js +358,Products,Productes
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partit Tipus i Partit es requereix per al compte per cobrar / pagar {0}
 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
@@ -1488,13 +1434,13 @@
 DocType: Purchase Invoice,Notification Email Address,Dir Adreça de correu electrònic per notificacions
 DocType: Payment Tool,Find Invoices to Match,Troba factures perquè coincideixi
 ,Item-wise Sales Register,Tema-savi Vendes Registre
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","per exemple ""XYZ Banc Nacional """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","per exemple ""XYZ Banc Nacional """
 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/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Totals de l'objectiu
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Totals de l'objectiu
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Cistella de la compra està habilitat
 DocType: Job Applicant,Applicant for a Job,Sol·licitant d'ocupació
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,No hi ha ordres de fabricació creades
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Nòmina d'empleat {0} ja creat per a aquest mes
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +140,Salary Slip of employee {0} already created for this month,Nòmina d'empleat {0} ja creat per a aquest mes
 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: Sales Invoice Item,Batch No,Lot número
@@ -1504,14 +1450,14 @@
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
 apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nova {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establir prefix de numeracions seriades a les transaccions
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Detingut ordre no es pot cancel·lar. Unstop per cancel·lar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +323,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/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Detingut ordre no es pot cancel·lar. Unstop per cancel·lar.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,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: Item,Variants,Variants
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,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 +111,There is not enough leave balance for Leave Type {0},There is not enough leave balance for Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},There is not enough leave balance for Leave Type {0}
 DocType: Sales Team,Contribution to Net Total,Contribució neta total
 DocType: Sales Invoice Item,Customer's Item Code,Del client Codi de l'article
 DocType: Stock Reconciliation,Stock Reconciliation,Reconciliació d'Estoc
@@ -1548,11 +1494,11 @@
 DocType: Sales Order Item,Actual Qty,Actual Quantitat
 DocType: Sales Invoice Item,References,Referències
 DocType: Quality Inspection Reading,Reading 10,Reading 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Publica els teus productes o serveis de compra o venda Assegura't de revisar el Grup d'articles, unitat de mesura i altres propietats quan comencis"
+apps/erpnext/erpnext/public/js/setup_wizard.js +348,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Publica els teus productes o serveis de compra o venda Assegura't de revisar el Grup d'articles, unitat de mesura i altres propietats quan comencis"
 DocType: Hub Settings,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/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Valor {0} per a l&#39;atribut {1} no existeix a la llista d&#39;article vàlida Atribut Valors
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Associat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associat
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Article {0} no és un article serialitzat
 DocType: SMS Center,Create Receiver List,Crear Llista de receptors
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Caducat
@@ -1561,7 +1507,7 @@
 DocType: Warranty Claim,Issue Date,Data De Assumpte
 DocType: Activity Cost,Activity Cost,Cost Activitat
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Quantitat utilitzada
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telecomunicacions
+apps/erpnext/erpnext/setup/setup_wizard/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)
 DocType: Payment Tool,Make Payment Entry,Feu Entrada Pagament
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Quantitat d'articles per {0} ha de ser menor de {1}
@@ -1578,10 +1524,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Venda de comprovar, si es selecciona aplicable Perquè {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Oferta del proveïdor d'article
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Feu Estructura Salarial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Cisallament
 DocType: Item,Has Variants,Té variants
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Feu clic al botó 'Make factura de venda ""per crear una nova factura de venda."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Envasament i etiquetatge
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la Distribució Mensual
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Si us plau, especifiqui Moneda per defecte a l'empresa Mestre i predeterminats globals"
@@ -1592,19 +1536,18 @@
 DocType: Budget Detail,Fiscal Year,Any Fiscal
 DocType: Cost Center,Budget,Pressupost
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"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/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Aconseguit
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Aconseguit
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Localitat / Client
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,per exemple 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Fila {0}: quantitat assignada {1} ha de ser menor o igual a quantitat pendent de facturar {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,e.g. 5,per exemple 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Fila {0}: quantitat assignada {1} ha de ser menor o igual a quantitat pendent de facturar {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,En paraules seran visibles un cop que guardi la factura de venda.
 DocType: Item,Is Sales Item,És article de venda
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Arbre de grups d'article
 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/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Un producte o servei
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Hi han hagut errors.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Tapping
+apps/erpnext/erpnext/public/js/setup_wizard.js +356,A Product or Service,Un producte o servei
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +146,There were errors.,Hi han hagut errors.
 DocType: Naming Series,Current Value,Valor actual
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} creat
 DocType: Delivery Note Item,Against Sales Order,Contra l'Ordre de Venda
@@ -1619,7 +1562,7 @@
 apps/erpnext/erpnext/accounts/party.py +275,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 +170,Duties and Taxes,Taxes i impostos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Si us plau, introduïu la data de referència"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,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
@@ -1627,7 +1570,7 @@
 apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Arbre dels grups d'articles.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,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
 ,Item-wise Purchase History,Historial de compres d'articles
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Vermell
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Vermell
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,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}"
 DocType: Account,Frozen,Bloquejat
 ,Open Production Orders,Obertes les ordres de producció
@@ -1642,7 +1585,7 @@
 DocType: Item Attribute,Attribute Name,Nom del Atribut
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Article {0} ha de ser Vendes o Servei d'articles en {1}
 DocType: Item Group,Show In Website,Mostra en el lloc web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grup
+apps/erpnext/erpnext/public/js/setup_wizard.js +357,Group,Grup
 DocType: Task,Expected Time (in hours),Temps esperat (en hores)
 ,Qty to Order,Quantitat de comanda
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Per fer el seguiment de marca en el següent documentació Nota de lliurament, Oportunitat, sol·licitud de materials, d&#39;articles, d&#39;ordres de compra, compra val, Rebut comprador, la cita, la factura de venda, producte Bundle, ordres de venda, de sèrie"
@@ -1652,6 +1595,7 @@
 DocType: Features Setup,Brands,Marques
 DocType: C-Form Invoice Detail,Invoice No,Número de Factura
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,De l'Ordre de Compra
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixa no pot aplicar / cancel·lada abans de {0}, com a balanç de la llicència ja ha estat remès equipatge al futur registre d&#39;assignació de permís {1}"
 DocType: Activity Cost,Costing Rate,Pago Rate
 ,Customer Addresses And Contacts,Adreces de clients i contactes
 DocType: Employee,Resignation Letter Date,Carta de renúncia Data
@@ -1659,35 +1603,31 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,No Configurat
 DocType: Communication,Date,Data
 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/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Si us plau, espera mentre el sistema està essent configurat. Aquest procés pot trigar una estona."
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +115,Sit tight while your system is being setup. This may take a few moments.,"Si us plau, espera mentre el sistema està essent configurat. Aquest procés pot trigar una estona."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ha de tenir rol 'aprovador de despeses'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Parell
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Pair,Parell
 DocType: Bank Reconciliation Detail,Against Account,Contra Compte
 DocType: Maintenance Schedule Detail,Actual Date,Data actual
 DocType: Item,Has Batch No,Té número de lot
 DocType: Delivery Note,Excise Page Number,Excise Page Number
 DocType: Employee,Personal Details,Dades Personals
 ,Maintenance Schedules,Programes de manteniment
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Repujat
 ,Quotation Trends,Quotation Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,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 +302,Debit To account must be a Receivable account,Dèbit al compte ha de ser un compte per cobrar
-apps/erpnext/erpnext/stock/doctype/item/item.py +310,"As Production Order can be made for this item, it must be a stock item.",Per a poder fer aquest article Ordre de Producció cal designar-lo com a article d'estoc
 DocType: Shipping Rule Condition,Shipping Amount,Total de l'enviament
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Unió
-DocType: Authorization Rule,Above Value,Per sobre de Valor
 ,Pending Amount,A l'espera de l'Import
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversió
 DocType: Purchase Order,Delivered,Alliberat
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Setup incoming server for jobs email id. (e.g. jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Nombre de vehicles
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La data en què s'atura la factura recurrent
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,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
 DocType: Address Template,This format is used if country specific format is not found,Aquest format s'utilitza si no hi ha el format específic de cada país
 DocType: Custom Field,Custom,A mida
 DocType: Production Order,Use Multi-Level BOM,Utilitzeu Multi-Nivell BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Injecció de plàstics
 DocType: Bank Reconciliation,Include Reconciled Entries,Inclogui els comentaris conciliades
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Arbre dels comptes financers
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Deixar en blanc si es considera per a tot tipus d'empleats
@@ -1697,30 +1637,28 @@
 apps/frappe/frappe/config/setup.py +130,Printing,Impressió
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,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: Purchase Invoice,Additional Discount Amount,Import addicional de descompte
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,El dia (s) en el qual està sol·licitant el permís són vacances. Vostè no necessita sol·licitar l'excedència.
 apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,i
 DocType: Leave Block List Allow,Leave Block List Allow,Leave Block List Allow
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr no pot estar en blanc o l&#39;espai
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Esports
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Esports
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Actual total
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Unitat
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Unit,Unitat
 apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Please set Dropbox access keys in your site config
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Si us plau, especifiqui l'empresa"
 ,Customer Acquisition and Loyalty,Captació i Fidelització
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Magatzem en què es desen les existències dels articles rebutjats
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,El seu exercici acaba el
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,El seu exercici acaba el
 DocType: POS Profile,Price List,Llista de preus
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} és ara l'Any Fiscal.oer defecte Si us plau, actualitzi el seu navegador perquè el canvi tingui efecte."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Les reclamacions de despeses
 DocType: Issue,Support,Suport
-DocType: Authorization Rule,Approving Role,Aprovar Rol
 ,BOM Search,BOM Cercar
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Tancament (Obertura + totals)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,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/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Mostra / Amaga característiques com Nº de Sèrie, TPV etc."
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,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 +237,Account {0} is invalid. Account Currency must be {1},Compte {0} no és vàlid. Compte moneda ha de ser {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Es requereix el factor de conversió de la UOM a la fila {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},La data de liquidació no pot ser anterior a la data de verificació a la fila {0}
 DocType: Salary Slip,Deduction,Deducció
@@ -1739,13 +1677,13 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,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
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Avís: certificat SSL no vàlid en la inclinació {0}
 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/page/setup_wizard/install_fixtures.py +170,Job Description,Descripció del Treball
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Descripció del Treball
 DocType: Purchase Order Item,Qty as per Stock UOM,La quantitat d'existències ha d'estar expresada en la UDM
 apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Seleccioneu un arxiu csv vàlids amb dades
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Revestiment
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"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
@@ -1755,12 +1693,11 @@
 DocType: Supplier Quotation,Manufacturing Manager,Gerent de Fàbrica
 apps/erpnext/erpnext/support/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 +69,Split Delivery Note into packages.,Dividir nota de lliurament en paquets.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Els enviaments
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Emmotllament per immersió
+apps/erpnext/erpnext/hooks.py +68,Shipments,Els enviaments
 DocType: Purchase Order,To be delivered to customer,Per ser lliurat al client
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Hora de registre d'estat ha de ser presentada.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Número de sèrie {0} no pertany a cap magatzem
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configuració
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +114,Setting Up,Configuració
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Fila # 
 DocType: Purchase Invoice,In Words (Company Currency),En paraules (Divisa de la Companyia)
 DocType: Pricing Rule,Supplier,Proveïdor
@@ -1768,7 +1705,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Despeses diverses
 DocType: Global Defaults,Default Company,Companyia defecte
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Despesa o compte Diferència és obligatori per Punt {0} ja que afecta el valor de valors en general
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","No es pot sobrefacturar l'element {0} a la fila {1} més de {2}. Per permetre la sobrefacturació, configura-ho a configuració d'existències"
+apps/erpnext/erpnext/controllers/accounts_controller.py +355,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","No es pot sobrefacturar l'element {0} a la fila {1} més de {2}. Per permetre la sobrefacturació, configura-ho a configuració d'existències"
 DocType: Employee,Bank Name,Nom del banc
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Sobre
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,L'usuari {0} està deshabilitat
@@ -1781,27 +1718,26 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} és obligatori per l'article {1}
 DocType: Currency Exchange,From Currency,De la divisa
 DocType: DocField,Name,Nom
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"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/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Ordres de venda requerides per l'article {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"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/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Ordres de venda requerides per l'article {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Les quantitats no es reflecteix en el sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Companyia moneda)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Altres
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Altres
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Si no troba un article a joc. Si us plau seleccioni un altre valor per {0}.
 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/accounts/doctype/purchase_invoice/purchase_invoice.js +94,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/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Acabat
 DocType: Web Form,Select DocType,Seleccioneu doctype
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brotxatge
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banca
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banca
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Si us plau, feu clic a ""Generar la Llista d'aconseguir horari"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nou Centre de Cost
 DocType: Bin,Ordered Quantity,Quantitat demanada
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","per exemple ""Construir eines per als constructors """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","per exemple ""Construir eines per als constructors """
 DocType: Quality Inspection,In Process,En procés
 DocType: Authorization Rule,Itemwise Discount,Descompte d'articles
 DocType: Purchase Order Item,Reference Document Type,Referència Tipus de document
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} en contra d'ordres de venda {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{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 +283,Serialized Inventory,Inventari serialitzat
 DocType: Activity Type,Default Billing Rate,Per defecte Facturació Tarifa
@@ -1816,14 +1752,13 @@
 DocType: Purchase Invoice Item,Page Break,Salt de pàgina
 DocType: Production Order Operation,Pending,Pendent
 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/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,No es pot canviar UOM per defecte de Variant. Per canviar UOM predeterminat per a la variant UOM canvi predeterminat de la plantilla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Material d'oficina
 DocType: Purchase Invoice Item,Qty,Quantitat
 DocType: Fiscal Year,Companies,Empreses
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Electrònica
+apps/erpnext/erpnext/setup/setup_wizard/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/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Des Programa de manteniment
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Temps complet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Temps complet
 DocType: Purchase Invoice,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."
@@ -1835,11 +1770,12 @@
 DocType: Job Applicant,Job Opening,Obertura de treball
 DocType: Payment Reconciliation,Payment Reconciliation,Reconciliació de Pagaments
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Si us plau, seleccioneu el nom de la persona al càrrec"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Tecnologia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tecnologia
 DocType: Offer Letter,Offer Letter,Carta De Oferta
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generar sol·licituds de materials (MRP) i ordres de producció.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Total facturat Amt
 DocType: Time Log,To Time,Per Temps
+DocType: Authorization Rule,Approving Role (above authorized value),Aprovar Rol (per sobre del valor autoritzat)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Per afegir nodes secundaris, explora arbre i feu clic al node en el qual voleu afegir més nodes."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Crèdit al compte ha de ser un compte per pagar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM recursiu: {0} no pot ser pare o fill de {2}
@@ -1852,10 +1788,8 @@
 DocType: Item,Customer Item Codes,Codis dels clients
 DocType: Opportunity,Lost Reason,Raó Perdut
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Crear entrades de pagament contra ordres o factures.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Soldadura
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Es requereix nou Stock UOM
 DocType: Quality Inspection,Sample Size,Mida de la mostra
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,S'han facturat tots els articles
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,S'han facturat tots els articles
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Si us plau, especifica un 'Des del Cas Número' vàlid"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,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"
 DocType: Project,External,Extern
@@ -1867,8 +1801,7 @@
 DocType: Bin,Actual Quantity,Quantitat real
 DocType: Shipping Rule,example: Next Day Shipping,exemple: Enviament Dia següent
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} no trobat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Els teus Clients
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,El modelo per compressió
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Your Customers,Els teus Clients
 DocType: Leave Block List Date,Block Date,Bloquejar Data
 DocType: Sales Order,Not Delivered,No Lliurat
 ,Bank Clearance Summary,Resum Liquidació del Banc
@@ -1889,10 +1822,10 @@
 DocType: SMS Log,Sent To,Enviat A
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Fer Factura Vendes
 DocType: Company,For Reference Only.,Només de referència.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},No vàlida {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},No vàlida {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Quantitat Anticipada
 DocType: Manufacturing Settings,Capacity Planning,Planificació de la capacitat
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Des de la data' és obligatori
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Des de la data' és obligatori
 DocType: Journal Entry,Reference Number,Número de referència
 DocType: Employee,Employment Details,Detalls d'Ocupació
 DocType: Employee,New Workplace,Nou lloc de treball
@@ -1907,7 +1840,7 @@
 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
 DocType: Item,End of Life,Final de la Vida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Viatges
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Viatges
 DocType: Leave Block List,Allow Users,Permetre que usuaris
 DocType: Purchase Order,Customer Mobile No,Client Mòbil No
 DocType: Sales Invoice,Recurring,Periódico
@@ -1921,7 +1854,7 @@
 DocType: Naming Series,User must always select,Usuari sempre ha de seleccionar
 DocType: Stock Settings,Allow Negative Stock,Permetre existències negatives
 DocType: Installation Note,Installation Note,Nota d'instal·lació
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Afegir Impostos
+apps/erpnext/erpnext/public/js/setup_wizard.js +283,Add Taxes,Afegir Impostos
 ,Financial Analytics,Comptabilitat analítica
 DocType: Quality Inspection,Verified By,Verified Per
 DocType: Address,Subsidiary,Filial
@@ -1931,7 +1864,6 @@
 DocType: System Settings,In Hours,En Hores
 DocType: Process Payroll,Create Salary Slip,Crear fulla de nòmina
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Import pendent de rebre com per banc
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Polit
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Font dels fons (Passius)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,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: Appraisal,Employee,Empleat
@@ -1948,11 +1880,11 @@
 DocType: Rename Tool,File to Rename,Arxiu per canviar el nom de
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Nombre de comanda purchse requerit per Punt {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mostrar Pagaments
-apps/erpnext/erpnext/controllers/buying_controller.py +245,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 +202,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 +236,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 +197,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/frappe/frappe/desk/page/backups/backups.html +13,Size,Mida
 DocType: Notification Control,Expense Claim Approved,Compte de despeses Aprovat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmacèutic
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,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
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Crear Client
@@ -1962,7 +1894,6 @@
 DocType: Quality Inspection Reading,Reading 9,Lectura 9
 DocType: Supplier,Is Frozen,Està Congelat
 DocType: Buying Settings,Buying Settings,Ajustaments de compra
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Acabat en massa
 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
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configuració del servidor d'entrada de correu electrònic d'identificació de les vendes. (Per exemple sales@example.com)
@@ -1970,7 +1901,7 @@
 DocType: Payment Tool,Payment Account,Compte de Pagament
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Si us plau, especifiqui l'empresa per a procedir"
 apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Esborrany
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatori
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatori
 DocType: Quality Inspection Reading,Accepted,Acceptat
 DocType: User,Female,Dona
 DocType: Journal Entry Account,Debit in Account Currency,Dèbit en Compte moneda
@@ -1982,7 +1913,7 @@
 DocType: Shipping Rule,Shipping Rule Label,Regla Etiqueta d'enviament
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Matèries primeres no poden estar en blanc.
 DocType: Newsletter,Test,Prova
-apps/erpnext/erpnext/stock/doctype/item/item.py +364,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Com que hi ha transaccions d&#39;accions existents per aquest concepte, \ no pot canviar els valors de &#39;no té de sèrie&#39;, &#39;Té lot n&#39;, &#39;És de la Element &quot;i&quot; Mètode de valoració&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Seient Ràpida
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,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
@@ -1993,13 +1924,14 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Sol·licituds d'articles.
 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.
 DocType: Purchase Invoice,Terms and Conditions1,Termes i Condicions 1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Instal·lació completa
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Instal·lació completa
 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/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Si us plau, guardi el document abans de generar el programa de manteniment"
 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/config/crm.py +96,Newsletter Mailing List,Butlletí de la llista de correu
 DocType: Delivery Note,Transporter Name,Nom Transportista
+DocType: Authorization Rule,Authorized Value,Valor Autoritzat
 DocType: Contact,Enter department to which this Contact belongs,Introduïu departament al qual pertany aquest contacte
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Absent
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,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
@@ -2024,16 +1956,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Taxa Bàsica (segons de la UOM)
 DocType: SMS Log,No of Requested SMS,No de SMS sol·licitada
 DocType: Campaign,Campaign-.####,Campanya-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Perforació
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Propers passos
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,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: 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ó.
 DocType: Customer Group,Has Child Node,Té Node Nen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} contra l'Ordre de Compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} contra l'Ordre de Compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduïu els paràmetres d'URL estàtiques aquí (Ex. Remitent = ERPNext, nom d'usuari = ERPNext, password = 1234 etc.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} no en qualsevol any fiscal activa. Per a més detalls de verificació {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Aquest és un lloc web d'exemple d'auto-generada a partir ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Aquest és un lloc web d'exemple d'auto-generada a partir ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Rang Envelliment 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Mecanitzat fotoquímic
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2079,7 +2010,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Quantitat
 DocType: Email Account,Email Ids,E-mail Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,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 +471,Stock Entry {0} is not submitted,Entrada de la {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +473,Stock Entry {0} is not submitted,Entrada de la {0} no es presenta
 DocType: Payment Reconciliation,Bank / Cash Account,Compte Bancari / Efectiu
 DocType: Tax Rule,Billing City,Facturació Ciutat
 DocType: Global Defaults,Hide Currency Symbol,Amaga Símbol de moneda
@@ -2095,7 +2026,7 @@
 DocType: Purchase Invoice,Currency and Price List,Moneda i Preus
 DocType: Opportunity,Customer / Lead Name,nom del Client/Client Potencial
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,No s'esmenta l'espai de dates
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Producció
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Producció
 DocType: Item,Allow Production Order,Permetre Ordre de Producció
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,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)
@@ -2108,7 +2039,7 @@
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Els meus Direccions
 DocType: Stock Ledger Entry,Outgoing Rate,Sortint Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organization branch master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,o
+apps/erpnext/erpnext/controllers/accounts_controller.py +238, or ,o
 DocType: Sales Order,Billing Status,Estat de facturació
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,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 +65,90-Above,Per sobre de 90-
@@ -2135,6 +2066,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Número de sèrie / lot
 DocType: Product Bundle,Parent Item,Article Pare
 DocType: Account,Account Type,Tipus de compte
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Deixar tipus {0} no es poden enviar-portar
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,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/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"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"
@@ -2142,10 +2074,7 @@
 DocType: Bin,Reserved Quantity,Quantitat reservades
 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/page/setup_wizard/fixtures/operations.py +62,Cutting,Tall
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Aixafament
 DocType: Account,Income Account,Compte d'ingressos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Motllura
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Lliurament
 DocType: Stock Reconciliation Item,Current Qty,Quantitat actual
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Vegeu ""Taxa de materials basats en"" a la Secció Costea"
@@ -2155,20 +2084,19 @@
 apps/frappe/frappe/desk/moduleview.py +61,Documents,Documents
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Àrbitre
 DocType: Cost Center,Cost Center,Centre de Cost
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Comprovant #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Comprovant #
 DocType: Notification Control,Purchase Order Message,Missatge de les Ordres de Compra
 DocType: Tax Rule,Shipping Country,País d&#39;enviament
 DocType: Upload Attendance,Upload HTML,Pujar HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +392,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Avanç total ({0}) en contra de l'ordre {1} no pot ser major \
  que el Gran Total ({2})"
 DocType: Employee,Relieving Date,Data Alleujar
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","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/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Director de Màrqueting i Vendes
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Impost sobre els guanys
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Làser dissenyat conformació neta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Director de Màrqueting i Vendes
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Impost sobre els guanys
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","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 +163,Track Leads by Industry Type.,Seguiment dels clients potencials per tipus d'indústria.
 DocType: Item Supplier,Item Supplier,Article Proveïdor
@@ -2191,31 +2119,28 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Actual Quantitat Després de Transacció
 ,Pending SO Items For Purchase Request,A l'espera dels Articles de la SO per la sol·licitud de compra
 DocType: Supplier,Billing Currency,Facturació moneda
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra gran
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra gran
 ,Profit and Loss Statement,Guanys i Pèrdues
 DocType: Bank Reconciliation Detail,Cheque Number,Número de Xec
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Premsat
 DocType: Payment Tool Detail,Payment Tool Detail,Detall mitjà de Pagament
 ,Sales Browser,Analista de Vendes
 DocType: Journal Entry,Total Credit,Crèdit Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,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/setup/page/setup_wizard/setup_wizard.py +459,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +476,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/setup/setup_wizard/setup_wizard.py +397,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/page/setup_wizard/install_fixtures.py +147,Large,Gran
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,No s'ha trobat cap empleat!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Gran
 DocType: C-Form Invoice Detail,Territory,Territori
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Si us plau, no de visites requerides"
 DocType: Purchase Order,Customer Address Display,Direcció del client Pantalla
 DocType: Stock Settings,Default Valuation Method,Mètode de valoració predeterminat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polit
 DocType: Production Order Operation,Planned Start Time,Planificació de l'hora d'inici
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Tancar Balanç i llibre Guany o Pèrdua.
-apps/erpnext/erpnext/stock/doctype/item/item.py +661,"Default Unit of Measure for Item {0} cannot be changed directly because \
+apps/erpnext/erpnext/stock/doctype/item/item.py +665,"Default Unit of Measure for Item {0} cannot be changed directly because \
 			you have already made some transaction(s) with another UOM. To change default UOM, \
 			use 'UOM Replace Utility' tool under Stock module.","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. Per canviar UOM defecte, \ ús &#39;UOM Substituir Utilitat&#39; eina de baix mòdul d&#39;Stock."
 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 +146,Quotation {0} is cancelled,L'annotació {0} està cancel·lada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,L'annotació {0} està cancel·lada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Total Monto Pendent
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Empleat {0} estava de llicència a {1}. No es pot marcar l'assistència.
 DocType: Sales Partner,Targets,Blancs
@@ -2226,7 +2151,6 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Si us plau, crea Client a partir del client potencial {0}"
 DocType: Price List,Applicable for Countries,Aplicable per als Països
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Ordinadors
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-química de mòlta
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,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.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Si us plau, configura el teu pla de comptes abans de començar els assentaments comptables"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorar Regla preus
@@ -2284,7 +2208,6 @@
 DocType: Maintenance Visit,Purposes,Propòsits
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,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 +67,"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"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Mecanitzat electroquímic
 ,Requested,Comanda
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Sense Observacions
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Endarrerit
@@ -2293,7 +2216,7 @@
 DocType: Monthly Distribution,Distribution Name,Distribution Name
 DocType: Features Setup,Sales and Purchase,Compra i Venda
 DocType: Supplier Quotation Item,Material Request No,Número de sol·licitud de Material
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspecció de qualitat requerida per a l'article {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspecció de qualitat requerida per a l'article {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Rati a la qual es converteix la divisa del client es converteix en la moneda base de la companyia
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} ha estat èxit de baixa d&#39;aquesta llista.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Taxa neta (Companyia moneda)
@@ -2311,9 +2234,8 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Any fiscal {0} no es troba.
 DocType: Bank Reconciliation,Get Relevant Entries,Obtenir assentaments corresponents
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Entrada Comptabilitat de Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Encunyant
 DocType: Sales Invoice,Sales Team1,Equip de Vendes 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,Item {0} does not exist,Article {0} no existeix
+apps/erpnext/erpnext/stock/doctype/item/item.py +416,Item {0} does not exist,Article {0} no existeix
 DocType: Sales Invoice,Customer Address,Direcció del client
 apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar addicional de descompte en les
@@ -2325,14 +2247,13 @@
 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 +149,Target warehouse is mandatory for row {0},Magatzem destí obligatori per a la fila {0}
 DocType: Quality Inspection,Quality Inspection,Inspecció de Qualitat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Petit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Ruixeu la formació
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Petit
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,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 +191,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ó.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Alimentació, begudes i tabac"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentació, begudes i tabac"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL o BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Només es pot fer el pagament contra facturats {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +531,Can only make payment against unbilled {0},Només es pot fer el pagament contra facturats {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,La Comissió no pot ser major que 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nivell d'inventari mínim
 DocType: Stock Entry,Subcontract,Subcontracte
@@ -2343,19 +2264,18 @@
 DocType: Item,Manufacturer Part Number,PartNumber del fabricant
 DocType: Production Order Operation,Estimated Time and Cost,Temps estimat i cost
 DocType: Bin,Bin,Paperera
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Sospita
 DocType: SMS Log,No of Sent SMS,No d'SMS enviats
 DocType: Account,Company,Empresa
 DocType: Account,Expense Account,Compte de Despeses
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Programari
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Color
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Programari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Color
 DocType: Maintenance Visit,Scheduled,Programat
 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"
 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.
 DocType: Purchase Invoice Item,Valuation Rate,Tarifa de Valoració
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,No s'ha escollit una divisa per la llista de preus
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Article Fila {0}: Compra de Recepció {1} no existeix a la taulat 'Rebuts de compra'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,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/hr/doctype/leave_application/leave_application.py +145,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 +8,Until,Fins
 DocType: Rename Tool,Rename Log,Canviar el nom de registre
@@ -2365,7 +2285,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Seleccioneu {0}
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Investigador
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Investigador
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Actualització
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Si us plau, guardi el butlletí abans d'enviar-"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nom o Email és obligatori
@@ -2374,11 +2294,10 @@
 DocType: Employee,Exit,Sortida
 apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Type is mandatory
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial No {0} creat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Acabat vibratori
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Per comoditat dels clients, aquests codis es poden utilitzar en formats d'impressió, com factures i albarans"
 DocType: Employee,You can enter any date manually,Podeu introduir qualsevol data manualment
 DocType: Sales Invoice,Advertisement,Anunci
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Període De Prova
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Període De Prova
 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
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Rebut de compra dels articles subministrats
@@ -2386,19 +2305,16 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,To Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Registres per mantenir l&#39;estat de lliurament de sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Mòlta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Retractilat
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Activitats pendents
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmat
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Proveïdor > Tipus Proveïdor
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Please enter relieving date.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Només es poden presentar les Aplicacions d'absència amb estat ""Aprovat"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Només es poden presentar les Aplicacions d'absència amb estat ""Aprovat"""
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Títol d'adreça obligatori.
 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/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editors de Newspapers
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Editors de Newspapers
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Seleccioneu l'any fiscal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Fosa
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Nivell de Reabastecimiento
 DocType: Attendance,Attendance Date,Assistència Data
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salary breakup based on Earning and Deduction.
@@ -2413,16 +2329,15 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 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)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,El número de sèrie {0} no existeix
 DocType: Pricing Rule,Discount Percentage,%Descompte
 DocType: Payment Reconciliation Invoice,Invoice Number,Número de factura
-apps/erpnext/erpnext/hooks.py +70,Orders,Ordres
+apps/erpnext/erpnext/hooks.py +54,Orders,Ordres
 DocType: Leave Control Panel,Employee Type,Tipus d'ocupació
 DocType: Employee Leave Approver,Leave Approver,Aprovador d'absències
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Recalcat
 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"""
 ,Issued Items Against Production Order,Articles emesa contra ordre de producció
@@ -2434,7 +2349,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Depreciació
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveïdor (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Període invàlid
 DocType: Customer,Credit Limit,Límit de Crèdit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Seleccioneu el tipus de transacció
 DocType: GL Entry,Voucher No,Número de comprovant
@@ -2444,9 +2358,9 @@
 DocType: Customer,Address and Contact,Direcció i Contacte
 DocType: Customer,Last Day of the Next Month,Últim dia del mes
 DocType: Employee,Feedback,Resposta
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"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 +284,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/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Horari
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Mecanitzat per raig abrasiu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Horari
 DocType: Stock Settings,Freeze Stock Entries,Freeze Imatges entrades
 DocType: Website Settings,Website Settings,Configuració del lloc web
 DocType: Item,Reorder level based on Warehouse,Nivell de comanda basat en Magatzem
@@ -2463,7 +2377,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostra Imatges d'entrades
 ,Is Primary Address,És Direcció Primària
 DocType: Production Order,Work-in-Progress Warehouse,Magatzem de treballs en procés
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referència #{0} amb data {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referència #{0} amb data {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Administrar Direccions
 DocType: Pricing Rule,Item Code,Codi de l'article
 DocType: Production Planning Tool,Create Production Orders,Crear ordres de producció
@@ -2472,7 +2386,7 @@
 DocType: Lead,Market Segment,Sector de mercat
 DocType: Communication,Phone,Telèfon
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de treball intern de l'empleat
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Tancament (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Tancament (Dr)
 DocType: Contact,Passive,Passiu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,El número de sèrie {0} no està en estoc
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Plantilla d'Impostos per a la venda de les transaccions.
@@ -2488,8 +2402,8 @@
 ,Billed Amount,Quantitat facturada
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliació bancària
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obtenir actualitzacions
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Material de Sol·licitud {0} es cancel·la o s'atura
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Afegir uns registres d&#39;exemple
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +133,Material Request {0} is cancelled or stopped,Material de Sol·licitud {0} es cancel·la o s'atura
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Add a few sample records,Afegir uns registres d&#39;exemple
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Deixa Gestió
 DocType: Event,Groups,Grups
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Agrupa Per Comptes
@@ -2502,38 +2416,34 @@
 DocType: Features Setup,Sales Extras,Extres de venda
 apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} pressupost per al compte {1} contra Centre de Cost {2} superarà per {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"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/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Número d'ordre de Compra per {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Número d'ordre de Compra per {0}
 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'
 ,Stock Projected Qty,Quantitat d'estoc previst
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Client {0} no pertany a projectar {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Client {0} no pertany a projectar {1}
 DocType: Sales Order,Customer's Purchase Order,Àrea de clients Ordre de Compra
 DocType: Warranty Claim,From Company,Des de l'empresa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor o Quantitat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minut
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Minute,Minut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Compra Impostos i Càrrecs
 ,Qty to Receive,Quantitat a Rebre
 DocType: Leave Block List,Leave Block List Allowed,Llista d'absències permeses bloquejades
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Factor de conversió no pot estar en fraccions
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,El utilitzarà per iniciar sessió
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,El utilitzarà per iniciar sessió
 DocType: Sales Partner,Retailer,Detallista
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,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 +128,All Supplier Types,Tots els tipus de proveïdors
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,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 +99,Quotation {0} not of type {1},Cita {0} no del tipus {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank Overdraft Account
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Feu nòmina
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Navegar per llista de materials
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Préstecs Garantits
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Productes impressionants
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Productes impressionants
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Saldo inicial Equitat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,No es pot aprovar l'absència perquè no estàs autoritzat per aprovar-les en dates bloquejades
 DocType: Appraisal,Appraisal,Avaluació
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Fosa a l&#39;escuma perduda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Dibuix
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data repetida
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},L'aprovador d'absències ha de ser un de {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},L'aprovador d'absències ha de ser un de {0}
 DocType: Hub Settings,Seller Email,Electrònic
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Cost total de compra (mitjançant compra de la factura)
 DocType: Workstation Working Hour,Start Time,Hora d'inici
@@ -2547,7 +2457,7 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Import net (Companyia moneda)
 DocType: BOM Operation,Hour Rate,Hour Rate
 DocType: Stock Settings,Item Naming By,Article Naming Per
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Des de l'oferta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Des de l'oferta
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Una altra entrada Període de Tancament {0} s'ha fet després de {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material transferit per a la Fabricació
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,{0} no existeix Compte
@@ -2561,21 +2471,19 @@
 DocType: Purchase Invoice Item,PR Detail,Detall PR
 DocType: Sales Order,Fully Billed,Totalment Anunciat
 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 +72,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 +119,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)"
 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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Els meus enviaments
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Els meus enviaments
 DocType: Journal Entry,Bill Date,Data de la factura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"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:"
 DocType: Supplier,Supplier Details,Detalls del proveïdor
 DocType: Communication,Recipients,Destinataris
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Cargolar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Moleteado
 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 +44,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/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Transferència Bancària
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Transferència Bancària
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Seleccioneu el compte bancari
 DocType: Newsletter,Create and Send Newsletters,Crear i enviar butlletins de notícies
 apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,A partir de la data ha de ser abans Per Data
@@ -2583,14 +2491,14 @@
 DocType: Company,Default Income Account,Compte d'Ingressos predeterminat
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grup de Clients / Client
 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/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Benvingut a ERPNext
+,Welcome to ERPNext,Benvingut a ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Detail Number
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,El plom a la Petició
 DocType: Lead,From Customer,De Client
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Trucades
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Trucades
 DocType: Project,Total Costing Amount (via Time Logs),Suma total del càlcul del cost (a través dels registres de temps)
 DocType: Purchase Order Item Supplied,Stock UOM,UDM de l'Estoc
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Ordre de Compra {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +194,Purchase Order {0} is not submitted,Ordre de Compra {0} no es presenta
 ,Projected,Projectat
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} no pertany al Magatzem {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota: El sistema no verificarà el lliurament excessiva i l'excés de reserves per Punt {0} com la quantitat o la quantitat és 0
@@ -2598,7 +2506,6 @@
 DocType: Issue,Opening Date,Data d'obertura
 DocType: Journal Entry,Remark,Observació
 DocType: Purchase Receipt Item,Rate and Amount,Taxa i Quantitat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Avorrit
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,A partir d'ordres de venda
 DocType: Blog Category,Parent Website Route,Parent Website Route
 DocType: Sales Order,Not Billed,No Anunciat
@@ -2612,19 +2519,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,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/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"per exemple, l'IVA"
+apps/erpnext/erpnext/public/js/setup_wizard.js +292,e.g. VAT,"per exemple, l'IVA"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Article 4
 DocType: Journal Entry Account,Journal Entry Account,Compte entrada de diari
 DocType: Shopping Cart Settings,Quotation Series,Sèrie Cotització
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"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/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Formant gas de metall calent
 DocType: Sales Order Item,Sales Order Date,Sol·licitar Sales Data
 DocType: Sales Invoice Item,Delivered Qty,Quantitat lliurada
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Magatzem {0}: Empresa és obligatori
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Anar al grup apropiat (en general Font dels fons&gt; Passius Corrents&gt; Impostos i drets i crear un nou compte (fent clic a Afegeix nen) de tipus &quot;impostos&quot; i fer parlar de la taxa d&#39;impostos.
 ,Payment Period Based On Invoice Date,Període de pagament basat en Data de la factura
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Manca de canvi de moneda per {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Tall per làser
 DocType: Event,Monday,Dilluns
 DocType: Journal Entry,Stock Entry,Entrada estoc
 DocType: Account,Payable,Pagador
@@ -2657,7 +2562,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,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 +69,{0}% Delivered,{0}% Lliurat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,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 +82,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
 DocType: Territory,Territory Targets,Objectius Territori
 DocType: Delivery Note,Transporter Info,Informació del transportista
@@ -2666,7 +2571,6 @@
 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."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,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/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 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.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Si us plau, tiri d'articles de lliurament Nota"
@@ -2681,7 +2585,6 @@
 ,Purchase Analytics,Anàlisi de Compres
 DocType: Sales Invoice Item,Delivery Note Item,Nota de lliurament d'articles
 DocType: Expense Claim,Task,Tasca
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Afeitat
 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 +14,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.
@@ -2693,13 +2596,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Propòsit ha de ser un de {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,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/setup_wizard/fixtures/operations.py +94,Facing,Davant
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Fòrum de la comunitat
 DocType: Leave Application,Leave Balance Before Application,Leave Balance Before Application
 DocType: SMS Center,Send SMS,Enviar SMS
 DocType: Company,Default Letter Head,Per defecte Cap de la lletra
 DocType: Time Log,Billable,Facturable
-DocType: Authorization Rule,This will be used for setting rule in HR module,Això s'utilitza per ajustar la regla en el mòdul HR
 DocType: Account,Rate at which this tax is applied,Rati a la qual s'aplica aquest impost
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Quantitat per a generar comanda
 DocType: Company,Stock Adjustment Account,Compte d'Ajust d'estocs
@@ -2726,16 +2627,15 @@
 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%
 DocType: Serial No,Out of AMC,Fora d'AMC
 DocType: Purchase Order Item,Material Request Detail No,Número de detall de petició de material
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Tornejat dur
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Feu Manteniment Visita
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,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 +79,Company (not Customer or Supplier) master.,Companyia (no client o proveïdor) mestre.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Si us plau, introdueixi 'la data prevista de lliurament'"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,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/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Si us plau, introdueixi 'la data prevista de lliurament'"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,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/accounts/doctype/sales_invoice/sales_invoice.py +373,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 +109,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/hr/doctype/leave_application/leave_application.py +124,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/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Nota: Si el pagament no es fa en contra de qualsevol referència, fer entrada de diari manualment."
 DocType: Item,Supplier Items,Articles Proveïdor
 DocType: Opportunity,Opportunity Type,Tipus d'Oportunitats
@@ -2747,7 +2647,7 @@
 DocType: Hub Settings,Publish Availability,Publicar disponibilitat
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,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/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' es desactiva
+apps/erpnext/erpnext/controllers/accounts_controller.py +201,{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: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correus electrònics automàtics als Contactes al Presentar les transaccions
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2757,45 +2657,39 @@
 DocType: Purchase Order,Customer Contact Email,Client de correu electrònic de contacte
 DocType: Event,Sunday,Diumenge
 DocType: Sales Team,Contribution (%),Contribució (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,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/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilitats
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,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/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilitats
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Plantilla
 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/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Afegir usuaris
+apps/erpnext/erpnext/public/js/setup_wizard.js +255,Add Users,Afegir usuaris
 DocType: Pricing Rule,Item Group,Grup d'articles
 DocType: Task,Actual Start Date (via Time Logs),Data d&#39;inici real (a través dels registres de temps)
 DocType: Stock Reconciliation Item,Before reconciliation,Abans de la reconciliació
 apps/erpnext/erpnext/support/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 +340,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 +344,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
 DocType: Item,Default BOM,BOM predeterminat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,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 +70,Total Outstanding Amt,Viu total Amt
 DocType: Time Log Batch,Total Hours,Total d'hores
 DocType: Journal Entry,Printing Settings,Paràmetres d&#39;impressió
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,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/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automòbil
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Es requereix un article
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Emmotllament per injecció de metall
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,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/sales_invoice/sales_invoice.js +684,From Delivery Note,De la nota de lliurament
 DocType: Time Log,From Time,From Time
 DocType: Notification Control,Custom Message,Missatge personalitzat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Banca d'Inversió
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Seleccioni el seu País, Zona horària i moneda"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banca d'Inversió
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +316,"Select your Country, Time Zone and Currency","Seleccioni el seu País, Zona horària i moneda"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,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
 DocType: Purchase Invoice,Price List Exchange Rate,Tipus de canvi per a la llista de preus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Decapat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Fosa de sorra
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanoplàstia
 DocType: Purchase Invoice Item,Rate,Tarifa
 DocType: Purchase Invoice Item,Rate,Tarifa
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
 DocType: Newsletter,A Lead with this email id should exist,Hauria d'haver-hi un client potencial amb aquest correu electrònic
 DocType: Stock Entry,From BOM,A partir de la llista de materials
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Bàsic
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Si us plau, feu clic a ""Generar Planificació"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Per a la data ha de ser igual a partir de la data d'autorització de Medi Dia
@@ -2803,11 +2697,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Reference No és obligatori si introduir Data de Referència
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,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 Structure,Salary Structure,Estructura salarial
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Múltiple Preu Regla existeix amb els mateixos criteris, si us plau resoldre \
  conflicte mitjançant l'assignació de prioritat. Regles Preu: {0}"
 DocType: Account,Bank,Banc
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Aerolínia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aerolínia
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Material Issue
 DocType: Material Request Item,For Warehouse,Per Magatzem
 DocType: Employee,Offer Date,Data d'Oferta
@@ -2817,29 +2711,24 @@
 DocType: Item,Is Fixed Asset Item,És la partida de l'actiu fix
 DocType: Stock Entry,Including items for sub assemblies,Incloent articles per subconjunts
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Si vostè té formats d'impressió llargs, aquesta característica pot ser utilitzada per dividir la pàgina que s'imprimirà en diverses pàgines amb tots els encapçalaments i peus de pàgina en cada pàgina"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Tots els territoris
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Tots els territoris
 DocType: Purchase Invoice,Items,Articles
 DocType: Fiscal Year,Year Name,Nom Any
 DocType: Process Payroll,Process Payroll,Process Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Hi ha més vacances que els dies de treball aquest mes.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +68,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
 DocType: Purchase Invoice Item,Image View,Veure imatges
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Acabat i acabat industrial
 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/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
 DocType: Shipping Rule,Calculate Based On,Calcula a causa del
 DocType: Delivery Note Item,From Warehouse,De Magatzem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Perforació
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,L&#39;emmotllament per bufat
 DocType: Purchase Taxes and Charges,Valuation and Total,Valoració i total
 DocType: Tax Rule,Shipping City,Enviaments City
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Aquest article és una variant de {0} (plantilla). Els atributs es copiaran de la plantilla llevat que 'No Copy' es fixa
 DocType: Account,Purchase User,Usuari de compres
 DocType: Notification Control,Customize the Notification,Personalitza la Notificació
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Martelleig
 DocType: Web Page,Slideshow,Slideshow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,La Plantilla de la direcció predeterminada no es pot eliminar
 DocType: Sales Invoice,Shipping Rule,Regla d'enviament
@@ -2848,9 +2737,8 @@
 DocType: Workflow State,Search,cerca
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,El total no pot ser zero
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Soldadura
 DocType: C-Form,Amended From,Modificada Des de
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Matèria Primera
+apps/erpnext/erpnext/public/js/setup_wizard.js +359,Raw Material,Matèria Primera
 DocType: Leave Application,Follow via Email,Seguiu per correu electrònic
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Suma d'impostos Després del Descompte
 apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Compte Nen existeix per aquest compte. No es pot eliminar aquest compte.
@@ -2864,10 +2752,10 @@
 ,Produced,Produït
 DocType: Item,Item Code for Suppliers,Codi de l&#39;article per Proveïdors
 DocType: Issue,Raised By (Email),Raised By (Email)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,General
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Afegir capçalera de carta
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,General
+apps/erpnext/erpnext/public/js/setup_wizard.js +241,Attach Letterhead,Afegir capçalera de carta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,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/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Enumereu els seus caps fiscals (per exemple, l&#39;IVA, duanes, etc., sinó que han de tenir noms únics) i les seves tarifes estàndard. Això crearà una plantilla estàndard, que pot editar i afegir més tard."
+apps/erpnext/erpnext/public/js/setup_wizard.js +284,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Enumereu els seus caps fiscals (per exemple, l&#39;IVA, duanes, etc., sinó que han de tenir noms únics) i les seves tarifes estàndard. Això crearà una plantilla estàndard, que pot editar i afegir més tard."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Nº de Sèrie Necessari per article serialitzat {0}
 DocType: Journal Entry,Bank Entry,Entrada Banc
 DocType: Authorization Rule,Applicable To (Designation),Aplicable a (Designació)
@@ -2876,33 +2764,32 @@
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Activar / desactivar les divises.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Despeses postals
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entreteniment i Oci
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entreteniment i Oci
 DocType: Purchase Order,The date on which recurring order will be stop,La data en què s'aturarà la comanda recurrent
 DocType: Quality Inspection,Item Serial No,Número de sèrie d'article
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} ha de ser reduït per {1} o s'ha d'augmentar la tolerància de desbordament
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Present total
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Hora
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,Hour,Hora
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialitzat article {0} no es pot actualitzar utilitzant \
  Stock Reconciliació"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transferència de material a proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +513,Transfer Material to Supplier,Transferència de material a proveïdor
 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
 DocType: Lead,Lead Type,Tipus de client potencial
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Crear Cotització
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Tots aquests elements ja s'han facturat
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,No està autoritzat per aprovar els fulls de bloquejar les dates
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Tots aquests elements ja s'han facturat
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Pot ser aprovat per {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Condicions d'enviament
 DocType: BOM Replace Tool,The new BOM after replacement,La nova llista de materials després del reemplaçament
 DocType: Features Setup,Point of Sale,Punt de Venda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Impost
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},La fila {0}: {1} no és vàlida per {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Refinació
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},La fila {0}: {1} no és vàlida per {2}
 DocType: Production Planning Tool,Production Planning Tool,Eina de Planificació de la producció
 DocType: Quality Inspection,Report Date,Data de l'informe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Encaminament
 DocType: C-Form,Invoices,Factures
 DocType: Job Opening,Job Title,Títol Professional
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} ja assignat per Empleat {1} per al període {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinataris
 DocType: Features Setup,Item Groups in Details,Els grups d'articles en detalls
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Quantitat de Fabricació ha de ser major que 0.
@@ -2920,14 +2807,13 @@
 DocType: DocType,Setup,Ajustos
 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/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Resum per a aquest mes i activitats pendents
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Laminació en fred
 DocType: Customer Group,Customer Group Name,Nom del grup al Client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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 +410,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: Item,Attributes,Atributs
 DocType: Packing Slip,Get Items,Obtenir elements
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Si us plau indica el Compte d'annotació
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Please enter Write Off Account,Si us plau indica el Compte d'annotació
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Darrera Data de comanda
 DocType: DocField,Image,Imatge
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Feu Factura impostos especials
@@ -2937,7 +2823,7 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID Operació no estableix
 DocType: Production Order,Planned Start Date,Data d'inici prevista
 DocType: Serial No,Creation Document Type,Creació de tipus de document
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Visita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Visita
 DocType: Leave Type,Is Encash,És convertirà en efectiu
 DocType: Purchase Invoice,Mobile No,Número de Mòbil
 DocType: Payment Tool,Make Journal Entry,Feu entrada de diari
@@ -2945,35 +2831,31 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Dades-Project savi no està disponible per a la cita
 DocType: Project,Expected End Date,Esperat Data de finalització
 DocType: Appraisal Template,Appraisal Template Title,Títol de plantilla d'avaluació
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +378,Commercial,Comercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Article Pare {0} no ha de ser un arxiu d&#39;articles
 DocType: Cost Center,Distribution Id,ID de Distribució
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Serveis impressionants
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Serveis impressionants
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Tots els Productes o Serveis.
 DocType: Purchase Invoice,Supplier Address,Adreça del Proveïdor
 DocType: Contact Us Settings,Address Line 2,Adreça Línia 2
 DocType: ToDo,Reference,referència
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforat
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Quantitat de sortida
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regles per calcular l'import d'enviament per a una venda
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Sèries és obligatori
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Serveis Financers
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Serveis Financers
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valor de l&#39;atribut {0} ha d&#39;estar dins del rang de {1} a {2} en els increments de {3}
 DocType: Tax Rule,Sales,Venda
 DocType: Stock Entry Detail,Basic Amount,Suma Bàsic
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Magatzem necessari per a l'article d'estoc {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Magatzem necessari per a l'article d'estoc {0}
 DocType: Leave Allocation,Unused leaves,Fulles no utilitzades
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Per defecte Comptes per cobrar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Serrar
 DocType: Tax Rule,Billing State,Estat de facturació
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminació
 DocType: Item Reorder,Transfer,Transferència
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,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 +101,Due Date is mandatory,Data de venciment és obligatori
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Increment de Atribut {0} no pot ser 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,La sinterització
 DocType: Journal Entry,Pay To / Recd From,Pagar a/Rebut de
 DocType: Naming Series,Setup Series,Sèrie d'instal·lació
 DocType: Supplier,Contact HTML,Contacte HTML
@@ -2986,7 +2868,6 @@
 DocType: Attendance,Absent,Absent
 DocType: Product Bundle,Product Bundle,Bundle Producte
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Fila {0}: Referència no vàlida {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Aclaparadora
 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: GL Entry,Remarks,Observacions
@@ -2994,14 +2875,12 @@
 DocType: Journal Entry,Write Off Based On,Anotació basada en
 DocType: Features Setup,POS View,POS Veure
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Registre d'instal·lació per a un nº de sèrie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,La colada contínua
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Si us plau, especifiqueu un"
 DocType: Offer Letter,Awaiting Response,Espera de la resposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Per sobre de
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionament Freda
 DocType: Salary Slip,Earning & Deduction,Guanyar i Deducció
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,El Compte {0} no pot ser un grup
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regió
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard.js +314,Region,Regió
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,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 +104,Negative Valuation Rate is not allowed,No es permeten els ràtios de valoració negatius
 DocType: Holiday List,Weekly Off,Setmanal Off
@@ -3019,7 +2898,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Compte {0} està inactiu
 DocType: GL Entry,Is Advance,És Avanç
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Assistència Des de la data i Assistència a la data és obligatori
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Si us plau, introdueixi 'subcontractació' com Sí o No"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Si us plau, introdueixi 'subcontractació' com Sí o No"
 DocType: Sales Team,Contact No.,Número de Contacte
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Pèrdues i Guanys"" tipus de compte {0} no es permet l'entrada amb obertura"
 DocType: Workflow State,Time,temps
@@ -3028,14 +2907,13 @@
 DocType: Authorization Rule,Authorization Rule,Regla d'Autorització
 DocType: Sales Invoice,Terms and Conditions Details,Termes i Condicions Detalls
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impostos i càrrecs de venda de plantilla
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Roba i Accessoris
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Roba i Accessoris
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.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.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especifica les condicions d'enviament per calcular l'import del transport
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Afegir Nen
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Paper deixa forjar congelats Comptes i editar les entrades congelades
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,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/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Es requereix el factor de conversió
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Comissió de Vendes
 DocType: Offer Letter Term,Value / Description,Valor / Descripció
@@ -3043,10 +2921,8 @@
 ,Customers Not Buying Since Long Time,Els clients no comprar des de fa molt temps
 DocType: Production Order,Expected Delivery Date,Data de lliurament esperada
 apps/erpnext/erpnext/accounts/general_ledger.py +121,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/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Voluminós
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporatiu-model de fosa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Despeses d'Entreteniment
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,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 +190,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/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Edat
 DocType: Time Log,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.
@@ -3065,26 +2941,24 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nous ingressos al Client
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Despeses de viatge
 DocType: Maintenance Visit,Breakdown,Breakdown
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,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 +242,Account: {0} with currency: {1} can not be selected,Compte: {0} amb la divisa: {1} no es pot seleccionar
 DocType: Bank Reconciliation Detail,Cheque Date,Data Xec
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Compte {0}: el compte Pare {1} no pertany a la companyia: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Esmolant
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Probation
-apps/erpnext/erpnext/stock/doctype/item/item.py +264,Default Warehouse is mandatory for stock Item.,El magatzem predeterminat és obligatòria pels articles d'estoc
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probation
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,El magatzem predeterminat és obligatòria pels articles d'estoc
 DocType: Feed,Full Name,Nom complet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Reblat
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},El pagament del salari corresponent al mes {0} i {1} anys
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},El pagament del salari corresponent al mes {0} i {1} anys
 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 +25,Total Paid Amount,Suma total de pagament
 ,Transferred Qty,Quantitat Transferida
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegació
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planificació
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planificació
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Fer un registre de temps
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Emès
 DocType: Project,Total Billing Amount (via Time Logs),Suma total de facturació (a través dels registres de temps)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Venem aquest article
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,We sell this Item,Venem aquest article
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Identificador de Proveïdor
 DocType: Journal Entry,Cash Entry,Entrada Efectiu
 DocType: Sales Partner,Contact Desc,Descripció del Contacte
@@ -3093,18 +2967,16 @@
 DocType: Brand,Item Manager,Administració d&#39;elements
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Afegir files per establir els pressupostos anuals de Comptes.
 DocType: Buying Settings,Default Supplier Type,Tipus predeterminat de Proveïdor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Extracció
 DocType: Production Order,Total Operating Cost,Cost total de funcionament
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Nota: L'article {0} entrat diverses vegades
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Nota: L'article {0} entrat diverses vegades
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tots els contactes.
 DocType: Newsletter,Test Email Id,Test Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Abreviatura de l'empresa
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Abreviatura de l'empresa
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Si vostè segueix la inspecció de qualitat. Permet article QA Obligatori i QA No en rebut de compra
 DocType: GL Entry,Party Type,Tipus Partit
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,La matèria primera no pot ser la mateixa que article principal
 DocType: Item Attribute Value,Abbreviation,Abreviatura
 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/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,El modelo rotacional
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Salary template master.
 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 +55,Set Tax Rule for shopping cart,Estableixi la regla fiscal de carret de la compra
@@ -3118,15 +2990,15 @@
 apps/erpnext/erpnext/config/selling.py +18,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/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Tots els Grups de clients
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{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/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Tots els Grups de clients
+apps/erpnext/erpnext/controllers/accounts_controller.py +475,{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 +37,Tax Template is mandatory.,Plantilla d&#39;impostos és obligatori.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,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: Account,Temporary,Temporal
 DocType: Address,Preferred Billing Address,Preferit Direcció de facturació
 DocType: Monthly Distribution Percentage,Percentage Allocation,Percentatge d'Assignació
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Secretari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Secretari
 DocType: Serial No,Distinct unit of an Item,Unitat diferent d'un article
 DocType: Pricing Rule,Buying,Compra
 DocType: HR Settings,Employee Records to be created by,Registres d'empleats a ser creats per
@@ -3139,9 +3011,8 @@
 ,Item-wise Price List Rate,Llista de Preus de tarifa d'article
 DocType: Purchase Order Item,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/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Planxat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} està aturat
-apps/erpnext/erpnext/stock/doctype/item/item.py +352,Barcode {0} already used in Item {1},Barcode {0} ja utilitzat en el punt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barcode {0} ja utilitzat en el punt {1}
 DocType: Lead,Add to calendar on this date,Afegir al calendari en aquesta data
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regles per afegir les despeses d'enviament.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Pròxims esdeveniments
@@ -3150,13 +3021,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Entrada ràpida
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} és obligatori per a la Tornada
 DocType: Purchase Order,To Receive,Rebre
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink apropiat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Ingressos / despeses
 DocType: Employee,Personal Email,Email Personal
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Variància total
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,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/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Corretatge
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Corretatge
 DocType: Address,Postal Code,Codi Postal
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","en minuts 
@@ -3164,14 +3034,13 @@
 DocType: Customer,From Lead,De client potencial
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Comandes llançades per a la producció.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Seleccioneu l'Any Fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,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 +444,POS Profile required to make POS Entry,POS perfil requerit per fer l&#39;entrada POS
 DocType: Hub Settings,Name Token,Nom Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Raspallat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standard Selling
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +120,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Almenys un magatzem és obligatori
 DocType: Serial No,Out of Warranty,Fora de la Garantia
 DocType: BOM Replace Tool,Replace,Reemplaçar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} contra factura Vendes {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} contra factura Vendes {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Si us plau ingressi Unitat de mesura per defecte
 DocType: Purchase Invoice Item,Project Name,Nom del projecte
 DocType: Supplier,Mention if non-standard receivable account,Esmenteu si compta per cobrar no estàndard
@@ -3187,9 +3056,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,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 Replace Tool,The BOM which will be replaced,Llista de materials que serà substituïda
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nou Stock UOM ha de ser diferent de l'actual de les accions UOM
 DocType: Account,Debit,Dèbit
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Les fulles han de ser assignats en múltiples de 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,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 +71,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
@@ -3207,8 +3075,7 @@
 DocType: Employee,Internal Work History,Historial de treball intern
 DocType: DocField,Column Break,Salt de columna
 DocType: Event,Thursday,Dijous
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Tornejat
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Comentaris del client
 DocType: Account,Expense,Despesa
 DocType: Sales Invoice,Exhibition,Exposició
@@ -3221,19 +3088,19 @@
 DocType: Employee,Held On,Held On
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Element Producció
 ,Employee Information,Informació de l'empleat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Tarifa (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +294,Rate (%),Tarifa (%)
 DocType: Stock Entry Detail,Additional Cost,Cost addicional
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Data de finalització de l'exercici fiscal
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Data de finalització de l'exercici fiscal
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"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/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Fer Oferta de Proveïdor
 DocType: Quality Inspection,Incoming,Entrant
 DocType: BOM,Materials Required (Exploded),Materials necessaris (explotat)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduir el guany per absències sense sou (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Afegir usuaris a la seva organització, que no sigui vostè"
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,"Add users to your organization, other than yourself","Afegir usuaris a la seva organització, que no sigui vostè"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,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/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Deixar Casual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Deixar Casual
 DocType: Batch,Batch ID,Identificació de lots
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Nota: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Nota: {0}
 ,Delivery Note Trends,Nota de lliurament Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Resum de la setmana
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} ha de ser un article de compra o de subcontractació a la fila {1}
@@ -3245,7 +3112,7 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Retorn Contra Compra Rebut
 DocType: Purchase Order,To Bill,Per Bill
 DocType: Material Request,% Ordered,Demanem%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Treball a preu fet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Treball a preu fet
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,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
@@ -3262,13 +3129,13 @@
 DocType: Opportunity,To Discuss,Per Discutir
 DocType: SMS Settings,SMS Settings,Ajustaments de SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Comptes temporals
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Negre
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Negre
 DocType: BOM Explosion Item,BOM Explosion Item,Explosió de BOM d'article
 DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,Data de finalització del període de l'ordre actual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Fer una Oferta Carta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retorn
-apps/erpnext/erpnext/stock/doctype/item/item.py +503,Default Unit of Measure for Variant must be same as Template,Unitat de mesura per defecte per a la variant ha de ser la mateixa que la plantilla
+apps/erpnext/erpnext/stock/doctype/item/item.py +507,Default Unit of Measure for Variant must be same as Template,Unitat de mesura per defecte per a la variant ha de ser la mateixa que la plantilla
 DocType: DocField,Fold,fold
 DocType: Production Order Operation,Production Order Operation,Ordre de Producció Operació
 DocType: Pricing Rule,Disable,Desactiva
@@ -3279,13 +3146,12 @@
 DocType: Page,Page Name,Nom de pàgina
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Per Temps ha de ser més gran que From Time
 DocType: Journal Entry Account,Exchange Rate,Tipus De Canvi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Comanda de client {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Comanda de client {0} no es presenta
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magatzem {0}: compte de Pares {1} no Bolong a l'empresa {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Acabat cargol
 DocType: BOM,Last Purchase Rate,Darrera Compra Rate
 DocType: Account,Asset,Basa
 DocType: Project Task,Task ID,Tasca ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","per exemple ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","per exemple ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Estoc no pot existir per al punt {0} ja té variants
 ,Sales Person-wise Transaction Summary,Resum de transaccions de vendes Persona-savi
 DocType: System Settings,Time Zone,Fus horari
@@ -3294,9 +3160,7 @@
 DocType: Monthly Distribution,Monthly Distribution Percentages,Els percentatges de distribució mensuals
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,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
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Grapat
 DocType: Customer,Customer Details,Dades del client
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Shaping
 DocType: Employee,Reports to,Informes a
 DocType: SMS Settings,Enter url parameter for receiver nos,Introdueix els paràmetres URL per als receptors
 DocType: Sales Invoice,Paid Amount,Quantitat pagada
@@ -3305,13 +3169,13 @@
 DocType: Item Variant,Item Variant,Article Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,En establir aquesta plantilla de direcció per defecte ja que no hi ha altre defecte
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"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/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestió de la Qualitat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestió de la Qualitat
 DocType: Production Planning Tool,Filter based on customer,Filtre basat en el client
 DocType: Payment Tool Detail,Against Voucher No,Contra el comprovant número
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Introduïu la quantitat d'articles per {0}
 DocType: Employee External Work History,Employee External Work History,Historial de treball d'Empleat extern
 DocType: Tax Rule,Purchase,Compra
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Saldo Quantitat
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Saldo Quantitat
 DocType: Item Group,Parent Item Group,Grup d'articles pare
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} de {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Centres de costos
@@ -3321,12 +3185,12 @@
 DocType: Opportunity,Next Contact,Següent Contacte
 DocType: Employee,Employment Type,Tipus d'Ocupació
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Actius Fixos
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,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
 DocType: Employee,Notice (days),Avís (dies)
 DocType: Page,Yes,Sí
 DocType: Tax Rule,Sales Tax Template,Plantilla d&#39;Impost a les Vendes
 DocType: Employee,Encashment Date,Data Cobrament
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroformado
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Contra val Type ha de ser un ordre de compra, factura de compra o entrada de diari"
 DocType: Account,Stock Adjustment,Ajust d'estoc
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Hi Cost per defecte per al tipus d&#39;activitat Activitat - {0}
@@ -3362,12 +3226,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,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/pos/pos.html +36,Amount Paid,Quantitat pagada
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerent De Projecte
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Despatx
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerent De Projecte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Despatx
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descompte màxim permès per l'article: {0} és {1}%
 DocType: Customer,Default Taxes and Charges,Impostos i Càrrecs per defecte
 DocType: Account,Receivable,Compte per cobrar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,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 +263,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.
 DocType: Sales Invoice,Supplier Reference,Referència Proveïdor
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material."
@@ -3375,8 +3239,8 @@
 DocType: Hub Settings,Seller Description,Venedor Descripció
 DocType: Employee Education,Qualification,Qualificació
 DocType: Item Price,Item Price,Preu d'article
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Sabó i Detergent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Cinema i vídeo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sabó i Detergent
+apps/erpnext/erpnext/setup/setup_wizard/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
 DocType: Warehouse,Warehouse Name,Nom Magatzem
 DocType: Naming Series,Select Transaction,Seleccionar Transacció
@@ -3385,7 +3249,6 @@
 DocType: BOM,Rate Of Materials Based On,Tarifa de materials basats en
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Suport
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Falta Empresa als magatzems {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Utilitat de susbtitució de les UDM de l'estoc
 DocType: POS Profile,Terms and Conditions,Condicions
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,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."
@@ -3397,7 +3260,7 @@
 DocType: Sales Order Item,For Production,Per Producció
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Introduïu l'ordre de venda a la taula anterior
 DocType: Project Task,View Task,Vista de tasques
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,El seu exercici comença el
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,El seu exercici comença el
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Si us plau ingressi rebuts de compra
 DocType: Sales Invoice,Get Advances Received,Obtenir les bestretes rebudes
 DocType: Email Digest,Add/Remove Recipients,Afegir / Treure Destinataris
@@ -3405,16 +3268,14 @@
 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/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuració del servidor d'entrada per l'id de suport per correu electrònic. (Per exemple support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Quantitat escassetat
-apps/erpnext/erpnext/stock/doctype/item/item.py +528,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 +532,Item variant {0} exists with same attributes,Hi ha la variant d&#39;article {0} amb mateixos atributs
 DocType: Salary Slip,Salary Slip,Slip Salari
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Brunyit
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Per Dóna't' es requereix
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Per Dóna't' 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."
 DocType: Sales Invoice Item,Sales Order Item,Sol·licitar Sales Item
 DocType: Salary Slip,Payment Days,Dies de pagament
 DocType: BOM,Manage cost of operations,Administrar cost de les operacions
 DocType: Features Setup,Item Advanced,Article Avançat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Laminació en calent
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Quan es ""Presenta"" alguna de les operacions marcades, s'obre automàticament un correu electrònic emergent per enviar un correu electrònic al ""Contacte"" associat a aquesta transacció, amb la transacció com un arxiu adjunt. L'usuari pot decidir enviar, o no, el correu electrònic."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Configuració global
 DocType: Employee Education,Employee Education,Formació Empleat
@@ -3427,25 +3288,23 @@
 DocType: Customer,Sales Team Details,Detalls de l'Equip de Vendes
 DocType: Expense Claim,Total Claimed Amount,Suma total del Reclamat
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Els possibles oportunitats de venda.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Baixa per malaltia
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},No vàlida {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,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/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Grans Magatzems
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Grans Magatzems
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Balanç de Sistema
 DocType: Workflow,Is Active,Està actiu
 apps/erpnext/erpnext/controllers/stock_controller.py +71,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 +22,Save the document first.,Deseu el document primer.
 DocType: Account,Chargeable,Facturable
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Desbarbatge
 DocType: Company,Change Abbreviation,Canvi Abreviatura
 DocType: Workflow State,Primary,Primari
 DocType: Expense Claim Detail,Expense Date,Data de la Despesa
 DocType: Item,Max Discount (%),Descompte màxim (%)
 DocType: Communication,More Information,Més informació
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Darrera Quantitat de l'ordre
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Voladura
 DocType: Company,Warn,Advertir
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Valoració Article actualitzat
 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: Purchase Order,Raw Materials Supplied,Matèries primeres subministrades
@@ -3455,7 +3314,7 @@
 DocType: Appraisal,Appraisal Template,Plantilla d'Avaluació
 DocType: Communication,Email,Correu electrònic
 DocType: Item Group,Item Classification,Classificació d'articles
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerent de Desenvolupament de Negocis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerent de Desenvolupament de Negocis
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Manteniment Motiu de visita
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Període
 ,General Ledger,Comptabilitat General
@@ -3465,9 +3324,7 @@
 ,Itemwise Recommended Reorder Level,Nivell d'articles recomanat per a tornar a passar comanda
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Seleccioneu {0} primer
 DocType: Features Setup,To get Item Group in details table,Per obtenir Grup d'articles a la taula detalls
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redibuixar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Lot {0} de {1} article ha expirat.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Aiguafort
 DocType: Sales Invoice,Commission,Comissió
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3512,7 +3369,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,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}
 DocType: Supplier,Address and Contacts,Direcció i contactes
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detall UOM Conversió
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Manteniu 900px web amigable (w) per 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Keep it web friendly 900px (w) by 100px (h),Manteniu 900px web amigable (w) per 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,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 +44,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: Payment Tool,Get Outstanding Vouchers,Get Outstanding Vouchers
@@ -3528,54 +3385,49 @@
 DocType: Item,Average time taken by the supplier to deliver,Temps mitjà pel proveïdor per lliurar
 DocType: Time Log,Hours,hores
 DocType: Project,Expected Start Date,Data prevista d'inici
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rodant
 DocType: ToDo,Priority,Prioritat
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Treure article si els càrrecs no és aplicable a aquest
 DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Access Allowed
 DocType: Dropbox Backup,Weekly,Setmanal
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ex. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Rebre
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Receive,Rebre
 DocType: Maintenance Visit,Fully Completed,Totalment Acabat
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complet
 DocType: Employee,Educational Qualification,Capacitació per a l'Educació
 DocType: Workstation,Operating Costs,Costos Operatius
 DocType: Employee Leave Approver,Employee Leave Approver,Empleat Deixar aprovador
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ha estat afegit amb èxit al llistat de Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +383,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 +387,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 +67,"Cannot declare as lost, because Quotation has been made.","No es pot declarar com perdut, perquè s'han fet ofertes"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Mecanitzat per feix d&#39;electrons
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Administraodr principal de compres
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,L'Ordre de Producció {0} ha d'estar Presentada
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,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/config/stock.py +141,Main Reports,Informes principals
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Saldos d'entrades de moviments d'estocs actualitzats
 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: Purchase Receipt Item,Prevdoc DocType,Prevdoc Doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +176,Add / Edit Prices,Afegeix / Edita Preus
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Afegeix / Edita Preus
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Gràfic de centres de cost
 ,Requested Items To Be Ordered,Articles sol·licitats serà condemnada
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Les meves comandes
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Les meves comandes
 DocType: Price List,Price List Name,nom de la llista de preus
 DocType: Time Log,For Manufacturing,Per Manufactura
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totals
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totals
 DocType: BOM,Manufacturing,Fabricació
 ,Ordered Items To Be Delivered,Els articles demanats per ser lliurats
 DocType: Account,Income,Ingressos
 ,Setup Wizard,Assistent de configuració
 DocType: Industry Type,Industry Type,Tipus d'Indústria
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Quelcom ha fallat!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Advertència: Deixa aplicació conté dates bloc
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Factura {0} ja s'ha presentat
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Advertència: Deixa aplicació conté dates bloc
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Factura {0} ja s'ha presentat
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data d'acabament
 DocType: Purchase Invoice Item,Amount (Company Currency),Import (Companyia moneda)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Fosa a pressió
 DocType: Email Alert,Reference Date,Data de Referència
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unitat d'Organització (departament) mestre.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Entra números de mòbil vàlids
 DocType: Budget Detail,Budget Detail,Detall del Pressupost
 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: Async Task,Status,Estat
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Estoc UOM actualitza per al punt {0}
 DocType: Company History,Year,Any
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Punt de Venda Perfil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Actualitza Ajustaments SMS
@@ -3589,12 +3441,12 @@
 ,Serial No Service Contract Expiry,Número de sèrie del contracte de venciment del servei
 DocType: Item,Unit of Measure Conversion,Unitat de conversió de la mesura
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Empleat no es pot canviar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,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 +265,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: Naming Series,Help HTML,Ajuda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},El pes total assignat ha de ser 100%. És {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Permissió de superació {0} superat per l'article {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nom de la persona o organització a la que pertany aquesta direcció.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Els seus Proveïdors
+apps/erpnext/erpnext/public/js/setup_wizard.js +325,Your Suppliers,Els seus Proveïdors
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,No es pot establir tan perdut com està feta d'ordres de venda.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Una altra estructura salarial {0} està activa per l'empleat {1}. Si us plau, passeu el seu estat a 'inactiu' per seguir."
 DocType: Purchase Invoice,Contact,Contacte
@@ -3603,37 +3455,35 @@
 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 +16,{0}: From {0} for {1},{0}: Des {0} de {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunt de Proveïdors per a l&#39;element {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunt de Proveïdors per a l&#39;element {1}
 DocType: Issue,Content Type,Tipus de Contingut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Ordinador
+apps/erpnext/erpnext/setup/setup_wizard/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/accounts/doctype/journal_entry/journal_entry.py +283,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/accounts/doctype/journal_entry/journal_entry.py +285,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 +62,Item: {0} does not exist in the system,Article: {0} no existeix en el sistema
 apps/erpnext/erpnext/accounts/doctype/account/account.py +81,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: Cost Center,Budgets,Pressupostos
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Actualitzat
 DocType: Employee,Emergency Contact Details,Detalls de Contacte d'Emergència
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Què fa?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Què fa?
 DocType: Delivery Note,To Warehouse,Magatzem destí
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Compte {0} s'ha introduït més d'una vegada per a l'any fiscal {1}
 ,Average Commission Rate,Comissió de Tarifes mitjana
-apps/erpnext/erpnext/stock/doctype/item/item.py +313,'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 +317,'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/hr/doctype/attendance/attendance.py +34,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: Purchase Taxes and Charges,Account Head,Cap Compte
 apps/erpnext/erpnext/config/stock.py +79,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/page/setup_wizard/install_fixtures.py +111,Electrical,Elèctric
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elèctric
 DocType: Stock Entry,Total Value Difference (Out - In),Diferència Total Valor (Out - En)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipus de canvi és obligatori
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,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}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,De reclam de garantia
 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 +212,Birthday Reminder for {0},Recordatori d'aniversari per {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Polit
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dies des de l'última comanda
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dies des de l'última comanda
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,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
@@ -3647,7 +3497,7 @@
 DocType: Notification Control,Sales Invoice Message,Missatge de Factura de vendes
 DocType: Authorization Rule,Based On,Basat en
 DocType: Sales Order Item,Ordered Qty,Quantitat demanada
-apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item {0} is disabled,Article {0} està deshabilitat
+apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is disabled,Article {0} està deshabilitat
 DocType: Stock Settings,Stock Frozen Upto,Estoc bloquejat fins a
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Període Des i Període Per dates obligatòries per als recurrents {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Activitat del projecte / tasca.
@@ -3657,7 +3507,6 @@
 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: ToDo,Low,Sota
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Escriu Off Import (Companyia moneda)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Filat
 DocType: Landed Cost Voucher,Landed Cost Voucher,Val Landed Cost
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Si us plau, estableix {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Repetiu el Dia del Mes
@@ -3679,7 +3528,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Cal un nom de Campanya
 DocType: Maintenance Visit,Maintenance Date,Manteniment Data
 DocType: Purchase Receipt Item,Rejected Serial No,Número de sèrie Rebutjat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Embotició profunda
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nou Butlletí
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},La data d'inici ha de ser anterior a la data de finalització per l'article {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Mostra Equilibri
@@ -3690,7 +3538,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,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
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Quantitat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Reblat
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM reemplaçat
 ,Sales Analytics,Analytics de venda
 DocType: Manufacturing Settings,Manufacturing Settings,Ajustaments de Manufactura
@@ -3702,20 +3549,19 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,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/page/setup_wizard/install_fixtures.py +73,Customer Service,Servei Al Client
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Servei Al Client
 DocType: Item,Thumbnail,Ungla del polze
 DocType: Item Customer Detail,Item Customer Detail,Item Customer Detail
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Confirma teu email
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Oferta candidat a Job.
 DocType: Notification Control,Prompt for Email on Submission of,Demana el correu electrònic al Presentar
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Total de fulles assignats més de dia en el període
 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 +107,Default settings for accounting transactions.,Ajustos predeterminats per a les operacions comptables.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} és necessari
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Emmotllament per buit
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data prevista no pot ser anterior material Data de sol·licitud
 DocType: Contact Us Settings,City,Ciutat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Mecanitzat per ultrasons
 apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Error: No és un document d&#39;identitat vàlid?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,L'Article {0} ha de ser un article de Vendes
 DocType: Naming Series,Update Series Number,Actualització Nombre Sèries
@@ -3723,7 +3569,7 @@
 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/page/setup_wizard/install_fixtures.py +84,Engineer,Enginyer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Enginyer
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Assemblees Cercar Sub
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Codi de l'article necessari a la fila n {0}
 DocType: Sales Partner,Partner Type,Tipus de Partner
@@ -3731,7 +3577,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Descompte
 DocType: Purchase Invoice,Against Expense Account,Contra el Compte de Despeses
 DocType: Production Order,Production Order,Ordre de Producció
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,La Nota d'Instal·lació {0} ja s'ha presentat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,La Nota d'Instal·lació {0} ja s'ha presentat
 DocType: Quotation Item,Against Docname,Contra DocName
 DocType: SMS Center,All Employee (Active),Tot Empleat (Actiu)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Veure ara
@@ -3740,19 +3586,19 @@
 DocType: Item,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/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Diagrama de Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Temps parcial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Temps parcial
 DocType: Employee,Applicable Holiday List,Llista de vacances aplicable
 DocType: Employee,Cheque,Xec
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Sèries Actualitzat
 apps/erpnext/erpnext/accounts/doctype/account/account.py +131,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/doctype/purchase_common/purchase_common.py +69,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/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Al detall i a l'engròs
+apps/erpnext/erpnext/setup/setup_wizard/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/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,La Primera Usuari:
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,La Primera Usuari:
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,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/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Reconciliats amb èxit
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Reconciliats amb èxit
 DocType: Production Order,Planned End Date,Planejat Data de finalització
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Lloc d'emmagatzematge dels articles.
 DocType: Tax Rule,Validity,Validesa
@@ -3772,39 +3618,36 @@
 DocType: DocPerm,Level,Nivell
 DocType: Purchase Taxes and Charges,On Net Total,En total net
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,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/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,No té permís per utilitzar l'eina de Pagament
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,No té permís per utilitzar l'eina de Pagament
 apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,«Notificació adreces de correu electrònic 'no especificats per recurrent% s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Mòlta
 apps/erpnext/erpnext/accounts/doctype/account/account.py +99,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: Company,Round Off Account,Per arrodonir el compte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Rosegant
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Despeses d'Administració
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Pares Grup de Clients
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Canvi
 DocType: Purchase Invoice,Contact Email,Correu electrònic de contacte
 DocType: Appraisal Goal,Score Earned,Score Earned
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","per exemple ""El meu Company LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Període de Notificació
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","per exemple ""El meu Company LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Període de Notificació
 DocType: Bank Reconciliation Detail,Voucher ID,Val ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,This is a root territory and cannot be edited.
 DocType: Packing Slip,Gross Weight UOM,Pes brut UDM
 DocType: Email Digest,Receivables / Payables,Cobrar / pagar
 DocType: Delivery Note Item,Against Sales Invoice,Contra la factura de venda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Estampat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Compte de Crèdit
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost article
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,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: 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 +521,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 +525,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l&#39;atribut {0}"
 DocType: Item,Default Warehouse,Magatzem predeterminat
 DocType: Task,Actual End Date (via Time Logs),Actual Data de finalització (a través dels registres de temps)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Pressupost no es pot assignar contra comptes de grup {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Si us plau, introduïu el centre de cost dels pares"
 DocType: Delivery Note,Print Without Amount,Imprimir Sense Monto
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoria d'impostos no poden 'Valoració' o 'Valoració i Total ""com tots els articles no siguin disponible articles"
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoria d'impostos no poden 'Valoració' o 'Valoració i Total ""com tots els articles no siguin disponible articles"
 DocType: User,Last Name,Cognoms
 DocType: Web Page,Left,Esquerra
 DocType: Event,All Day,Tot el dia
@@ -3812,7 +3655,7 @@
 DocType: Appraisal,Total Score (Out of 5),Puntuació total (de 5)
 DocType: Contact Us Settings,State,Estat
 DocType: Batch,Batch,Lot
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Equilibri
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Equilibri
 DocType: Project,Total Expense Claim (via Expense Claims),Reclamació de Despeses totals (a través de reclamacions de despeses)
 DocType: User,Gender,Gènere
 DocType: Journal Entry,Debit Note,Nota de Dèbit
@@ -3842,8 +3685,7 @@
 DocType: Purchase Order,Get Last Purchase Rate,Obtenir Darrera Tarifa de compra
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Facturació Tarifa basada en Tipus d&#39;activitat (per hora)
 DocType: Company,Company Info,Qui Som
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","ID de correu electrònic de l'empresa no trobat, per tant, no s'ha enviat el correu"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +206,"Company Email ID not found, hence mail not sent","ID de correu electrònic de l'empresa no trobat, per tant, no s'ha enviat el correu"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicació de Fons (Actius)
 DocType: Production Planning Tool,Filter based on item,Filtre basada en l'apartat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Compte Dèbit
@@ -3855,17 +3697,16 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{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/selling/doctype/quotation/quotation.js +591,From Opportunity,De Oportunitat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Supressió
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficis als empleats
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficis als empleats
 DocType: Sales Invoice,Is POS,És TPV
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,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}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,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
 DocType: Purchase Receipt Item,Accepted Quantity,Quantitat Acceptada
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} no existeix
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Factures enviades als clients.
 DocType: DocField,Default,Defecte
 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 +466,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +468,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}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonats afegir
 DocType: Maintenance Schedule,Schedule,Horari
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definir Pressupost per a aquest centre de cost. Per configurar l&#39;acció de pressupost, vegeu &quot;Llista de l&#39;Empresa&quot;"
@@ -3876,7 +3717,7 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,La llista de preus no existeix o està deshabilitada
 DocType: Expense Claim,Approved,Aprovat
 DocType: Pricing Rule,Price,Preu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Empleat rellevat en {0} ha de ser establert com 'Esquerra'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +88,Employee relieved on {0} must be set as 'Left',Empleat rellevat en {0} ha de ser establert com 'Esquerra'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","En seleccionar ""Sí"" li donarà una identitat única a cada entitat d'aquest article que es pot veure a la taula mestre de Números de sèrie"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,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ó
@@ -3887,7 +3728,7 @@
 apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Informes estàndard
 apps/erpnext/erpnext/config/accounts.py +13,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 +209,Please select Employee Record first.,Seleccioneu Employee Record primer.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Seleccioneu Employee Record primer.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Per crear un compte d'impostos
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Si us plau ingressi Compte de Despeses
@@ -3900,46 +3741,43 @@
 DocType: Sales Order,Track this Sales Order against any Project,Seguir aquesta Ordre Vendes cap algun projecte
 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
 DocType: DocShare,Document Type,Tipus de document
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Oferta de Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,From Supplier Quotation,Oferta de Proveïdor
 DocType: Deduction Type,Deduction Type,Tipus Deducció
 DocType: Attendance,Half Day,Medi Dia
 DocType: Pricing Rule,Min Qty,Quantitat mínima
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Per realitzar un seguiment d&#39;articles en vendes i documents de compra amb els números de lot. &quot;Indústria Preferida: Químics&quot;
 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 +91,Total Tax,Impost Total
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Impost Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,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/accounts/doctype/journal_entry/journal_entry.py +79,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
 DocType: Notification Control,Purchase Receipt Message,Rebut de Compra Missatge
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Total de fulles assignats més de període
 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 +23,Record item movement.,Desa el Moviment d'article
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Llista de subscriptors al butlletí
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Mortajar
 DocType: Email Account,Service,Servei
 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 +232,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}.
 ,Monthly Salary Register,Registre de Salari mensual
-apps/frappe/frappe/website/template.py +140,Next,Següent
+apps/frappe/frappe/desk/page/setup_wizard/setup_wizard_page.html +17,Next,Següent
 DocType: Warranty Claim,If different than customer address,Si és diferent de la direcció del client
 DocType: BOM Operation,BOM Operation,BOM Operació
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,El electropolit
 DocType: Purchase Taxes and Charges,On Previous Row Amount,A limport de la fila anterior
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,"Si us plau, introduïu la suma del pagament en almenys una fila"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,"Si us plau, introduïu la suma del pagament en almenys una fila"
 DocType: POS Profile,POS Profile,POS Perfil
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","L'estacionalitat d'establir pressupostos, objectius, etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Fila {0}: Quantitat de pagament no pot ser superior a quantitat lliurada
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Total no pagat
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Registre d'hores no facturable
 apps/erpnext/erpnext/stock/get_item_details.py +128,"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/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Comprador
+apps/erpnext/erpnext/public/js/setup_wizard.js +272,Purchaser,Comprador
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Salari net no pot ser negatiu
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Introduïu manualment la partida dels comprovants
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Introduïu manualment la partida dels comprovants
 DocType: SMS Settings,Static Parameters,Paràmetres estàtics
 DocType: Purchase Order,Advance Paid,Bestreta pagada
 DocType: Item,Item Tax,Impost d'article
@@ -3948,14 +3786,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Enviar SMS massiu als seus contactes
 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/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-balanceig
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Targeta De Crèdit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,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 +95,Default settings for stock transactions.,Ajustos per defecte per a les transaccions de valors.
 DocType: Purchase Invoice,Next Date,Següent Data
 DocType: Employee Education,Major/Optional Subjects,Major/Optional Subjects
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Entra les taxes i càrrecs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Conreu
 DocType: Sales Invoice Item,Drop Ship,Nau de la gota
 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: Hub Settings,Seller Name,Nom del venedor
@@ -3965,7 +3801,7 @@
 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
 DocType: Item Attribute,Numeric Values,Els valors numèrics
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Adjuntar Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +246,Attach Logo,Adjuntar Logo
 DocType: Customer,Commission Rate,Percentatge de comissió
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Fer Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Bloquejar sol·licituds d'absències per departament.
@@ -3980,19 +3816,19 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Seleccioneu un arxiu csv
 DocType: Dropbox Backup,Send Backups to Dropbox,Enviar còpies de seguretat de Dropbox
 DocType: Purchase Order,To Receive and Bill,Per Rebre i Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Dissenyador
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Dissenyador
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Plantilla de Termes i Condicions
 DocType: Serial No,Delivery Details,Detalls del lliurament
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,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/stock/doctype/purchase_receipt/purchase_receipt.py +386,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: Item,Automatically create Material Request if quantity falls below this level,Creació automàtica de sol·licitud de materials si la quantitat és inferior a aquest nivell
 ,Item-wise Purchase Register,Registre de compra d'articles
 DocType: Batch,Expiry Date,Data De Caducitat
-apps/erpnext/erpnext/stock/doctype/item/item.py +375,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Per establir el nivell de comanda, article ha de ser un article de compra o fabricació d&#39;articles"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Per establir el nivell de comanda, article ha de ser un article de compra o fabricació d&#39;articles"
 ,Supplier Addresses and Contacts,Adreces i contactes dels proveïdors
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Si us plau, Selecciona primer la Categoria"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projecte mestre.
 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 +330, (Half Day),(Mig dia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Mig dia)
 DocType: Supplier,Credit Days,Dies de Crèdit
 DocType: Leave Type,Is Carry Forward,Is Carry Forward
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Obtenir elements de la llista de materials
@@ -4000,7 +3836,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Llista de materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,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}
 DocType: Dropbox Backup,Send Notifications To,Enviar notificacions a
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Data
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +54,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Raons per deixar el
 DocType: Expense Claim Detail,Sanctioned Amount,Sanctioned Amount
 DocType: GL Entry,Is Opening,Està obrint
@@ -4008,4 +3844,3 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,El compte {0} no existeix
 DocType: Account,Cash,Efectiu
 DocType: Employee,Short biography for website and other publications.,Breu biografia de la pàgina web i altres publicacions.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Si us plau, creu Estructura salarial per als empleats {0}"