[translations]
diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index 660e5b7..6999b02 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -33,7 +33,7 @@
 DocType: Purchase Order,% Billed,% Facturat
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Tipus de canvi ha de ser el mateix que {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nom del client
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +131,Bank account cannot be named as {0},Compte bancari no pot ser nomenat com {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +132,Bank account cannot be named as {0},Compte bancari no pot ser nomenat com {0}
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Tots els camps relacionats amb l'exportació, com la moneda, taxa de conversió, el total de les exportacions, els totals de les exportacions etc estan disponibles a notes de lliurament, TPV, ofertes, factura de venda, ordre de venda, etc."
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Capçaleres (o grups) contra els quals es mantenen els assentaments comptables i els saldos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +173,Outstanding for {0} cannot be less than zero ({1}),Excedent per {0} no pot ser menor que zero ({1})
@@ -47,7 +47,7 @@
 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'inici
 apps/erpnext/erpnext/utilities/transaction_base.py +107,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 +206,New Leave Application,Nova aplicació Deixar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +226,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
@@ -82,7 +82,7 @@
 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ó."
 apps/erpnext/erpnext/controllers/recurring_document.py +129,New {0}: #{1},Nova {0}: # {1}
 ,Sales Partners Commission,Comissió dels revenedors
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Abreviatura no pot tenir més de 5 caràcters
+apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Abreviatura no pot tenir més de 5 caràcters
 DocType: Payment Request,Payment Request,Sol·licitud de Pagament
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Atribut Valor {0} no es pot treure de {1} com Article Variants \ existeixen amb aquest atribut.
@@ -196,6 +196,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Data d'instal·lació no pot ser abans de la data de lliurament d'article {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Descompte Preu de llista Taxa (%)
 DocType: Offer Letter,Select Terms and Conditions,Selecciona Termes i Condicions
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,valor fora
 DocType: Production Planning Tool,Sales Orders,Ordres de venda
 DocType: Purchase Taxes and Charges,Valuation,Valoració
 ,Purchase Order Trends,Compra Tendències Sol·licitar
@@ -208,6 +209,7 @@
 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}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +408,Advance amount cannot be greater than {0} {1},quantitat d'avanç no pot ser més gran que {0} {1}
 DocType: Naming Series,Series List for this Transaction,Llista de Sèries per a aquesta transacció
 DocType: Sales Invoice,Is Opening Entry,És assentament d'obertura
 DocType: Customer Group,Mention if non-standard receivable account applicable,Esmenteu si compta per cobrar no estàndard aplicable
@@ -227,7 +229,7 @@
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea nòmina per als criteris abans esmentats.
 apps/erpnext/erpnext/templates/generators/item.html +30,No description given,Cap descripció donada
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Sol·licitud de venda.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +173,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 +193,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/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ó> Configuració> Sèrie Naming"
@@ -236,8 +238,8 @@
 apps/erpnext/erpnext/stock/utils.py +178,Warehouse {0} does not belong to company {1},Magatzem {0} no pertany a l'empresa {1}
 DocType: Item Website Specification,Item Website Specification,Especificacions d'article al Web
 DocType: Payment Tool,Reference No,Referència número
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +398,Leave Blocked,Absència bloquejada
-apps/erpnext/erpnext/stock/doctype/item/item.py +586,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 +418,Leave Blocked,Absència bloquejada
+apps/erpnext/erpnext/stock/doctype/item/item.py +572,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 +341,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Estoc Reconciliació article
 DocType: Stock Entry,Sales Invoice No,Factura No
@@ -249,7 +251,7 @@
 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 +606,Item {0} is cancelled,L'article {0} està cancel·lat
+apps/erpnext/erpnext/stock/doctype/item/item.py +592,Item {0} is cancelled,L'article {0} està cancel·lat
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,Material Request,Sol·licitud de materials
 DocType: Bank Reconciliation,Update Clearance Date,Actualització Data Liquidació
 DocType: Item,Purchase Details,Informació de compra
@@ -297,7 +299,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +699,Delivery Note,Nota de lliurament
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configuració d'Impostos
 apps/erpnext/erpnext/accounts/utils.py +191,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 +387,{0} entered twice in Item Tax,{0} entrat dues vegades en l'Impost d'article
+apps/erpnext/erpnext/stock/doctype/item/item.py +381,{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
@@ -329,7 +331,7 @@
 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 +215,Please see attachment,"Si us plau, vegeu el document adjunt"
 DocType: Purchase Order,% Received,% Rebut
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Configuració acabada !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,Configuració acabada !!
 ,Finished Goods,Béns Acabats
 DocType: Delivery Note,Instructions,Instruccions
 DocType: Quality Inspection,Inspected By,Inspeccionat per
@@ -354,14 +356,13 @@
 ,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 +169,{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 +189,{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/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/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}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Oportunitats
 DocType: Employee,Single,Solter
-DocType: Issue,Attachment,Accessori
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Pressupost no es pot establir de centres de cost Grup
 DocType: Account,Cost of Goods Sold,Cost de Vendes
 DocType: Purchase Invoice,Yearly,Anual
@@ -390,7 +391,7 @@
 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 +564,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 +550,Attribute {0} selected multiple times in Attributes Table,Atribut {0} seleccionat diverses vegades en la taula Atributs
 DocType: HR Settings,Employee record is created using selected field. ,Es crea el registre d'empleat utilitzant el camp seleccionat.
 DocType: Sales Order,Not Applicable,No Aplicable
 apps/erpnext/erpnext/config/hr.py +148,Holiday master.,Mestre de vacances.
@@ -429,7 +430,7 @@
 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/setup_wizard/industry_type.py +20,Cosmetics,Productes cosmètics
-apps/erpnext/erpnext/stock/doctype/item/item.py +468,"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 +454,"To merge, following properties must be same for both items","Per fusionar, propietats han de ser el mateix per a tots dos articles"
 DocType: Shipping Rule,Net Weight,Pes Net
 DocType: Employee,Emergency Phone,Telèfon d'Emergència
 ,Serial No Warranty Expiry,Venciment de la garantia del número de sèrie
@@ -440,7 +441,8 @@
 apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Subcontractació Gestió
 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}
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Account {0} does not belong to company: {1},Compte {0} no pertany a la companyia: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation already used for another company,Abreviatura ja utilitzat per una altra empresa
 DocType: Selling Settings,Default Customer Group,Grup predeterminat Client
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Si ho desactives, el camp 'Arrodonir Total' no serà visible a cap transacció"
 DocType: BOM,Operating Cost,Cost de funcionament
@@ -476,6 +478,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +126,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 +89,Financial / accounting year.,Exercici comptabilitat /.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Els valors acumulats
 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"
 DocType: Project Task,Project Task,Tasca del projecte
 ,Lead Id,Identificador del client potencial
@@ -497,7 +500,7 @@
 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/stock/doctype/item/item.py +712,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unitat de mesura per defecte per a l'article {0} no es pot canviar directament perquè ja ha realitzat alguna transacció (s) amb una altra UOM. Vostè haurà de crear un nou element a utilitzar un UOM predeterminat diferent.
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unitat de mesura per defecte per a l'article {0} no es pot canviar directament perquè ja ha realitzat alguna transacció (s) amb una altra UOM. Vostè haurà de crear un nou element a utilitzar un UOM predeterminat diferent.
 apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Suma assignat no pot ser negatiu
 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.
@@ -575,7 +578,7 @@
 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 +543,Item has variants.,L'article té variants.
+apps/erpnext/erpnext/stock/doctype/item/item.py +529,Item has variants.,L'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
@@ -588,6 +591,7 @@
 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.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,en Valor
 DocType: Lead,Campaign Name,Nom de la campanya
 ,Reserved,Reservat
 DocType: Purchase Order,Supply Raw Materials,Subministrament de Matèries Primeres
@@ -602,16 +606,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +92,Account with existing transaction cannot be converted to ledger,El Compte de la transacció existent no es pot convertir a llibre major
 DocType: Delivery Note,Customer's Purchase Order No,Del client Ordre de Compra No
 DocType: Employee,Cell Number,Número de cel·la
-apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Les sol·licituds de material auto generada
+apps/erpnext/erpnext/stock/reorder_item.py +166,Auto Material Requests Generated,Les sol·licituds de material auto generada
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdut
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +126,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/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/utilities/doctype/address/address.py +103,There is an error in your Address Template {0},Hi ha un error en la seva plantilla de direcció {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,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 +274,Row {0}: Conversion Factor is mandatory,Fila {0}: el factor de conversió és obligatori
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +271,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Regles Preu múltiples existeix amb el mateix criteri, si us plau, resoldre els conflictes mitjançant l'assignació de prioritat. Regles de preus: {0}"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Entrades de Comptabilitat es poden fer en contra de nodes fulla. No es permeten els comentaris en contra dels grups.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +357,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
@@ -673,7 +679,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +255,Price List not selected,Llista de preus no seleccionat
 DocType: Employee,Family Background,Antecedents de família
 DocType: Process Payroll,Send Email,Enviar per correu electrònic
-apps/erpnext/erpnext/stock/doctype/item/item.py +148,Warning: Invalid Attachment {0},Advertència: no vàlida Adjunt {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +147,Warning: Invalid Attachment {0},Advertència: no vàlida Adjunt {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,No permission
 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"
@@ -703,13 +709,13 @@
 DocType: Production Planning Tool,Select Items,Seleccionar elements
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,{0} against Bill {1} dated {2},{0} contra Bill {1} {2} de data
 DocType: Maintenance Visit,Completion Status,Estat de finalització
-DocType: Sales Invoice Item,Target Warehouse,Magatzem destí
+DocType: Production Order,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 +50,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/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/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +34,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/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Estat és {2}
@@ -717,7 +723,7 @@
 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 +247,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 +240,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','Obertura'
 DocType: Notification Control,Delivery Note Message,Missatge de la Nota de lliurament
 DocType: Expense Claim,Expenses,Despeses
@@ -727,7 +733,7 @@
 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
-DocType: Item,Re-Order Qty,Re-Quantitat
+DocType: Item Reorder,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}
 DocType: Pricing Rule,Price or Discount,Preu o Descompte
@@ -770,7 +776,7 @@
 DocType: Bank Reconciliation,Total Amount,Quantitat total
 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/stock_balance/stock_balance.py +53,Balance Value,Valor Saldo
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Llista de preus de venda
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicar sincronitzar articles
 DocType: Bank Reconciliation,Account Currency,Compte moneda
@@ -779,7 +785,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 +538,Item Variants {0} updated,Article Variants {0} actualitza
+apps/erpnext/erpnext/stock/doctype/item/item.py +524,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
@@ -856,7 +862,7 @@
 DocType: POS Profile,Cash/Bank Account,Compte de Caixa / Banc
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,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 +561,Attribute table is mandatory,Taula d'atributs és obligatori
+apps/erpnext/erpnext/stock/doctype/item/item.py +547,Attribute table is mandatory,Taula d'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/public/js/pos/pos.html +28,Discount,Descompte
@@ -884,7 +890,7 @@
 DocType: Tax Rule,Shipping State,Estat de l'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/setup_wizard/setup_wizard.py +134,Standard Buying,Compra Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,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ó
@@ -926,7 +932,7 @@
 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 +210,Production Order {0} must be cancelled before cancelling this Sales Order,Ordre de Producció {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
-apps/erpnext/erpnext/public/js/controllers/transaction.js +879,Please set 'Apply Additional Discount On',"Si us plau, estableix "Aplicar descompte addicional en '"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +909,Please set 'Apply Additional Discount On',"Si us plau, estableix "Aplicar descompte addicional en '"
 ,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.
@@ -994,9 +1000,9 @@
 DocType: Contact,User ID,ID d'usuari
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +132,View Ledger,Veure Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Earliest
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,"An Item Group exists with same name, please change the item name or rename the item group","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 +431,"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: Production Order,Manufacture against Sales Order,Fabricació contra ordre de vendes
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +450,Rest Of The World,Resta del món
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +452,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
@@ -1026,7 +1032,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +189,Not authorized to edit frozen Account {0},No autoritzat per editar el compte bloquejat {0}
 DocType: Journal Entry,Get Outstanding Invoices,Rep les factures pendents
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Vendes Sol·licitar {0} no és vàlid
-apps/erpnext/erpnext/setup/doctype/company/company.py +159,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
+apps/erpnext/erpnext/setup/doctype/company/company.py +165,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
 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}
@@ -1045,7 +1051,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
 apps/erpnext/erpnext/public/js/setup_wizard.js +277,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/stock/doctype/item/item.py +122,Website Image should be a public file or website URL,Lloc web imatge ha de ser un arxiu públic o URL del lloc web
+apps/erpnext/erpnext/stock/doctype/item/item.py +121,Website Image should be a public file or website URL,Lloc web imatge ha de ser un arxiu públic o URL del lloc web
 apps/erpnext/erpnext/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
 DocType: Warehouse,Warehouse Contact Info,Informació del contacte del magatzem
@@ -1117,6 +1123,7 @@
 DocType: Address,Utilities,Utilitats
 DocType: Purchase Invoice Item,Accounting,Comptabilitat
 DocType: Features Setup,Features Setup,Característiques del programa d'instal·lació
+DocType: Item,Is Service Item,És un servei
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +82,Application period cannot be outside leave allocation period,Període d'aplicació no pot ser període d'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
@@ -1147,7 +1154,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 +465,cannot be greater than 100,no pot ser major que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +597,Item {0} is not a stock Item,Article {0} no és un article d'estoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +583,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
@@ -1207,7 +1214,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Govern
 apps/erpnext/erpnext/config/stock.py +263,Item Variants,Variants de l'article
 DocType: Company,Services,Serveis
-apps/erpnext/erpnext/accounts/report/financial_statements.py +154,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +174,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
@@ -1280,17 +1287,17 @@
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,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/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Torneu a enviar el pagament per correu electrònic
 DocType: Dependent Task,Dependent Task,Tasca dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +350,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 +157,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 +344,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 +177,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'antelació.
 DocType: HR Settings,Stop Birthday Reminders,Aturar recordatoris d'aniversari
 DocType: SMS Center,Receiver List,Llista de receptors
 DocType: Payment Tool Detail,Payment Amount,Quantitat de pagament
 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 +512,{0} View,{0} Veure
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +93,Net Change in Cash,Canvi Net en Efectiu
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Canvi Net en Efectiu
 DocType: Salary Structure Deduction,Salary Structure Deduction,Salary Structure Deduction
-apps/erpnext/erpnext/stock/doctype/item/item.py +345,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 +339,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/accounts/doctype/payment_request/payment_request.py +26,Payment Request already exists {0},Sol·licitud de pagament ja existeix {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost d'articles Emeses
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Quantity must not be more than {0},La quantitat no ha de ser més de {0}
@@ -1352,7 +1359,7 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Seleccioneu el codi de l'article
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reduir Deducció per absències sense sou (LWP)
 DocType: Territory,Territory Manager,Gerent de Territory
-DocType: Delivery Note Item,To Warehouse (Optional),Per magatzems (Opcional)
+DocType: Packed Item,To Warehouse (Optional),Per magatzems (Opcional)
 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
@@ -1361,7 +1368,7 @@
 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 +201,"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 +194,"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 +217,Time Log Batch {0} must be 'Submitted',S'ha de 'Presentar' el registre de temps {0}
@@ -1372,6 +1379,7 @@
 DocType: Employee,Date Of Retirement,Data de la jubilació
 DocType: Upload Attendance,Get Template,Aconsegueix Plantilla
 DocType: Address,Postal,Postal
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +203,ERPNext Setup Complete!,Configuració ERPNext completa!
 DocType: Item,Weightage,Weightage
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"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 +155,Please select {0} first.,Seleccioneu {0} primer.
@@ -1400,12 +1408,12 @@
 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
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permetre diverses ordres de venda en contra d'un client Ordre de Compra
-apps/erpnext/erpnext/setup/doctype/company/company.py +139,Main,Inici
+apps/erpnext/erpnext/setup/doctype/company/company.py +145,Main,Inici
 apps/erpnext/erpnext/stock/doctype/item/item.js +53,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establir prefix de numeracions seriades a les transaccions
 DocType: Employee Attendance Tool,Employees HTML,Els empleats HTML
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +165,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 +367,Default BOM ({0}) must be active for this item or its template,Per defecte la llista de materials ({0}) ha d'estar actiu per aquest material o la seva plantilla
+apps/erpnext/erpnext/stock/doctype/item/item.py +361,Default BOM ({0}) must be active for this item or its template,Per defecte la llista de materials ({0}) ha d'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
@@ -1430,7 +1438,6 @@
 DocType: Sales Order,To Deliver and Bill,Per Lliurar i Bill
 DocType: GL Entry,Credit Amount in Account Currency,Suma de crèdit en compte Moneda
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Registres de temps per a la seva fabricació.
-DocType: Item,Apply Warehouse-wise Reorder Level,Aplicar Warehouse-savi Nivell de Reabastament
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +425,BOM {0} must be submitted,BOM {0} ha de ser presentat
 DocType: Authorization Control,Authorization Control,Control d'Autorització
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +92,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: Magatzem Rebutjat és obligatori en la partida rebutjada {1}
@@ -1529,6 +1536,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Fila # {0}: Operació {1} no s'ha completat per {2} Quantitat de productes acabats en ordre de producció # {3}. Si us plau, actualitzi l'estat de funcionament a través dels registres de temps"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Inversions
 DocType: Issue,Resolution Details,Resolució Detalls
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,les assignacions
 DocType: Quality Inspection Reading,Acceptance Criteria,Criteris d'acceptació
 DocType: Item Attribute,Attribute Name,Nom del Atribut
 DocType: Item Group,Show In Website,Mostra en el lloc web
@@ -1579,7 +1587,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,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
 DocType: Leave Block List Allow,Leave Block List Allow,Leave Block List Allow
-apps/erpnext/erpnext/setup/doctype/company/company.py +228,Abbr can not be blank or space,Abbr no pot estar en blanc o l'espai
+apps/erpnext/erpnext/setup/doctype/company/company.py +234,Abbr can not be blank or space,Abbr no pot estar en blanc o l'espai
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Group to Non-Group,Grup de No-Grup
 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
@@ -1620,7 +1628,7 @@
 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 +152,Warning: Invalid SSL certificate on attachment {0},Avís: certificat SSL no vàlid en la inclinació {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +151,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
@@ -1769,7 +1777,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Cas No. No pot ser 0
 DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity,Si vostè té equip de vendes i Venda Partners (Socis de canal) que poden ser etiquetats i mantenir la seva contribució en l'activitat de vendes
 DocType: Item,Show a slideshow at the top of the page,Mostra una presentació de diapositives a la part superior de la pàgina
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Botigues
+DocType: Item,"Allow in Sales Order of type ""Service""",Deixi d'ordres de venda de "Servei" Tipus
+apps/erpnext/erpnext/setup/doctype/company/company.py +86,Stores,Botigues
 DocType: Time Log,Projects Manager,Gerent de Projectes
 DocType: Serial No,Delivery Time,Temps de Lliurament
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Envelliment basat en
@@ -1794,7 +1803,7 @@
 ,Financial Analytics,Comptabilitat analítica
 DocType: Quality Inspection,Verified By,Verified Per
 DocType: Address,Subsidiary,Filial
-apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","No es pot canviar moneda per defecte de l'empresa, perquè hi ha operacions existents. Les transaccions han de ser cancel·lades a canviar la moneda per defecte."
+apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","No es pot canviar moneda per defecte de l'empresa, perquè hi ha operacions existents. Les transaccions han de ser cancel·lades a canviar la moneda per defecte."
 DocType: Quality Inspection,Purchase Receipt No,Número de rebut de compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Diners Earnest
 DocType: Process Payroll,Create Salary Slip,Crear fulla de nòmina
@@ -1842,7 +1851,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +205,Raw Materials cannot be blank.,Matèries primeres no poden estar en blanc.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +425,"Could not update stock, invoice contains drop shipping item.","No s'ha pogut actualitzar valors, factura conté els articles de l'enviament de la gota."
 DocType: Newsletter,Test,Prova
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Com que hi ha transaccions d'accions existents per aquest concepte, \ no pot canviar els valors de 'no té de sèrie', 'Té lot n', 'És de la Element "i" Mètode de valoració'"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Seient Ràpida
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,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
@@ -1951,7 +1960,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,"Si us plau, nota de lliurament primer"
 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/accounts/doctype/bank_reconciliation/bank_reconciliation.py +65,Clearance Date not mentioned,No s'esmenta l'espai de dates
 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ó
@@ -1961,7 +1970,7 @@
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
 DocType: Salary Structure,Total Earning,Benefici total
 DocType: Purchase Receipt,Time at which materials were received,Moment en què es van rebre els materials
-apps/erpnext/erpnext/utilities/doctype/address/address.py +118,My Addresses,Els meus Direccions
+apps/erpnext/erpnext/utilities/doctype/address/address.py +125,My Addresses,Els meus Direccions
 DocType: Stock Ledger Entry,Outgoing Rate,Sortint Rate
 apps/erpnext/erpnext/config/hr.py +108,Organization branch master.,Organization branch master.
 apps/erpnext/erpnext/controllers/accounts_controller.py +253, or ,o
@@ -2030,7 +2039,7 @@
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrar grup Client arbre.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +302,New Cost Center Name,Nou nom de centres de cost
 DocType: Leave Control Panel,Leave Control Panel,Deixa Panell de control
-apps/erpnext/erpnext/utilities/doctype/address/address.py +95,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"No hi ha adreça predeterminada. Si us plau, crea'n una de nova a Configuració> Premsa i Branding> plantilla d'adreça."
+apps/erpnext/erpnext/utilities/doctype/address/address.py +96,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"No hi ha adreça predeterminada. Si us plau, crea'n una de nova a Configuració> Premsa i Branding> plantilla d'adreça."
 DocType: Appraisal,HR User,HR User
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impostos i despeses deduïdes
 apps/erpnext/erpnext/shopping_cart/utils.py +36,Issues,Qüestions
@@ -2047,7 +2056,7 @@
 ,Sales Browser,Analista de Vendes
 DocType: Journal Entry,Total Credit,Crèdit Total
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,Warning: Another {0} # {1} exists against stock entry {2},Hi ha un altre {0} # {1} contra l'entrada de població {2}: Són els
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +392,Local,Local
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +394,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Préstecs i bestretes (Actius)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Deutors
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Gran
@@ -2066,7 +2075,6 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Totes les transaccions de venda es poden etiquetar contra múltiples venedors ** ** perquè pugui establir i monitoritzar metes.
 ,S.O. No.,S.O. No.
 DocType: Production Order Operation,Make Time Log,Feu l'hora de registre
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Please set reorder quantity,Si us plau ajust la quantitat de comanda
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +154,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
@@ -2153,7 +2161,7 @@
 DocType: Bank Reconciliation,Get Relevant Entries,Obtenir assentaments corresponents
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +409,Accounting Entry for Stock,Entrada Comptabilitat de Stock
 DocType: Sales Invoice,Sales Team1,Equip de Vendes 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,Item {0} does not exist,Article {0} no existeix
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Item {0} does not exist,Article {0} no existeix
 DocType: Sales Invoice,Customer Address,Direcció del client
 DocType: Payment Request,Recipient and Message,Del destinatari i el missatge
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar addicional de descompte en les
@@ -2195,7 +2203,7 @@
 DocType: Purchase Invoice Item,Valuation Rate,Tarifa de Valoració
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +147,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 +155,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
@@ -2233,7 +2241,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Please enter relieving date.
 apps/erpnext/erpnext/controllers/trends.py +138,Amt,Amt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Només es poden presentar les Aplicacions d'absència amb estat ""Aprovat"""
-apps/erpnext/erpnext/utilities/doctype/address/address.py +24,Address Title is mandatory.,Títol d'adreça obligatori.
+apps/erpnext/erpnext/utilities/doctype/address/address.py +25,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/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
@@ -2257,6 +2265,7 @@
 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: Sales Invoice Item,Customer Warehouse (Optional),Magatzem al client (opcional)
 DocType: Pricing Rule,Discount Percentage,%Descompte
 DocType: Payment Reconciliation Invoice,Invoice Number,Número de factura
 apps/erpnext/erpnext/hooks.py +55,Orders,Ordres
@@ -2366,7 +2375,7 @@
 DocType: Appraisal,Appraisal,Avaluació
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data repetida
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Signant Autoritzat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +164,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 +184,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
@@ -2535,7 +2544,7 @@
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Replace Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,País savi defecte Plantilles de direcció
 DocType: Sales Order Item,Supplier delivers to Customer,Proveïdor lliura al Client
-apps/erpnext/erpnext/public/js/controllers/transaction.js +733,Show tax break-up,Mostrar impostos ruptura
+apps/erpnext/erpnext/public/js/controllers/transaction.js +763,Show tax break-up,Mostrar impostos ruptura
 apps/erpnext/erpnext/accounts/party.py +283,Due / Reference Date cannot be after {0},A causa / Data de referència no pot ser posterior a {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Les dades d'importació i exportació
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Si s'involucra en alguna fabricació. Activa 'es fabrica'
@@ -2585,7 +2594,7 @@
 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 +384,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 +378,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/doctype/company/company.js +22,Please re-type company name to confirm,"Si us plau, torneu a escriure nom de l'empresa per confirmar"
@@ -2613,9 +2622,6 @@
 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
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Salary Structure,Estructura salarial
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +256,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","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/setup_wizard/industry_type.py +9,Airline,Aerolínia
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +579,Issue Material,Material Issue
@@ -2640,7 +2646,7 @@
 DocType: Issue,Opening Time,Temps d'obertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Des i Fins a la data sol·licitada
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +554,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitat de mesura per defecte per Variant '{0}' ha de ser el mateix que a la plantilla '{1}'
+apps/erpnext/erpnext/stock/doctype/item/item.py +540,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitat de mesura per defecte per Variant '{0}' ha de ser el mateix que a la plantilla '{1}'
 DocType: Shipping Rule,Calculate Based On,Calcula a causa del
 DocType: Delivery Note Item,From Warehouse,De Magatzem
 DocType: Purchase Taxes and Charges,Valuation and Total,Valoració i total
@@ -2649,7 +2655,7 @@
 DocType: Account,Purchase User,Usuari de compres
 DocType: Notification Control,Customize the Notification,Personalitza la Notificació
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Flux de caixa operatiu
-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
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,La Plantilla de la direcció predeterminada no es pot eliminar
 DocType: Sales Invoice,Shipping Rule,Regla d'enviament
 DocType: Manufacturer,Limited to 12 characters,Limitat a 12 caràcters
 DocType: Journal Entry,Print Heading,Imprimir Capçalera
@@ -2743,7 +2749,7 @@
 apps/erpnext/erpnext/controllers/trends.py +258,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/setup_wizard/setup_wizard.py +373,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +375,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'articles
 DocType: Cost Center,Distribution Id,ID de Distribució
 apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Serveis impressionants
@@ -2762,7 +2768,7 @@
 DocType: Customer,Default Receivable Accounts,Per defecte Comptes per cobrar
 DocType: Tax Rule,Billing State,Estat de facturació
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +607,Transfer,Transferència
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +640,Fetch exploded BOM (including sub-assemblies),Fetch exploded BOM (including sub-assemblies)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +642,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 +95,Due Date is mandatory,Data de venciment és obligatori
 apps/erpnext/erpnext/controllers/item_variant.py +52,Increment for Attribute {0} cannot be 0,Increment de Atribut {0} no pot ser 0
@@ -2795,7 +2801,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,No es permeten els ràtios de valoració negatius
 DocType: Holiday List,Weekly Off,Setmanal Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Per exemple, 2012, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +33,Provisional Profit / Loss (Credit),Compte de guanys / pèrdues provisional (Crèdit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +35,Provisional Profit / Loss (Credit),Compte de guanys / pèrdues provisional (Crèdit)
 DocType: Sales Invoice,Return Against Sales Invoice,Retorn Contra Vendes Factura
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Tema 5
 apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},"Si us plau, estableix el valor per defecte {0} a l'empresa {1}"
@@ -2826,6 +2832,7 @@
 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/report/stock_balance/stock_balance.py +47,Opening Value,Valor d'obertura
 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ó
@@ -2859,7 +2866,6 @@
 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/setup_wizard/install_fixtures.py +58,Probation,Probation
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default Warehouse is mandatory for stock Item.,El magatzem predeterminat és obligatòria pels articles d'estoc
 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
@@ -2895,7 +2901,7 @@
 DocType: Payment Tool,Set Matching Amounts,Establir sumes a joc
 DocType: Purchase Invoice,Taxes and Charges Added,Impostos i càrregues afegides
 ,Sales Funnel,Sales Funnel
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Abreviatura és obligatori
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,Abreviatura és obligatori
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Gràcies pel seu interès en subscriure-vos-hi
 ,Qty to Transfer,Quantitat a Transferir
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotitzacions a clients potencials o a clients.
@@ -2923,7 +2929,7 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +691,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/accounts/doctype/journal_entry/journal_entry.py +221,{0} {1} is stopped,{0} {1} està aturat
-apps/erpnext/erpnext/stock/doctype/item/item.py +396,Barcode {0} already used in Item {1},Barcode {0} ja utilitzat en el punt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +390,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
@@ -2946,7 +2952,7 @@
 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 +458,POS Profile required to make POS Entry,POS perfil requerit per fer l'entrada POS
 DocType: Hub Settings,Name Token,Nom Token
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +134,Standard Selling,Standard Selling
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +138,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Almenys un magatzem és obligatori
 DocType: Serial No,Out of Warranty,Fora de la Garantia
 DocType: BOM Replace Tool,Replace,Reemplaçar
@@ -3069,7 +3075,7 @@
 DocType: Sales Invoice,Paid Amount,Quantitat pagada
 ,Available Stock for Packing Items,Estoc disponible per articles d'embalatge
 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/utilities/doctype/address_template/address_template.py +16,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 +113,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo del compte ja en dèbit, no se li permet establir ""El balanç ha de ser"" com ""crèdit"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestió de la Qualitat
 DocType: Production Planning Tool,Filter based on customer,Filtre basat en el client
@@ -3170,7 +3176,7 @@
 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 +578,Item variant {0} exists with same attributes,Hi ha la variant d'article {0} amb mateixos atributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +564,Item variant {0} exists with same attributes,Hi ha la variant d'article {0} amb mateixos atributs
 DocType: Salary Slip,Salary Slip,Slip Salari
 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."
@@ -3181,7 +3187,7 @@
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","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
-apps/erpnext/erpnext/public/js/controllers/transaction.js +749,It is needed to fetch Item Details.,Es necessita a cercar Detalls de l'article.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +779,It is needed to fetch Item Details.,Es necessita a cercar Detalls de l'article.
 DocType: Salary Slip,Net Pay,Pay Net
 DocType: Account,Account,Compte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Nombre de sèrie {0} ja s'ha rebut
@@ -3207,6 +3213,7 @@
 DocType: BOM,Manufacturing User,Usuari de fabricació
 DocType: Purchase Order,Raw Materials Supplied,Matèries primeres subministrades
 DocType: Purchase Invoice,Recurring Print Format,Recurrent Format d'impressió
+DocType: C-Form,Series,Sèrie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +55,Expected Delivery Date cannot be before Purchase Order Date,Data prevista de lliurament no pot ser anterior a l'Ordre de Compra
 DocType: Appraisal,Appraisal Template,Plantilla d'Avaluació
 DocType: Item Group,Item Classification,Classificació d'articles
@@ -3293,7 +3300,7 @@
 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 +434,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 +420,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"
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Administraodr principal de compres
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +426,Production Order {0} must be submitted,L'Ordre de Producció {0} ha d'estar Presentada
@@ -3301,7 +3308,7 @@
 apps/erpnext/erpnext/config/stock.py +136,Main Reports,Informes principals
 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 +194,Add / Edit Prices,Afegeix / Edita Preus
+apps/erpnext/erpnext/stock/doctype/item/item.js +187,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 +315,My Orders,Les meves comandes
@@ -3349,7 +3356,7 @@
 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 +150,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunt de Proveïdors per a l'element {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +115,Website Image {0} attached to Item {1} cannot be found,Lloc web Imatge {0} unit a l'article {1} no es pot trobar
+apps/erpnext/erpnext/stock/doctype/item/item.py +114,Website Image {0} attached to Item {1} cannot be found,Lloc web Imatge {0} unit a l'article {1} no es pot trobar
 DocType: Issue,Content Type,Tipus de Contingut
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Ordinador
 DocType: Item,List this Item in multiple groups on the website.,Fes una llista d'articles en diversos grups en el lloc web.
@@ -3363,7 +3370,7 @@
 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 +357,'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 +351,'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
@@ -3389,7 +3396,7 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Compte {0} Cloenda ha de ser de Responsabilitat / Patrimoni
 DocType: Authorization Rule,Based On,Basat en
 DocType: Sales Order Item,Ordered Qty,Quantitat demanada
-apps/erpnext/erpnext/stock/doctype/item/item.py +590,Item {0} is disabled,Article {0} està deshabilitat
+apps/erpnext/erpnext/stock/doctype/item/item.py +576,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 +168,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.
@@ -3397,7 +3404,7 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Compra de comprovar, si es selecciona aplicable Perquè {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Descompte ha de ser inferior a 100
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Escriu Off Import (Companyia moneda)
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Row #{0}: Please set reorder quantity,Fila # {0}: Configureu la quantitat de comanda
+apps/erpnext/erpnext/stock/doctype/item/item.py +412,Row #{0}: Please set reorder quantity,Fila # {0}: Configureu la quantitat de comanda
 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
@@ -3470,7 +3477,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Veure ara
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Seleccioneu el període en què la factura es generarà de forma automàtica
 DocType: BOM,Raw Material Cost,Matèria primera Cost
-DocType: Item,Re-Order Level,Re-Order Nivell
+DocType: Item Reorder,Re-Order Level,Re-Order Nivell
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Introduïu articles i Quantitat prevista per a les que desitja elevar les ordres de producció o descàrrega de matèries primeres per a la seva anàlisi.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Temps parcial
 DocType: Employee,Applicable Holiday List,Llista de vacances aplicable
@@ -3525,7 +3532,7 @@
 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 +573,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l'atribut {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +559,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l'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}
@@ -3604,7 +3611,7 @@
 DocType: Address,Office,Oficina
 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 +226,Please select Employee Record first.,Seleccioneu Employee Record primer.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +246,Please select Employee Record first.,Seleccioneu Employee Record primer.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,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 +240,Please enter Expense Account,Si us plau ingressi Compte de Despeses
@@ -3679,7 +3686,7 @@
 DocType: Item Attribute,Numeric Values,Els valors numèrics
 apps/erpnext/erpnext/public/js/setup_wizard.js +174,Attach Logo,Adjuntar Logo
 DocType: Customer,Commission Rate,Percentatge de comissió
-apps/erpnext/erpnext/stock/doctype/item/item.js +230,Make Variant,Fer Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +223,Make Variant,Fer Variant
 apps/erpnext/erpnext/config/hr.py +153,Block leave applications by department.,Bloquejar sol·licituds d'absències per departament.
 apps/erpnext/erpnext/templates/pages/cart.html +51,Cart is Empty,El carret està buit
 DocType: Production Order,Actual Operating Cost,Cost de funcionament real
@@ -3696,15 +3703,14 @@
 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 +380,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 +419,"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'articles"
+apps/erpnext/erpnext/stock/doctype/item/item.py +408,"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'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 +380, (Half Day),(Mig dia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +400, (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 +566,Get Items from BOM,Obtenir elements de la llista de materials